sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 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

13 years, 10 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; }

13 years, 10 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;

13 years, 10 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

13 years, 10 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

13 years, 10 months

git:master: Merge remote branch 'origin/andrei/raw_sock'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 88b1fb440e9a379bbcd64292a8bb1d8e29a8b427 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88b1fb4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:49:04 2010 +0200 Merge remote branch 'origin/andrei/raw_sock' Raw socket support for sending UDP IPv4 packets (major performance increase on multi-cpu machines running linux: 40-50% faster at least in stateless mode). * origin/andrei/raw_sock: NEWS: notes about the new udp4_raw mode raw sockets: added info rpc core: compile raw socket support by default on freebsd raw sockets: freebsd support cfg: delay cfg_shmize to just before forking core: always compile the raw sockets code on linux raw sockets: ttl can be set from the config file raw sockets: ttl can be set or auto-detected core: include raw socket support in version info raw sockets: use BSD ip & udp structure versions raw sockets: config file support raw sockets: udp send will use now raw sockets if enabled raw sockets: runtime config support raw sockets: build ip header & fragmentation support raw socket: compilation fixes raw sockets: get dst. ip from the ip header core: basic support for receiving udp sip packets on raw sockets core: basic raw socket support functions ---

13 years, 10 months

git:master: app_lua: updated to the sr31 export records

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d3796af0614b59b58633243c7d5adb2eaba6276a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3796af… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:27:53 2010 +0200 app_lua: updated to the sr31 export records - use the new unified sr31_cmd_export_t (removed checks for v0 or v1 modules). - set the correct module function type in the created action (in function of the function export record number of parameters one of the MODULE[0-5]_T or MODULEX_T). --- modules/app_lua/app_lua_sr.c | 47 ++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 0900bd4..bd1510a 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -109,10 +109,11 @@ static int lua_sr_modf (lua_State *L) char *argv[MAX_ACTIONS]; int argc; int i; + int mod_type; struct run_act_ctx ra_ctx; unsigned modver; struct action *act; - union cmd_export_u* expf; + sr31_cmd_export_t* expf; sr_lua_env_t *env_L; ret = 1; @@ -169,12 +170,42 @@ static int lua_sr_modf (lua_State *L) goto error; } /* check fixups */ - if (expf->v1.fixup!=NULL && (modver!=1 || expf->v1.free_fixup==NULL)) { + if (expf->fixup!=NULL && expf->free_fixup==NULL) { LM_ERR("function '%s' has fixup - cannot be used\n", luav[0]); goto error; } + switch(expf->param_no) { + case 0: + mod_type = MODULE0_T; + break; + case 1: + mod_type = MODULE1_T; + break; + case 2: + mod_type = MODULE2_T; + break; + case 3: + mod_type = MODULE3_T; + break; + case 4: + mod_type = MODULE4_T; + break; + case 5: + mod_type = MODULE5_T; + break; + case 6: + mod_type = MODULE6_T; + break; + case VAR_PARAM_NO: + mod_type = MODULEX_T; + break; + default: + LM_ERR("unknown/bad definition for function '%s' (%d params)\n", + luav[0], expf->param_no); + goto error; + } - act = mk_action(MODULE_T, argc+1 /* number of (type, value) pairs */, + act = mk_action(mod_type, argc+1 /* number of (type, value) pairs */, MODEXP_ST, expf, /* function */ NUMBER_ST, argc-1, /* parameter number */ STRING_ST, argv[1], /* param. 1 */ @@ -191,10 +222,10 @@ static int lua_sr_modf (lua_State *L) } /* handle fixups */ - if (expf->v1.fixup) { + if (expf->fixup) { if(argc==1) { /* no parameters */ - if(expf->v1.fixup(0, 0)<0) + if(expf->fixup(0, 0)<0) { LM_ERR("Error in fixup (0) for '%s'\n", luav[0]); goto error; @@ -202,7 +233,7 @@ static int lua_sr_modf (lua_State *L) } else { for(i=1; i<=argc; i++) { - if(expf->v1.fixup(&(act->val[i+1].u.data), i)<0) + if(expf->fixup(&(act->val[i+1].u.data), i)<0) { LM_ERR("Error in fixup (%d) for '%s'\n", i, luav[0]); goto error; @@ -215,12 +246,12 @@ static int lua_sr_modf (lua_State *L) ret = do_action(&ra_ctx, act, env_L->msg); /* free fixups */ - if (expf->v1.fixup) { + if (expf->fixup) { for(i=1; i<=argc; i++) { if ((act->val[i+1].type == MODFIXUP_ST) && (act->val[i+1].u.data)) { - expf->v1.free_fixup(&(act->val[i+1].u.data), i); + expf->free_fixup(&(act->val[i+1].u.data), i); } } }

13 years, 10 months

git:master: debugger: update the module functions types

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 690a19f54924cf5fef642b3542b3d86e41170508 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=690a19f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:24:46 2010 +0200 debugger: update the module functions types Updated to the current module function types (MODULE*_T), after the rve_f_params merge. Removed MODULE_T and added MODULE0_T, MODULE1_T, MODULE2_T, MODULE1_RVE_T, MODULE2_RVE_T, MODULE3_RVE_T, MODULE4_RVE_T, MODULE5_RVE_T, MODULE6_RVE_T, MODULEX_RVE_T. --- modules/debugger/debugger_act.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/modules/debugger/debugger_act.c b/modules/debugger/debugger_act.c index f99d63a..e9372fa 100644 --- a/modules/debugger/debugger_act.c +++ b/modules/debugger/debugger_act.c @@ -117,12 +117,21 @@ str* dbg_get_action_name(struct action *a) if(a->val[1].u.number&RETURN_R_F) return &_dbg_action_special[3]; return &_dbg_action_special[1]; - case MODULE_T: + case MODULE0_T: + case MODULE1_T: + case MODULE2_T: case MODULE3_T: case MODULE4_T: case MODULE5_T: case MODULE6_T: case MODULEX_T: + case MODULE1_RVE_T: + case MODULE2_RVE_T: + case MODULE3_RVE_T: + case MODULE4_RVE_T: + case MODULE5_RVE_T: + case MODULE6_RVE_T: + case MODULEX_RVE_T: cmd = (cmd_export_common_t*)(a->val[0].u.data); aname.s = cmd->name; aname.len = strlen(aname.s);

13 years, 10 months

git:master: Merge remote branch 'origin/andrei/rve_f_params'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 99cff51099aad0613ed7a7a19c3042045a52917a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99cff51… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:18:06 2010 +0200 Merge remote branch 'origin/andrei/rve_f_params' Automatic support for expressions or variables in lots of module functions. It applies to all the module functions declared without a fixup, with a fixup and the corresponding free_fixup function or with a compatible ser or kamailio style standard fixup (declared in sr_module.h or mod_fix.h). E.g.: f($a, "b = " + $b); t_set_fr($v + 2 + $x). t_set_fr($foo) (equivalent now with t_set_fr("$foo")). If the expression is constant, then there is no restriction, all the module functions can take it as parameter. E.g.: f("7 *" +" 6 = " + 7 * 6) # equivalent to f("7 * 6 = 42") * origin/andrei/rve_f_params: (21 commits) NEWS: notes about expressions in function parameters core: enable RVE fixup support when fixup_free is present core: automatically fill known fixup_free functions core: functions to get a fixup corresp. fixup_free function core: k style fixup_free fixes core: added generic fparam fixup_free functions core: pvapi: added pv_spec_free_contents() core: fix "unsigned" bug in sint2str*() core: fix auto-deref. for vars in fparam fixups perl(k): use sr31_cmd_export_t app_python: use sr31_cmd_export_t core: internal module interface changes print(s): fparam fixup example core: support for RVEs in fparam fixups core: rval - don't use static buffer for int conversions core: ut.* - BSD licence core: ut.h: added sint2strbuf() perl(k): update api calls: s/MODULE_T/MODULE2_T/ app_python: update api calls: s/MODULE_T/MODULE2_T print(s): more module function examples core: support for expressions/variables in function parameters Conflicts: NEWS action.c modules/app_python/python_msgobj.c modules_k/perl/openserxs.xs pkg/kamailio/debian-lenny pvapi.c route.c route_struct.h sr_module.c ---

13 years, 10 months

3.0.2 Makefile issues continued - FreeBSD 6

by Olle E. Johansson

Installing on Linux went like a charm, no issues. However, there are some issues when building on FreeBSD. Some comments: - The xmlrpc module links to -lresolv, something that doesn't exist on FreeBSD and can be removed. - Libraries in /usr/local/lib was not found, but it seems like include files in /usr/local/include was found by some modules, but not all. Setting CPATH solved issues here. - There's no point in even trying to compile iptrtpproxy on systems that are not Linux, right? - There are many compiler warnings that should be looked at - In order to get INADDR_LOOPBACK, that is used in presence_dialoginfo and other modules I ended up copying the definition of INADDR_LOOPBACK into ip_addr.h... It's in netinet/in.h but must be disabled for some reason. Also getting this at make install (but not make modules), guessing it belongs to kamctl installation: MYSQLON=yes make -C ../../utils/kamctl/ install-modules "../../Makefile.defs", line 88: Missing dependency operator Error expanding embedded variable. gmake[1]: *** [install-mysql-scripts] Error 2 gmake[1]: Leaving directory `/s/usr-local/src/kamailio-3.0.2/modules/db_mysql' gmake: *** [install-modules] Error 1 I had to exclude all db modules in order to get around this. I guess someone with some more experience of the build system needs to look at this :-) Cheers, /O

13 years, 10 months

← Newer
1
...
23
24
25
26
27
28
29
...
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