sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

git:master: - fix bug when RURI was changed before and newuri will be used

by Klaus Darilion

Module: sip-router Branch: master Commit: bd8a8dc848f45d7dc40ae9620ffb606f6c781808 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd8a8dc… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:51:24 2009 +0000 - fix bug when RURI was changed before and newuri will be used (cherry picked from commit 1e663ffa8129c4b24f21563c09a5bea4ecd65784) --- modules_k/siputils/contact_ops.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 666332c..5a786cb 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -173,6 +173,10 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) if (uri.s == NULL) return -1; } + else + { + uri = msg->new_uri; + } res = decode_uri (uri, separator, &newUri);

14 years, 5 months

git:master: - remove unused code

by Klaus Darilion

Module: sip-router Branch: master Commit: 673f3cd3d1ae721f54d1a911e92321c6733ce7f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=673f3cd… Author: root <root(a)relay.labs.nic.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:25:01 2009 +0000 - remove unused code - correct indention and make code more readable (cherry picked from commit 9eacaacb45fe700615ac94cc3944824f1b22fdc4) --- modules_k/siputils/contact_ops.c | 46 +++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 82fcd35..666332c 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -168,40 +168,36 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) separator = contact_flds_separator[0]; if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) - { + { uri = msg->first_line.u.request.uri; - if (uri.s == NULL) return -1; - } + if (uri.s == NULL) + return -1; + } - res = decode_uri (uri, separator, &newUri); + res = decode_uri (uri, separator, &newUri); #ifdef DEBUG - if (res == 0) fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); + if (res == 0) + fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); #endif - if (res != 0) - { - LM_ERR("failed decoding contact.Code %d\n", res); + if (res != 0) + { + LM_ERR("failed decoding contact.Code %d\n", res); #ifdef STRICT_CHECK - return res; + return res; #endif - } + } + else + { + /* we do not modify the original first line */ + if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + msg->new_uri = newUri; else - /* we do not modify the original first line */ - if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) msg->new_uri = newUri; - else - { - pkg_free(msg->new_uri.s); - msg->new_uri = newUri; - } - - - /* - if (patch (msg, uri.s, uri.len, newUri.s, newUri.len) < 0) { - LM_ERR("lumping failed in mangling port \n"); - return -2; - } - */ + pkg_free(msg->new_uri.s); + msg->new_uri = newUri; + } + } return 1; }

14 years, 5 months

git:sr_3.0: - fix bug in encode_contact()

by Klaus Darilion

Module: sip-router Branch: sr_3.0 Commit: 52cbb75af5e3965deed41ddd2d80ad2d615b843f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52cbb75… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 15:53:12 2009 +0000 - fix bug in encode_contact() - fix and extend documentation about contact encoding/decoding (cherry picked from commit 8929913f5edb519b7ed280a12728376ed872ec53) --- modules_k/siputils/README | 392 ++++++++++++++++------------- modules_k/siputils/contact_ops.c | 5 +- modules_k/siputils/doc/siputils_admin.xml | 42 ++-- 3 files changed, 252 insertions(+), 187 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=52c…

14 years, 5 months

git:sr_3.0: - fix bug when RURI was changed before and newuri will be used

by Klaus Darilion

Module: sip-router Branch: sr_3.0 Commit: 9d38adf7320503ebac28b7ba27ce629e150e3506 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d38adf… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:51:24 2009 +0000 - fix bug when RURI was changed before and newuri will be used (cherry picked from commit 1e663ffa8129c4b24f21563c09a5bea4ecd65784) --- modules_k/siputils/contact_ops.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index f0d0dbb..5911f8c 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -165,6 +165,10 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) if (uri.s == NULL) return -1; } + else + { + uri = msg->new_uri; + } res = decode_uri (uri, separator, &newUri);

14 years, 5 months

git:sr_3.0: - remove unused code

by Klaus Darilion

Module: sip-router Branch: sr_3.0 Commit: 1ab44045e92c397c801a9dccd82215125b098895 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ab4404… Author: root <root(a)relay.labs.nic.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:25:01 2009 +0000 - remove unused code - correct indention and make code more readable (cherry picked from commit 9eacaacb45fe700615ac94cc3944824f1b22fdc4) --- modules_k/siputils/contact_ops.c | 46 +++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index a796610..f0d0dbb 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -160,40 +160,36 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) separator = contact_flds_separator[0]; if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) - { + { uri = msg->first_line.u.request.uri; - if (uri.s == NULL) return -1; - } + if (uri.s == NULL) + return -1; + } - res = decode_uri (uri, separator, &newUri); + res = decode_uri (uri, separator, &newUri); #ifdef DEBUG - if (res == 0) fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); + if (res == 0) + fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); #endif - if (res != 0) - { - LM_ERR("failed decoding contact.Code %d\n", res); + if (res != 0) + { + LM_ERR("failed decoding contact.Code %d\n", res); #ifdef STRICT_CHECK - return res; + return res; #endif - } + } + else + { + /* we do not modify the original first line */ + if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + msg->new_uri = newUri; else - /* we do not modify the original first line */ - if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) msg->new_uri = newUri; - else - { - pkg_free(msg->new_uri.s); - msg->new_uri = newUri; - } - - - /* - if (patch (msg, uri.s, uri.len, newUri.s, newUri.len) < 0) { - LM_ERR("lumping failed in mangling port \n"); - return -2; - } - */ + pkg_free(msg->new_uri.s); + msg->new_uri = newUri; + } + } return 1; }

14 years, 5 months

git:kamailio_3.0: - fix bug in encode_contact()

by Klaus Darilion

Module: sip-router Branch: kamailio_3.0 Commit: 8929913f5edb519b7ed280a12728376ed872ec53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8929913… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 15:53:12 2009 +0000 - fix bug in encode_contact() - fix and extend documentation about contact encoding/decoding --- modules_k/siputils/README | 392 ++++++++++++++++------------- modules_k/siputils/contact_ops.c | 5 +- modules_k/siputils/doc/siputils_admin.xml | 42 ++-- 3 files changed, 252 insertions(+), 187 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=892…

14 years, 5 months

git:kamailio_3.0: - fix bug when RURI was changed before and newuri will be used

by Klaus Darilion

Module: sip-router Branch: kamailio_3.0 Commit: 1e663ffa8129c4b24f21563c09a5bea4ecd65784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e663ff… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:51:24 2009 +0000 - fix bug when RURI was changed before and newuri will be used --- modules_k/siputils/contact_ops.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index f0d0dbb..5911f8c 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -165,6 +165,10 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) if (uri.s == NULL) return -1; } + else + { + uri = msg->new_uri; + } res = decode_uri (uri, separator, &newUri);

14 years, 5 months

git:kamailio_3.0: - remove unused code

by Klaus Darilion

Module: sip-router Branch: kamailio_3.0 Commit: 9eacaacb45fe700615ac94cc3944824f1b22fdc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9eacaac… Author: root <root(a)relay.labs.nic.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:25:01 2009 +0000 - remove unused code - correct indention and make code more readable --- modules_k/siputils/contact_ops.c | 46 +++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index a796610..f0d0dbb 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -160,40 +160,36 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) separator = contact_flds_separator[0]; if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) - { + { uri = msg->first_line.u.request.uri; - if (uri.s == NULL) return -1; - } + if (uri.s == NULL) + return -1; + } - res = decode_uri (uri, separator, &newUri); + res = decode_uri (uri, separator, &newUri); #ifdef DEBUG - if (res == 0) fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); + if (res == 0) + fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); #endif - if (res != 0) - { - LM_ERR("failed decoding contact.Code %d\n", res); + if (res != 0) + { + LM_ERR("failed decoding contact.Code %d\n", res); #ifdef STRICT_CHECK - return res; + return res; #endif - } + } + else + { + /* we do not modify the original first line */ + if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + msg->new_uri = newUri; else - /* we do not modify the original first line */ - if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) msg->new_uri = newUri; - else - { - pkg_free(msg->new_uri.s); - msg->new_uri = newUri; - } - - - /* - if (patch (msg, uri.s, uri.len, newUri.s, newUri.len) < 0) { - LM_ERR("lumping failed in mangling port \n"); - return -2; - } - */ + pkg_free(msg->new_uri.s); + msg->new_uri = newUri; + } + } return 1; }

14 years, 5 months

git:kamailio_3.0: nathelper(k): fix for swap scenario

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 839e2fee663846f68289a519c27aef433a872afa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=839e2fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 7 11:33:37 2010 +0100 nathelper(k): fix for swap scenario A -> RTPP -> B, offer in INVITE, answer in 200 OK (SDP in INVITE+200 OK) A -> RTPP -> B, re-Invite on session expiry, SDP in 200 OK + ACK The from-tag and to-tag are not swapped in the ACK with rtpproxy_answer(). Options "sl" would do the trick also, but "s" is deprecated soon Patch by Walter Schober --- modules_k/nathelper/nathelper.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 90fca05..3e66ee4 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -2985,12 +2985,14 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) FORCE_RTP_PROXY_RET (-1); } create = 0; - if (swap != 0 || (msg->first_line.type == SIP_REPLY && offer != 0)) { + if (swap != 0 || (msg->first_line.type == SIP_REPLY && offer != 0) + || (msg->first_line.type == SIP_REQUEST && offer == 0)) { tmp = from_tag; from_tag = to_tag; to_tag = tmp; } - } else if (swap != 0 || (msg->first_line.type == SIP_REPLY && offer != 0)) { + } else if (swap != 0 || (msg->first_line.type == SIP_REPLY && offer != 0) + || (msg->first_line.type == SIP_REQUEST && offer == 0)) { if (to_tag.len == 0) { FORCE_RTP_PROXY_RET (-1); }

14 years, 5 months

SF.net SVN: openser:[5965] branches/1.5/modules/nathelper/nathelper.c

by Daniel-Constantin Mierla

Revision: 5965 http://openser.svn.sourceforge.net/openser/?rev=5965&view=rev Author: miconda Date: 2010-01-07 10:31:02 +0000 (Thu, 07 Jan 2010) Log Message: ----------- fix for scenario: A -> RTPP -> B, offer in INVITE, answer in 200 OK (SDP in INVITE+200 OK) A -> RTPP -> B, re-Invite on session expiry, SDP in 200 OK + ACK The from-tag and to-tag are not swapped in the ACK with rtpproxy_answer(). Options "sl" would do the trick also, but "s" is deprecated soon Patch by Walter Schober Modified Paths: -------------- branches/1.5/modules/nathelper/nathelper.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 5 months

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010