sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

Assigning a null value from a $sht to a $var fails after upgrade on master

by Hugh Waite

Hello, We are having an issue with PVs after upgrading to the latest master (i.e. 4.1.0-pre1) which might be related to the comparison of $null and 0 In our previous version (compiled on 9th October) the following code worked. It is using the htable as a DB cache $var(ip_trusted) = $sht(trusted=>$var(srcip)); if($var(ip_trusted) == $null) { /* DB lookup */ $sht(trusted->$var(srcip)) = $var(ip_trusted); } After upgrading, the first line is not working as expected. The htable value is null (not assigned), but the $var(ip_trusted) value is assigned the value 0, so the check fails. Is this related to the pv comparison bugfix (http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=commitdiff;h=38… Certainly something has changed since 9 Oct. Hugh -- Hugh Waite Principal Design Engineer Crocodile RCS Ltd.

10 years, 5 months

[tracker] Task closed: location not updated correctly when using GRUUs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#368 - location not updated correctly when using GRUUs User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=368 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, 5 months

[tracker] Comment added: uac_redirect not honoring q-value for max_total = 1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#349 - uac_redirect not honoring q-value for max_total = 1 User who did this - Stefan Prelle (spr) ---------- The workaround with t_*_contacts is working (at least with 4.0.4). perfectly. Thank you for the hint. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=349#comment1180 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, 5 months

git:master: modules/ims_registrar_pcscf: fix log

by Camille Oudot

Module: sip-router Branch: master Commit: 0e711165f9e26b04110cadda9b372eae0387df41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e71116… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: Tue Nov 26 16:08:35 2013 +0100 modules/ims_registrar_pcscf: fix log --- modules/ims_registrar_pcscf/service_routes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 8af77e2..ab57cd6 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -349,7 +349,7 @@ int force_service_routes(struct sip_msg* _m, udomain_t* _d) { } LM_DBG("Setting dst_uri to <%.*s> \n", c->service_routes[0].len, - c->service_routes[i].s); + c->service_routes[0].s); if (set_dst_uri(_m, &c->service_routes[0]) !=0 ) { LM_ERR("Error setting new dst uri\n");

10 years, 5 months

git:4.1: rtpproxy-ng: remove trailing double \r\n from multipart SDP

by Richard Fuchs

Module: sip-router Branch: 4.1 Commit: 0b85493f3c1bc7c6cbd48f39aea9d3ecc135d4ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b85493… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Nov 26 10:36:18 2013 -0500 rtpproxy-ng: remove trailing double \r\n from multipart SDP --- modules/rtpproxy-ng/rtpproxy_funcs.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy-ng/rtpproxy_funcs.c b/modules/rtpproxy-ng/rtpproxy_funcs.c index 1c283e5..3f7079e 100644 --- a/modules/rtpproxy-ng/rtpproxy_funcs.c +++ b/modules/rtpproxy-ng/rtpproxy_funcs.c @@ -257,7 +257,10 @@ int extract_body(struct sip_msg *msg, str *body ) } /* end of while */ if(c==1) { - while(rest && (*rest=='\r' || *rest=='\n')) rest++; + if (rest < p2 && *rest == '\r') rest++; + if (rest < p2 && *rest == '\n') rest++; + if (rest < p2 && p2[-1] == '\n') p2--; + if (rest < p2 && p2[-1] == '\r') p2--; body->s = rest; body->len = p2-rest; goto done;

10 years, 5 months

git:master: rtpproxy-ng: remove trailing double \r\n from multipart SDP

by Richard Fuchs

Module: sip-router Branch: master Commit: dd3ce694280e9748740680a19837b530f48b5bc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd3ce69… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Tue Nov 26 10:36:18 2013 -0500 rtpproxy-ng: remove trailing double \r\n from multipart SDP --- modules/rtpproxy-ng/rtpproxy_funcs.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy-ng/rtpproxy_funcs.c b/modules/rtpproxy-ng/rtpproxy_funcs.c index 1c283e5..3f7079e 100644 --- a/modules/rtpproxy-ng/rtpproxy_funcs.c +++ b/modules/rtpproxy-ng/rtpproxy_funcs.c @@ -257,7 +257,10 @@ int extract_body(struct sip_msg *msg, str *body ) } /* end of while */ if(c==1) { - while(rest && (*rest=='\r' || *rest=='\n')) rest++; + if (rest < p2 && *rest == '\r') rest++; + if (rest < p2 && *rest == '\n') rest++; + if (rest < p2 && p2[-1] == '\n') p2--; + if (rest < p2 && p2[-1] == '\r') p2--; body->s = rest; body->len = p2-rest; goto done;

10 years, 5 months

git:luismartingil/ndb_cassandra: ndb_cassandra: Initial commit of the module

by Luis Martin Gil

Module: sip-router Branch: luismartingil/ndb_cassandra Commit: 5caf33ceaea8449adfe134fa784c10b2d0f5d068 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5caf33c… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Mon Nov 25 18:20:02 2013 -0500 ndb_cassandra: Initial commit of the module - Simply adding all the files of the new module. --- modules/ndb_cassandra/.gitignore | 1 + modules/ndb_cassandra/Cassandra.cpp |11061 ++++++++++++++++++++ modules/ndb_cassandra/Cassandra.h | 4685 +++++++++ modules/ndb_cassandra/Makefile | 44 + modules/ndb_cassandra/README | 162 + modules/ndb_cassandra/cassandra_constants.cpp | 18 + modules/ndb_cassandra/cassandra_constants.h | 24 + modules/ndb_cassandra/cassandra_types.cpp | 3263 ++++++ modules/ndb_cassandra/cassandra_types.h | 1999 ++++ modules/ndb_cassandra/doc/Makefile | 4 + modules/ndb_cassandra/doc/ndb_cassandra.xml | 37 + modules/ndb_cassandra/doc/ndb_cassandra_admin.xml | 171 + modules/ndb_cassandra/ndb_cassandra.c | 301 + modules/ndb_cassandra/test-cpp/Cassandra.cpp | 1 + modules/ndb_cassandra/test-cpp/Cassandra.h | 1 + modules/ndb_cassandra/test-cpp/Makefile | 33 + .../ndb_cassandra/test-cpp/cassandra_constants.cpp | 1 + .../ndb_cassandra/test-cpp/cassandra_constants.h | 1 + modules/ndb_cassandra/test-cpp/cassandra_types.cpp | 1 + modules/ndb_cassandra/test-cpp/cassandra_types.h | 1 + modules/ndb_cassandra/test-cpp/test.c | 42 + modules/ndb_cassandra/test-cpp/thrift_wrapper.cpp | 1 + modules/ndb_cassandra/test-cpp/thrift_wrapper.h | 1 + modules/ndb_cassandra/thrift_wrapper.cpp | 129 + modules/ndb_cassandra/thrift_wrapper.h | 18 + 25 files changed, 22000 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5ca…

10 years, 5 months

git:coudot/escape-param DELETED: lib/kcore: make escape_param() conform to RFC3261

by Camille Oudot

Module: sip-router Branch: coudot/escape-param DELETED Commit: d2e964190cc4768a9968af3f699226980c169e07 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2e9641… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: Wed Nov 6 16:28:44 2013 +0100 lib/kcore: make escape_param() conform to RFC3261 escape_param --- lib/kcore/strcommon.c | 72 ++++++++++++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 27 deletions(-) diff --git a/lib/kcore/strcommon.c b/lib/kcore/strcommon.c index 1c4e9a2..3733cda 100644 --- a/lib/kcore/strcommon.c +++ b/lib/kcore/strcommon.c @@ -312,7 +312,11 @@ int unescape_param(str *sin, str *sout) /*! \brief * Escape all printable characters that are not valid in - * a param part of request uri: = | ; | , | | " | ? | & + * a param part of request uri + * no_need_to_escape = unreserved | param-unreserved + * unreserved = alphanum | mark + * mark = - | _ | . | ! | ~ | * | ' | ( | ) + * param-unreserved = [ | ] | / | : | & | + | $ */ int escape_param(str *sin, str *sout) { @@ -329,33 +333,47 @@ int escape_param(str *sin, str *sout) if (*p < 32 || *p > 126) { LM_ERR("invalid escaped character <%u>\n", (unsigned int)*p); return -1; - } - switch (*p) { - case ' ': - case '?': - case '&': - case '=': - case ',': - case ';': - case '"': - case '+': - *at++ = '%'; - x = (*p) >> 4; - if (x < 10) - { - *at++ = x + '0'; - } else { - *at++ = x - 10 + 'a'; - } - x = (*p) & 0x0f; - if (x < 10) { - *at = x + '0'; - } else { - *at = x - 10 + 'a'; + } else if (isdigit((int)*p) || ((*p >= 'A') && (*p <= 'Z')) || + ((*p >= 'a') && (*p <= 'z'))) { + + } else { + switch (*p) { + case '-': + case '_': + case '.': + case '!': + case '~': + case '*': + case '\'': + case '(': + case ')': + case '[': + case ']': + case '/': + case ':': + case '&': + case '+': + case '$': + *at = *p; + break; + default: + + *at++ = '%'; + x = (*p) >> 4; + if (x < 10) + { + *at++ = x + '0'; + } else { + *at++ = x - 10 + 'a'; + } + x = (*p) & 0x0f; + if (x < 10) { + *at = x + '0'; + } else { + *at = x - 10 + 'a'; + } + break; } - break; - default: - *at = *p; } at++; p++;

10 years, 5 months

git:master: lib/kcore: make escape_param() conform to RFC3261

by Camille Oudot

Module: sip-router Branch: master Commit: 504973f1dabdc60212cba2bacaede9fe8a36e952 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=504973f… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: Wed Nov 6 16:28:44 2013 +0100 lib/kcore: make escape_param() conform to RFC3261 --- lib/kcore/strcommon.c | 72 ++++++++++++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 27 deletions(-) diff --git a/lib/kcore/strcommon.c b/lib/kcore/strcommon.c index 1c4e9a2..fa01a03 100644 --- a/lib/kcore/strcommon.c +++ b/lib/kcore/strcommon.c @@ -312,7 +312,11 @@ int unescape_param(str *sin, str *sout) /*! \brief * Escape all printable characters that are not valid in - * a param part of request uri: = | ; | , | | " | ? | & + * a param part of request uri + * no_need_to_escape = unreserved | param-unreserved + * unreserved = alphanum | mark + * mark = - | _ | . | ! | ~ | * | ' | ( | ) + * param-unreserved = [ | ] | / | : | & | + | $ */ int escape_param(str *sin, str *sout) { @@ -329,33 +333,47 @@ int escape_param(str *sin, str *sout) if (*p < 32 || *p > 126) { LM_ERR("invalid escaped character <%u>\n", (unsigned int)*p); return -1; - } - switch (*p) { - case ' ': - case '?': - case '&': - case '=': - case ',': - case ';': - case '"': - case '+': - *at++ = '%'; - x = (*p) >> 4; - if (x < 10) - { - *at++ = x + '0'; - } else { - *at++ = x - 10 + 'a'; - } - x = (*p) & 0x0f; - if (x < 10) { - *at = x + '0'; - } else { - *at = x - 10 + 'a'; - } - break; - default: + } else if (isdigit((int)*p) || ((*p >= 'A') && (*p <= 'Z')) || + ((*p >= 'a') && (*p <= 'z'))) { *at = *p; + } else { + switch (*p) { + case '-': + case '_': + case '.': + case '!': + case '~': + case '*': + case '\'': + case '(': + case ')': + case '[': + case ']': + case '/': + case ':': + case '&': + case '+': + case '$': + *at = *p; + break; + default: + + *at++ = '%'; + x = (*p) >> 4; + if (x < 10) + { + *at++ = x + '0'; + } else { + *at++ = x - 10 + 'a'; + } + x = (*p) & 0x0f; + if (x < 10) { + *at = x + '0'; + } else { + *at = x - 10 + 'a'; + } + break; + } } at++; p++;

10 years, 5 months

{s.escape.param} transformation

by Camille Oudot

Hi, I've noticed that {s.escape.param} doesn't change "@" into "%40", and yet RFC3261 specifies pvalue as pvalue = 1*paramchar paramchar = param-unreserved / unreserved / escaped param-unreserved = "[" / "]" / "/" / ":" / "&" / "+" / "$" with: unreserved = alphanum / mark mark = "-" / "_" / "." / "!" / "~" / "*" / "'" / "(" / ")" escaped = "%" HEXDIG HEXDIG I've committed a patch in coudot/escape-param branch to fix the escape function. Several unreserved characters were escaped, and some reserved ones weren't. Regards -- Camille

10 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2013