sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: core: typo fix in dns_cache_clone_entry()
by Andrei Pelinescu-Onciul 26 Aug '10

26 Aug '10

Module: sip-router Branch: master Commit: 31b1244704964cb123989bac4f03bcff43f5b1fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31b1244… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:39:33 2010 +0200 core: typo fix in dns_cache_clone_entry() --- dns_cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index ef3a986..22d1676 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -4112,7 +4112,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, /* fix the values and pointers */ new->next = new->prev = NULL; #ifdef DNS_LU_LST - new->last_used_lst.next = new->last_used_lst.next = NULL; + new->last_used_lst.next = new->last_used_lst.prev = NULL; #endif new->rr_lst = (struct dns_rr*)translate_pointer((char*)new, (char*)e, (char*)new->rr_lst);

1 0

git:master: tm: warnings and avp param init. fixes
by Andrei Pelinescu-Onciul 26 Aug '10

26 Aug '10

Module: sip-router Branch: master Commit: ff78f8722f20c68f2614788c55300581819a04b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff78f87… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:33:45 2010 +0200 tm: warnings and avp param init. fixes - wrong pointer was passed to pv_get_avp_name(): int instead of unsigned short ( => not the whole int was set and problems on big endian archs). - unneeded pointer casts removed - variables declared at the function start (otherwise older compilers won't work) --- modules/tm/t_funcs.c | 11 +++++++---- modules/tm/t_msgbuilder.c | 4 ++-- modules/tm/t_reply.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 76bd6d8..13e3952 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -402,6 +402,7 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, char* contacts_avp_param) { pv_spec_t avp_spec; + unsigned short avp_type; if (fr_timer_param && *fr_timer_param) { fr_timer_str.s = fr_timer_param; @@ -417,12 +418,12 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, return -1; } - if(pv_get_avp_name(0, &avp_spec.pvp, &fr_timer_avp, - (unsigned short*)&fr_timer_avp_type)!=0) + if(pv_get_avp_name(0, &avp_spec.pvp, &fr_timer_avp, &avp_type)!=0) { LM_ERR("[%s]- invalid AVP definition\n", fr_timer_param); return -1; } + fr_timer_avp_type = avp_type; } else { if (parse_avp_spec( &fr_timer_str, &fr_timer_avp_type, &fr_timer_avp, &fr_timer_index)<0) { @@ -448,11 +449,12 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, } if(pv_get_avp_name(0, &avp_spec.pvp, &fr_inv_timer_avp, - (unsigned short*)&fr_inv_timer_avp_type)!=0) + &avp_type)!=0) { LM_ERR("[%s]- invalid AVP definition\n", fr_inv_timer_param); return -1; } + fr_inv_timer_avp_type = avp_type; } else { if (parse_avp_spec( &fr_inv_timer_str, &fr_inv_timer_avp_type, &fr_inv_timer_avp, &fr_inv_timer_index)<0) { @@ -476,10 +478,11 @@ int init_avp_params(char *fr_timer_param, char *fr_inv_timer_param, } if(pv_get_avp_name(0, &(avp_spec.pvp), &contacts_avp, - (unsigned short*)&contacts_avp_type) != 0) { + &avp_type) != 0) { LM_ERR("invalid AVP definition <%s>\n", contacts_avp_param); return -1; } + contacts_avp_type = avp_type; } else { if (parse_avp_spec( &contacts_avp_str, &contacts_avp_type, &contacts_avp, &contacts_avp_index)<0) { diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index b334380..340f99a 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -808,7 +808,7 @@ static unsigned long nhop_type(sip_msg_t *orig_inv, rte_t *rtset, * equals the address provided by this route; if does -> loose */ DEBUG("checking INVITE's destination against its first route.\n"); URI_PORT(&topr_uri, uri_port); - if (! (dst_port = su_getport((void *)&dst_inv->to))) + if (! (dst_port = su_getport(&dst_inv->to))) return 0; /* not really expected */ if (dst_port != uri_port) return F_RB_NH_STRICT; @@ -821,7 +821,7 @@ static unsigned long nhop_type(sip_msg_t *orig_inv, rte_t *rtset, /* we have an IP address in route -> comparison can go swiftly */ if (init_su(&uri_sau, uri_ia, uri_port) < 0) return 0; /* not really expected */ - if (su_cmp(&uri_sau, (void *)&dst_inv->to)) + if (su_cmp(&uri_sau, &dst_inv->to)) /* ;lr and sent there */ return F_RB_NH_LOOSE; else diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 1a90844..fcf214d 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1595,6 +1595,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* retransmission structure of outbound reply and request */ struct retr_buf *uas_rb; str* to_tag; + str reason; #ifdef TMCB_ONSEND struct tmcb_params onsend_params; #endif @@ -1605,7 +1606,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, relayed_msg=0; relayed_code=0; totag_retr=0; - str reason; /* remember, what was sent upstream to know whether we are

1 0

git:master: sst(k): don't register statistics twice
by Andrei Pelinescu-Onciul 26 Aug '10

26 Aug '10

Module: sip-router Branch: master Commit: 53fb4b2bc0c8983a0df6d04dcaf790a8f438aa91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53fb4b2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:29:28 2010 +0200 sst(k): don't register statistics twice Include kstats_wraper.h and don't register statistics twice (both form mod_init() and via the module exports structure). --- modules_k/sst/sst.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules_k/sst/sst.c b/modules_k/sst/sst.c index 1c162b7..f7c65a8 100644 --- a/modules_k/sst/sst.c +++ b/modules_k/sst/sst.c @@ -50,6 +50,9 @@ #include "../../modules/sl/sl.h" #include "sst_handlers.h" /* also includes sr_module.h needed by handlers */ +#ifdef STATISTICS +#include "../../lib/kcore/kstats_wrapper.h" +#endif MODULE_VERSION @@ -118,6 +121,7 @@ static param_export_t mod_params[]={ { 0,0,0 } }; +#ifdef STATISTICS /* * Export the statistics we have */ @@ -125,13 +129,14 @@ static stat_export_t mod_stats[] = { {"expired_sst", 0, &expired_sst}, {0,0,0} }; +#endif /* STATISTICS */ struct module_exports exports= { "sst", /* module's name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ mod_params, /* param exports */ - mod_stats, /* exported statistics */ + 0, /* exported statistics (they are registered from mod_init) */ 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */

1 0

git:master: nathelper(k): add missing mi.h include
by Andrei Pelinescu-Onciul 26 Aug '10

26 Aug '10

Module: sip-router Branch: master Commit: 40944265f59fafe29dcc5040d8408ff1b935e817 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4094426… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Aug 26 21:22:50 2010 +0200 nathelper(k): add missing mi.h include --- modules_k/nathelper/nathelper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 2706d10..cf55d4b 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -210,6 +210,7 @@ #include "../../pt.h" #include "../../timer_proc.h" #include "../../lib/kmi/attr.h" +#include "../../lib/kmi/mi.h" #include "../../lib/kcore/km_ut.h" #include "../../lib/kcore/parser_helpers.h" #include "../../pvar.h"

1 0

git:sr_3.0: modules_k/nathelper: better add_contact_alias/ handle_ruri_alias fix
by Juha Heinanen 26 Aug '10

26 Aug '10

Module: sip-router Branch: sr_3.0 Commit: 553e42836221286db831dee39bb907253770ecc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=553e428… 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;

1 0

git:kamailio_3.0: modules_k/nathelper: better add_contact_alias/ handle_ruri_alias fix
by Juha Heinanen 26 Aug '10

26 Aug '10

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;

1 0

git:master: modules_k/nathelper: better add_contact_alias/ handle_ruri_alias fix
by Juha Heinanen 26 Aug '10

26 Aug '10

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;

1 0

git:kamailio_3.0: Revert "lcr: fix load_gws() 2nd param"
by Juha Heinanen 26 Aug '10

26 Aug '10

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 }

1 0

git:kamailio_3.0: lcr: fix load_gws() 2nd param
by Juha Heinanen 26 Aug '10

26 Aug '10

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 }

3 3

lcr_mod.c corrupted
by Juha Heinanen 26 Aug '10

26 Aug '10

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

3 2

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010