sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: modules_k/nathelper: better add_contact_alias/ handle_ruri_alias fix

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: 1f11c47523449aa87c54cefc8db1489bed020bcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f11c47… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Aug 26 19:54:49 2010 +0300 modules_k/nathelper: better add_contact_alias/handle_ruri_alias fix - In add_contact_alias/handle_ruri_alias functions, use ~ char both as port and transport protocol separator in (cherry picked from commit 9d80a7e32f1db5e1f166175e55e7868ee75879e7) --- modules_k/nathelper/nathelper.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 2113e32..c9808e2 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1442,7 +1442,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return -1; } param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + - 1 /* t */ + 1 /* proto */; + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); @@ -1460,7 +1460,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len); append_str(at, port, len); - append_chr(at, 't'); + append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { pkg_free(param); LM_ERR("invalid transport protocol\n"); @@ -1500,8 +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, - *col; + char buf[MAX_URI_SIZE], *val, *sep, *at, *next, *cur_uri, *rest, + *port, *trans; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_port_len; @@ -1535,25 +1535,24 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) /* set dst uri based on alias param value */ val = rest + ALIAS_LEN; val_len = rest_len - ALIAS_LEN; - sep = memchr(val, 116 /* t */, val_len); - if (sep == NULL) { - LM_ERR("no 't' in alias param value\n"); + port = memchr(val, 126 /* ~ */, val_len); + if (port == NULL) { + LM_ERR("no '~' in alias param value\n"); return -1; } - at = &(buf[0]); - 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"); + *(port++) = ':'; + trans = memchr(port, 126 /* ~ */, val_len - (port - val)); + if (trans == NULL) { + LM_ERR("no second '~' in alias param value\n"); return -1; } - *(col) = ':'; + at = &(buf[0]); + append_str(at, "sip:", 4); + ip_port_len = trans - val; + alias_len = SALIAS_LEN + ip_port_len + 2 /* ~n */; memcpy(at, val, ip_port_len); at = at + ip_port_len; - trans = sep + 1; + trans = trans + 1; if ((ip_port_len + 2 > val_len) || (*trans == ';') || (*trans == '?')) { LM_ERR("no proto in alias param\n"); return -1;

14 years, 5 months

git:master: modules_k/nathelper: better add_contact_alias/ handle_ruri_alias fix

by Juha Heinanen

Module: sip-router Branch: master Commit: 9d80a7e32f1db5e1f166175e55e7868ee75879e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d80a7e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Aug 26 19:54:49 2010 +0300 modules_k/nathelper: better add_contact_alias/handle_ruri_alias fix - In add_contact_alias/handle_ruri_alias functions, use ~ char both as port and transport protocol separator in --- modules_k/nathelper/nathelper.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index a437786..2706d10 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -819,7 +819,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return -1; } param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + - 1 /* t */ + 1 /* proto */; + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); @@ -837,7 +837,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len); append_str(at, port, len); - append_chr(at, 't'); + append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { pkg_free(param); LM_ERR("invalid transport protocol\n"); @@ -877,8 +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, - *col; + char buf[MAX_URI_SIZE], *val, *sep, *at, *next, *cur_uri, *rest, + *port, *trans; unsigned int len, rest_len, val_len, alias_len, proto_type, cur_uri_len, ip_port_len; @@ -912,25 +912,24 @@ handle_ruri_alias_f(struct sip_msg* msg, char* str1, char* str2) /* set dst uri based on alias param value */ val = rest + ALIAS_LEN; val_len = rest_len - ALIAS_LEN; - sep = memchr(val, 116 /* t */, val_len); - if (sep == NULL) { - LM_ERR("no 't' in alias param value\n"); + port = memchr(val, 126 /* ~ */, val_len); + if (port == NULL) { + LM_ERR("no '~' in alias param value\n"); return -1; } - at = &(buf[0]); - 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"); + *(port++) = ':'; + trans = memchr(port, 126 /* ~ */, val_len - (port - val)); + if (trans == NULL) { + LM_ERR("no second '~' in alias param value\n"); return -1; } - *(col) = ':'; + at = &(buf[0]); + append_str(at, "sip:", 4); + ip_port_len = trans - val; + alias_len = SALIAS_LEN + ip_port_len + 2 /* ~n */; memcpy(at, val, ip_port_len); at = at + ip_port_len; - trans = sep + 1; + trans = trans + 1; if ((ip_port_len + 2 > val_len) || (*trans == ';') || (*trans == '?')) { LM_ERR("no proto in alias param\n"); return -1;

14 years, 5 months

git:kamailio_3.0: Revert "lcr: fix load_gws() 2nd param"

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: 6b7c7b41c9b02c26748fb80da434b2616268c59d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b7c7b4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Aug 26 14:39:08 2010 +0300 Revert "lcr: fix load_gws() 2nd param" This reverts commit 5da493e4457dd97a0d9f3e453303c0aa98cdb30c. --- modules/lcr/lcr_mod.c | 48 ------------------------------------------------ 1 files changed, 0 insertions(+), 48 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index c0df7ab..65c65d1 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1695,12 +1695,7 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, /* * Load info of matching GWs into gw_uri_avps */ -<<<<<<< HEAD static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) -======= -static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, - pv_spec_t* _from_uri) ->>>>>>> ef56e6b... lcr: fix load_gws() 2nd param { str ruri_user, from_uri; int i, j, lcr_id; @@ -1709,11 +1704,6 @@ static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, struct matched_gw_info matched_gws[MAX_NO_OF_GWS + 1]; struct lcr_info **lcrs, *lcr_rec, *pl; struct gw_info *gws; -<<<<<<< HEAD -======= - struct target *t; - pv_value_t pv_val; ->>>>>>> ef56e6b... lcr: fix load_gws() 2nd param /* Get and check parameter values */ if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { @@ -1724,7 +1714,6 @@ static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } -<<<<<<< HEAD if (get_str_fparam(&from_uri, _m, (fparam_t *)_from_uri) != 0) { LM_ERR("no from_uri parameter value\n"); @@ -1733,23 +1722,6 @@ static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, if (from_uri.len == 0) { LM_ERR("empry from_uri param value\n"); return -1; -======= - if (_from_uri) { - 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; ->>>>>>> ef56e6b... lcr: fix load_gws() 2nd param } /* Use gws and lcr rules with index lcr_id */ @@ -1843,27 +1815,7 @@ static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, add_avp(lcr_id_avp_type, lcr_id_avp, val); } -<<<<<<< HEAD return 1; -======= - if (gw_index > 0) { - return 1; - } else { - return 2; - } -} - - -static int load_gws_1(struct sip_msg* _m, char *_lcr_id, char *_s2) -{ - 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, (pv_spec_t *)_from_uri); ->>>>>>> ef56e6b... lcr: fix load_gws() 2nd param }

14 years, 5 months

git:kamailio_3.0: lcr: fix load_gws() 2nd param

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: 5da493e4457dd97a0d9f3e453303c0aa98cdb30c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5da493e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Aug 25 22:42:33 2010 +0300 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). (cherry picked from commit ef56e6bc119e982dc305bfa4b7508ca9226a1287) Conflicts: modules/lcr/lcr_mod.c --- modules/lcr/lcr_mod.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 65c65d1..c0df7ab 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -1695,7 +1695,12 @@ void add_gws_into_avps(struct gw_info *gws, struct matched_gw_info *matched_gws, /* * Load info of matching GWs into gw_uri_avps */ +<<<<<<< HEAD static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) +======= +static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, + pv_spec_t* _from_uri) +>>>>>>> ef56e6b... lcr: fix load_gws() 2nd param { str ruri_user, from_uri; int i, j, lcr_id; @@ -1704,6 +1709,11 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) struct matched_gw_info matched_gws[MAX_NO_OF_GWS + 1]; struct lcr_info **lcrs, *lcr_rec, *pl; struct gw_info *gws; +<<<<<<< HEAD +======= + struct target *t; + pv_value_t pv_val; +>>>>>>> ef56e6b... lcr: fix load_gws() 2nd param /* Get and check parameter values */ if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { @@ -1714,6 +1724,7 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } +<<<<<<< HEAD if (get_str_fparam(&from_uri, _m, (fparam_t *)_from_uri) != 0) { LM_ERR("no from_uri parameter value\n"); @@ -1722,6 +1733,23 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) if (from_uri.len == 0) { LM_ERR("empry from_uri param value\n"); return -1; +======= + if (_from_uri) { + 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; +>>>>>>> ef56e6b... lcr: fix load_gws() 2nd param } /* Use gws and lcr rules with index lcr_id */ @@ -1815,7 +1843,27 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) add_avp(lcr_id_avp_type, lcr_id_avp, val); } +<<<<<<< HEAD return 1; +======= + if (gw_index > 0) { + return 1; + } else { + return 2; + } +} + + +static int load_gws_1(struct sip_msg* _m, char *_lcr_id, char *_s2) +{ + 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, (pv_spec_t *)_from_uri); +>>>>>>> ef56e6b... lcr: fix load_gws() 2nd param }

14 years, 5 months

lcr_mod.c corrupted

by Juha Heinanen

i don't know what happened, but when i pulled latest kamailio_3.0 branch, lcr_mod.c got this in it: <<<<<<< HEAD static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) ======= static int load_gws(struct sip_msg* _m, fparam_t *_lcr_id, pv_spec_t* _from_uri) >>>>>>> ef56e6b... lcr: fix load_gws() 2nd param is it just me? perhaps i should re-pull the whole repo or something? -- juha

14 years, 5 months

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, 5 months

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, 5 months

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, 5 months

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, 5 months

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, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev