sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

Start a nNew thread

Jenkins build became unstable: kamailio44-nightly-source » jessie,master #123

by jenkins＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio44-nightly-source/distribution=jes…>

7 years

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

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 212b33ea0a7c1494cfdca7c06d8425376914cbe9 URL: https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d84253… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> 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/212b33ea0a7c1494cfdca7c06d84253… Patch: https://github.com/kamailio/kamailio/commit/212b33ea0a7c1494cfdca7c06d84253… --- 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,

7 years

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

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 6ff438d29abf1dbbacc071c995456bd91ee93bf3 URL: https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> 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/6ff438d29abf1dbbacc071c995456bd… Patch: https://github.com/kamailio/kamailio/commit/6ff438d29abf1dbbacc071c995456bd… --- 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},

7 years

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

by Victor Seva

Module: kamailio Branch: 4.4 Commit: fb66e911b17f5c4e378c4c8c2dd9a776d7d259b4 URL: https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a77… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> 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/fb66e911b17f5c4e378c4c8c2dd9a77… Patch: https://github.com/kamailio/kamailio/commit/fb66e911b17f5c4e378c4c8c2dd9a77…

7 years

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

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 50414379518b38b1b7210d19f7d8ad1e7ba65d4c URL: https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> 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/50414379518b38b1b7210d19f7d8ad1… Patch: https://github.com/kamailio/kamailio/commit/50414379518b38b1b7210d19f7d8ad1…

7 years

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

by Kamailio Dev

Module: kamailio Branch: 5.0 Commit: cea3af6dd4c2275df1f0e33a7adf0a29ac711b6c URL: https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> 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/cea3af6dd4c2275df1f0e33a7adf0a2… Patch: https://github.com/kamailio/kamailio/commit/cea3af6dd4c2275df1f0e33a7adf0a2… --- 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.

7 years

git:5.0:ae575733: modules/nathelper: check also transport protocol when determining

by Juha Heinanen

Module: kamailio Branch: 5.0 Commit: ae575733a2761dba1232166f105eeb82781229e6 URL: https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb8… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> 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/ae575733a2761dba1232166f105eeb8… Patch: https://github.com/kamailio/kamailio/commit/ae575733a2761dba1232166f105eeb8… --- 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, <quote>;alias</quote> 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. </para> <para> 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 */

7 years

git:5.1:a7049edf: modules/nathelper: check also transport protocol when determining

by Juha Heinanen

Module: kamailio Branch: 5.1 Commit: a7049edf431b8b8f8c80040b3b005c2e00d44eca URL: https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> 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/a7049edf431b8b8f8c80040b3b005c2… Patch: https://github.com/kamailio/kamailio/commit/a7049edf431b8b8f8c80040b3b005c2… --- 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, <quote>;alias</quote> 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. </para> <para> 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 */

7 years

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

by Kamailio Dev

Module: kamailio Branch: master Commit: b79f3e3308786b86864abaddb75e06587722ef6c URL: https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e065… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> 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/b79f3e3308786b86864abaddb75e065… Patch: https://github.com/kamailio/kamailio/commit/b79f3e3308786b86864abaddb75e065… --- 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.

7 years

git:master:93c81f53: modules/nathelper: check also transport protocol when determining

by Juha Heinanen

Module: kamailio Branch: master Commit: 93c81f5326acc2aefaca01c347f79c972727d0bf URL: https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c9… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> 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/93c81f5326acc2aefaca01c347f79c9… Patch: https://github.com/kamailio/kamailio/commit/93c81f5326acc2aefaca01c347f79c9… --- 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, <quote>;alias</quote> 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. </para> <para> 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 */

7 years

← Newer
1
...
18
19
20
21
22
23
24
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017