Re: [sr-dev] [kamailio/kamailio] pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject (#1330)

[Daniel-Constantin Mierla]

Merged #1330.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1330#event-1357747005___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:5.1:0ef5bef4: pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject

[Daniel-Constantin Mierla]

Module: kamailio
Branch: 5.1
Commit: 0ef5bef4738af52a8a7b173cfd662a04a4d568dd
URL: 
https://github.com/kamailio/kamailio/commit/0ef5bef4738af52a8a7b173cfd662a04a4d568dd

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:59+01:00

pkg/kamailio/alpine_docker: Alpine docker scripts moved to subproject

---

Added: .gitmodules
Added: pkg/docker
Modified: pkg/kamailio/alpine/APKBUILD
Removed: pkg/kamailio/alpine_docker/Dockerfile
Removed: pkg/kamailio/alpine_docker/README.md
Removed: pkg/kamailio/alpine_docker/build.sh
Removed: pkg/kamailio/alpine_docker/hooks/pre_build

---

Diff:  
https://github.com/kamailio/kamailio/commit/0ef5bef4738af52a8a7b173cfd662a04a4d568dd.diff
Patch: 
https://github.com/kamailio/kamailio/commit/0ef5bef4738af52a8a7b173cfd662a04a4d568dd.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] pkg/kamailio/obs: Fixed lua module build (#1317)

[Daniel-Constantin Mierla]

Merged #1317.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1317#event-1357746948___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:5.0:50e1a0d1: Revert "pkg/obs: enable the same modules for RHEL 7 as for Centos 7"

[Daniel-Constantin Mierla]

Module: kamailio
Branch: 5.0
Commit: 50e1a0d1837ce319abd57c73991b2ec00499da7a
URL: 
https://github.com/kamailio/kamailio/commit/50e1a0d1837ce319abd57c73991b2ec00499da7a

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:35+01:00

Revert "pkg/obs: enable the same modules for RHEL 7 as for Centos 7"

This reverts commit cb42b9881b3d1f90f3cb54765eef65ce9d773f92.

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  
https://github.com/kamailio/kamailio/commit/50e1a0d1837ce319abd57c73991b2ec00499da7a.diff
Patch: 
https://github.com/kamailio/kamailio/commit/50e1a0d1837ce319abd57c73991b2ec00499da7a.patch

---

diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index 9f0b2a9f12..4cf0d11441 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -132,18 +132,18 @@
 %if 0%{?rhel} == 7 && 0%{?centos_ver} != 7
 %define dist_name rhel
 %define dist_version %{?rhel}
-%bcond_without cnxcc
+%bcond_with cnxcc
 %bcond_with dnssec
-%bcond_without geoip
-%bcond_without http_async_client
-%bcond_without jansson
-%bcond_without json
-%bcond_without kazoo
-%bcond_without memcached
+%bcond_with geoip
+%bcond_with http_async_client
+%bcond_with jansson
+%bcond_with json
+%bcond_with kazoo
+%bcond_with memcached
 %bcond_without perl
 %bcond_without redis
-%bcond_without sctp
-%bcond_without websocket
+%bcond_with sctp
+%bcond_with websocket
 %bcond_without xmlrpc
 %endif
 


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:5.0:2043ab77: pkg/kamailio/obs: Fixed build of lua module

[Daniel-Constantin Mierla]

Module: kamailio
Branch: 5.0
Commit: 2043ab77af5f6e3fe25bd402dc24a2449cffa67e
URL: 
https://github.com/kamailio/kamailio/commit/2043ab77af5f6e3fe25bd402dc24a2449cffa67e

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:35+01:00

pkg/kamailio/obs: Fixed build of lua module

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  
https://github.com/kamailio/kamailio/commit/2043ab77af5f6e3fe25bd402dc24a2449cffa67e.diff
Patch: 
https://github.com/kamailio/kamailio/commit/2043ab77af5f6e3fe25bd402dc24a2449cffa67e.patch

---

diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index 4cf0d11441..1d0a01af83 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -11,6 +11,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -29,6 +30,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -47,6 +49,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -65,6 +68,7 @@
 %bcond_with http_async_client
 %bcond_with jansson
 %bcond_with json
+%bcond_without lua
 %bcond_with kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -84,6 +88,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -102,6 +107,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_with kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -120,6 +126,7 @@
 %bcond_with http_async_client
 %bcond_with jansson
 %bcond_with json
+%bcond_with lua
 %bcond_with kazoo
 %bcond_with memcached
 %bcond_with perl
@@ -138,6 +145,7 @@
 %bcond_with http_async_client
 %bcond_with jansson
 %bcond_with json
+%bcond_with lua
 %bcond_with kazoo
 %bcond_with memcached
 %bcond_without perl


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:e264699b: pkg/kamailio/obs: Fixed build of lua module

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: e264699bdfb63d7fe153d465215fd9cfdaca4993
URL: 
https://github.com/kamailio/kamailio/commit/e264699bdfb63d7fe153d465215fd9cfdaca4993

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:03+01:00

pkg/kamailio/obs: Fixed build of lua module

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  
https://github.com/kamailio/kamailio/commit/e264699bdfb63d7fe153d465215fd9cfdaca4993.diff
Patch: 
https://github.com/kamailio/kamailio/commit/e264699bdfb63d7fe153d465215fd9cfdaca4993.patch

---

diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index c079f02d4b..0f60a0a8a0 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -11,6 +11,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -30,6 +31,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -49,6 +51,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -68,6 +71,7 @@
 %bcond_with http_async_client
 %bcond_with jansson
 %bcond_with json
+%bcond_without lua
 %bcond_with kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -88,6 +92,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_without kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -107,6 +112,7 @@
 %bcond_without http_async_client
 %bcond_without jansson
 %bcond_without json
+%bcond_without lua
 %bcond_with kazoo
 %bcond_without memcached
 %bcond_without perl
@@ -126,6 +132,7 @@
 %bcond_with http_async_client
 %bcond_with jansson
 %bcond_with json
+%bcond_with lua
 %bcond_with kazoo
 %bcond_with memcached
 %bcond_with perl
@@ -145,6 +152,7 @@
 %bcond_with http_async_client
 %bcond_with jansson
 %bcond_with json
+%bcond_with lua
 %bcond_with kazoo
 %bcond_with memcached
 %bcond_without perl


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:70021219: pkg/kamailio/obs: Added acc_diameter module files

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 70021219713d2ab79bcd3282f1073e7a615d27ad
URL: 
https://github.com/kamailio/kamailio/commit/70021219713d2ab79bcd3282f1073e7a615d27ad

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:03+01:00

pkg/kamailio/obs: Added acc_diameter module files

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  
https://github.com/kamailio/kamailio/commit/70021219713d2ab79bcd3282f1073e7a615d27ad.diff
Patch: 
https://github.com/kamailio/kamailio/commit/70021219713d2ab79bcd3282f1073e7a615d27ad.patch

---

diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index e578ca1d99..c079f02d4b 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -1145,6 +1145,7 @@ fi
 
 %dir %{_docdir}/kamailio/modules
 %doc %{_docdir}/kamailio/modules/README.acc
+%doc %{_docdir}/kamailio/modules/README.acc_diameter
 %doc %{_docdir}/kamailio/modules/README.alias_db
 %doc %{_docdir}/kamailio/modules/README.app_jsdt
 %doc %{_docdir}/kamailio/modules/README.async
@@ -1292,6 +1293,7 @@ fi
 
 %dir %{_libdir}/kamailio/modules
 %{_libdir}/kamailio/modules/acc.so
+%{_libdir}/kamailio/modules/acc_diameter.so
 %{_libdir}/kamailio/modules/alias_db.so
 %{_libdir}/kamailio/modules/app_jsdt.so
 %{_libdir}/kamailio/modules/async.so


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:f23c7e34: pkg/kamailio/obs: Added sipdump module

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: f23c7e34061e52aaf7cb79fad22048500f957cbb
URL: 
https://github.com/kamailio/kamailio/commit/f23c7e34061e52aaf7cb79fad22048500f957cbb

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:03+01:00

pkg/kamailio/obs: Added sipdump module

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  
https://github.com/kamailio/kamailio/commit/f23c7e34061e52aaf7cb79fad22048500f957cbb.diff
Patch: 
https://github.com/kamailio/kamailio/commit/f23c7e34061e52aaf7cb79fad22048500f957cbb.patch

---

diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index bd4dd1c769..e578ca1d99 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -185,6 +185,7 @@ Conflicts:  kamailio-postgresql < %ver, kamailio-presence < 
%ver
 Conflicts:  kamailio-python < %ver
 Conflicts:  kamailio-radius < % ver, kamailio-redis < %ver
 Conflicts:  kamailio-regex < %ver, kamailio-sctp < %ver
+Conflicts:  kamailio-sipdump < %ver
 Conflicts:  kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite 
< %ver
 Conflicts:  kamailio-tls < %ver, kamailio-unixodbc < %ver
 Conflicts:  kamailio-utils < %ver, kamailio-websocket < %ver
@@ -690,6 +691,15 @@ Requires:   kamailio-sipcapture = %ver
 reference config for sipcapture daemon.
 
 
+%packagesipdump
+Summary:This module writes SIP traffic and some associated details into 
local files
+Group:  System Environment/Daemons
+Requires:   kamailio = %ver
+
+%descriptionsipdump
+This module writes SIP traffic and some associated details into local files
+
+
 %packagesmsops
 Summary:Tools for handling SMS packets in SIP messages
 Group:  System Environment/Daemons
@@ -1787,6 +1797,12 @@ fi
 %endif
 
 
+%files  sipdump
+%defattr(-,root,root)
+%doc %{_docdir}/kamailio/modules/README.sipdump
+%{_libdir}/kamailio/modules/sipdump.so
+
+
 %files  snmpstats
 %defattr(-,root,root)
 %{_docdir}/kamailio/modules/README.snmpstats


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:88745f4b: pkg/kamailio/obs: Ported ca39ea810c01f6947db70870cc1d786e95cb4bc3 to OBS SPEC

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 88745f4b0ad51e2b9fb7a1817ee3aea201fd306e
URL: 
https://github.com/kamailio/kamailio/commit/88745f4b0ad51e2b9fb7a1817ee3aea201fd306e

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:03+01:00

pkg/kamailio/obs: Ported ca39ea810c01f6947db70870cc1d786e95cb4bc3 to OBS SPEC

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  
https://github.com/kamailio/kamailio/commit/88745f4b0ad51e2b9fb7a1817ee3aea201fd306e.diff
Patch: 
https://github.com/kamailio/kamailio/commit/88745f4b0ad51e2b9fb7a1817ee3aea201fd306e.patch

---

diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec
index a33b7f9315..8ad3290f24 100644
--- a/pkg/kamailio/obs/kamailio.spec
+++ b/pkg/kamailio/obs/kamailio.spec
@@ -176,7 +176,7 @@ Conflicts:  kamailio-postgresql < %ver, kamailio-presence < 
%ver
 Conflicts:  kamailio-python < %ver
 Conflicts:  kamailio-radius < % ver, kamailio-redis < %ver
 Conflicts:  kamailio-regex < %ver, kamailio-sctp < %ver
-Conflicts:  kamailio-snmpstats < %ver, kamailio-sqlite < %ver
+Conflicts:  kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite 
< %ver
 Conflicts:  kamailio-tls < %ver, kamailio-unixodbc < %ver
 Conflicts:  kamailio-utils < %ver, kamailio-websocket < %ver
 Conflicts:  kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver
@@ -712,6 +712,16 @@ Requires:   kamailio = %ver
 Send commands to statsd server.
 
 
+%packagesqlang
+Summary:Squirrel Language (SQLang) for Kamailio
+Group:  System Environment/Daemons
+Requires:   squirrel-libs, kamailio = %version
+BuildRequires:  squirrel-devel gcc-c++
+
+%descriptionsqlang
+app_sqlang module for Kamailio.
+
+
 %packagesqlite
 Summary:SQLite database connectivity for Kamailio
 Group:  System Environment/Daemons
@@ -1206,6 +1216,9 @@ fi
 %doc %{_docdir}/kamailio/modules/README.jsonrpcs
 %doc %{_docdir}/kamailio/modules/README.nosip
 %doc %{_docdir}/kamailio/modules/README.tsilo
+%doc %{_docdir}/kamailio/modules/README.call_obj
+%doc %{_docdir}/kamailio/modules/README.evrexec
+%doc %{_docdir}/kamailio/modules/README.keepalive
 
 
 %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio
@@ -1350,6 +1363,9 @@ fi
 %{_libdir}/kamailio/modules/jsonrpcs.so
 %{_libdir}/kamailio/modules/nosip.so
 %{_libdir}/kamailio/modules/tsilo.so
+%{_libdir}/kamailio/modules/call_obj.so
+%{_libdir}/kamailio/modules/evrexec.so
+%{_libdir}/kamailio/modules/keepalive.so
 
 
 %{_sbindir}/kamailio
@@ -1487,6 +1503,7 @@ fi
 %doc %{_docdir}/kamailio/modules/README.ims_auth
 %doc %{_docdir}/kamailio/modules/README.ims_charging
 %doc %{_docdir}/kamailio/modules/README.ims_dialog
+%doc %{_docdir}/kamailio/modules/README.ims_diameter_server
 %doc %{_docdir}/kamailio/modules/README.ims_icscf
 %doc %{_docdir}/kamailio/modules/README.ims_isc
 %doc %{_docdir}/kamailio/modules/README.ims_qos
@@ -1503,6 +1520,7 @@ fi
 %{_libdir}/kamailio/modules/ims_auth.so
 %{_libdir}/kamailio/modules/ims_charging.so
 %{_libdir}/kamailio/modules/ims_dialog.so
+%{_libdir}/kamailio/modules/ims_diameter_server.so
 %{_libdir}/kamailio/modules/ims_icscf.so
 %{_libdir}/kamailio/modules/ims_isc.so
 %{_libdir}/kamailio/modules/ims_qos.so
@@ -1694,7 +1712,9 @@ fi
 %files  redis
 %defattr(-,root,root)
 %doc %{_docdir}/kamailio/modules/README.ndb_redis
+%doc %{_docdir}/kamailio/modules/README.topos_redis
 %{_libdir}/kamailio/modules/ndb_redis.so
+%{_libdir}/kamailio/modules/topos_redis.so
 %endif
 
 
@@ -1749,6 +1769,12 @@ fi
 %{_libdir}/kamailio/modules/statsd.so
 
 
+%files  sqlang
+%defattr(-,root,root)
+%doc %{_docdir}/kamailio/modules/README.app_sqlang
+%{_libdir}/kamailio/modules/app_sqlang.so
+
+
 %files  sqlite
 %defattr(-,root,root)
 %doc %{_docdir}/kamailio/modules/README.db_sqlite
@@ -1832,6 +1858,13 @@ fi
   - added packaging for Fedora 26 and openSUSE Leap 42.3
   - removed packaging for Fedora 24 and openSUSE Leap 42.1 as End Of Life
   - rewrited SPEC file to support Fedora, RHEL, CentOS, openSUSE distrs
+* Wed Apr 26 2017 Carsten Bock 
+  - added ims_diameter_server module
+  - added topos_redis module
+  - added call_obj module
+  - added evrexec module
+  - added keepalive module
+  - added app_sqlang module
 * Thu Mar 09 2017 Federico Cabiddu 
   - added jansson package
 * Sat Feb 04 2017 Federico Cabiddu 


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:d9639951: pkg/kamailio/obs: Added missed directories to packaging (non systemd dists)

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: d9639951cb70ae927f899e6cef19dfde66512918
URL: 
https://github.com/kamailio/kamailio/commit/d9639951cb70ae927f899e6cef19dfde66512918

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:19:03+01:00

pkg/kamailio/obs: Added missed directories to packaging (non systemd dists)
Added workarround for buggy _sharedstatedir on openSUSE Leap.
Fixed build error for RHEL7 dists
Some SPEC clenup

---

Modified: pkg/kamailio/obs/kamailio.spec

---

Diff:  
https://github.com/kamailio/kamailio/commit/d9639951cb70ae927f899e6cef19dfde66512918.diff
Patch: 
https://github.com/kamailio/kamailio/commit/d9639951cb70ae927f899e6cef19dfde66512918.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] pkg/kamailio: Removed stalled RPM packaging scripts (#1286)

[Daniel-Constantin Mierla]

Merged #1286.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1286#event-1357746798___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:7565fb7a: pkg/kamailio/fedora: Removed unsuported Fedora packaging scripts

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 7565fb7ae287e8656633c57e2133ad91e2043367
URL: 
https://github.com/kamailio/kamailio/commit/7565fb7ae287e8656633c57e2133ad91e2043367

Author: Sergey Safarov 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:18:44+01:00

pkg/kamailio/fedora: Removed unsuported Fedora packaging scripts

---

Removed: pkg/kamailio/fedora/17/README
Removed: pkg/kamailio/fedora/17/kamailio-build.appl
Removed: pkg/kamailio/fedora/17/kamailio.appl
Removed: pkg/kamailio/fedora/17/kamailio.service
Removed: pkg/kamailio/fedora/17/kamailio.spec
Removed: pkg/kamailio/fedora/17/kamailio.sysconfig
Removed: pkg/kamailio/fedora/18/README
Removed: pkg/kamailio/fedora/18/kamailio-build.appl
Removed: pkg/kamailio/fedora/18/kamailio.appl
Removed: pkg/kamailio/fedora/18/kamailio.service
Removed: pkg/kamailio/fedora/18/kamailio.spec
Removed: pkg/kamailio/fedora/18/kamailio.sysconfig

---

Diff:  
https://github.com/kamailio/kamailio/commit/7565fb7ae287e8656633c57e2133ad91e2043367.diff
Patch: 
https://github.com/kamailio/kamailio/commit/7565fb7ae287e8656633c57e2133ad91e2043367.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] http_client: add missed useragent parameter (#1331)

[Daniel-Constantin Mierla]

Merged #1331.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1331#event-1357746514___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] http_client: add missed useragent parameter (#1331)

[Daniel-Constantin Mierla]

Thanks1

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1331#issuecomment-346923852___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:65a777f3: http_client: add missed useragent parameter

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 65a777f3316fb3a3adfa61739a091bb9d61582a8
URL: 
https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb9d61582a8

Author: Vasiliy Ganchev 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:16:55+01:00

http_client: add missed useragent parameter

While preparing query_params, "useragent" was missed - add it.

---

Modified: src/modules/http_client/functions.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb9d61582a8.diff
Patch: 
https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb9d61582a8.patch

---

diff --git a/src/modules/http_client/functions.c 
b/src/modules/http_client/functions.c
index d19910f90f..3dfe21a8a9 100644
--- a/src/modules/http_client/functions.c
+++ b/src/modules/http_client/functions.c
@@ -552,6 +552,7 @@ int curl_con_query_url_f(struct sip_msg* _m, const str 
*connection,
query_params.cacert = default_tls_cacert;
query_params.ciphersuites = conn->ciphersuites;
query_params.tlsversion = conn->tlsversion;
+   query_params.useragent = conn->useragent;
query_params.verify_peer = conn->verify_peer;
query_params.verify_host = conn->verify_host;
query_params.timeout = conn->timeout;


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Update textops.c (#1332)

[Daniel-Constantin Mierla]

Thanks! Patch pushed manually because the one from this PR doesn't have the 
commit message formatted as per guidelines in contributing.md

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1332#issuecomment-346923818___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:ebd51dae: textops: fixed name of in_list() function export to kemi

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: ebd51daea816a6bab3436e24de22d23d079d7c91
URL: 
https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23d079d7c91

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:13:20+01:00

textops: fixed name of in_list() function export to kemi

- reported by GH #1332

---

Modified: src/modules/textops/textops.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23d079d7c91.diff
Patch: 
https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23d079d7c91.patch

---

diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c
index cafb4520be..b05fdd6b31 100644
--- a/src/modules/textops/textops.c
+++ b/src/modules/textops/textops.c
@@ -3940,7 +3940,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = {
{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
-   { str_init("textops"), str_init("is_list"),
+   { str_init("textops"), str_init("in_list"),
SR_KEMIP_INT, ki_in_list,
{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] [kamailio/kamailio] Possible issue with parameters (#1333)

[Daniel-Constantin Mierla]

Thanks! Patch pushed is referenced above. Proof checking other exports is very 
appreciated...

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/1333#issuecomment-346923663___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:b524d25a: textops: kemi search_append() and search_append_body() have two params

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: b524d25a3ba327d7a52544489d847932f1ee1a28
URL: 
https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d847932f1ee1a28

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-25T08:09:49+01:00

textops: kemi search_append() and search_append_body() have two params

- reported by GH #1333

---

Modified: src/modules/textops/textops.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d847932f1ee1a28.diff
Patch: 
https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d847932f1ee1a28.patch

---

diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c
index 7d2f71cf21..cafb4520be 100644
--- a/src/modules/textops/textops.c
+++ b/src/modules/textops/textops.c
@@ -3832,12 +3832,12 @@ static sr_kemi_t sr_kemi_textops_exports[] = {
},
{ str_init("textops"), str_init("search_append"),
SR_KEMIP_INT, ki_search_append,
-   { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
{ str_init("textops"), str_init("search_append_body"),
SR_KEMIP_INT, ki_search_append_body,
-   { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
},
{ str_init("textops"), str_init("is_present_hf"),


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio/kamailio] Possible issue with parameters (#1333)

[Sam]

https://github.com/kamailio/kamailio/blob/f95fda89d4532ba333aed835c72f102a7c032980/src/modules/textops/textops.c#L3835

Hi, it seems that KEMI defines this method to accept one parameter but the 
ki_search_append seems to expect two arguments.

I might have misunderstood how KEMI is implemented but wanted to open this 
ticket in case it is an issue.

The same goes for: search_append_body


-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/1333___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio/kamailio] Update textops.c (#1332)

[Sam]

textops: fixed naming convention

- The original function is named in_ rather than is_, updating to the same 
standard
You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/1332

-- Commit Summary --

  * Update textops.c

-- File Changes --

M src/modules/textops/textops.c (2)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1332.patch
https://github.com/kamailio/kamailio/pull/1332.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1332
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:48d55652: app_jsdt: detect if a kemi function is already in exported list

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 48d55652fa36cb2b20540d1ebc7665476dfb1b1e
URL: 
https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc7665476dfb1b1e

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T19:11:44+01:00

app_jsdt: detect if a kemi function is already in exported list

---

Modified: src/modules/app_jsdt/app_jsdt_kemi_export.c
Modified: src/modules/app_jsdt/utils/app_jsdt_ctl

---

Diff:  
https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc7665476dfb1b1e.diff
Patch: 
https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc7665476dfb1b1e.patch

---

diff --git a/src/modules/app_jsdt/app_jsdt_kemi_export.c 
b/src/modules/app_jsdt/app_jsdt_kemi_export.c
index a1f398f022..2150ab3dcc 100644
--- a/src/modules/app_jsdt/app_jsdt_kemi_export.c
+++ b/src/modules/app_jsdt/app_jsdt_kemi_export.c
@@ -9277,6 +9277,9 @@ duk_c_function sr_kemi_jsdt_export_associate(sr_kemi_t 
*ket)
_sr_kemi_jsdt_export_list[i].ket = ket;
return _sr_kemi_jsdt_export_list[i].pfunc;
}
+   if(_sr_kemi_jsdt_export_list[i].ket==ket) {
+   return _sr_kemi_jsdt_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;
diff --git a/src/modules/app_jsdt/utils/app_jsdt_ctl 
b/src/modules/app_jsdt/utils/app_jsdt_ctl
index eb1bd4c682..26e37aa4ca 100755
--- a/src/modules/app_jsdt/utils/app_jsdt_ctl
+++ b/src/modules/app_jsdt/utils/app_jsdt_ctl
@@ -136,6 +136,9 @@ duk_c_function sr_kemi_jsdt_export_associate(sr_kemi_t *ket)
_sr_kemi_jsdt_export_list[i].ket = ket;
return _sr_kemi_jsdt_export_list[i].pfunc;
}
+   if(_sr_kemi_jsdt_export_list[i].ket==ket) {
+   return _sr_kemi_jsdt_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:e177266e: app_sqlang: detect if a kemi function was already added in exports list

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: e177266e8f113f1541b31496f9fb0c71ac751f17
URL: 
https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c71ac751f17

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T19:15:42+01:00

app_sqlang: detect if a kemi function was already added in exports list

---

Modified: src/modules/app_sqlang/app_sqlang_kemi_export.c
Modified: src/modules/app_sqlang/utils/app_sqlang_ctl

---

Diff:  
https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c71ac751f17.diff
Patch: 
https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c71ac751f17.patch

---

diff --git a/src/modules/app_sqlang/app_sqlang_kemi_export.c 
b/src/modules/app_sqlang/app_sqlang_kemi_export.c
index 52a79df9a3..08d045306c 100644
--- a/src/modules/app_sqlang/app_sqlang_kemi_export.c
+++ b/src/modules/app_sqlang/app_sqlang_kemi_export.c
@@ -9277,6 +9277,9 @@ SQFUNCTION sr_kemi_sqlang_export_associate(sr_kemi_t *ket)
_sr_kemi_sqlang_export_list[i].ket = ket;
return _sr_kemi_sqlang_export_list[i].pfunc;
}
+   if(_sr_kemi_sqlang_export_list[i].ket==ket) {
+   return _sr_kemi_sqlang_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;
diff --git a/src/modules/app_sqlang/utils/app_sqlang_ctl 
b/src/modules/app_sqlang/utils/app_sqlang_ctl
index f5a8375d4a..006dc82321 100755
--- a/src/modules/app_sqlang/utils/app_sqlang_ctl
+++ b/src/modules/app_sqlang/utils/app_sqlang_ctl
@@ -136,6 +136,9 @@ SQFUNCTION sr_kemi_sqlang_export_associate(sr_kemi_t *ket)
_sr_kemi_sqlang_export_list[i].ket = ket;
return _sr_kemi_sqlang_export_list[i].pfunc;
}
+   if(_sr_kemi_sqlang_export_list[i].ket==ket) {
+   return _sr_kemi_sqlang_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:7cbece0e: app_lua: print special kemi functions via rpc

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 7cbece0e2e60f8c334bea97333b029d51e5b7e33
URL: 
https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d51e5b7e33

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T19:39:27+01:00

app_lua: print special kemi functions via rpc

---

Modified: src/modules/app_lua/app_lua_mod.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d51e5b7e33.diff
Patch: 
https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d51e5b7e33.patch

---

diff --git a/src/modules/app_lua/app_lua_mod.c 
b/src/modules/app_lua/app_lua_mod.c
index 4c431dd3ed..b4a44fab70 100644
--- a/src/modules/app_lua/app_lua_mod.c
+++ b/src/modules/app_lua/app_lua_mod.c
@@ -606,6 +606,54 @@ static void app_lua_rpc_list(rpc_t* rpc, void* ctx)
return;
 }
 
+/**
+ * only prototypes of special kemi exports in order to list via rpc
+ */
+/* clang-format off */
+static sr_kemi_t sr_kemi_app_lua_rpc_exports[] = {
+   { str_init("pv"), str_init("get"),
+   SR_KEMIP_STR, NULL,
+   { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+   { str_init("pv"), str_init("seti"),
+   SR_KEMIP_NONE, NULL,
+   { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+   { str_init("pv"), str_init("sets"),
+   SR_KEMIP_NONE, NULL,
+   { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+   { str_init("pv"), str_init("unset"),
+   SR_KEMIP_NONE, NULL,
+   { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+   { str_init("pv"), str_init("is_null"),
+   SR_KEMIP_BOOL, NULL,
+   { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+   { str_init("x"), str_init("modf"),
+   SR_KEMIP_INT, NULL,
+   { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+   { str_init("x"), str_init("exit"),
+   SR_KEMIP_NONE, NULL,
+   { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+   { str_init("x"), str_init("drop"),
+   SR_KEMIP_NONE, NULL,
+   { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
+   SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+   },
+
+   { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }
+};
 
 static const char* app_lua_rpc_api_list_doc[2] = {
"list kemi exports to lua",
@@ -656,6 +704,22 @@ static void app_lua_rpc_api_list(rpc_t* rpc, void* ctx)
return;
}
}
+   for(i=0; sr_kemi_app_lua_rpc_exports[i].fname.s!=NULL; i++) {
+   ket = _kemi_app_lua_rpc_exports[i];
+   if(rpc->struct_add(ih, "{", "func", )<0) {
+   rpc->fault(ctx, 500, "Internal error internal 
structure");
+   return;
+   }
+   if(rpc->struct_add(sh, "",
+   "ret", sr_kemi_param_map_get_name(ket->rtype),
+   "module", >mname,
+   "name", >fname,
+   "params", 
sr_kemi_param_map_get_params(ket->ptypes))<0) {
+   LM_ERR("failed to add the structure with attributes 
(%d)\n", i);
+   rpc->fault(ctx, 500, "Internal error creating dest 
struct");
+   return;
+   }
+   }
 }
 
 rpc_export_t app_lua_rpc_cmds[] = {


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:f4c6365f: app_python: updated the ctl tool to generate the exports

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: f4c6365f2678e5c30d4a1fc287206b82a7eee459
URL: 
https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b82a7eee459

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T19:04:13+01:00

app_python: updated the ctl tool to generate the exports

---

Modified: src/modules/app_python/apy_kemi_export.c
Modified: src/modules/app_python/utils/app_python_ctl

---

Diff:  
https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b82a7eee459.diff
Patch: 
https://github.com/kamailio/kamailio/commit/f4c6365f2678e5c30d4a1fc287206b82a7eee459.patch

---

diff --git a/src/modules/app_python/apy_kemi_export.c 
b/src/modules/app_python/apy_kemi_export.c
index 07cc901abd..fab078b68e 100644
--- a/src/modules/app_python/apy_kemi_export.c
+++ b/src/modules/app_python/apy_kemi_export.c
@@ -9279,6 +9279,9 @@ PyCFunction sr_apy_kemi_export_associate(sr_kemi_t *ket)
_sr_apy_kemi_export_list[i].ket = ket;
return _sr_apy_kemi_export_list[i].pfunc;
}
+   if(_sr_apy_kemi_export_list[i].ket==ket) {
+   return _sr_apy_kemi_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;
diff --git a/src/modules/app_python/utils/app_python_ctl 
b/src/modules/app_python/utils/app_python_ctl
index 273d5ca2c4..7fff1c7f2d 100755
--- a/src/modules/app_python/utils/app_python_ctl
+++ b/src/modules/app_python/utils/app_python_ctl
@@ -34,7 +34,7 @@ cat > ../apy_kemi_export.h <
-#include "../../kemi.h"
+#include "../../core/kemi.h"
 
 #define SR_APY_KEMI_EXPORT_SIZE${KEMI_MAX_SIZE}
 
@@ -83,7 +83,7 @@ cat > ../apy_kemi_export.c <
 
-#include "../../dprint.h"
+#include "../../core/dprint.h"
 
 #include "apy_kemi.h"
 #include "apy_kemi_export.h"
@@ -138,6 +138,9 @@ PyCFunction sr_apy_kemi_export_associate(sr_kemi_t *ket)
_sr_apy_kemi_export_list[i].ket = ket;
return _sr_apy_kemi_export_list[i].pfunc;
}
+   if(_sr_apy_kemi_export_list[i].ket==ket) {
+   return _sr_apy_kemi_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:50a9e2ec: app_lua: updated paths to included files from core in the ctl tool

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 50a9e2ec1cb86590a067dc23b2298b96a12bc232
URL: 
https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b96a12bc232

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T19:05:58+01:00

app_lua: updated paths to included files from core in the ctl tool

---

Modified: src/modules/app_lua/utils/app_lua_ctl

---

Diff:  
https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b96a12bc232.diff
Patch: 
https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b96a12bc232.patch

---

diff --git a/src/modules/app_lua/utils/app_lua_ctl 
b/src/modules/app_lua/utils/app_lua_ctl
index e4ef9aca8c..a14c160b1d 100755
--- a/src/modules/app_lua/utils/app_lua_ctl
+++ b/src/modules/app_lua/utils/app_lua_ctl
@@ -36,7 +36,7 @@ cat > ../app_lua_kemi_export.h <
 #include 
 #include 
-#include "../../kemi.h"
+#include "../../core/kemi.h"
 
 #define SR_KEMI_LUA_EXPORT_SIZE${KEMI_MAX_SIZE}
 
@@ -87,7 +87,7 @@ cat > ../app_lua_kemi_export.c <
 #include 
 
-#include "../../dprint.h"
+#include "../../core/dprint.h"
 
 #include "app_lua_sr.h"
 #include "app_lua_kemi_export.h"


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:ac8cc0a3: app_lua: updated the utils/app_lua_ctl

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: ac8cc0a3735325ec79a4a634eea6bcdcea4affe7
URL: 
https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcdcea4affe7

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T19:00:34+01:00

app_lua: updated the utils/app_lua_ctl

---

Modified: src/modules/app_lua/utils/app_lua_ctl

---

Diff:  
https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcdcea4affe7.diff
Patch: 
https://github.com/kamailio/kamailio/commit/ac8cc0a3735325ec79a4a634eea6bcdcea4affe7.patch

---

diff --git a/src/modules/app_lua/utils/app_lua_ctl 
b/src/modules/app_lua/utils/app_lua_ctl
index 6a85943dda..e4ef9aca8c 100755
--- a/src/modules/app_lua/utils/app_lua_ctl
+++ b/src/modules/app_lua/utils/app_lua_ctl
@@ -142,6 +142,9 @@ lua_CFunction sr_kemi_lua_export_associate(sr_kemi_t *ket)
_sr_kemi_lua_export_list[i].ket = ket;
return _sr_kemi_lua_export_list[i].pfunc;
}
+   if(_sr_kemi_lua_export_list[i].ket==ket) {
+   return _sr_kemi_lua_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:6c7bc039: drouting: removed unused variable

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 6c7bc0390fc1d9972ca9fc330c25dd9b29f2476a
URL: 
https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9b29f2476a

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T18:48:09+01:00

drouting: removed unused variable

---

Modified: src/modules/drouting/drouting.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9b29f2476a.diff
Patch: 
https://github.com/kamailio/kamailio/commit/6c7bc0390fc1d9972ca9fc330c25dd9b29f2476a.patch

---

diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c
index 148c991a25..234e3ea1b9 100644
--- a/src/modules/drouting/drouting.c
+++ b/src/modules/drouting/drouting.c
@@ -729,7 +729,6 @@ static int do_routing(struct sip_msg *msg, int grp_id)
struct sip_uri uri;
str *ruri;
int_str val;
-   struct usr_avp *avp;
 #define DR_MAX_GWLIST 32
static int active_gwlist[DR_MAX_GWLIST];
static int local_gwlist[DR_MAX_GWLIST];
@@ -1209,4 +1208,4 @@ int mod_register(char *path, int *dlflags, void *p1, void 
*p2)
 {
sr_kemi_modules_add(sr_kemi_drouting_exports);
return 0;
-}
\ No newline at end of file
+}


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:d98a005a: app_lua: detect if a kemi function was already added in the exports list

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: d98a005ac57b957231f8bda26c711bf7c7260049
URL: 
https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf7c7260049

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T18:42:07+01:00

app_lua: detect if a kemi function was already added in the exports list

---

Modified: src/modules/app_lua/app_lua_kemi_export.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf7c7260049.diff
Patch: 
https://github.com/kamailio/kamailio/commit/d98a005ac57b957231f8bda26c711bf7c7260049.patch

---

diff --git a/src/modules/app_lua/app_lua_kemi_export.c 
b/src/modules/app_lua/app_lua_kemi_export.c
index 0fe6c0d9cb..29aa0e3d2b 100644
--- a/src/modules/app_lua/app_lua_kemi_export.c
+++ b/src/modules/app_lua/app_lua_kemi_export.c
@@ -9281,6 +9281,9 @@ lua_CFunction sr_kemi_lua_export_associate(sr_kemi_t *ket)
_sr_kemi_lua_export_list[i].ket = ket;
return _sr_kemi_lua_export_list[i].pfunc;
}
+   if(_sr_kemi_lua_export_list[i].ket==ket) {
+   return _sr_kemi_lua_export_list[i].pfunc;
+   }
}
LM_ERR("no more indexing slots\n");
return NULL;


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:b24cae28: cnxcc: docs - added parameters to functions

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: b24cae28dcb8ba3289e0320a1e406e4667371258
URL: 
https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4667371258

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T15:15:19+01:00

cnxcc: docs - added parameters to functions

---

Modified: src/modules/cnxcc/doc/cnxcc_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4667371258.diff
Patch: 
https://github.com/kamailio/kamailio/commit/b24cae28dcb8ba3289e0320a1e406e4667371258.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:3205c597: core: mod_fix - typedefed struct to pvs_fixup_t

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 3205c5970652bba56e2e3904a565491503fb6206
URL: 
https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491503fb6206

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T14:44:12+01:00

core: mod_fix - typedefed struct to pvs_fixup_t

---

Modified: src/core/mod_fix.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491503fb6206.diff
Patch: 
https://github.com/kamailio/kamailio/commit/3205c5970652bba56e2e3904a565491503fb6206.patch

---

diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c
index 3e8562add6..b07adcfc26 100644
--- a/src/core/mod_fix.c
+++ b/src/core/mod_fix.c
@@ -259,14 +259,14 @@ FIXUP_F1T(pvar_null, 1, 1, FPARAM_PVS)
 FIXUP_F1T(pvar_pvar, 1, 2, FPARAM_PVS)
 */
 
-struct pvs_fixup {
+typedef struct pvs_fixup {
pv_spec_t pvs; /* parsed pv spec */
void* orig;/* original pointer */
-};
+} pvs_fixup_t;
 
 int fixup_pvar_all(void** param, int param_no)
 {
-   struct pvs_fixup* pvs_f;
+   pvs_fixup_t* pvs_f;
str name;

pvs_f = 0;
@@ -296,14 +296,14 @@ int fixup_pvar_all(void** param, int param_no)
 
 int fixup_free_pvar_all(void** param, int param_no)
 {
-   struct pvs_fixup* pvs_f;
+   pvs_fixup_t* pvs_f;

if (*param) {
pvs_f = *param;
*param = pvs_f->orig;
/* free only the contents (don't attempt to free _f->pvs)*/
pv_spec_destroy(_f->pvs);
-   /* free the whole pvs_fixup */
+   /* free the whole pvs_fixup_t */
pkg_free(pvs_f);
}
return 0;


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:41953f19: cnxcc: use fixup function helper for core to get string and int params

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 41953f192185989b5ba3ee7154202b6c390fe84c
URL: 
https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6c390fe84c

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T14:48:38+01:00

cnxcc: use fixup function helper for core to get string and int params

---

Modified: src/modules/cnxcc/cnxcc_mod.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6c390fe84c.diff
Patch: 
https://github.com/kamailio/kamailio/commit/41953f192185989b5ba3ee7154202b6c390fe84c.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] [kamailio/kamailio] http_client: add missed useragent parameter (#1331)

[Vasiliy Ganchev]

While preparing query_params, "useragent" was missed - add it. 
As before User-Agent was never present in HTTP requests.

 Pre-Submission Checklist



- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, 
...)
- [x] Each component has a single commit (if not, squash them into one commit)
- [x] No commits to README files for modules (changes must be done to docbook 
files
in `doc/` subfolder, the README file is autogenerated)

 Type Of Change
- [x] Small bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)

 Checklist:

- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue # (replace  with an open issue number)

 Description


You can view, comment on, or merge this pull request online at:

  https://github.com/kamailio/kamailio/pull/1331

-- Commit Summary --

  * http_client: add missed useragent parameter

-- File Changes --

M src/modules/http_client/functions.c (1)

-- Patch Links --

https://github.com/kamailio/kamailio/pull/1331.patch
https://github.com/kamailio/kamailio/pull/1331.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1331
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » i386,trusty,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » i386,jessie,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » i386,squeeze,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » i386,precise,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:db004a73: cnxcc: clang format the code

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: db004a73d21c29a6a375d46eb15a6ba0b58910a7
URL: 
https://github.com/kamailio/kamailio/commit/db004a73d21c29a6a375d46eb15a6ba0b58910a7

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T12:37:54+01:00

cnxcc: clang format the code

---

Modified: src/modules/cnxcc/cnxcc.c
Modified: src/modules/cnxcc/cnxcc.h
Modified: src/modules/cnxcc/cnxcc_check.c
Modified: src/modules/cnxcc/cnxcc_check.h
Modified: src/modules/cnxcc/cnxcc_mod.c
Modified: src/modules/cnxcc/cnxcc_mod.h
Modified: src/modules/cnxcc/cnxcc_redis.c
Modified: src/modules/cnxcc/cnxcc_redis.h
Modified: src/modules/cnxcc/cnxcc_rpc.c
Modified: src/modules/cnxcc/cnxcc_rpc.h
Modified: src/modules/cnxcc/cnxcc_select.c
Modified: src/modules/cnxcc/cnxcc_select.h
Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c
Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.h

---

Diff:  
https://github.com/kamailio/kamailio/commit/db004a73d21c29a6a375d46eb15a6ba0b58910a7.diff
Patch: 
https://github.com/kamailio/kamailio/commit/db004a73d21c29a6a375d46eb15a6ba0b58910a7.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » amd64,wheezy,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » amd64,squeeze,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » i386,xenial,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » amd64,precise,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » amd64,jessie,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:a8b4bd94: lcr: exported functions to kemi framework

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: a8b4bd942794c864d8455ca9fb144c1daa76e164
URL: 
https://github.com/kamailio/kamailio/commit/a8b4bd942794c864d8455ca9fb144c1daa76e164

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T11:05:21+01:00

lcr: exported functions to kemi framework

---

Modified: src/modules/lcr/lcr_mod.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/a8b4bd942794c864d8455ca9fb144c1daa76e164.diff
Patch: 
https://github.com/kamailio/kamailio/commit/a8b4bd942794c864d8455ca9fb144c1daa76e164.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:8fbf7d83: lcr: exported load_gws() variants to kemi framework

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 8fbf7d83b1dbeedf1ee53895aadbf6e99321432d
URL: 
https://github.com/kamailio/kamailio/commit/8fbf7d83b1dbeedf1ee53895aadbf6e99321432d

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2017-11-24T11:05:21+01:00

lcr: exported load_gws() variants to kemi framework

---

Modified: src/modules/lcr/lcr_mod.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/8fbf7d83b1dbeedf1ee53895aadbf6e99321432d.diff
Patch: 
https://github.com/kamailio/kamailio/commit/8fbf7d83b1dbeedf1ee53895aadbf6e99321432d.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » i386,wheezy,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-binaries » amd64,trusty,slave #123

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-source » wheezy,master #124

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-source » trusty,master #124

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] rfc: clang format the code

[Daniel-Constantin Mierla]

On 24.11.17 09:12, Juha Heinanen wrote:
> Am Donnerstag, 23. November 2017, 17:20:48 CET schrieb Daniel-Constantin 
> Mierla:
>
>> it was discussed during the last irc devel meeting and everyone there
>> agreed to use clang-format to format the source code:
>>
>>   - https://clang.llvm.org/docs/ClangFormat.html
> Does anyone have emacs c-mode-hook for this or am I too old school when
> I still use emacs?
>
>
Not using clang myself, but found:

  - https://github.com/sonatard/clang-format

Then this blog looks to be recent enough:

  - https://eklitzke.org/smarter-emacs-clang-format

Cheers,
Daniel

-- 
Daniel-Constantin Mierla
www.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio Advanced Training - www.asipto.com
Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] Jenkins build is back to stable : kamailio44-nightly-source » squeeze,master #124

[jenkins]

See 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.4:212b33ea: pkg/kamailio/deb: kamailio-nth add less as default [skip ci]

[Victor Seva]

Module: kamailio
Branch: 4.4
Commit: 212b33ea0a7c1494cfdca7c06d8425376914cbe9
URL: 
https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d8425376914cbe9

Author: Victor Seva 
Committer: Victor Seva 
Date: 2017-11-24T10:01:48+01:00

pkg/kamailio/deb: kamailio-nth add less as default [skip ci]

* most is not available on all distributions

(cherry picked from commit c4e5d9bf4438561fe8a87361b462eff38dc88d93)
(cherry picked from commit 974a7d54052f4009376d451dcdad7620206cb1ca)

---

Modified: pkg/kamailio/deb/debian/control
Modified: pkg/kamailio/deb/jessie/control
Modified: pkg/kamailio/deb/precise/control
Modified: pkg/kamailio/deb/sid/control
Modified: pkg/kamailio/deb/squeeze/control
Modified: pkg/kamailio/deb/stretch/control
Modified: pkg/kamailio/deb/trusty/control
Modified: pkg/kamailio/deb/wheezy/control
Modified: pkg/kamailio/deb/xenial/control

---

Diff:  
https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d8425376914cbe9.diff
Patch: 
https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d8425376914cbe9.patch

---

diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control
index d03fb7b8f7..3bf11e1bc0 100644
--- a/pkg/kamailio/deb/debian/control
+++ b/pkg/kamailio/deb/debian/control
@@ -752,9 +752,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control
index 72f8280055..eaa3e17f96 100644
--- a/pkg/kamailio/deb/jessie/control
+++ b/pkg/kamailio/deb/jessie/control
@@ -750,9 +750,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control
index ad956b19e6..8f753a5fe6 100644
--- a/pkg/kamailio/deb/precise/control
+++ b/pkg/kamailio/deb/precise/control
@@ -699,9 +699,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control
index 78e68197c5..ac96ff2f42 100644
--- a/pkg/kamailio/deb/sid/control
+++ b/pkg/kamailio/deb/sid/control
@@ -734,9 +734,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control
index 5000fadd9d..3a5ff22fbc 100644
--- a/pkg/kamailio/deb/squeeze/control
+++ b/pkg/kamailio/deb/squeeze/control
@@ -579,9 +579,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control
index 78e68197c5..ac96ff2f42 100644
--- a/pkg/kamailio/deb/stretch/control
+++ b/pkg/kamailio/deb/stretch/control
@@ -734,9 +734,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control
index 278464023d..cbbf16e5b8 100644
--- a/pkg/kamailio/deb/trusty/control
+++ b/pkg/kamailio/deb/trusty/control
@@ -749,9 +749,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control
index 3cf91a7a8d..a5aa33c3c7 100644
--- a/pkg/kamailio/deb/wheezy/control
+++ b/pkg/kamailio/deb/wheezy/control
@@ -681,9 +681,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,
diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control
index dc312d65e9..fba230d851 100644
--- a/pkg/kamailio/deb/xenial/control
+++ b/pkg/kamailio/deb/xenial/control
@@ -751,9 +751,9 @@ Depends:
  gcc,
  gdb,
  iftop,
+ less | most,
  lsof,
  mc,
- most,
  ngrep,
  psmisc,
  screen,


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.4:6ff438d2: pkg/kamailio/deb: add lsb-base [skip ci]

[Victor Seva]

Module: kamailio
Branch: 4.4
Commit: 6ff438d29abf1dbbacc071c995456bd91ee93bf3
URL: 
https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd91ee93bf3

Author: Victor Seva 
Committer: Victor Seva 
Date: 2017-11-24T10:01:48+01:00

pkg/kamailio/deb: add lsb-base [skip ci]

fixes lintian error:
> E: kamailio: init.d-script-needs-depends-on-lsb-base etc/init.d/kamailio

(cherry picked from commit 574ad1fc96fa207a5a30fba66977d27e50ea1da1)
(cherry picked from commit 253e7884b67349c5042ff721161d974adc8e9bc4)

---

Modified: pkg/kamailio/deb/debian/control
Modified: pkg/kamailio/deb/jessie/control
Modified: pkg/kamailio/deb/precise/control
Modified: pkg/kamailio/deb/sid/control
Modified: pkg/kamailio/deb/squeeze/control
Modified: pkg/kamailio/deb/stretch/control
Modified: pkg/kamailio/deb/trusty/control
Modified: pkg/kamailio/deb/wheezy/control
Modified: pkg/kamailio/deb/xenial/control

---

Diff:  
https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd91ee93bf3.diff
Patch: 
https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd91ee93bf3.patch

---

diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control
index aad8454efb..d03fb7b8f7 100644
--- a/pkg/kamailio/deb/debian/control
+++ b/pkg/kamailio/deb/debian/control
@@ -66,6 +66,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control
index 78140a5be2..72f8280055 100644
--- a/pkg/kamailio/deb/jessie/control
+++ b/pkg/kamailio/deb/jessie/control
@@ -64,6 +64,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control
index c14f5f38ec..ad956b19e6 100644
--- a/pkg/kamailio/deb/precise/control
+++ b/pkg/kamailio/deb/precise/control
@@ -61,6 +61,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control
index f500a50ffc..78e68197c5 100644
--- a/pkg/kamailio/deb/sid/control
+++ b/pkg/kamailio/deb/sid/control
@@ -64,6 +64,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control
index 3b2e6d7a2e..5000fadd9d 100644
--- a/pkg/kamailio/deb/squeeze/control
+++ b/pkg/kamailio/deb/squeeze/control
@@ -54,6 +54,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control
index f500a50ffc..78e68197c5 100644
--- a/pkg/kamailio/deb/stretch/control
+++ b/pkg/kamailio/deb/stretch/control
@@ -64,6 +64,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control
index c444350189..278464023d 100644
--- a/pkg/kamailio/deb/trusty/control
+++ b/pkg/kamailio/deb/trusty/control
@@ -63,6 +63,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control
index 7d77b3da16..3cf91a7a8d 100644
--- a/pkg/kamailio/deb/wheezy/control
+++ b/pkg/kamailio/deb/wheezy/control
@@ -60,6 +60,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control
index dd03c6c3ca..dc312d65e9 100644
--- a/pkg/kamailio/deb/xenial/control
+++ b/pkg/kamailio/deb/xenial/control
@@ -65,6 +65,7 @@ Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
  adduser,
+ lsb-base,
  python,
  ${misc:Depends},
  ${shlibs:Depends},


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.4:fb66e911: pkg/kamailio/deb: remove lintian errors for old distributions [skip ci]

[Victor Seva]

Module: kamailio
Branch: 4.4
Commit: fb66e911b17f5c4e378c4c8c2dd9a776d7d259b4
URL: 
https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a776d7d259b4

Author: Victor Seva 
Committer: Victor Seva 
Date: 2017-11-24T10:01:15+01:00

pkg/kamailio/deb: remove lintian errors for old distributions [skip ci]

* we are using a newer version of lintian, so new errors are detected

(cherry picked from commit a56d67d3b7e0d4f5014f91b6b413c5861afc3560)

---

Added: pkg/kamailio/deb/jessie/kamailio-mysql-modules.lintian-overrides
Added: pkg/kamailio/deb/precise/kamailio-mysql-modules.lintian-overrides
Added: pkg/kamailio/deb/squeeze/kamailio-mysql-modules.lintian-overrides
Added: pkg/kamailio/deb/trusty/kamailio-mysql-modules.lintian-overrides
Added: pkg/kamailio/deb/wheezy/kamailio-mysql-modules.lintian-overrides
Added: pkg/kamailio/deb/xenial/kamailio-mysql-modules.lintian-overrides
Modified: pkg/kamailio/deb/debian/backports/jessie
Modified: pkg/kamailio/deb/debian/backports/precise
Modified: pkg/kamailio/deb/debian/backports/squeeze
Modified: pkg/kamailio/deb/debian/backports/trusty
Modified: pkg/kamailio/deb/debian/backports/wheezy
Modified: pkg/kamailio/deb/debian/backports/xenial
Modified: pkg/kamailio/deb/jessie/source.lintian-overrides
Modified: pkg/kamailio/deb/precise/source.lintian-overrides
Modified: pkg/kamailio/deb/squeeze/source.lintian-overrides
Modified: pkg/kamailio/deb/trusty/source.lintian-overrides
Modified: pkg/kamailio/deb/wheezy/source.lintian-overrides
Modified: pkg/kamailio/deb/xenial/source.lintian-overrides

---

Diff:  
https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a776d7d259b4.diff
Patch: 
https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a776d7d259b4.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:4.4:50414379: pkg/kamailio/deb: wrap-and-sort -sat [skip ci]

[Victor Seva]

Module: kamailio
Branch: 4.4
Commit: 50414379518b38b1b7210d19f7d8ad1e7ba65d4c
URL: 
https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1e7ba65d4c

Author: Victor Seva 
Committer: Victor Seva 
Date: 2017-11-24T10:00:55+01:00

pkg/kamailio/deb: wrap-and-sort -sat [skip ci]

---

Modified: pkg/kamailio/deb/debian/control
Modified: pkg/kamailio/deb/jessie/control
Modified: pkg/kamailio/deb/precise/control
Modified: pkg/kamailio/deb/sid/control
Modified: pkg/kamailio/deb/squeeze/control
Modified: pkg/kamailio/deb/stretch/control
Modified: pkg/kamailio/deb/trusty/control
Modified: pkg/kamailio/deb/wheezy/control
Modified: pkg/kamailio/deb/xenial/control

---

Diff:  
https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1e7ba65d4c.diff
Patch: 
https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1e7ba65d4c.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:5.0:cea3af6d: modules: readme files regenerated - modules ... [skip ci]

[Kamailio Dev]

Module: kamailio
Branch: 5.0
Commit: cea3af6dd4c2275df1f0e33a7adf0a29ac711b6c
URL: 
https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a29ac711b6c

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2017-11-24T10:01:16+01:00

modules: readme files regenerated - modules ... [skip ci]

---

Modified: src/modules/nathelper/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a29ac711b6c.diff
Patch: 
https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a29ac711b6c.patch

---

diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README
index f5e831ae5c..3918f479ba 100644
--- a/src/modules/nathelper/README
+++ b/src/modules/nathelper/README
@@ -612,7 +612,8 @@ if(is_rfc1918("$rd")) {
Adds an “;alias=ip~port~transport” parameter to the contact URI
containing either received ip, port, and transport protocol or those
given as parameters. If called without parameters, “;alias” parameter
-   is only added if received ip and port differ from those in contact URI.
+   is only added if received ip, port, or transport protocol differs from
+   that in contact URI.
 
This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,
BRANCH_ROUTE, and LOCAL_ROUTE.


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:5.0:ae575733: modules/nathelper: check also transport protocol when determining

[Juha Heinanen]

Module: kamailio
Branch: 5.0
Commit: ae575733a2761dba1232166f105eeb82781229e6
URL: 
https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb82781229e6

Author: Juha Heinanen 
Committer: Juha Heinanen 
Date: 2017-11-24T10:58:57+02:00

modules/nathelper: check also transport protocol when determining
  if ;alias parameter needs to be added by add_contact_alias() call

---

Modified: src/modules/nathelper/doc/nathelper_admin.xml
Modified: src/modules/nathelper/nathelper.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb82781229e6.diff
Patch: 
https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb82781229e6.patch

---

diff --git a/src/modules/nathelper/doc/nathelper_admin.xml 
b/src/modules/nathelper/doc/nathelper_admin.xml
index d08f80c3a5..d7ea668e02 100644
--- a/src/modules/nathelper/doc/nathelper_admin.xml
+++ b/src/modules/nathelper/doc/nathelper_admin.xml
@@ -707,8 +707,8 @@ if(is_rfc1918("$rd")) {
the contact URI containing either received ip, port, and
transport protocol or those given as parameters.  If called
without parameters, ;alias parameter is
-   only added if received ip and port differ from those in
-   contact URI.
+   only added if received ip, port, or transport protocol differs
+from that in contact URI.


This function can be used from
diff --git a/src/modules/nathelper/nathelper.c 
b/src/modules/nathelper/nathelper.c
index 283e75c89b..642318d52b 100644
--- a/src/modules/nathelper/nathelper.c
+++ b/src/modules/nathelper/nathelper.c
@@ -799,11 +799,12 @@ add_contact_alias_0(struct sip_msg* msg)
LM_DBG("contact uri host is not an ip address\n");
} else {
if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) &&
-   ((msg->rcv.src_port == uri.port_no) ||
-   ((uri.port.len == 0) && (msg->rcv.src_port == 
5060 {
-   LM_DBG("no need to add alias param\n");
-   return 2;
-   }
+((msg->rcv.src_port == uri.port_no) ||
+ ((uri.port.len == 0) && (msg->rcv.src_port == 5060))) &&
+(uri.proto == msg->rcv.proto)) {
+LM_DBG("no need to add alias param\n");
+return 2;
+}
}
 
/* Check if function has been called already */


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:5.1:a7049edf: modules/nathelper: check also transport protocol when determining

[Juha Heinanen]

Module: kamailio
Branch: 5.1
Commit: a7049edf431b8b8f8c80040b3b005c2e00d44eca
URL: 
https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2e00d44eca

Author: Juha Heinanen 
Committer: Juha Heinanen 
Date: 2017-11-24T10:51:04+02:00

modules/nathelper: check also transport protocol when determining
  if ;alias parameter needs to be added by add_contact_alias() call

(cherry picked from commit 93c81f5326acc2aefaca01c347f79c972727d0bf)

---

Modified: src/modules/nathelper/doc/nathelper_admin.xml
Modified: src/modules/nathelper/nathelper.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2e00d44eca.diff
Patch: 
https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2e00d44eca.patch

---

diff --git a/src/modules/nathelper/doc/nathelper_admin.xml 
b/src/modules/nathelper/doc/nathelper_admin.xml
index 9c3373a9ec..c032fc3a84 100644
--- a/src/modules/nathelper/doc/nathelper_admin.xml
+++ b/src/modules/nathelper/doc/nathelper_admin.xml
@@ -707,8 +707,8 @@ if(is_rfc1918("$rd")) {
the contact URI containing either received ip, port, and
transport protocol or those given as parameters.  If called
without parameters, ;alias parameter is
-   only added if received ip and port differ from those in
-   contact URI.
+   only added if received ip, port, or transport protocol differs
+from that in contact URI.


This function can be used from
diff --git a/src/modules/nathelper/nathelper.c 
b/src/modules/nathelper/nathelper.c
index a34d0a19dd..5e7b82b617 100644
--- a/src/modules/nathelper/nathelper.c
+++ b/src/modules/nathelper/nathelper.c
@@ -780,13 +780,13 @@ static int add_contact_alias_0(struct sip_msg *msg)
&& ((ip = str2ip6(&(uri.host))) == NULL)) {
LM_DBG("contact uri host is not an ip address\n");
} else {
-   if(ip_addr_cmp(ip, &(msg->rcv.src_ip))
-   && ((msg->rcv.src_port == uri.port_no)
-  || ((uri.port.len == 0)
- && 
(msg->rcv.src_port == 5060 {
-   LM_DBG("no need to add alias param\n");
-   return 2;
-   }
+   if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) &&
+((msg->rcv.src_port == uri.port_no) ||
+ ((uri.port.len == 0) && (msg->rcv.src_port == 5060))) &&
+(uri.proto == msg->rcv.proto)) {
+LM_DBG("no need to add alias param\n");
+return 2;
+}
}
 
/* Check if function has been called already */


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:b79f3e33: modules: readme files regenerated - nathelper ... [skip ci]

[Kamailio Dev]

Module: kamailio
Branch: master
Commit: b79f3e3308786b86864abaddb75e06587722ef6c
URL: 
https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e06587722ef6c

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2017-11-24T09:31:56+01:00

modules: readme files regenerated - nathelper ... [skip ci]

---

Modified: src/modules/nathelper/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e06587722ef6c.diff
Patch: 
https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e06587722ef6c.patch

---

diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README
index 2b12e8c67c..867e7aad88 100644
--- a/src/modules/nathelper/README
+++ b/src/modules/nathelper/README
@@ -612,7 +612,8 @@ if(is_rfc1918("$rd")) {
Adds an “;alias=ip~port~transport” parameter to the contact URI
containing either received ip, port, and transport protocol or those
given as parameters. If called without parameters, “;alias” parameter
-   is only added if received ip and port differ from those in contact URI.
+   is only added if received ip, port, or transport protocol differs from
+   that in contact URI.
 
This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,
BRANCH_ROUTE, and LOCAL_ROUTE.


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:93c81f53: modules/nathelper: check also transport protocol when determining

[Juha Heinanen]

Module: kamailio
Branch: master
Commit: 93c81f5326acc2aefaca01c347f79c972727d0bf
URL: 
https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c972727d0bf

Author: Juha Heinanen 
Committer: Juha Heinanen 
Date: 2017-11-24T10:18:33+02:00

modules/nathelper: check also transport protocol when determining
  if ;alias parameter needs to be added by add_contact_alias() call

---

Modified: src/modules/nathelper/doc/nathelper_admin.xml
Modified: src/modules/nathelper/nathelper.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c972727d0bf.diff
Patch: 
https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c972727d0bf.patch

---

diff --git a/src/modules/nathelper/doc/nathelper_admin.xml 
b/src/modules/nathelper/doc/nathelper_admin.xml
index 9c3373a9ec..c032fc3a84 100644
--- a/src/modules/nathelper/doc/nathelper_admin.xml
+++ b/src/modules/nathelper/doc/nathelper_admin.xml
@@ -707,8 +707,8 @@ if(is_rfc1918("$rd")) {
the contact URI containing either received ip, port, and
transport protocol or those given as parameters.  If called
without parameters, ;alias parameter is
-   only added if received ip and port differ from those in
-   contact URI.
+   only added if received ip, port, or transport protocol differs
+from that in contact URI.


This function can be used from
diff --git a/src/modules/nathelper/nathelper.c 
b/src/modules/nathelper/nathelper.c
index a34d0a19dd..5e7b82b617 100644
--- a/src/modules/nathelper/nathelper.c
+++ b/src/modules/nathelper/nathelper.c
@@ -780,13 +780,13 @@ static int add_contact_alias_0(struct sip_msg *msg)
&& ((ip = str2ip6(&(uri.host))) == NULL)) {
LM_DBG("contact uri host is not an ip address\n");
} else {
-   if(ip_addr_cmp(ip, &(msg->rcv.src_ip))
-   && ((msg->rcv.src_port == uri.port_no)
-  || ((uri.port.len == 0)
- && 
(msg->rcv.src_port == 5060 {
-   LM_DBG("no need to add alias param\n");
-   return 2;
-   }
+   if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) &&
+((msg->rcv.src_port == uri.port_no) ||
+ ((uri.port.len == 0) && (msg->rcv.src_port == 5060))) &&
+(uri.proto == msg->rcv.proto)) {
+LM_DBG("no need to add alias param\n");
+return 2;
+}
}
 
/* Check if function has been called already */


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

Re: [sr-dev] rfc: clang format the code

[Juha Heinanen]

Am Donnerstag, 23. November 2017, 17:20:48 CET schrieb Daniel-Constantin 
Mierla:

> it was discussed during the last irc devel meeting and everyone there
> agreed to use clang-format to format the source code:
> 
>   - https://clang.llvm.org/docs/ClangFormat.html

Does anyone have emacs c-mode-hook for this or am I too old school when
I still use emacs?

-- Juha

___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev