sr-dev February 2013

sr-dev@lists.kamailio.org

45 participants
200 discussions

git:3.3: msrp: return proper value for $msrp(code)

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: b4861e720ba432addd5c197c9994181168d292c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4861e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 11 23:40:53 2013 +0100 msrp: return proper value for $msrp(code) - internally there is an offset of 10000 to the value in the msrp reply - reported by Peter Dunkley (cherry picked from commit 1690eafbb599842f0507ad41c1590fcbba8c7630) --- modules/msrp/msrp_parser.h | 2 ++ modules/msrp/msrp_vars.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/msrp/msrp_parser.h b/modules/msrp/msrp_parser.h index 5117d60..9b26fe1 100644 --- a/modules/msrp/msrp_parser.h +++ b/modules/msrp/msrp_parser.h @@ -44,6 +44,8 @@ #define MSRP_REQ_RPLSTART 10000 +#define MSRP_RPL_CODE(n) ((n) - MSRP_REQ_RPLSTART) + typedef struct msrp_fline { str buf; int msgtypeid; diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index cb1dbb9..fdc277a 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -152,7 +152,8 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 3: if(mf->fline.msgtypeid==MSRP_REQUEST) return pv_get_null(msg, param, res); - return pv_get_intstrval(msg, param, res, mf->fline.rtypeid, + return pv_get_intstrval(msg, param, res, + MSRP_RPL_CODE(mf->fline.rtypeid), &mf->fline.rtype); case 4: if(mf->hbody.s==NULL)

11 years, 10 months

git:3.3: msilo: safety check for freeing tmp_extra_headers

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: bc157c710d740715e78a26ac7299b2e6bb616cae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc157c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 25 13:58:55 2013 +0100 msilo: safety check for freeing tmp_extra_headers - it can be a static empty buffer - reported by Stoyan Mihaylov - backport of 23b84739a72c5cca1fd397fbe1a7468a621cc2e6 --- modules_k/msilo/msilo.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 209b309..efa49f1 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1134,13 +1134,15 @@ static int m_dump(struct sip_msg* msg, str* owner_s) tmp_extra_hdrs /*extra_hdrs*/) < 0) { LM_ERR("headers building failed [%d]\n", mid); - pkg_free(tmp_extra_hdrs.s); + if(tmp_extra_hdrs.len>0) + pkg_free(tmp_extra_hdrs.s); if (msilo_dbf.free_result(db_con, db_res) < 0) LM_ERR("failed to free the query result\n"); msg_list_set_flag(ml, mid, MS_MSG_ERRO); goto error; } - pkg_free(tmp_extra_hdrs.s); + if(tmp_extra_hdrs.len>0) + pkg_free(tmp_extra_hdrs.s); LM_DBG("msg [%d-%d] for: %.*s\n", i+1, mid, pto->uri.len, pto->uri.s);

11 years, 10 months

git:3.3: core: dns - prevent queries for IPv4/6 address literals

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 3c8ed67cffe5ea1a73cd6f8f1c35be24cade46cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c8ed67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 21 10:40:07 2013 +0100 core: dns - prevent queries for IPv4/6 address literals - prevent A queries for IPv6 address literals or AAAA queries for IPv4 address literals - patch by Simon Perreault (cherry picked from commit 9e6f0268097d81c0e06c7fe33599d0763ed38179) --- dns_cache.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 1a7f1c5..ea9ff34 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -1891,6 +1891,8 @@ inline static struct dns_hash_entry* dns_cache_do_request(str* name, int type) #endif /* USE_DNS_CACHE_STATS */ if (type==T_A){ + if (str2ip6(name)!=0) + goto end; if ((ip=str2ip(name))!=0){ e=dns_cache_mk_ip_entry(name, ip); if (likely(e)) @@ -1900,6 +1902,8 @@ inline static struct dns_hash_entry* dns_cache_do_request(str* name, int type) } #ifdef USE_IPV6 else if (type==T_AAAA){ + if (str2ip(name)!=0) + goto end; if ((ip=str2ip6(name))!=0){ e=dns_cache_mk_ip_entry(name, ip); if (likely(e)) @@ -2465,6 +2469,8 @@ inline static struct hostent* dns_a_get_he(str* name) struct hostent* he; e=0; + if (str2ip6(name)!=0) + return 0; if ((ip=str2ip(name))!=0){ return ip_addr2he(name, ip); } @@ -2489,6 +2495,8 @@ inline static struct hostent* dns_aaaa_get_he(str* name) struct hostent* he; e=0; + if (str2ip(name)!=0) + return 0; if ((ip=str2ip6(name))!=0){ return ip_addr2he(name, ip); } @@ -2963,6 +2971,8 @@ inline static int dns_a_resolve( struct dns_hash_entry** e, ret=-E_DNS_NO_IP; if (*e==0){ /* do lookup */ /* if ip don't set *e */ + if (str2ip6(name)!=0) + goto error; if ((tmp=str2ip(name))!=0){ *ip=*tmp; *rr_no=0; @@ -3012,6 +3022,8 @@ inline static int dns_aaaa_resolve( struct dns_hash_entry** e, ret=-E_DNS_NO_IP; if (*e==0){ /* do lookup */ /* if ip don't set *e */ + if (str2ip(name)!=0) + goto error; if ((tmp=str2ip6(name))!=0){ *ip=*tmp; *rr_no=0;

11 years, 10 months

git:3.3: kamailio.cfg: fixed typos to speeddial

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: bb01d3161f45e071ff0035968d91dd007b7207c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb01d31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 25 14:04:37 2013 +0100 kamailio.cfg: fixed typos to speeddial - backport of 0fd954bc6a8f94ac5e8087f6b8abdba372505c6e --- etc/kamailio.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 619f9ad..f924913 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -370,7 +370,7 @@ modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif -# ----- speedial params ----- +# ----- speeddial params ----- #!ifdef WITH_SPEEDDIAL modparam("speeddial", "db_url", DBURL) modparam("speeddial", "use_domain", MULTIDOMAIN) @@ -627,7 +627,7 @@ route[REGISTRAR] { # USER location service route[LOCATION] { -#!ifdef WITH_SPEEDIAL +#!ifdef WITH_SPEEDDIAL # search for short dialing - 2-digit extension if($rU=~"^[0-9][0-9]$") if(sd_lookup("speed_dial"))

11 years, 10 months

git:3.3: pua_reginfo: fix setting lengths of contact attributes

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 5e26e688af8967fdcb4daf218432e8d569eeade6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e26e68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 25 13:15:22 2013 +0100 pua_reginfo: fix setting lengths of contact attributes - fix also for warning from FS#255 reported by Ovidiu Sas - backport from f76bd09d4800ea63552c11002d7f6f72569e78ed --- modules_k/pua_reginfo/notify.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/modules_k/pua_reginfo/notify.c b/modules_k/pua_reginfo/notify.c index 3b20e4e..7116527 100644 --- a/modules_k/pua_reginfo/notify.c +++ b/modules_k/pua_reginfo/notify.c @@ -296,22 +296,27 @@ int process_body(str notify_body, udomain_t * domain) { callid.len = strlen(callid.s); received.s = xmlGetAttrContentByName(contacts, "received"); if (received.s == NULL) { - LM_DBG("No received for this contact!\n"); - } - received.len - strlen(received.s); + LM_DBG("No received for this contact!\n"); + received.len = 0; + } else { + received.len = strlen(received.s); + } path.s = xmlGetAttrContentByName(contacts, "path"); - if (received.s == NULL) { - LM_DBG("No path for this contact!\n"); - } - path.len = strlen(path.s); + if (path.s == NULL) { + LM_DBG("No path for this contact!\n"); + path.len = 0; + } else { + path.len = strlen(path.s); + } user_agent.s = xmlGetAttrContentByName(contacts, "user_agent"); - if (received.s == NULL) { - LM_DBG("No user_agent for this contact!\n"); - } - user_agent.len = strlen(user_agent.s); - + if (user_agent.s == NULL) { + LM_DBG("No user_agent for this contact!\n"); + user_agent.len = 0; + } else { + user_agent.len = strlen(user_agent.s); + } event = reginfo_parse_event(xmlGetAttrContentByName(contacts, "event")); if (event == EVENT_UNKNOWN) { LM_ERR("No event for this contact!\n");

11 years, 10 months

git:3.3: core: end simple pv name (e.g., $xy) at end of line

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 8d93eea7c92b797caae8ce9817e90ecb7d9e3d31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d93eea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 25 11:38:38 2013 +0100 core: end simple pv name (e.g., $xy) at end of line - cfg parser was throwing error if last token in a line was $xy as pv with \n was not found (cherry picked from commit d2d6b4b932c7df6e6620a256692be5ef049356a3) --- cfg.lex | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index b074058..1de6e36 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1101,7 +1101,7 @@ IMPORTFILE "import_file" <PVARID>{ID}|'\.' {yymore(); } <PVARID>{LPAREN} { state = PVAR_P_S; BEGIN(PVAR_P); p_nest=1; yymore(); } -<PVARID>. { yyless(yyleng-1); +<PVARID>{CR}|{EAT_ABLE}|. { yyless(yyleng-1); count(); addstr(&s_buf, yytext, yyleng); yylval.strval=s_buf.s;

11 years, 10 months

git:3.3: json: proper handling of empty values for json documents

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 7fab57ff91fc395c1450503706b3f734fb9473c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fab57f… Author: Richard Brady <rnbrady(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 22 17:19:31 2013 +0100 json: proper handling of empty values for json documents (cherry picked from commit 15e1ae6720136a698326a0b53f6db8eef73e3e5a) --- modules/json/json_funcs.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/json/json_funcs.c b/modules/json/json_funcs.c index 1c42656..a75704b 100644 --- a/modules/json/json_funcs.c +++ b/modules/json/json_funcs.c @@ -51,6 +51,12 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) dst_pv = (pv_spec_t *)dst; struct json_object *j = json_tokener_parse(json_s.s); + + if (is_error(j)) { + LM_ERR("empty or invalid JSON\n"); + return -1; + } + char *value = (char*)json_object_to_json_string(json_object_object_get(j, field_s.s)); dst_val.rs.s = value;

11 years, 10 months

git:3.3: modules/sqlops: Check if pv_spec is available before trying to use it.

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 2475a1beb3f9feb47dfa742c186baa329cb81241 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2475a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 25 13:10:59 2013 +0100 modules/sqlops: Check if pv_spec is available before trying to use it. Instead of segfaulting when the script writer has not specified enough PV specs to hold all the query's result columns, bail out with an error message. - backport of a21750ff6fcf87d8e3f54597bdd3f1171846e6cb --- modules_k/sqlops/sql_api.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 77ff97f..83b3690 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -593,6 +593,10 @@ int sql_do_pvquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, pv = res; for(j=0; j<RES_COL_N(db_res); j++) { + if (pv == NULL) { + LM_ERR("Missing pv spec for column %d\n", j+1); + goto error; + } if (db_val2pv_spec(msg, &RES_ROWS(db_res)[0].values[j], &pv->sname) != 0) { LM_ERR("Failed to convert value for column %.*s\n", RES_NAMES(db_res)[j]->len, RES_NAMES(db_res)[j]->s);

11 years, 10 months

git:3.3: siputils: fix decode2format fuction to handle ; in userpart

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 08b5506618b1b4e590c55e89eea7bd2f0abcd796 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08b5506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 25 13:03:34 2013 +0100 siputils: fix decode2format fuction to handle ; in userpart - backported from ff22a1cbc2b817d63611b3da967d8245e11cb84c --- modules_k/siputils/contact_ops.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 73a2f8b..b238993 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -530,12 +530,6 @@ decode2format (str uri, char separator, struct uri_format *format) lastpos = pos+1; } - else - if (((*pos) == '>')||(*pos == ';')) - { - /* invalid chars inside username part */ - return -5; - } }

11 years, 10 months

git:3.3: core: fixed bug in PV caching that broke the use of the $$ symbol

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 514f6cc66e5220779188aad15f3b3eeeace7aabf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=514f6cc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 20 14:18:55 2013 +0000 core: fixed bug in PV caching that broke the use of the $$ symbol - Found and fixed by Hugh Waite @ Crocodile RCS (cherry picked from commit c059041a71a1b7175243c366316108ce370fffa7) --- pvapi.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pvapi.c b/pvapi.c index 64878f2..5072f0f 100644 --- a/pvapi.c +++ b/pvapi.c @@ -120,6 +120,10 @@ int pv_locate_name(str *in) LM_ERR("missing pv marker [%.*s]\n", in->len, in->s); return -1; } + if(in->s[1]==PV_MARKER) + { + return 2; + } pcount = 0; if(in->s[1]==PV_LNBRACKET) {

11 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2013