sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: kamailio.cfg: load rtpproxy module
by Daniel-Constantin Mierla 17 Aug '10

17 Aug '10

Module: sip-router Branch: master Commit: 1e72cd4c4bd82496e98e492656a333b1a9385ae2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e72cd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 17 17:26:36 2010 +0200 kamailio.cfg: load rtpproxy module - update for nathelper module split - rtpproxy module needed when WITH_NAT is defined --- etc/kamailio.cfg | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 46a87d0..98fa69d 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -169,6 +169,7 @@ loadmodule "presence_xml.so" #!ifdef WITH_NAT loadmodule "nathelper.so" +loadmodule "rtpproxy.so" #!endif # ----------------- setting module-specific parameters --------------- @@ -288,9 +289,10 @@ modparam("presence_xml", "force_active", 1) modparam("presence", "server_address", "sip:10.0.0.10:5060") #!endif -# ----- nathelper ----- #!ifdef WITH_NAT -modparam("nathelper", "rtpproxy_sock", "udp:127.0.0.1:7722") +# ----- rtpproxy ----- +modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") +# ----- nathelper ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", 7)

1 0

git:master: modules_k:rtpproxy - silence a noisy probe
by Ovidiu Sas 17 Aug '10

17 Aug '10

Module: sip-router Branch: master Commit: 359aacd999b2c7444bbce762ce99df2ec0fdfd91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=359aacd… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Aug 17 11:18:30 2010 -0400 modules_k:rtpproxy - silence a noisy probe --- modules_k/rtpproxy/nathelper.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/rtpproxy/nathelper.c b/modules_k/rtpproxy/nathelper.c index 6e8a513..bbdd7e4 100644 --- a/modules_k/rtpproxy/nathelper.c +++ b/modules_k/rtpproxy/nathelper.c @@ -2005,7 +2005,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) LM_ERR("Unable to parse sdp\n"); FORCE_RTP_PROXY_RET (-1); } - print_sdp((sdp_info_t*)msg->body, L_INFO); +#ifdef EXTRA_DEBUG + print_sdp((sdp_info_t*)msg->body, L_DBG); +#endif bodylimit = body.s + body.len;

1 0

git:master: modules_k:nathelper: updated documentation
by Ovidiu Sas 17 Aug '10

17 Aug '10

Module: sip-router Branch: master Commit: b8f11766d74605da3ebe689b6be21fc0d8a11ca2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8f1176… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Aug 17 10:22:58 2010 -0400 modules_k:nathelper: updated documentation --- modules_k/nathelper/README | 708 +++++---------------------- modules_k/nathelper/doc/nathelper.xml | 11 + modules_k/nathelper/doc/nathelper_admin.xml | 515 ------------------- 3 files changed, 125 insertions(+), 1109 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b8f…

1 0

git:master: modules_k:nathelper - restore nortpproxy_str parameter
by Ovidiu Sas 17 Aug '10

17 Aug '10

Module: sip-router Branch: master Commit: f8ae37321fde6cb18b334f0abfee830b52fae70c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8ae373… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Aug 17 10:16:03 2010 -0400 modules_k:nathelper - restore nortpproxy_str parameter --- modules_k/nathelper/nathelper.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 1baad10..6a728e0 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -389,6 +389,7 @@ static pv_export_t mod_pvs[] = { static param_export_t params[] = { {"natping_interval", INT_PARAM, &natping_interval }, {"ping_nated_only", INT_PARAM, &ping_nated_only }, + {"nortpproxy_str", STR_PARAM, &nortpproxy_str.s }, {"received_avp", STR_PARAM, &rcv_avp_param }, {"force_socket", STR_PARAM, &force_socket_str }, {"sipping_from", STR_PARAM, &sipping_from.s }, @@ -586,6 +587,18 @@ mod_init(void) return -1; } + if (nortpproxy_str.s==NULL || nortpproxy_str.s[0]==0) { + nortpproxy_str.len = 0; + nortpproxy_str.s = NULL; + } else { + nortpproxy_str.len = strlen(nortpproxy_str.s); + while (nortpproxy_str.len > 0 && (nortpproxy_str.s[nortpproxy_str.len - 1] == '\r' || + nortpproxy_str.s[nortpproxy_str.len - 1] == '\n')) + nortpproxy_str.len--; + if (nortpproxy_str.len == 0) + nortpproxy_str.s = NULL; + } + if (natping_interval > 0) { bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0); if (!bind_usrloc) {

1 0

set From and To attributes in assignments
by Daniel-Constantin Mierla 17 Aug '10

17 Aug '10

Hello, I committed in master branch (to be 3.1.0) code that allows to set uri, username, domain and display name for To and From headers using assignments to their respective PVs in configuration file. For example: $fu = "sip:anonymous@invalid"; $fn = '"Jon Doe"'; $tU = "+123455678"; Assignment of each such attribute should be done only once, otherwise you get concatenated values since it uses the internal lump system. Therefore, doing an update is not visible immediately in config unless you do use msg_apply_changes(). Also, use it carefully, in case you have sipv1 devices in your network then it can break dialog matching. Anyhow changing content of From and To headers was possible with remove_hf()/append_hf() or subst() functions, the new feature comes just to ease writing the config when one needs it. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

4 4

Freezing for 3.1 on Monday, Aug 16
by Daniel-Constantin Mierla 17 Aug '10

17 Aug '10

Hello, as I could spot, there was some intense activity from Andrei in the last days with a new internal statistics API. To allow some time for it as well as for others (like me) to get some work done that is good to be in 3.1, I propose next Monday (Aug 16) as timeline to freeze the repo for new features. Probably during the freeze we can still merge some modules (in the way of moving one version to modules and removing the other as long as remaining version includes the features of the other) -- thinking of pdt, ratelimit, sms, ... Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

3 6

git:master: core:sr_module If offsetof is not found in stddef. h define it as a macro
by Marius Zbihlei 17 Aug '10

17 Aug '10

Module: sip-router Branch: master Commit: b4c42f7bf36ce7a51fa51c316d1231d621b28362 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4c42f7… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Aug 17 11:24:43 2010 +0300 core:sr_module If offsetof is not found in stddef.h define it as a macro This is very unlikely; the macro uses the null pointer dereference --- sr_module.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index e4f94a3..421f1b7 100644 --- a/sr_module.c +++ b/sr_module.c @@ -101,11 +101,15 @@ struct sr_module* modules=0; extern struct module_exports sl_exports; #endif +#ifndef offsetof +#warning "use null pointer dereference for offsetof" +#define offsetof(st, m) \ + ((size_t) ( (char *)&((st *)(0))->m - (char *)0 )) +#endif int mod_response_cbk_no=0; response_function* mod_response_cbks=0; - /* initializes statically built (compiled in) modules*/ int register_builtin_modules() {

1 0

git:master: core: use offsetof() extension to finding the memory offset of a member of a structure
by Marius Zbihlei 17 Aug '10

17 Aug '10

Module: sip-router Branch: master Commit: b23832622f9211a04b1718741fd46eabb41937d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b238326… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Aug 17 11:12:38 2010 +0300 core: use offsetof() extension to finding the memory offset of a member of a structure This replaces some undefined behavior code in the form of null pointer dereferences Offsetof is present in stddef.h and it is fairly portable across platforms/compilers. --- sr_module.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sr_module.c b/sr_module.c index 9c7a2a9..e4f94a3 100644 --- a/sr_module.c +++ b/sr_module.c @@ -69,6 +69,7 @@ #include <strings.h> #include <stdlib.h> #include <string.h> +#include <stddef.h> /* for offsetof */ struct sr_module* modules=0; @@ -922,9 +923,9 @@ int init_modules(void) action_u_t *fixup_get_param(void **cur_param, int cur_param_no, int required_param_no) { - action_u_t *a, a2; + action_u_t *a; /* cur_param points to a->u.string, get pointer to a */ - a = (void*) ((char *)cur_param - ((char *)&a2.u.string-(char *)&a2)); + a = (void*) ((char *)cur_param - offsetof(action_u_t, u.string)); return a + required_param_no - cur_param_no; } @@ -947,7 +948,7 @@ int fixup_get_param_count(void **cur_param, int cur_param_no) action_param_type* fixup_get_param_ptype(void** param) { action_u_t* a; - a = (void*)((char*)param - (char*)&(((action_u_t*)(0))->u.string)); + a = (void*)((char*)param - offsetof(action_u_t, u.string)); return &a->type; }

1 0

git:master: tmx: updated for last tm changes
by Daniel-Constantin Mierla 16 Aug '10

16 Aug '10

Module: sip-router Branch: master Commit: aff441b32d2f87dfeee112432174e6692c4d6f42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aff441b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 16 18:35:45 2010 +0200 tmx: updated for last tm changes - cancel_uacs() takes new type of paraeters - reply function takes str* parameters --- modules_k/tmx/t_mi.c | 41 ++++++++++++++++++++--------------------- modules_k/tmx/tmx_mod.c | 29 +++++++++++++++++------------ 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 84288df..44c5054 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -663,6 +663,7 @@ struct mi_root* mi_tm_uac_dlg(struct mi_root* cmd_tree, void* param) */ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) { + struct cancel_info cancel_data; struct mi_node *node; struct cell *trans; @@ -676,7 +677,9 @@ struct mi_root* mi_tm_cancel(struct mi_root* cmd_tree, void* param) /* cancel the call */ LM_DBG("cancelling transaction %p\n",trans); - _tmx_tmb.cancel_uacs( trans, ~0/*all branches*/, 0); + init_cancel_info(&cancel_data); + cancel_data.cancel_bitmap = ~0; /*all branches*/ + _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); _tmx_tmb.unref_cell(trans); @@ -753,11 +756,11 @@ struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param) unsigned int hash_label; unsigned int rpl_code; struct cell *trans; - char *reason; - char *totag; - char *new_hdrs; - char *body; - str tmp; + str reason = {0, 0}; + str totag = {0, 0}; + str new_hdrs = {0, 0}; + str body = {0, 0}; + str tmp = {0, 0}; char *p; int n; @@ -774,49 +777,45 @@ struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param) /* reason text (param 2) */ node = node->next; - reason = as_asciiz(&node->value); + reason = node->value; /* trans_id (param 3) */ node = node->next; tmp = node->value; p = memchr( tmp.s, ':', tmp.len); - if ( p==NULL) + if(p==NULL) return init_mi_tree( 400, "Invalid trans_id", 16); tmp.len = p-tmp.s; - if( str2int( &tmp, &hash_index)!=0 ) + if(str2int(&tmp, &hash_index)!=0) return init_mi_tree( 400, "Invalid index in trans_id", 25); tmp.s = p+1; tmp.len = (node->value.s+node->value.len) - tmp.s; - if( str2int( &tmp, &hash_label)!=0 ) + if(str2int(&tmp, &hash_label)!=0) return init_mi_tree( 400, "Invalid label in trans_id", 25); - if( _tmx_tmb.t_lookup_ident( &trans, hash_index, hash_label)<0 ) + if(_tmx_tmb.t_lookup_ident( &trans, hash_index, hash_label)<0) return init_mi_tree( 404, "Transaction not found", 21); /* to_tag (param 4) */ node = node->next; - totag = as_asciiz(&node->value); + totag = node->value; /* new headers (param 5) */ node = node->next; - if (node->value.len==1 && node->value.s[0]=='.') - new_hdrs = 0; - else - new_hdrs = as_asciiz(&node->value); + if (!(node->value.len==1 && node->value.s[0]=='.')) + new_hdrs = node->value; /* body (param 5 - optional) */ node = node->next; if (node) - body = as_asciiz(&node->value); - else - body = 0; + body = node->value; /* it's refcounted now, t_reply_with body unrefs for me -- I can * continue but may not use T anymore */ - n = _tmx_tmb.t_reply_with_body( trans, rpl_code, reason, body, - new_hdrs, totag); + n = _tmx_tmb.t_reply_with_body(trans, rpl_code, &reason, &body, + &new_hdrs, &totag); if (n<0) return init_mi_tree( 500, "Reply failed", 12); diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 420cb30..3714fed 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -232,7 +232,7 @@ static int fixup_cancel_branches(void** param, int param_no) */ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) { - branch_bm_t cb = 0; + struct cancel_info cancel_data; struct cell *t = 0; tm_ctx_t *tcx = 0; int n=0; @@ -244,26 +244,30 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) if(tcx != NULL) idx = tcx->branch_index; n = (int)(long)k; + init_cancel_info(&cancel_data); switch(n) { case 1: /* prepare cancel for every branch except idx */ - _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 1<<idx); case 2: if(msg->first_line.u.reply.statuscode>=200) break; - cb = 1<<idx; + cancel_data.cancel_bitmap = 1<<idx; break; default: if (msg->first_line.u.reply.statuscode>=200) /* prepare cancel for every branch except idx */ - _tmx_tmb.prepare_to_cancel(t, &cb, 1<<idx); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 1<<idx); else - _tmx_tmb.prepare_to_cancel(t, &cb, 0); + _tmx_tmb.prepare_to_cancel(t, + &cancel_data.cancel_bitmap, 0); } - LM_DBG("canceling %d/%d\n", n, (int)cb); - if(cb==0) + LM_DBG("canceling %d/%d\n", n, (int)cancel_data.cancel_bitmap); + if(cancel_data.cancel_bitmap==0) return -1; - _tmx_tmb.cancel_uacs(t, cb, 0); + _tmx_tmb.cancel_uacs(t, &cancel_data, 0); return 1; } @@ -287,12 +291,11 @@ static int fixup_cancel_callid(void** param, int param_no) static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *flag) { struct cell *trans; - branch_bm_t cancel_bm; + struct cancel_info cancel_data; str cseq_s; str callid_s; int fl; - cancel_bm=0; fl = -1; if(fixup_get_svalue(msg, (gparam_p)cid, &callid_s)<0) @@ -321,8 +324,10 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla DBG("Now calling cancel_uacs\n"); if(trans->uas.request && fl>0 && fl<32) setflag(trans->uas.request, fl); - _tmx_tmb.prepare_to_cancel(trans, &cancel_bm, 0); - _tmx_tmb.cancel_uacs(trans, cancel_bm, 0); + init_cancel_info(&cancel_data); + cancel_data.cancel_bitmap = 0; + _tmx_tmb.prepare_to_cancel(trans, &cancel_data.cancel_bitmap, 0); + _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); //_tmx_tmb.unref_cell(trans);

1 0

git:master: tm: update to make seas module work
by Daniel-Constantin Mierla 16 Aug '10

16 Aug '10

Module: sip-router Branch: master Commit: b51171b5b8f1d173f5d3dca4ff92f7232f2a83ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b51171b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 16 18:32:48 2010 +0200 tm: update to make seas module work - worked from patch provided by Elias Baixas - new function to build uac cancel exported via API - several parameters for reply functions converted from char* to str* as lenght was available or needed anyhow - updated cancel_uacs() type definition --- modules/tm/dlg.c | 23 +++++++++ modules/tm/dlg.h | 9 ++++ modules/tm/h_table.h | 6 ++ modules/tm/t_cancel.c | 107 ++++++++++++++++++++++++++++++++++++++++++ modules/tm/t_cancel.h | 12 ++++- modules/tm/t_msgbuilder.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ modules/tm/t_msgbuilder.h | 5 ++ modules/tm/t_reply.c | 70 ++++++++++++++++----------- modules/tm/t_reply.h | 8 ++-- modules/tm/tm_load.c | 4 +- modules/tm/tm_load.h | 2 + 11 files changed, 324 insertions(+), 36 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b51…

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
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