sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:vseva/trusty DELETED: pkg/kamailio/deb: add verbose output

by Victor Seva

Module: sip-router Branch: vseva/trusty DELETED Commit: c7eecc4dfd76edebb9a94aa653d1dea63561bf35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7eecc4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Apr 22 13:26:03 2014 +0200 pkg/kamailio/deb: add verbose output --- pkg/kamailio/deb/debian/rules | 2 +- pkg/kamailio/deb/jessie/rules | 2 +- pkg/kamailio/deb/precise/rules | 2 +- pkg/kamailio/deb/squeeze/rules | 2 +- pkg/kamailio/deb/trusty/rules | 2 +- pkg/kamailio/deb/wheezy/rules | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index e2a0fba..81d1080 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index e33fd23..46276e1 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index d5be2df..d40b169 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index b94433e..6fa86a7 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -15,7 +15,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index e33fd23..46276e1 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 80323a5..b408807 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6

10 years, 7 months

git:vseva/trusty: pkg/kamailio/deb: add verbose output

by Victor Seva

Module: sip-router Branch: vseva/trusty Commit: c7eecc4dfd76edebb9a94aa653d1dea63561bf35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7eecc4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Apr 22 13:26:03 2014 +0200 pkg/kamailio/deb: add verbose output --- pkg/kamailio/deb/debian/rules | 2 +- pkg/kamailio/deb/jessie/rules | 2 +- pkg/kamailio/deb/precise/rules | 2 +- pkg/kamailio/deb/squeeze/rules | 2 +- pkg/kamailio/deb/trusty/rules | 2 +- pkg/kamailio/deb/wheezy/rules | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index e2a0fba..81d1080 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/jessie/rules b/pkg/kamailio/deb/jessie/rules index e33fd23..46276e1 100755 --- a/pkg/kamailio/deb/jessie/rules +++ b/pkg/kamailio/deb/jessie/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index d5be2df..d40b169 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index b94433e..6fa86a7 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -15,7 +15,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/trusty/rules b/pkg/kamailio/deb/trusty/rules index e33fd23..46276e1 100755 --- a/pkg/kamailio/deb/trusty/rules +++ b/pkg/kamailio/deb/trusty/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6 diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 80323a5..b408807 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -16,7 +16,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 quiet=verbose # java stuff using libgcj12 export JAVA_HOME=/usr/lib/jvm/java-gcj-4.6

10 years, 7 months

git:vseva/trusty: pkg/kamailio/deb: use libgcj14-dev when available

by Victor Seva

Module: sip-router Branch: vseva/trusty Commit: 91c2de3985edf750db31df3deac4e67515cfeac5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91c2de3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Apr 22 11:49:47 2014 +0200 pkg/kamailio/deb: use libgcj14-dev when available --- pkg/kamailio/deb/debian/backports/precise | 3 +++ pkg/kamailio/deb/debian/backports/squeeze | 2 +- pkg/kamailio/deb/debian/backports/wheezy | 3 +++ pkg/kamailio/deb/debian/control | 2 +- pkg/kamailio/deb/jessie/control | 2 +- pkg/kamailio/deb/trusty/control | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 6cf914a..f468442 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -27,6 +27,9 @@ sed -i -e '/FREERADIUS/d' ${DIST}/rules # use old json sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control +#use old libgcj +sed -i 's/libgcj14-dev/libgcj12-dev/' ${DIST}/control + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/backports/squeeze b/pkg/kamailio/deb/debian/backports/squeeze index b037d57..38132db 100755 --- a/pkg/kamailio/deb/debian/backports/squeeze +++ b/pkg/kamailio/deb/debian/backports/squeeze @@ -27,7 +27,7 @@ if [ -e ${DIST}/patches/series ]; then fi # No java module: -sed -i -e '/libgcj12-dev/d' -e '/^Package: kamailio-java-modules/,/^$/d' \ +sed -i -e '/libgcj14-dev/d' -e '/^Package: kamailio-java-modules/,/^$/d' \ ${DIST}/control sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index ccd1b9d..db9721b 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -33,6 +33,9 @@ sed -i -e '/FREERADIUS/d' ${DIST}/rules # use old json sed -i 's/libjson-c-dev/libjson0-dev/' ${DIST}/control +#use old libgcj +sed -i 's/libgcj14-dev/libgcj12-dev/' ${DIST}/control + # clean backports scripts rm -rf ${DIST}/backports exit 0 diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 820213b..c88d2fc 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -16,7 +16,7 @@ Build-Depends: bison, libevent-dev, libexpat1-dev, libfreeradius-client-dev, - libgcj12-dev, + libgcj14-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjson-c-dev, diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 476122e..3c62b7e 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -16,7 +16,7 @@ Build-Depends: bison, libevent-dev, libexpat1-dev, libfreeradius-client-dev, - libgcj12-dev, + libgcj14-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjson-c-dev, diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 476122e..3c62b7e 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -16,7 +16,7 @@ Build-Depends: bison, libevent-dev, libexpat1-dev, libfreeradius-client-dev, - libgcj12-dev, + libgcj14-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjson-c-dev,

10 years, 7 months

git:vseva/trusty: app_java: add libgcj14-dev support

by Victor Seva

Module: sip-router Branch: vseva/trusty Commit: 17c046a498dcbf15d6bb691041800a4938d754a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17c046a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Apr 22 11:44:29 2014 +0200 app_java: add libgcj14-dev support --- modules/app_java/Makefile | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/app_java/Makefile b/modules/app_java/Makefile index 68b8f8a..922ff47 100644 --- a/modules/app_java/Makefile +++ b/modules/app_java/Makefile @@ -17,8 +17,14 @@ LIBS += $(shell pkg-config libgcj-4.4 --cflags) -L$(JVM_PATH) -ljvm else # try to detect JAVA_HOME JAVA_HOME ?= $(shell readlink -f /usr/bin/javac | sed "s:bin/javac::") -DEFS += $(shell pkg-config libgcj12 --cflags) -I$(JAVA_HOME)/include -LIBS += $(shell pkg-config libgcj12 --libs) -L$(JAVA_HOME)/lib -ljvm +JVER=$(shell pkg-config --libs libgcj14 2>/dev/null) +ifeq ($(JVER),) +JLIB=libgcj12 +else +JLIB=libgcj14 +endif +DEFS += $(shell pkg-config $(JLIB) --cflags) -I$(JAVA_HOME)/include +LIBS += $(shell pkg-config $(JLIB) --libs) -L$(JAVA_HOME)/lib -ljvm ifeq ($(OS), freebsd) LIBS+=-pthread

10 years, 7 months

git:vseva/trusty: pkg/kamailio/deb: add Ubuntu trusty support

by Victor Seva

Module: sip-router Branch: vseva/trusty Commit: 2aa6ca056ba01bc531fc6a1848bb6d63b610aa5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2aa6ca0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Apr 22 10:42:54 2014 +0200 pkg/kamailio/deb: add Ubuntu trusty support --- pkg/kamailio/deb/debian/backports/trusty | 19 + pkg/kamailio/deb/trusty/changelog | 121 +++++ pkg/kamailio/deb/trusty/compat | 1 + pkg/kamailio/deb/trusty/control | 571 ++++++++++++++++++++ pkg/kamailio/deb/trusty/copyright | 335 ++++++++++++ .../kamailio-autheph-modules.lintian-overrides | 1 + pkg/kamailio/deb/trusty/kamailio-berkeley-bin.dirs | 1 + .../kamailio-dnssec-modules.lintian-overrides | 1 + .../kamailio-outbound-modules.lintian-overrides | 1 + .../trusty/kamailio-tls-modules.lintian-overrides | 1 + .../kamailio-websocket-modules.lintian-overrides | 1 + pkg/kamailio/deb/trusty/kamailio.README.Debian | 39 ++ pkg/kamailio/deb/trusty/kamailio.default | 28 + pkg/kamailio/deb/trusty/kamailio.examples | 2 + pkg/kamailio/deb/trusty/kamailio.init | 162 ++++++ pkg/kamailio/deb/trusty/kamailio.lintian-overrides | 2 + pkg/kamailio/deb/trusty/kamailio.postinst | 24 + pkg/kamailio/deb/trusty/rules | 221 ++++++++ pkg/kamailio/deb/trusty/source.lintian-overrides | 1 + pkg/kamailio/deb/trusty/source/format | 1 + pkg/kamailio/deb/trusty/watch | 3 + 21 files changed, 1536 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2aa…

10 years, 7 months

git:master: xmlrpc: keep pkg for sip message related ops

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2e8ff29fd33ccb6f2da609bec638dbd2d457be08 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e8ff29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 13:01:41 2014 +0200 xmlrpc: keep pkg for sip message related ops --- modules/xmlrpc/http.c | 12 ++++++------ modules/xmlrpc/xmlrpc.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/xmlrpc/http.c b/modules/xmlrpc/http.c index b7bb87f..b15b0f5 100644 --- a/modules/xmlrpc/http.c +++ b/modules/xmlrpc/http.c @@ -68,13 +68,13 @@ static int insert_fake_via(sip_msg_t* msg, char* via, int via_len) struct via_body* vb = 0; via_cnt++; - vb = mxr_malloc(sizeof(struct via_body)); + vb = pkg_malloc(sizeof(struct via_body)); if (vb == 0){ ERR("insert_fake_via: Out of memory\n"); goto error; } - msg->h_via1 = mxr_malloc(sizeof(hdr_field_t)); + msg->h_via1 = pkg_malloc(sizeof(hdr_field_t)); if (!msg->h_via1) { ERR("No memory left\n"); goto error; @@ -127,10 +127,10 @@ static int insert_fake_via(sip_msg_t* msg, char* via, int via_len) error: if (vb) { free_via_list(vb); - mxr_free(vb); + pkg_free(vb); } - if (msg->h_via1) mxr_free(msg->h_via1); + if (msg->h_via1) pkg_free(msg->h_via1); return -1; } @@ -185,12 +185,12 @@ int create_via(sip_msg_t* msg, char* s1, char* s2) } if (insert_fake_via(msg, via, via_len) < 0) { - mxr_free(via); + pkg_free(via); return -1; } if (insert_via_lump(msg, via, via_len - CRLF_LEN) < 0) { - mxr_free(via); + pkg_free(via); return -1; } diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 41d5901..d36c02c 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -2130,7 +2130,7 @@ static char* http_xmlrpc2sip(sip_msg_t* msg, int* new_msg_len) p = new_msg = mxr_malloc(len + 1); if (new_msg == 0) { DEBUG("memory allocation failure (%d bytes)\n", len); - mxr_free(via); + pkg_free(via); return 0; } @@ -2158,7 +2158,7 @@ static char* http_xmlrpc2sip(sip_msg_t* msg, int* new_msg_len) memcpy(p, SIP_MSG_START(msg) + msg->first_line.len, msg->len - msg->first_line.len); new_msg[len] = 0; /* null terminate, required by receive_msg() */ - mxr_free(via); + pkg_free(via); *new_msg_len = len; return new_msg; } @@ -2380,11 +2380,11 @@ static int xmlrpc_reply(sip_msg_t* msg, char* p1, char* p2) if (add_xmlrpc_reply(&reply, &success_suffix) < 0) return -1; } if (send_reply(msg, &reply.body) < 0) goto error; - if (reply.reason) mxr_free(reply.reason); + if (reply.reason) pkg_free(reply.reason); clean_xmlrpc_reply(&reply); return 1; error: - if (reply.reason) mxr_free(reply.reason); + if (reply.reason) pkg_free(reply.reason); clean_xmlrpc_reply(&reply); return -1; }

10 years, 7 months

git:master: xmlrpc: added guardian define for http. h and fixed usability by defaulting to system malloc

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5b4879495b0b1f0c61b7cbd3c48da964f4d79be4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b48794… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 22 12:35:40 2014 +0200 xmlrpc: added guardian define for http.h and fixed usability by defaulting to system malloc - with pkg the module is barely usable due to large overhead of xml tags --- modules/xmlrpc/Makefile | 4 +- modules/xmlrpc/http.c | 12 ++++---- modules/xmlrpc/http.h | 18 ++++++++++++ modules/xmlrpc/xmlrpc.c | 70 +++++++++++++++++++++++----------------------- 4 files changed, 61 insertions(+), 43 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5b4…

10 years, 7 months

[PATCH] modules/sca: use Call-Info for canonical AoR

by Timo Teräs

RFC3261 8.1.1.2 states that To header "may or may not be the ultimate recipient of the request", and 8.1.1.3 states that From header is "possibly the user's address-of-record". So either of them cannot be fully trusted. This was already noted and fixed partially in commit 1ef4587612806a94 ("modules/sca: reconcile Contact and From URIs in ACK callback"). But similar issues happen when using ENUM and/or calling using local alias (numbers only, or local forward) and the destination is in another SIP domain. To-header contains the initial domain, and not the AoR domain. When handling response to such INVITE a sane way to determine correct AoR is to inspect the Call-Info header's Application Server URI. Thus this changes AoR canonicalization to happens as follow: 1. User portion is taken from Contact header if present, otherwise from the applicable From / To header. 2. Domain/port part is taken from Call-Info header if present, and otherwise from the applicable From / To header. --- This has not fully tested, but this seems to be the root case why SCA does not on certain inter-domain calls that I get. I'd like to get review comments, and possible other fix ideas. I'll let you know how the testing goes, and if looks OK to you can push this to master and relevant stable branches. modules/sca/sca_util.c | 51 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/modules/sca/sca_util.c b/modules/sca/sca_util.c index 143ac47..e209cc0 100644 --- a/modules/sca/sca_util.c +++ b/modules/sca/sca_util.c @@ -26,6 +26,7 @@ #include <assert.h> #include "sca_util.h" +#include "sca_call_info.h" #include "../../parser/sdp/sdp.h" @@ -343,9 +344,13 @@ sca_aor_create_from_info( str *aor, uri_type type, str *user, str *domain, sca_create_canonical_aor_for_ua( sip_msg_t *msg, str *c_aor, int ua_opts ) { struct to_body *tf = NULL; - sip_uri_t c_uri; - str tf_aor = STR_NULL; + str user_portion; + str domain_portion; + str port_portion = STR_NULL; str contact_uri = STR_NULL; + sip_uri_t c_uri; + sca_call_info call_info; + hdr_field_t *call_info_hdr; int rc = -1; assert( msg != NULL ); @@ -373,12 +378,6 @@ sca_create_canonical_aor_for_ua( sip_msg_t *msg, str *c_aor, int ua_opts ) } } - if ( sca_uri_extract_aor( &tf->uri, &tf_aor ) < 0 ) { - LM_ERR( "sca_create_canonical_aor: failed to extract AoR from " - "URI <%.*s>", STR_FMT( &tf->uri )); - goto done; - } - memset( &c_uri, 0, sizeof( sip_uri_t )); if (( rc = sca_get_msg_contact_uri( msg, &contact_uri )) < 0 ) { LM_ERR( "sca_create_canonical_aor: failed to get contact URI from " @@ -394,22 +393,28 @@ sca_create_canonical_aor_for_ua( sip_msg_t *msg, str *c_aor, int ua_opts ) } } - if ( SCA_STR_EMPTY( &c_uri.user ) || - SCA_STR_EQ( &c_uri.user, &tf->parsed_uri.user )) { - /* empty contact header or Contact user matches To/From AoR */ - c_aor->s = (char *)pkg_malloc( tf_aor.len ); - c_aor->len = tf_aor.len; - memcpy( c_aor->s, tf_aor.s, tf_aor.len ); + /* Prefer Contact header user, fallback to To/From */ + if ( SCA_STR_EMPTY( &c_uri.user ) ) + user_portion = tf->parsed_uri.user; + else + user_portion = c_uri.user; + + memset( &call_info, 0, sizeof( sca_call_info )); + call_info_hdr = sca_call_info_header_find( msg->headers ); + if ( !SCA_HEADER_EMPTY( call_info_hdr ) && + sca_call_info_body_parse( &call_info_hdr->body, &call_info ) >= 0 ) { + /* Call-Info present, use the server name as AoR domain */ + domain_portion = call_info.sca_uri; } else { - /* Contact user and To/From user mismatch */ - if ( sca_aor_create_from_info( c_aor, c_uri.type, - &c_uri.user, &tf->parsed_uri.host, - &tf->parsed_uri.port ) < 0 ) { - LM_ERR( "sca_create_canonical_aor: failed to create AoR from " - "Contact <%.*s> and URI <%.*s>", - STR_FMT( &contact_uri ), STR_FMT( &tf_aor )); - goto done; - } + /* Use To/From domain */ + domain_portion = tf->parsed_uri.host; + port_portion = tf->parsed_uri.port; + } + + if ( sca_aor_create_from_info( c_aor, c_uri.type, &user_portion, &domain_portion, &port_portion ) < 0 ) { + LM_ERR( "sca_create_canonical_aor: failed to create canonical AoR " + "user: <%.*s>, domain: <%.*s>", STR_FMT( &user_portion ), STR_FMT( &domain_portion )); + goto done; } rc = 1; -- 1.8.4

10 years, 7 months

[tracker] Comment added: carrierroute not loading with kamailio 4.0.x

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#353 - carrierroute not loading with kamailio 4.0.x User who did this - Carsten Bock (carstenbock) ---------- Commited to 4.1 as well. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=353#comment1404 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

git:4.1: carrierroute: Remove dependency on libconfuse, based on the patch by Lucian Balaceanu with the Comments based on Marius Zbihlei

by Carsten Bock

Module: sip-router Branch: 4.1 Commit: 73003a01e9cb1ed49b5fdb6f1758a988cd77f9bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73003a0… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Mar 13 14:52:49 2014 +0100 carrierroute: Remove dependency on libconfuse, based on the patch by Lucian Balaceanu with the Comments based on Marius Zbihlei --- INSTALL | 2 - modules/carrierroute/Makefile | 17 - modules/carrierroute/cr_config.c | 437 ++++++++++++++--------- modules/carrierroute/doc/carrierroute_admin.xml | 15 - modules/carrierroute/parser_carrierroute.c | 411 +++++++++++++++++++++ modules/carrierroute/parser_carrierroute.h | 92 +++++ 6 files changed, 768 insertions(+), 206 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=730…

10 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014