sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: modules/path: unescaped received param value also in path rr callback

by Juha Heinanen

Module: sip-router Branch: master Commit: 1a22767e39d50af450a49256b4425503a2d0d388 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a22767… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Apr 11 09:31:37 2013 +0300 modules/path: unescaped received param value also in path rr callback --- modules/path/Makefile | 3 +++ modules/path/path.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/modules/path/Makefile b/modules/path/Makefile index a9aa7f1..26d784f 100644 --- a/modules/path/Makefile +++ b/modules/path/Makefile @@ -12,4 +12,7 @@ LIBS= DEFS+=-DKAMAILIO_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kcore/kcore + include ../../Makefile.modules diff --git a/modules/path/path.c b/modules/path/path.c index b38207f..122d7fa 100644 --- a/modules/path/path.c +++ b/modules/path/path.c @@ -36,6 +36,7 @@ #include "../../mem/mem.h" #include "../../data_lump.h" #include "../../parser/parse_param.h" +#include "../../lib/kcore/strcommon.h" #include "../../dset.h" #include "path.h" @@ -257,6 +258,8 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) { param_hooks_t hooks; param_t *params; + static char dst_uri_buf[MAX_URI_SIZE]; + static str dst_uri; if (parse_params(r_param, CLASS_CONTACT, &hooks, &params) != 0) { LM_ERR("failed to parse route parameters\n"); @@ -264,7 +267,14 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) } if (hooks.contact.received) { - if (set_dst_uri(_m, &hooks.contact.received->body) != 0) { + dst_uri.s = dst_uri_buf; + dst_uri.len = MAX_URI_SIZE; + if (unescape_user(&(hooks.contact.received->body), &dst_uri) < 0) { + LM_ERR("unescaping received failed\n"); + free_params(params); + return; + } + if (set_dst_uri(_m, &dst_uri) != 0) { LM_ERR("failed to set dst-uri\n"); free_params(params); return;

11 years, 9 months

git:master: modules/registrar: unescape received value using kcore function

by Juha Heinanen

Module: sip-router Branch: master Commit: 2003bc3b1cc73caa36e9b4892d8d25f810d6c458 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2003bc3… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Apr 11 08:11:35 2013 +0300 modules/registrar: unescape received value using kcore function - Now that unescaped received value goes into separate buffer, it is possible to use kcore unescape function. --- modules/registrar/path.c | 111 ++-------------------------------------------- 1 files changed, 4 insertions(+), 107 deletions(-) diff --git a/modules/registrar/path.c b/modules/registrar/path.c index ef976e0..cefd59a 100644 --- a/modules/registrar/path.c +++ b/modules/registrar/path.c @@ -32,114 +32,11 @@ #include "../../data_lump.h" #include "../../parser/parse_rr.h" #include "../../parser/parse_uri.h" +#include "../../lib/kcore/strcommon.h" #include "path.h" #include "reg_mod.h" -/*! \brief Unscape all printable ASCII characters */ -int unescape_string(str *sin, str *sout) -{ - char *at, *p, c; - - if(sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL - || sin->len<0 || sout->len < sin->len+1) - return -1; - - at = sout->s; - p = sin->s; - while(p < sin->s+sin->len) - { - if (*p == '%') - { - p++; - switch (*p) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - c = (*p - '0') << 4; - break; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - c = (*p - 'a' + 10) << 4; - break; - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - c = (*p - 'A' + 10) << 4; - break; - default: - LM_ERR("invalid hex digit <%u>\n", (unsigned int)*p); - return -1; - } - p++; - switch (*p) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - c = c + (*p - '0'); - break; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - c = c + (*p - 'a' + 10); - break; - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - c = c + (*p - 'A' + 10); - break; - default: - LM_ERR("invalid hex digit <%u>\n", (unsigned int)*p); - return -1; - } - if ((c < 32) || (c > 126)) - { - LM_ERR("invalid escaped character <%u>\n", (unsigned int)c); - return -1; - } - *at++ = c; - } else { - *at++ = *p; - } - p++; - } - - *at = 0; - sout->len = at - sout->s; - - LM_DBG("unescaped string is <%s>\n", sout->s); - return 0; -} - /*! \brief * Combines all Path HF bodies into one string. */ @@ -203,9 +100,9 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) if (hooks.contact.received) { uri_str.s = uri_buf; uri_str.len = MAX_URI_SIZE; - if (unescape_string(&(hooks.contact.received->body), &uri_str) < 0) { - LM_ERR("unescaping received failed\n"); - goto error; + if (unescape_user(&(hooks.contact.received->body), &uri_str) < 0) { + LM_ERR("unescaping received failed\n"); + goto error; } *received = uri_str; LM_DBG("received is <%.*s>\n", received->len, received->s);

11 years, 9 months

git:master: modules/registrar: fixed bug in un-escaping of path/received

by Juha Heinanen

Module: sip-router Branch: master Commit: 262b5880616d8b58cf9b012b460793f9879087b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=262b588… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 10 22:42:43 2013 +0300 modules/registrar: fixed bug in un-escaping of path/received --- modules/registrar/path.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/registrar/path.c b/modules/registrar/path.c index 63c282c..ef976e0 100644 --- a/modules/registrar/path.c +++ b/modules/registrar/path.c @@ -37,16 +37,17 @@ /*! \brief Unscape all printable ASCII characters */ -int unescape_string(str *sin) +int unescape_string(str *sin, str *sout) { char *at, *p, c; - if (sin == NULL || sin->s == NULL || sin->len < 0) + if(sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL + || sin->len<0 || sout->len < sin->len+1) return -1; - at = sin->s; + at = sout->s; p = sin->s; - while(p < sin->s + sin->len) + while(p < sin->s+sin->len) { if (*p == '%') { @@ -129,11 +130,13 @@ int unescape_string(str *sin) } else { *at++ = *p; } - p++; + p++; } - sin->len = at - sin->s; + *at = 0; + sout->len = at - sout->s; + LM_DBG("unescaped string is <%s>\n", sout->s); return 0; } @@ -143,6 +146,8 @@ int unescape_string(str *sin) int build_path_vector(struct sip_msg *_m, str *path, str *received) { static char buf[MAX_PATH_SIZE]; + static char uri_buf[MAX_URI_SIZE]; + static str uri_str; char *p; struct hdr_field *hdr; struct sip_uri puri; @@ -196,10 +201,14 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) } if (hooks.contact.received) { - *received = hooks.contact.received->body; - if (unescape_string(received) < 0) - LM_ERR("unescaping received value <%.*s> failed\n", - received->len, received->s); + uri_str.s = uri_buf; + uri_str.len = MAX_URI_SIZE; + if (unescape_string(&(hooks.contact.received->body), &uri_str) < 0) { + LM_ERR("unescaping received failed\n"); + goto error; + } + *received = uri_str; + LM_DBG("received is <%.*s>\n", received->len, received->s); } /*for (;params; params = params->next) { @@ -215,6 +224,7 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) path->s = buf; path->len = p-buf; + LM_DBG("path is <%.*s>\n", path->len, path->s); return 0; error: if(route) free_rr(&route);

11 years, 9 months

git:master: modules/tm: Enable named branch_failure routes

by Hugh Waite

Module: sip-router Branch: master Commit: 6e28b187ab4d9cb100e58cb7667c0ee64e8b6deb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e28b18… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Apr 10 11:33:15 2013 +0100 modules/tm: Enable named branch_failure routes - branch failure routes must be named with the format: -- "tm:branch-failure:myroute" - and enabled with the function: -- t_on_branch_failure("myroute") --- modules/tm/h_table.h | 4 ++++ modules/tm/t_fwd.c | 1 + modules/tm/t_lookup.c | 1 + modules/tm/t_reply.c | 41 ++++++++++++++++++++++++++++++++--------- modules/tm/t_reply.h | 3 ++- modules/tm/tm.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 6 files changed, 80 insertions(+), 16 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6e2…

11 years, 9 months

[tracker] Task closed: add_path_received() adds invalid path uri

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#284 - add_path_received() adds invalid path uri User who did this - Juha Heinanen (jh) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=284 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.

11 years, 9 months

[tracker] Comment added: add_path_received() adds invalid path uri

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#284 - add_path_received() adds invalid path uri User who did this - Juha Heinanen (jh) ---------- this is now fixed in master by escaping ; and =. if someone needs the fix in 4.0, he/she can cherry pick it there along with registrar unescape fix. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=284#comment824 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.

11 years, 9 months

Re: [sr-dev] [SR-Users] path uri problem

by Juha Heinanen

Juha Heinanen writes: > you are correct. i'll take a look if received param value could be > easily unescaped when it is stored in usrloc. i moved this tread to sr-dev. there is in lib/kcore/strcommon.c an unescape functiont that most likely could be used, bur when i tried to build new image, i got an error: $ make LD (cc) [sip-proxy] sip-proxy parser/parse_param.o: In function `parse_contact_class': /usr/src/trunk-src/openxg-sip-proxy/parser/parse_param.c:162: undefined reference to `unescape_user' collect2: error: ld returned 1 exit status does anyone know where in the makefile system -lkcore should be added so that this function would be found by loaded? there is no Makefile in parser dir. -- juha

11 years, 9 months

git:master: modules/path: b/f generate valid received param value

by Juha Heinanen

Module: sip-router Branch: master Commit: d9c0024033278975a38c010b768e8f95c2dbb144 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9c0024… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 10 18:04:03 2013 +0300 modules/path: b/f generate valid received param value --- modules/path/path.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/path/path.c b/modules/path/path.c index b5dc92b..b38207f 100644 --- a/modules/path/path.c +++ b/modules/path/path.c @@ -145,27 +145,27 @@ static int prepend_path(struct sip_msg* _m, str *user, path_param_t param) if (param == PATH_PARAM_RECEIVED) { /* TODO: agranig: optimize this one! */ src_ip = ip_addr2a(&_m->rcv.src_ip); - rcv_addr.s = pkg_malloc(6 + IP_ADDR_MAX_STR_SIZE + 22); /* 'sip:<ip>:<port>;transport=sctp'\0 */ + rcv_addr.s = pkg_malloc(6 + IP_ADDR_MAX_STR_SIZE + 24); /* sip:<ip>:<port>%3Btransport%3Dsctp\0 */ if(!rcv_addr.s) { LM_ERR("no pkg memory left for receive-address\n"); goto out3; } switch (_m->rcv.proto) { case PROTO_UDP: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 6, "'sip:%s:%u'", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 4, "sip:%s:%u", src_ip, _m->rcv.src_port); break; case PROTO_TCP: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 20, "'sip:%s:%u;transport=tcp'", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 22, "sip:%s:%u%%3Btransport%%3Dtcp", src_ip, _m->rcv.src_port); break; case PROTO_TLS: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 20, "'sip:%s:%u;transport=tls'", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 22, "sip:%s:%u%%3Btransport%%3Dtls", src_ip, _m->rcv.src_port); break; case PROTO_SCTP: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 21, "'sip:%s:%u;transport=sctp'", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 23, "sip:%s:%u%%3Btransport%%3Dsctp", src_ip, _m->rcv.src_port); break; case PROTO_WS: case PROTO_WSS: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 19, "'sip:%s:%u;transport=ws'", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 21, "sip:%s:%u%%3Btransport%%3Dws", src_ip, _m->rcv.src_port); break; }

11 years, 9 months

git:master: modules/registrar: unescape path header received param value

by Juha Heinanen

Module: sip-router Branch: master Commit: c01b97dd39a418acd0db7b4515d155c45d4092e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c01b97d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 10 18:00:04 2013 +0300 modules/registrar: unescape path header received param value --- modules/registrar/path.c | 110 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 1 deletions(-) diff --git a/modules/registrar/path.c b/modules/registrar/path.c index a4fd485..63c282c 100644 --- a/modules/registrar/path.c +++ b/modules/registrar/path.c @@ -35,6 +35,108 @@ #include "path.h" #include "reg_mod.h" + +/*! \brief Unscape all printable ASCII characters */ +int unescape_string(str *sin) +{ + char *at, *p, c; + + if (sin == NULL || sin->s == NULL || sin->len < 0) + return -1; + + at = sin->s; + p = sin->s; + while(p < sin->s + sin->len) + { + if (*p == '%') + { + p++; + switch (*p) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + c = (*p - '0') << 4; + break; + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + c = (*p - 'a' + 10) << 4; + break; + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + c = (*p - 'A' + 10) << 4; + break; + default: + LM_ERR("invalid hex digit <%u>\n", (unsigned int)*p); + return -1; + } + p++; + switch (*p) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + c = c + (*p - '0'); + break; + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + c = c + (*p - 'a' + 10); + break; + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + c = c + (*p - 'A' + 10); + break; + default: + LM_ERR("invalid hex digit <%u>\n", (unsigned int)*p); + return -1; + } + if ((c < 32) || (c > 126)) + { + LM_ERR("invalid escaped character <%u>\n", (unsigned int)c); + return -1; + } + *at++ = c; + } else { + *at++ = *p; + } + p++; + } + + sin->len = at - sin->s; + + return 0; +} + /*! \brief * Combines all Path HF bodies into one string. */ @@ -92,8 +194,14 @@ int build_path_vector(struct sip_msg *_m, str *path, str *received) LM_ERR("failed to parse parameters of first hop\n"); goto error; } - if (hooks.contact.received) + + if (hooks.contact.received) { *received = hooks.contact.received->body; + if (unescape_string(received) < 0) + LM_ERR("unescaping received value <%.*s> failed\n", + received->len, received->s); + } + /*for (;params; params = params->next) { if (params->type == P_RECEIVED) { *received = hooks.contact.received->body;

11 years, 9 months

git:master: pkg/kamailio/(centos|fedora): Updated .spec

by Peter Dunkley

Module: sip-router Branch: master Commit: ff2b0751b7a7925769afd14eae8c01b3af063568 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff2b075… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 10 15:01:52 2013 +0100 pkg/kamailio/(centos|fedora): Updated .spec - Added sipt module - Increased rel to dev2 --- pkg/kamailio/fedora/17/kamailio.spec | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 5c53ef7..c1e7501 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 4.1.0 -%define rel dev1%{dist} +%define rel dev2%{dist} @@ -588,6 +588,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sdpops %doc %{_docdir}/kamailio/modules/README.seas %doc %{_docdir}/kamailio/modules/README.sipcapture +%doc %{_docdir}/kamailio/modules/README.sipt %doc %{_docdir}/kamailio/modules/README.siptrace %doc %{_docdir}/kamailio/modules/README.siputils %doc %{_docdir}/kamailio/modules/README.sl @@ -727,6 +728,7 @@ fi %{_libdir}/kamailio/modules/sca.so %{_libdir}/kamailio/modules/seas.so %{_libdir}/kamailio/modules/sipcapture.so +%{_libdir}/kamailio/modules/sipt.so %{_libdir}/kamailio/modules/siptrace.so %{_libdir}/kamailio/modules/siputils.so %{_libdir}/kamailio/modules/sl.so @@ -1107,6 +1109,9 @@ fi %changelog +* Wed Apr 10 2013 Peter Dunkley <peter(a)dunkley.me.uk> + - Added sipt module to .spec + - Updated rel to dev2 * Fri Mar 29 2013 Peter Dunkley <peter(a)dunkley.me.uk> - Added stun module to .spec - Updated rel to dev1

11 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013