sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:sr_3.0: modules_k/nathelper: replaced offending contact alias character

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: b1b80f4b83ceabef5209180b2b00d8679baab26a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1b80f4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Aug 25 22:52:42 2010 +0300 modules_k/nathelper: replaced offending contact alias character - Changed character ':' in contact alias paramater value to '~', because ':' is not allowed in value field of generic contact parameter. - I first tried to cherry pick the commit for master, but it resulted in conflicts. So i went and edited k branch manually. (cherry picked from commit ca75bb5d4a327a0da4b720956dec3438513f2303) --- modules_k/nathelper/nathelper.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 5f73031..2113e32 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1441,7 +1441,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } - param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* : */ + 5 /* port */ + + param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* t */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { @@ -1457,7 +1457,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return -1; } at = at + ip_len; - append_chr(at, ':'); + append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len); append_str(at, port, len); append_chr(at, 't'); @@ -1500,7 +1500,8 @@ static int handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) { str uri, proto; - char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest; + char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest, + *col; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_port_len; @@ -1543,6 +1544,13 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, "sip:", 4); ip_port_len = sep - val; alias_len = SALIAS_LEN + ip_port_len + 2 /* tn */; + /* replace ~ with : */ + col = memchr(val, 126 /* ~ */, ip_port_len); + if (col == NULL) { + LM_ERR("no '~' in alias param value\n"); + return -1; + } + *(col) = ':'; memcpy(at, val, ip_port_len); at = at + ip_port_len; trans = sep + 1;

14 years, 1 month

git:kamailio_3.0: modules_k/nathelper: replaced offending contact alias character

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: ca75bb5d4a327a0da4b720956dec3438513f2303 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca75bb5… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Aug 25 22:52:42 2010 +0300 modules_k/nathelper: replaced offending contact alias character - Changed character ':' in contact alias paramater value to '~', because ':' is not allowed in value field of generic contact parameter. - I first tried to cherry pick the commit for master, but it resulted in conflicts. So i went and edited k branch manually. --- modules_k/nathelper/nathelper.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 5f73031..2113e32 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1441,7 +1441,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } - param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* : */ + 5 /* port */ + + param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* t */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { @@ -1457,7 +1457,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return -1; } at = at + ip_len; - append_chr(at, ':'); + append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len); append_str(at, port, len); append_chr(at, 't'); @@ -1500,7 +1500,8 @@ static int handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) { str uri, proto; - char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest; + char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest, + *col; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_port_len; @@ -1543,6 +1544,13 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, "sip:", 4); ip_port_len = sep - val; alias_len = SALIAS_LEN + ip_port_len + 2 /* tn */; + /* replace ~ with : */ + col = memchr(val, 126 /* ~ */, ip_port_len); + if (col == NULL) { + LM_ERR("no '~' in alias param value\n"); + return -1; + } + *(col) = ':'; memcpy(at, val, ip_port_len); at = at + ip_port_len; trans = sep + 1;

14 years, 1 month

git:master: modules_k/nathelper: replaced offending contact alias character

by Juha Heinanen

Module: sip-router Branch: master Commit: ee37a2ce17c8b8c43c67cd5876fa985e3c1482e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee37a2c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Aug 25 22:30:00 2010 +0300 modules_k/nathelper: replaced offending contact alias character - Changed character ':' in contact alias paramater value to '~', because ':' is not allowed in value field of generic contact parameter. --- modules_k/nathelper/nathelper.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 6a728e0..a437786 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -818,7 +818,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } - param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* : */ + 5 /* port */ + + param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* t */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { @@ -834,7 +834,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return -1; } at = at + ip_len; - append_chr(at, ':'); + append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len); append_str(at, port, len); append_chr(at, 't'); @@ -877,7 +877,8 @@ static int handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) { str uri, proto; - char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest; + char buf[MAX_URI_SIZE], *val, *sep, *trans, *at, *next, *cur_uri, *rest, + *col; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_port_len; @@ -920,6 +921,13 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, "sip:", 4); ip_port_len = sep - val; alias_len = SALIAS_LEN + ip_port_len + 2 /* tn */; + /* replace ~ with : */ + col = memchr(val, 126 /* ~ */, ip_port_len); + if (col == NULL) { + LM_ERR("no '~' in alias param value\n"); + return -1; + } + *(col) = ':'; memcpy(at, val, ip_port_len); at = at + ip_port_len; trans = sep + 1;

14 years, 1 month

git:master: lcr: fix load_gws() 2nd param

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ef56e6bc119e982dc305bfa4b7508ca9226a1287 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef56e6b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 25 18:59:21 2010 +0200 lcr: fix load_gws() 2nd param load_gws() 2nd optional parameter was treated like a fparam instead of a pv_spec_t (the fixup_igp_pvar function converts the first parameter to a fparam and the second one to a pv_spec). --- modules/lcr/lcr_mod.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index e3603cb..3d74975 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1649,7 +1649,8 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, /* * Load info of matching GWs into gw_uri_avps */ -static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, fparam_t *_from_uri) +static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, + pv_spec_t* _from_uri) { str ruri_user, from_uri; int i, j, lcr_id; @@ -1659,6 +1660,7 @@ static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, fparam_t *_from_uri) struct rule_info **rules, *rule, *pl; struct gw_info *gws; struct target *t; + pv_value_t pv_val; /* Get and check parameter values */ if (get_int_fparam(&lcr_id, _m, _lcr_id) != 0) { @@ -1670,14 +1672,17 @@ static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, fparam_t *_from_uri) return -1; } if (_from_uri) { - if (get_str_fparam(&from_uri, _m, _from_uri) != 0) { - LM_ERR("no from_uri parameter value\n"); - return -1; - } - if (from_uri.len == 0) { - LM_ERR("empty from_uri parameter value\n"); - return -1; - } + if (pv_get_spec_value(_m, _from_uri, &pv_val) == 0) { + if (pv_val.flags & PV_VAL_STR) + from_uri = pv_val.rs; + else { + LM_ERR("non string from_uri parameter value\n"); + return -1; + } + } else { + LM_ERR("could not get from_uri pvar value\n"); + return -1; + } } else { from_uri.len = 0; from_uri.s = (char *)0; @@ -1787,13 +1792,13 @@ static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, fparam_t *_from_uri) static int load_gws_1(struct sip_msg* _m, char *_lcr_id, char *_s2) { - return load_gws(_m, (fparam_t *)_lcr_id, (fparam_t *)0); + return load_gws(_m, (fparam_t *)_lcr_id, 0); } static int load_gws_2(struct sip_msg* _m, char *_lcr_id, char *_from_uri) { - return load_gws(_m, (fparam_t *)_lcr_id, (fparam_t *)_from_uri); + return load_gws(_m, (fparam_t *)_lcr_id, (pv_spec_t *)_from_uri); }

14 years, 1 month

nathelper compiler warning

by Juha Heinanen

i was going to fix an issue with add_contact_alias() function, but got this compiler warning in existing master version of the module: CC (cc) [M nathelper.so] nathelper.o nathelper.c: In function ‘mod_init’: nathelper.c:552: warning: implicit declaration of function ‘register_mi_mod’ it would be nice to get rid of it somehow. i thing it has appeared quite recently. -- juha

14 years, 1 month

git:master: auth: changed fixup to use fixup_var_pve_str_12()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 47f3c43ce442bed6d6b072fb9a563c2d085f36f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47f3c43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 25 15:09:26 2010 +0200 auth: changed fixup to use fixup_var_pve_str_12() - accept PVs inside str params --- modules/auth/auth_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index 8633ef5..f75530b 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -544,7 +544,7 @@ static int fixup_pv_auth(void **param, int param_no) switch(param_no) { case 1: case 2: - return fixup_var_str_12(param, 1); + return fixup_var_pve_str_12(param, 1); case 3: return fixup_var_int_12(param, 1); }

14 years, 1 month

git:master: textopsx: changed fixup to use fixup_var_pve_str_12()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4be7b35e189173130bee449ecd4fd14656c1a5a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4be7b35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 25 15:10:14 2010 +0200 textopsx: changed fixup to use fixup_var_pve_str_12() - accept PVs inside str params --- modules/textopsx/textopsx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index c9f2705..c20d1c0 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -155,7 +155,7 @@ static int change_reply_status_fixup(void** param, int param_no) if (param_no == 1) { return fixup_var_int_12(param, param_no); } else if (param_no == 2) - return fixup_var_str_12(param, param_no); + return fixup_var_pve_str_12(param, param_no); else return 0; }

14 years, 1 month

git:kamailio_3.0: Modules_k:pv No warning message for branch(count) if no branches

by Marius Zbihlei

Module: sip-router Branch: kamailio_3.0 Commit: 5e6a0aa429a9e12a7dd07eee042c518bd6ddaecb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e6a0aa… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Aug 25 14:08:35 2010 +0300 Modules_k:pv No warning message for branch(count) if no branches Patch by Carsten Gross (carsten.gross at 1und1 dot de) (cherry picked from commit 54f04ae93503f1d24763b6b6cb0ceec3045b26d9) --- modules_k/pv/pv_branch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index 163fc73..5c8b56d 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -47,7 +47,8 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket); - if(uri.s == 0) + /* branch(count) doesn't need a valid branch, everything else does */ + if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) { LM_ERR("error accessing branch [%d]\n", idx); return pv_get_null(msg, param, res);

14 years, 1 month

SF.net SVN: openser:[6042] branches/1.5/modules/pv/pv_branch.c

by Marius Zbihlei

Revision: 6042 http://openser.svn.sourceforge.net/openser/?rev=6042&view=rev Author: mariuszbihlei Date: 2010-08-25 12:53:33 +0000 (Wed, 25 Aug 2010) Log Message: ----------- Modules/pv No warning message for branch(count) if no branches Patch by Carsten Gross (carsten.gross at 1und1 dot de) Modified Paths: -------------- branches/1.5/modules/pv/pv_branch.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 1 month

git:master: sl: changed fixup to use fixup_var_pve_str_12()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b373df2ba5669224d402952f28208123829c3934 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b373df2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 25 13:33:20 2010 +0200 sl: changed fixup to use fixup_var_pve_str_12() - accept PV inside reason phrase param --- modules/sl/sl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 262a850..4af524b 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -342,7 +342,7 @@ static int fixup_sl_reply(void** param, int param_no) if (param_no == 1) { return fixup_var_int_12(param, 1); } else if (param_no == 2) { - return fixup_var_str_12(param, 2); + return fixup_var_pve_str_12(param, 2); } return 0; }

14 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010