sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: registrar(k): reset local contact holder

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e9229ca19b4946cecda89cc3ada716ba8a506b3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9229ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 19:40:50 2010 +0200 registrar(k): reset local contact holder - when an UA fetches the bindings for a user and the user isn't registered, properly return an empty contact. - closes SF#3035778, patch by Alex Hermann (cherry picked from commit 776d941bef2e97089493a896bf0b57607078c52d) --- modules_k/registrar/save.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 50bf57b..66b18f5 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -456,6 +456,8 @@ static inline int insert_contacts(struct sip_msg* _m, contact_t* _c, if (r->contacts) build_contact(r->contacts); ul.release_urecord(r); + } else { /* No contacts found */ + build_contact(NULL); } #ifdef USE_TCP

14 years, 5 months

git:kamailio_3.0: presence(k): set properly db updated flag

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 1463ba2c10179608c72332c4fac96d0e3f4c14d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1463ba2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 23:26:35 2010 +0200 presence(k): set properly db updated flag - patch by Marius-Ovidiu Bucur (cherry picked from commit b31c53abf1c3bafafb59d3fa6456135f1da6e6c9) --- modules_k/presence/hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/hash.c b/modules_k/presence/hash.c index 874fe03..bc31b87 100644 --- a/modules_k/presence/hash.c +++ b/modules_k/presence/hash.c @@ -261,7 +261,7 @@ int insert_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs) } new_rec->expires+= (int)time(NULL); - if(fallback2db==0) + if(fallback2db!=0) new_rec->db_flag= INSERTDB_FLAG; else new_rec->db_flag= NO_UPDATEDB_FLAG;

14 years, 5 months

git:kamailio_3.0: pua(k): use the outbound proxy on updates

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 33dcaf08698eb1fd6ee2bedfb78380939013081a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33dcaf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 20:25:52 2010 +0200 pua(k): use the outbound proxy on updates - patch by Alex Hermann, SF#3035780 (cherry picked from commit f39cb1976978f0860d41a05ed181e45e14c88c58) --- modules_k/pua/pua.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index 3706200..bf73187 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -667,7 +667,7 @@ int update_pua(ua_pres_t* p, unsigned int hash_code) p->pres_uri, /* Request-URI */ p->pres_uri, /* To */ p->pres_uri, /* From */ - 0 /* Outbound proxy*/ + &outbound_proxy /* Outbound proxy*/ ); if(result< 0) {

14 years, 5 months

git:kamailio_3.0: core: fix parsing quoted paramers in To header

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 8839ee27a09ecbc37ca1a899655d76c6d4720e3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8839ee2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 20:07:45 2010 +0200 core: fix parsing quoted paramers in To header - fix off-by-one bug for quoted parameter values in parse_to - patch by Alex Hermann, SF#3035382 (cherry picked from commit 8593bc83c748835c6132eaa678064a2466316ae7) --- parser/parse_to.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/parse_to.c b/parser/parse_to.c index 30ac170..d3fe90f 100644 --- a/parser/parse_to.c +++ b/parser/parse_to.c @@ -246,7 +246,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end, status = PARA_VALUE_QUOTED; break; case PARA_VALUE_QUOTED: - param->value.len=tmp-param->value.s-1 ; + param->value.len=tmp-param->value.s; add_param( param , to_b ); status = E_PARA_VALUE; break;

14 years, 5 months

git:kamailio_3.0: presence_dialoginfo(k): don' t exeed array size in error case

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: aa509c804d81f08a75a87c7083d76a3e321a042b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa509c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 23:29:43 2010 +0200 presence_dialoginfo(k): don't exeed array size in error case - error handling could get to the size of array as index, resulting in out of bounds operation - patch by Marius-Ovidiu Bucur (cherry picked from commit 48f3159cdcc9ef06114a6d8f853687dc1338a8f0) --- modules_k/presence_dialoginfo/notify_body.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/presence_dialoginfo/notify_body.c b/modules_k/presence_dialoginfo/notify_body.c index 965cef0..efa3b45 100644 --- a/modules_k/presence_dialoginfo/notify_body.c +++ b/modules_k/presence_dialoginfo/notify_body.c @@ -264,7 +264,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) error: if(xml_array!=NULL) { - for(i=0; i<=j; i++) + for(i=0; i<j; i++) { if(xml_array[i]!=NULL) xmlFreeDoc( xml_array[i]);

14 years, 5 months

git:kamailio_3.0: pv: fixed tobody.params transformation

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 2e9f1eee444bc4937a4de4be24343ac5cccb2c6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e9f1ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 30 20:15:13 2010 +0200 pv: fixed tobody.params transformation - len was wrong when having quoted parameters - patch by Alex Hermann, closes SF#3035382 (cherry picked from commit 6cc5f8ec90db48483d644430bc2628356833fc1e) --- modules_k/pv/pv_trans.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index f8e7347..939d8de 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -996,12 +996,8 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, if(_tr_tobody.param_lst!=NULL) { val->rs.s = _tr_tobody.param_lst->name.s; - if(_tr_tobody.last_param->value.s!=NULL) - val->rs.len = _tr_tobody.last_param->value.s - +_tr_tobody.last_param->value.len - val->rs.s; - else - val->rs.len = _tr_tobody.last_param->name.s - +_tr_tobody.last_param->name.len - val->rs.s; + val->rs.len = _tr_tobody_str.s + _tr_tobody_str.len + - val->rs.s; } else val->rs = _tr_empty; break;

14 years, 5 months

git:master: core: dns Added failed DNS requests statistics when dns cache is not used

by Marius Zbihlei

Module: sip-router Branch: master Commit: 4e0402173999fcb95257ebb000f3a8b951d1f68c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e04021… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Aug 11 17:54:27 2010 +0300 core:dns Added failed DNS requests statistics when dns cache is not used DNS statistics can be seen with: sercmd> cnt.get dns failed_dns_request Still TODO: failed statistics for DNS cache --- resolve.c | 37 +++++++++++++++++++++++++++++++++---- resolve.h | 9 +++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/resolve.c b/resolve.c index b68aadc..9aedd85 100644 --- a/resolve.c +++ b/resolve.c @@ -77,7 +77,13 @@ #include "dns_cache.h" #endif - +/* counters framework */ +struct dns_counters_h dns_cnts_h; +counter_def_t dns_cnt_defs[] = { + {&dns_cnts_h.failed_dns_req, "failed_dns_request", 0, 0, 0, + "incremented each time a DNS request has failed."}, + {0, 0, 0, 0, 0, 0 } +}; /* mallocs for local stuff */ #define local_malloc pkg_malloc @@ -119,6 +125,18 @@ int register_resolv_reinit_cb(on_resolv_reinit cb) } #endif +/* counter init function + must be called before fork +*/ +static int stat_init() +{ + if (counter_register_array("dns", dns_cnt_defs) < 0) + goto error; + return 0; +error: + return -1; +} + /* init. the resolver * params: retr_time - time before retransmitting (must be >0) * retr_no - retransmissions number @@ -157,12 +175,17 @@ static int _resolv_init() /* wrapper function to initialize the resolver at startup */ int resolv_init() { + int res = -1; _resolv_init(); #ifdef USE_NAPTR init_naptr_proto_prefs(); #endif - return 0; + /* init counter API only at startup + * This function must be called before DNS cache init method (if available) + */ + res = stat_init(); + return res; } /* wrapper function to reinitialize the resolver @@ -1486,11 +1509,17 @@ end: */ struct hostent* _sip_resolvehost(str* name, unsigned short* port, char* proto) { + struct hostent* res = NULL; #ifdef USE_NAPTR if (cfg_get(core, core_cfg, dns_try_naptr)) - return naptr_sip_resolvehost(name, port, proto); + res = naptr_sip_resolvehost(name, port, proto); #endif - return srv_sip_resolvehost(name, 0, port, proto, 0, 0); + res = srv_sip_resolvehost(name, 0, port, proto, 0, 0); + if( unlikely(!res) ){ + /* failed DNS request */ + counter_inc(dns_cnts_h.failed_dns_req); + } + return res; } diff --git a/resolve.h b/resolve.h index 9f0d4ef..5611c9d 100644 --- a/resolve.h +++ b/resolve.h @@ -47,6 +47,7 @@ #include <netdb.h> #include <arpa/nameser.h> #include <resolv.h> +#include "counters.h" #ifdef __OS_darwin #include <arpa/nameser_compat.h> @@ -78,6 +79,14 @@ #define RES_ONLY_TYPE 1 /* return only the specified type records */ #define RES_AR 2 /* return also the additional records */ +/* counter for failed DNS requests +*/ +struct dns_counters_h { + counter_handle_t failed_dns_req; +}; + +extern struct dns_counters_h dns_cnts_h; + /* query union*/ union dns_query{ HEADER hdr;

14 years, 5 months

git:master: core:resolve. c Added counter increment on error case for another function present in the interface

by Marius Zbihlei

Module: sip-router Branch: master Commit: 506d54309c6c145f349ff1e44e3ae8410c7b642b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=506d543… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 12 12:14:59 2010 +0300 core:resolve.c Added counter increment on error case for another function present in the interface TThe get_record() is called when resolving new entries in dns_cache(if compiled). --- resolve.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/resolve.c b/resolve.c index 9aedd85..a106315 100644 --- a/resolve.c +++ b/resolve.c @@ -990,6 +990,8 @@ error: LOG(L_ERR, "ERROR: get_record \n"); if (head) free_rdata_list(head); not_found: + /* increment error counter */ + counter_inc(dns_cnts_h.failed_dns_req); return 0; }

14 years, 5 months

git:kamailio_3.0: sl(k): removed not needed var

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 8672d515c263d73717503c1d4ce5499188205f16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8672d51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jul 24 08:44:56 2010 +0200 sl(k): removed not needed var (cherry picked from commit 52e256540d8d2e6aa17256887fb9ff17580af3f8) --- modules_k/sl/sl_funcs.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules_k/sl/sl_funcs.c b/modules_k/sl/sl_funcs.c index 78e3f8a..a890697 100644 --- a/modules_k/sl/sl_funcs.c +++ b/modules_k/sl/sl_funcs.c @@ -171,7 +171,6 @@ int sl_get_reply_totag(struct sip_msg *msg, str *totag) int sl_send_reply_helper(struct sip_msg *msg ,int code, str *text, str *tag) { str buf; - union sockaddr_union to; char *dset; int dset_len; struct bookmark dummy_bm; @@ -233,7 +232,7 @@ int sl_send_reply_helper(struct sip_msg *msg ,int code, str *text, str *tag) goto error; } - run_sl_callbacks( SLCB_REPLY_OUT, msg, &buf, code, text, &to ); + run_sl_callbacks( SLCB_REPLY_OUT, msg, &buf, code, text, &dst.to ); /* supress multhoming support when sending a reply back -- that makes sure that replies will come from where requests came in; good for NATs

14 years, 5 months

dlg_end_dlg and early dialog

by Jason Penton

Hi Guys, I'd like to try and add the functionality to be able to CANCEL an early dialog when dlg_end_dlg is called. At the moment we cannot terminate an early dialog through MI interface. Do any of you have any tips/pointers/ideas before I start? Cheers jason

14 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev