sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
319 discussions

git:master: acc: use r-uri winning branch even for local generated replies
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: master Commit: 81b9c83b2fa3bd32d502a1ae9014cc7d6747e710 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81b9c83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 21:15:12 2013 +0100 acc: use r-uri winning branch even for local generated replies - it was only for received and relayed replies - reported by Kelvin Chua --- modules/acc/acc_logic.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c index 50278fb..18437fc 100644 --- a/modules/acc/acc_logic.c +++ b/modules/acc/acc_logic.c @@ -344,11 +344,20 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, { str new_uri_bk = {0, 0}; int flags_to_reset = 0; + int br = -1; - /* set as new_uri the last branch */ + /* get winning branch index, if set */ if (t->relayed_reply_branch>=0) { + br = t->relayed_reply_branch; + } else { + if(code>=300) { + br = tmb.t_get_picked_branch(); + } + } + /* set as new_uri the one from selected branch */ + if (br>=0) { new_uri_bk = req->new_uri; - req->new_uri = t->uac[t->relayed_reply_branch].uri; + req->new_uri = t->uac[br].uri; req->parsed_uri_ok = 0; } else { new_uri_bk.len = -1; @@ -416,6 +425,7 @@ static inline void acc_onreply( struct cell* t, struct sip_msg *req, struct sip_msg *reply, int code) { str new_uri_bk; + int br = -1; /* acc_onreply is bound to TMCB_REPLY which may be called from _reply, like when FR hits; we should not miss this @@ -426,10 +436,19 @@ static inline void acc_onreply( struct cell* t, struct sip_msg *req, if (!should_acc_reply(req, reply, code)) return; - /* for reply processing, set as new_uri the winning branch */ + /* get winning branch index, if set */ if (t->relayed_reply_branch>=0) { + br = t->relayed_reply_branch; + } else { + if(code>=300) { + br = tmb.t_get_picked_branch(); + } + } + + /* for reply processing, set as new_uri the one from selected branch */ + if (br>=0) { new_uri_bk = req->new_uri; - req->new_uri = t->uac[t->relayed_reply_branch].uri; + req->new_uri = t->uac[br].uri; req->parsed_uri_ok = 0; } else { new_uri_bk.len = -1;

1 0

git:master: kamctl: don't force global exit if gdb is not found
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: master Commit: 8b023bbab187020bff7883bad1e671c3cf2860c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b023bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 20:49:38 2013 +0100 kamctl: don't force global exit if gdb is not found - it is not a general requirement, only for trap command --- utils/kamctl/kamctl | 6 +++++- utils/kamctl/kamctl.base | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index e6c87f1..519da55 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2649,6 +2649,10 @@ extcmd() { # kamailio_trap() { + if [ -z "$GDB" ] ; then + merr "'gdb' tool not found: set GDB variable to correct tool path" + exit + fi DATE=`/bin/date +%Y%m%d_%H%M%S` LOG_FILE=/tmp/gdb_kamailio_$DATE minfo "Trap file: $LOG_FILE" @@ -2661,7 +2665,7 @@ kamailio_trap() { PID=`echo $pid | cut -d '-' -f 1` echo "" >> $LOG_FILE echo "---start $PID -----------------------------------------------------" >> $LOG_FILE - $GDB kamailio $PID -batch --eval-command="bt full" &>> $LOG_FILE + $GDB kamailio $PID -batch --eval-command="bt full" & >> $LOG_FILE echo "---end $PID -------------------------------------------------------" >> $LOG_FILE done echo "." diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 62d4c9b..bd2817b 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -57,10 +57,12 @@ if [ -z "$GDB" ] ; then locate_tool gdb if [ -z "$TOOLPATH" ] ; then # now error, but we can look for alternative names if it is the case - echo "error: 'gdb' tool not found: set GDB variable to correct tool path" - exit + GDB="" + # echo "error: 'gdb' tool not found: set GDB variable to correct tool path" + # exit + else + GDB="$TOOLPATH" fi - GDB="$TOOLPATH" fi if [ -z "$MD5" ]; then locate_tool md5sum md5

1 0

Kamailio v3.3.6 Released
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Hello, Kamailio SIP Server v3.3.6 stable release is out. This is a maintenance release of the previous stable branch, 3.3, that includes fixes since release of v3.3.5. There is no change to database schema or configuration language structure that you have to do on installations of previous v3.3.x. Deployments running previous v3.x.x versions are strongly recommended to be upgraded to v3.3.6 or a newer stable release. For more details about version 3.3.6 (including links and hints to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2013/12/kamailio-v3-3-6-released/ Be aware that this is intended to be the last version released from branch 3.3. Note that latest stable series is now 4.1.x, with v4.1.0 released about two weeks ago. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:3.3: ChangeLog: updated for v3.3.6
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: 3.3 Commit: 48db3424eb8b1c4870c8c990fa5e7cddef416c18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48db342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 16:56:17 2013 +0100 ChangeLog: updated for v3.3.6 --- ChangeLog | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffe0199..ea415ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,110 @@ +===================== 2013-12-18 Version 3.3.6 Released ===================== + +===================== Changes Since Version 3.3.5 =========================== + +commit 2cc9e1dae56bc8c4a78e7cb01d4f5719c618c213 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Dec 19 16:45:42 2013 +0100 + + Makefile.defs: version set to 3.3.6 + +commit 4cc43066cb2b9dcfc3c0d0d5ab67b28dd2c19189 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Dec 19 16:45:09 2013 +0100 + + pkg/rpm: updated specs to version to 3.3.6 + +commit 7157d105c1efb10db7852adffbf55ec2803b3d44 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Dec 19 16:44:22 2013 +0100 + + pkg/debian: updated specs to version to 3.3.6 + +commit ee62d8542dbc6f9391e59018560e17a0459e7a64 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Fri Sep 20 11:15:16 2013 +0200 + + registrar: if rcv_parm value is empty, don't add received to contacts in 200ok reply + + - otherwise results in malformed value + + (cherry picked from commit 2f213e313a86e16665f6d0acfec959bf23f72b7d) + (cherry picked from commit fc410ae69c6b371538f457947fd3a2946dc492cd) + +commit efd3fad94f179b27ac364c16df6cd69d27d814c3 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon Dec 2 20:42:12 2013 +0100 + + mem: malloc(0) should return a valid pointer for free according to specs + + (cherry picked from commit f61ff34aac7c7bae3a96fb698a899c8a0e692a9f) + (cherry picked from commit e605174dab9b86ce06689d184b4b9d81288f1193) + +commit aa43b51c87e025d9526f31059dee55c2199e970f +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Thu Dec 19 16:24:32 2013 +0100 + + core: declared static and extern inline prototypes for gcc (clang) on mac os x + +commit 7ad6202d80d5fee7248db732a789d37e48b24d1e +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Fri Dec 6 16:33:04 2013 +0100 + + Makefile.defs: compiler optimization level made variable + + - allow using -O3 for clang, which gives error on the former default -O9 + + (cherry picked from commit 0713c0de50f8c2f4da2ee0ef33b0505c37792392) + + Conflicts: + Makefile.defs + +commit 16dcfd515424a23cd0706de64eea822c88df0c58 +Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> +Date: Mon Sep 17 17:21:02 2012 +0300 + + Makefiles.defs: clang compiles to O9 + + (cherry picked from commit 5273948a6eeb6f6fe878696dce54880cabb0ef7c) + +commit 8cd628522a4258f32923fe58595677b300292b97 +Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> +Date: Mon Sep 17 10:17:41 2012 +0300 + + Provide inline linkage for non-gcc compilers(like clang) + + Inline method in headers should be declared extern. + + (cherry picked from commit 2e5145ecdd8368c947ea93b98449ebd997824ce2) + +commit e53fdcd77f918c634119c8188f35d5fd3873b48e +Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> +Date: Fri Sep 14 13:17:24 2012 +0300 + + core: Added support for the clang compiler + + Support for clang, a C compiler from the LLVM suite has been added. + Install clang and run 'make cfg CC=clang && make' for building. GCC Inline assembly is supported. + TODO: clean warning caused by clang (-Wunused-variable, etc) + + (cherry picked from commit 452c543de61d413351a5ac0816adc137d150824b) + +commit f0203464ddc1e6f4b90d8d8d2bf0ff953760ba6c +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Fri Nov 1 15:33:08 2013 +0100 + + registrar: clean static values at pack_ci + + - backport from master 66185905850cd2ac9ab933776184da0f0882e5ac + +commit 5a71476e054975a659628aeec89a51a1d0a326f4 +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Fri Nov 29 12:03:14 2013 +0100 + + usrloc: db_update contact by instance + reg_id + + - backport from master f67171cf3be1ade0e1c9dd013d560c87b3fd4359 + ===================== 2013-08-12 Version 3.3.5 Released ===================== ===================== Changes Since Version 3.3.4 ===========================

1 0

git:3.3: Makefile.defs: version set to 3.3.6
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: 3.3 Commit: 2cc9e1dae56bc8c4a78e7cb01d4f5719c618c213 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2cc9e1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 16:45:42 2013 +0100 Makefile.defs: version set to 3.3.6 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 962d8e9..adcbe84 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -161,7 +161,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 3 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory debugger switcher

1 0

git:3.3: pkg/rpm: updated specs to version to 3.3.6
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: 3.3 Commit: 4cc43066cb2b9dcfc3c0d0d5ab67b28dd2c19189 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cc4306… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 16:45:09 2013 +0100 pkg/rpm: updated specs to version to 3.3.6 --- pkg/kamailio/rpm/kamailio.spec-4.1 | 2 +- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- pkg/kamailio/rpm/kamailio.spec.SuSE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 7f9bd61..ea1c80e 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.3.4 +%define ver 3.3.6 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 1e898c1..9e2e4da 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.3.4 +%define ver 3.3.6 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index b8351b4..9cb76ce 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.3.4 +%define ver 3.3.6 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:3.3: pkg/debian: updated specs to version to 3.3.6
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: 3.3 Commit: 7157d105c1efb10db7852adffbf55ec2803b3d44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7157d10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 16:44:22 2013 +0100 pkg/debian: updated specs to version to 3.3.6 --- pkg/kamailio/deb/debian/changelog | 12 ++++++++++++ pkg/kamailio/deb/lenny/changelog | 12 ++++++++++++ pkg/kamailio/deb/lucid/changelog | 12 ++++++++++++ pkg/kamailio/deb/precise/changelog | 12 ++++++++++++ pkg/kamailio/deb/squeeze/changelog | 12 ++++++++++++ pkg/kamailio/deb/wheezy/changelog | 12 ++++++++++++ 6 files changed, 72 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 556a4ae..6f18803 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,15 @@ +kamailio (3.3.6) unstable; urgency=low + + * update to 3.3.6 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Dec 2013 16:35:00 +0100 + +kamailio (3.3.5) unstable; urgency=low + + * update to 3.3.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 12 Aug 2013 18:05:00 +0100 + kamailio (3.3.4) unstable; urgency=low * update to 3.3.4 from upstream diff --git a/pkg/kamailio/deb/lenny/changelog b/pkg/kamailio/deb/lenny/changelog index 556a4ae..6f18803 100644 --- a/pkg/kamailio/deb/lenny/changelog +++ b/pkg/kamailio/deb/lenny/changelog @@ -1,3 +1,15 @@ +kamailio (3.3.6) unstable; urgency=low + + * update to 3.3.6 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Dec 2013 16:35:00 +0100 + +kamailio (3.3.5) unstable; urgency=low + + * update to 3.3.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 12 Aug 2013 18:05:00 +0100 + kamailio (3.3.4) unstable; urgency=low * update to 3.3.4 from upstream diff --git a/pkg/kamailio/deb/lucid/changelog b/pkg/kamailio/deb/lucid/changelog index 52440a8..ebe4f79 100644 --- a/pkg/kamailio/deb/lucid/changelog +++ b/pkg/kamailio/deb/lucid/changelog @@ -1,3 +1,15 @@ +kamailio (3.3.6) unstable; urgency=low + + * update to 3.3.6 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Dec 2013 16:35:00 +0100 + +kamailio (3.3.5) unstable; urgency=low + + * update to 3.3.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 12 Aug 2013 18:05:00 +0100 + kamailio (3.3.4) unstable; urgency=low * update to 3.3.4 from upstream diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 52440a8..ebe4f79 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,15 @@ +kamailio (3.3.6) unstable; urgency=low + + * update to 3.3.6 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Dec 2013 16:35:00 +0100 + +kamailio (3.3.5) unstable; urgency=low + + * update to 3.3.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 12 Aug 2013 18:05:00 +0100 + kamailio (3.3.4) unstable; urgency=low * update to 3.3.4 from upstream diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 52440a8..ebe4f79 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,15 @@ +kamailio (3.3.6) unstable; urgency=low + + * update to 3.3.6 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Dec 2013 16:35:00 +0100 + +kamailio (3.3.5) unstable; urgency=low + + * update to 3.3.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 12 Aug 2013 18:05:00 +0100 + kamailio (3.3.4) unstable; urgency=low * update to 3.3.4 from upstream diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 52440a8..ebe4f79 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,15 @@ +kamailio (3.3.6) unstable; urgency=low + + * update to 3.3.6 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 19 Dec 2013 16:35:00 +0100 + +kamailio (3.3.5) unstable; urgency=low + + * update to 3.3.5 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 12 Aug 2013 18:05:00 +0100 + kamailio (3.3.4) unstable; urgency=low * update to 3.3.4 from upstream

1 0

git:3.3: mem: malloc(0) should return a valid pointer for free according to specs
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: 3.3 Commit: efd3fad94f179b27ac364c16df6cd69d27d814c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efd3fad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 2 20:42:12 2013 +0100 mem: malloc(0) should return a valid pointer for free according to specs (cherry picked from commit f61ff34aac7c7bae3a96fb698a899c8a0e692a9f) (cherry picked from commit e605174dab9b86ce06689d184b4b9d81288f1193) --- mem/f_malloc.c | 2 ++ mem/q_malloc.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 008874b..7a0e115 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -361,6 +361,8 @@ void* fm_malloc(struct fm_block* qm, unsigned long size) MDBG("fm_malloc(%p, %lu) called from %s: %s(%d)\n", qm, size, file, func, line); #endif + /*malloc(0) should return a valid pointer according to specs*/ + if(unlikely(size==0)) size=4; /*size must be a multiple of 8*/ size=ROUNDUP(size); /* if (size>(qm->size-qm->real_used)) return 0; */ diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 497c3f9..f966c3f 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -368,6 +368,8 @@ void* qm_malloc(struct qm_block* qm, unsigned long size) MDBG("qm_malloc(%p, %lu) called from %s: %s(%d)\n", qm, size, file, func, line); #endif + /*malloc(0) should return a valid pointer according to specs*/ + if(unlikely(size==0)) size=4; /*size must be a multiple of 8*/ size=ROUNDUP(size); if (size>(qm->size-qm->real_used)) return 0;

1 0

git:3.3: registrar: if rcv_parm value is empty, don' t add received to contacts in 200ok reply
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: 3.3 Commit: ee62d8542dbc6f9391e59018560e17a0459e7a64 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee62d85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 20 11:15:16 2013 +0200 registrar: if rcv_parm value is empty, don't add received to contacts in 200ok reply - otherwise results in malformed value (cherry picked from commit 2f213e313a86e16665f6d0acfec959bf23f72b7d) (cherry picked from commit fc410ae69c6b371538f457947fd3a2946dc492cd) --- modules_k/registrar/reply.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/reply.c b/modules_k/registrar/reply.c index e403889..226d29d 100644 --- a/modules_k/registrar/reply.c +++ b/modules_k/registrar/reply.c @@ -110,7 +110,7 @@ static inline unsigned int calc_buf_len(ucontact_t* c, str *host, int mode) qlen = len_q(c->q); if (qlen) len += Q_PARAM_LEN + qlen; len += EXPIRES_PARAM_LEN + INT2STR_MAX_LEN; - if (c->received.s) { + if (rcv_param.len>0 && c->received.s) { len += 1 /* ; */ + rcv_param.len + 1 /* = */ @@ -251,7 +251,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) memcpy(p, cp, len); p += len; - if (c->received.s) { + if (rcv_param.len>0 && c->received.s) { *p++ = ';'; memcpy(p, rcv_param.s, rcv_param.len); p += rcv_param.len;

1 0

git:3.3: core: declared static and extern inline prototypes for gcc (clang) on mac os x
by Daniel-Constantin Mierla 19 Dec '13

19 Dec '13

Module: sip-router Branch: 3.3 Commit: aa43b51c87e025d9526f31059dee55c2199e970f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa43b51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 19 16:24:32 2013 +0100 core: declared static and extern inline prototypes for gcc (clang) on mac os x --- parser/parse_param.h | 2 +- sip_msg_clone.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/parse_param.h b/parser/parse_param.h index e0b15fd..db7f401 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -150,7 +150,7 @@ typedef union param_hooks { * 0: success, but expect a next paramter * 1: success and exepect no more parameters */ -inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t); +extern inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t); /*! \brief diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 28933b2..58ce353 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -150,7 +150,7 @@ do { \ -inline struct via_body* via_body_cloner( char* new_buf, +static inline struct via_body* via_body_cloner( char* new_buf, char *org_buf, struct via_body *param_org_via, char **p) { struct via_body *new_via;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013