sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
429 discussions

git:master: xhttp_pi: escape special characters
by Ovidiu Sas 14 Mar '13

14 Mar '13

Module: sip-router Branch: master Commit: a00662049f2f245f53dfb23a07da9229e2ebe159 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a006620… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Mar 14 12:16:32 2013 -0400 xhttp_pi: escape special characters --- modules/xhttp_pi/xhttp_pi_fnc.c | 59 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 3 deletions(-) diff --git a/modules/xhttp_pi/xhttp_pi_fnc.c b/modules/xhttp_pi/xhttp_pi_fnc.c index e93ac4d..b822e8a 100644 --- a/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/modules/xhttp_pi/xhttp_pi_fnc.c @@ -243,6 +243,49 @@ do{ \ }while(0) +#define XHTTP_PI_ESC_COPY(p,str,temp_holder,temp_counter) \ +do{ \ + (temp_holder).s = (str).s; \ + (temp_holder).len = 0; \ + for((temp_counter)=0;(temp_counter)<(str).len;(temp_counter)++) { \ + switch((str).s[(temp_counter)]) { \ + case '<': \ + (temp_holder).len = (temp_counter) - (temp_holder).len; \ + XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_LT); \ + (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).len = (temp_counter) + 1; \ + break; \ + case '>': \ + (temp_holder).len = (temp_counter) - (temp_holder).len; \ + XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_GT); \ + (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).len = (temp_counter) + 1; \ + break; \ + case '&': \ + (temp_holder).len = (temp_counter) - (temp_holder).len; \ + XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_AMP); \ + (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).len = (temp_counter) + 1; \ + break; \ + case '"': \ + (temp_holder).len = (temp_counter) - (temp_holder).len; \ + XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_QUOT); \ + (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).len = (temp_counter) + 1; \ + break; \ + case '\'': \ + (temp_holder).len = (temp_counter) - (temp_holder).len; \ + XHTTP_PI_COPY_2(p, (temp_holder), XHTTP_PI_ESC_SQUOT); \ + (temp_holder).s += (temp_counter) + 1; \ + (temp_holder).len = (temp_counter) + 1; \ + break; \ + } \ + } \ + (temp_holder).len = (temp_counter) - (temp_holder).len; \ + XHTTP_PI_COPY(p, (temp_holder)); \ +}while(0) + + static const str XHTTP_PI_Response_Head_1 = str_init("<html><head><title>"\ "Kamailio Provisionning Interface</title>"\ "<style type=\"text/css\">"\ @@ -349,6 +392,12 @@ static const str XHTTP_PI_Response_Foot = str_init(\ #define XHTTP_PI_ROWSPAN 20 static const str XHTTP_PI_CMD_ROWSPAN = str_init("20"); +static const str XHTTP_PI_ESC_LT = str_init("<"); /* < */ +static const str XHTTP_PI_ESC_GT = str_init(">"); /* > */ +static const str XHTTP_PI_ESC_AMP = str_init("&"); /* & */ +static const str XHTTP_PI_ESC_QUOT = str_init("""); /* " */ +static const str XHTTP_PI_ESC_SQUOT = str_init("'"); /* ' */ + xmlAttrPtr ph_xmlNodeGetAttrByName(xmlNodePtr node, const char *name) { @@ -2543,7 +2592,8 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) str arg_url = {ctx->arg.s, ctx->arg.len}; str arg_name; str arg_val; - //unsigned long i; + str temp_holder; + int temp_counter; int i; int j; int max_page_len = ctx->reply.buf.len; @@ -2733,8 +2783,11 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) values[j].val.str_val.len, values[j].val.str_val.s, val_str.len, val_str.s); - XHTTP_PI_COPY(p, - val_str.len?val_str:XHTTP_PI_NBSP); + if (val_str.len) { + XHTTP_PI_ESC_COPY(p, val_str, temp_holder, temp_counter); + } else { + XHTTP_PI_COPY(p, XHTTP_PI_NBSP); + } break; case DB1_INT: val_str.s = p;

1 0

Lua sr.pv.get and htable pv problem
by Jasmin Schnatterbeck 14 Mar '13

14 Mar '13

Hi, when using sr.pv.get() in app_lua the pv value is not always returned. Lua code is: local fscript = sr.pv.get("$(sht(myscripts=>" .. args["filterid"] .."))") if(fscript) then sr.log("info","Filterscript is " .. fscript) else sr.log("warn","fscript not found!") end And log shows: app_lua [app_lua_sr.c:888]: pv get: (sht(myscripts=>1)) <core> [pvapi.c:318]: pvar [$(sht(myscripts=>1))] found in cache WARNING: app_lua [app_lua_sr.c:99]: fscript not found! So the pv is being discovered in the pv cache, but sr.pv.get() returns no value. I think the problem occurs especially in the case, when using sht_reload mi command. So I have had a short look into htable.c and I did not find any code, that clears the pv cache... is that necessary/may the reason for the problem, that pv is found in pv cache but nothing returned? (kamailio 3.2.3) Thanks for any ideas... Cheers Jasmin

3 4

massive SQL load and one subscriber only with presence 3.3
by Jasmin Schnatterbeck 14 Mar '13

14 Mar '13

Hi, in kamailio 3.3 the presence DB mode parameters "subs_db_mode", "publ_cache" and "notifier_processes" control how the module stores presentity and watcher info in DB. If they have been set to the following values: subs_db_mode=3 publ_cache=0 notifier_processes=3 the following query is executed >10 times/second (mysql log): "select presentity_uri,callid,to_tag,from_tag,event from kamailio_active_watchers where updated=123 AND event<>'presence.winfo'" According to the notifier_poll_rate default value (==10) and the formula in the documentation 1/(waitn_time * notifier_poll_rate * notifier_processes) That results in 1/(5*10*3) == 1/150 So is it really regular behaviour, if the query is performed that often? What about using triggers in that situation? Additionally I have noticed, that only one subscriber gets notified, if a presentity changes although all subcribers have been stored correctly in active_watchers. When I set notifier_processes to 0 (old behaviour) every subscriber gets notified correctly... Cheers Jasmin

3 2

MySQL max index length and DB structure
by Jasmin Schnatterbeck 14 Mar '13

14 Mar '13

Hi, when upgrading to kamailio 3.3 I have noticed, that in the database structure new indexes are present (e.g. in presence module). The problem is, that some of those indexes are too long for mysql, if the DB charset is utf8 (mysql calculates several bytes per character): "Specified key was too long; max key length is 1000 bytes". This is a very well-known limitation in mysql: http://bugs.mysql.com/bug.php?id=4541 ... and I think we can not expect this behaviour to be changed in future versions of mysql (at least that is what comments like "redesign your table" or "table design is bad" indicate). Not using utf8 at all is (in my opinion) not really a solution. That means, that mysql-support for the DB structure is somewhat limited...? What about MariaDB as an alternative? Cheers Jasmin

1 0

git:jason.penton/tm_async_reply_support: first work on async reply processing
by Jason Penton 14 Mar '13

14 Mar '13

Module: sip-router Branch: jason.penton/tm_async_reply_support Commit: 7199d849853dd89e2a1d7cc6415f83f8f1daae51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7199d84… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Thu Mar 14 16:48:29 2013 +0200 first work on async reply processing --- parser/msg_parser.h | 1 + receive.c | 12 ++++++++++-- route_struct.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 79194e3..49d91f6 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -119,6 +119,7 @@ typedef enum request_method { #define FL_SDP_BODY (1 << 12) /*!< msg has SDP in body */ #define FL_USE_UAC_FROM (1<<13) /* take FROM hdr from UAC instead of UAS*/ #define FL_USE_UAC_TO (1<<14) /* take TO hdr from UAC instead of UAS */ +#define FL_RPL_SUSPENDED (1<<15) /* for async reply processing */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */ diff --git a/receive.c b/receive.c index a4018ff..e107cfa 100644 --- a/receive.c +++ b/receive.c @@ -265,6 +265,12 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) STATS_RPL_FWD_DROP(); goto skip_send_reply; /* drop the message, no error */ } + + if (unlikely(ret==0 || msg->flags&FL_RPL_SUSPENDED)) { + goto skip_send_reply; + /* suspend the reply (async), no error */ + } + } /* send the msg */ forward_reply(msg); @@ -277,8 +283,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) DBG("successfully ran reply processing...(%d usec)\n", diff); #endif - /* execute post reply-script callbacks */ - exec_post_script_cb(msg, ONREPLY_CB_TYPE); + if (likely(!(msg->flags&FL_RPL_SUSPENDED))) { + /* execute post reply-script callbacks */ + exec_post_script_cb(msg, ONREPLY_CB_TYPE); + } } end: diff --git a/route_struct.h b/route_struct.h index e56f4c0..83d1eb0 100644 --- a/route_struct.h +++ b/route_struct.h @@ -147,6 +147,7 @@ typedef enum _operand_subtype action_param_type; #define RETURN_R_F 2 #define BREAK_R_F 4 #define DROP_R_F 8 +#define SUSPEND_R_F 16 #define IGNORE_ON_BREAK_R_F 256

1 0

git:pd/outbound: modules/registrar: Updated documentation for outbound related modparams
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 6b4d87a4321f8edefbf93b1323502d4bab965290 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b4d87a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 14:19:31 2013 +0000 modules/registrar: Updated documentation for outbound related modparams --- modules/registrar/README | 39 +++++++++++----------- modules/registrar/doc/registrar_admin.xml | 51 +++++++++++++--------------- 2 files changed, 43 insertions(+), 47 deletions(-) diff --git a/modules/registrar/README b/modules/registrar/README index f89b36d..afc7160 100644 --- a/modules/registrar/README +++ b/modules/registrar/README @@ -642,24 +642,23 @@ modparam("registrar", "gruu_enabled", 0) 3.24. outbound_mode (integer) - If set to 0 then this module will accept REGISTER requests that do not + If set to 0 this module will accept REGISTER requests that do not contain a Supported: header with the outbound options-tag. The 200 OK response to REGISTER requests that this module generates will not - contain Require: or Supported: headers with the outbound options tag. + contain Require: or Supported: headers with the outbound options-tag. + If the client has a Require: header with the outbound options tag the + REGISTER will be rejected with a 420 Bad Extension response. - If set to 1 then this module will accept REGISTER requests that do not - contain a Supported: header with the outbound options-tag. The 200 OK - response to REGISTER requests that this module generates will contain a - Supported: header with the outbound options tag. - - If set to 2 then this module will reject REGISTER requests that do not - contain a Supported: header with the outbound options-tag. The 200 OK - response to REGISTER requests that this module generates will contain - Require: and Supported: headers with the outbound options tag. + If set to 1 this module will accept REGISTER requests that do not + contain a Supported: header with the outbound options-tag and REGISTER + requests that do contain a Supported: or Requires: header with the + outbound options-tag. When the client supports outbound the appropriate + RFC5626 procedures will be followed. - Set this parameter to 2 if you are using SIP Outbound (RFC 5626) and - want your Edge Proxy to insert a Flow-Timer: header into the 200 OK - response to REGISTERs (as per RFC 5626 section 5.4). + If set to 2 this module will reject REGISTER requests that do not + contain a Supported: header with the outbound options-tag. When the + client supports outbound the appropriate RFC5626 procedures will be + followed. Default value is 0. @@ -675,17 +674,17 @@ modparam("registrar", "outbound_mode", 2) If set to > 0 then this module will add a Flow-Timer: header containing this value to 200 OK responses to REGISTER requests. This parameter may - only be set to a value > 0 when outbound_mode is set to 2. + only be set to a value > 0 when outbound_mode is set to 1 or 2. When set to a value > 0 this parameter should be set to slightly less than the connection timeout value between the UAC and the network (this corresponds to the core tcp_connection_lifetime option and websocket keepalive_timeout modparam). This parameter is most useful when you - have a single edge proxy/registrar. If you are using a separate SIP - Outbound Edge Proxy you should consider leaving this parameter set to 0 - and adding the Flow-Timer: header on the Edge Proxy (as this allows you - to keep all of the timer values for a specific flow in one - configuration - that of the Edge Proxy). + have a single edge proxy/registrar or if you have an edge proxy that + cannot modify responses. If you are using a separate edge proxy you + should consider leaving this parameter set to 0 and adding the + Flow-Timer: header on the edge proxy as this allows you to keep all of + the timer values for a specific flow in one configuration. Default value is 0. diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index ef8e78b..8b0609d 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -724,31 +724,27 @@ modparam("registrar", "gruu_enabled", 0) <section> <title><varname>outbound_mode</varname> (integer)</title> <para> - If set to 0 then this module will accept REGISTER requests - that do not contain a Supported: header with the outbound - options-tag. The 200 OK response to REGISTER requests that this - module generates will not contain Require: or Supported: headers - with the outbound options tag. + If set to 0 this module will accept REGISTER requests that do + not contain a Supported: header with the outbound options-tag. + The 200 OK response to REGISTER requests that this module + generates will not contain Require: or Supported: headers with + the outbound options-tag. If the client has a Require: header + with the outbound options tag the REGISTER will be rejected + with a 420 Bad Extension response. </para> <para> - If set to 1 then this module will accept REGISTER requests - that do not contain a Supported: header with the outbound - options-tag. The 200 OK response to REGISTER requests that this - module generates will contain a Supported: header with the - outbound options tag. + If set to 1 this module will accept REGISTER requests that + do not contain a Supported: header with the outbound + options-tag and REGISTER requests that do contain a Supported: + or Requires: header with the outbound options-tag. When the + client supports outbound the appropriate RFC5626 procedures + will be followed. </para> <para> - If set to 2 then this module will reject REGISTER requests - that do not contain a Supported: header with the outbound - options-tag. The 200 OK response to REGISTER requests that this - module generates will contain Require: and Supported: headers - with the outbound options tag. - </para> - <para> - Set this parameter to 2 if you are using SIP Outbound (RFC - 5626) and want your Edge Proxy to insert a Flow-Timer: header - into the 200 OK response to REGISTERs (as per RFC 5626 section - 5.4). + If set to 2 this module will reject REGISTER requests that + do not contain a Supported: header with the outbound + options-tag. When the client supports outbound the appropriate + RFC5626 procedures will be followed. </para> <para> <emphasis> @@ -775,7 +771,7 @@ modparam("registrar", "outbound_mode", 2) If set to > 0 then this module will add a Flow-Timer: header containing this value to 200 OK responses to REGISTER requests. This parameter may only be set to a value > 0 when - <emphasis>outbound_mode</emphasis> is set to 2. + <emphasis>outbound_mode</emphasis> is set to 1 or 2. </para> <para> When set to a value > 0 this parameter should be set to slightly @@ -783,13 +779,14 @@ modparam("registrar", "outbound_mode", 2) network (this corresponds to the core <emphasis>tcp_connection_lifetime</emphasis> option and <emphasis>websocket</emphasis> - <emphasis>keepalive_timeout</emphasis> modparam). This parameter - is most useful when you have a single edge proxy/registrar. If - you are using a separate SIP Outbound Edge Proxy you should + <emphasis>keepalive_timeout</emphasis> modparam). This + parameter is most useful when you have a single edge + proxy/registrar or if you have an edge proxy that cannot modify + responses. If you are using a separate edge proxy you should consider leaving this parameter set to 0 and adding the - Flow-Timer: header on the Edge Proxy (as this allows you to + Flow-Timer: header on the edge proxy as this allows you to keep all of the timer values for a specific flow in one - configuration - that of the Edge Proxy). + configuration. </para> <para> <emphasis>

1 0

git:pd/outbound: modules/register: Fixed mod init check of flow_timer modparam
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 2a4300284364c4be42b1e4262966d17e5a546799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a43002… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 14:19:05 2013 +0000 modules/register: Fixed mod init check of flow_timer modparam --- modules/registrar/reg_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 586e3cc..f07a44a 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -403,7 +403,7 @@ static int mod_init(void) } if (reg_flow_timer < 0 || reg_flow_timer > REG_FLOW_TIMER_MAX - || (reg_flow_timer > 0 && reg_outbound_mode != REG_OUTBOUND_REQUIRE)) { + || (reg_flow_timer > 0 && reg_outbound_mode == REG_OUTBOUND_NONE)) { LM_ERR("bad value for flow_timer\n"); return -1; }

1 0

What is ICE ?
by Khoa Pham 14 Mar '13

14 Mar '13

Hi, AFAIK, ICE is used to detect as many ways as possible to send media stream to the other client. If it can't find, it will use TURN protocol to determine media relay proxy. How can ICE detect many ways? Can we benefit from ICE if we're in symmetric NAT? -- Khoa Pham HCMC University of Science Faculty of Information Technology

2 1

git:pd/outbound: modules/registrar: fixes to checking of Require: and Supported: headers for outbound
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: c9f8bfdf7a124c9136b28cf78936ac14cec511b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9f8bfd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 12:25:52 2013 +0000 modules/registrar: fixes to checking of Require: and Supported: headers for outbound --- modules/registrar/reply.c | 3 ++- modules/registrar/save.c | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 129e7d6..46b1619 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -673,7 +673,8 @@ int reg_send_reply(struct sip_msg* _m) if (add_supported(_m, &outbound_str) < 0) return -1; - if (get_require(_m) & F_OPTION_TAG_OUTBOUND) { + if ((get_require(_m) & F_OPTION_TAG_OUTBOUND) + || (get_supported(_m) & F_OPTION_TAG_OUTBOUND)) { if (add_require(_m, &outbound_str) < 0) return -1; diff --git a/modules/registrar/save.c b/modules/registrar/save.c index dc19011..c4bfb02 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -865,7 +865,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) } if (parse_require(_m) == 0) { - if (!(get_require(_m) & F_OPTION_TAG_OUTBOUND) + if ((get_require(_m) & F_OPTION_TAG_OUTBOUND) && reg_outbound_mode == REG_OUTBOUND_NONE) { LM_WARN("Outbound required by UAC and not supported by server\n"); rerrno = R_OB_REQD; @@ -908,17 +908,18 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) goto error; } - if (use_ob == 0 && (get_supported(_m) & F_OPTION_TAG_OUTBOUND) - && contact->reg_id) { - LM_WARN("Outbound used by UAC but not supported by edge proxy\n"); - rerrno = R_OB_UNSUP_EDGE; - goto error; - } else { - /* ignore ;reg-id parameter */ - use_regid = 0; + if (use_ob == 0) { + if ((get_supported(_m) & F_OPTION_TAG_OUTBOUND) + && contact->reg_id) { + LM_WARN("Outbound used by UAC but not supported by edge proxy\n"); + rerrno = R_OB_UNSUP_EDGE; + goto error; + } else { + /* ignore ;reg-id parameter */ + use_regid = 0; + } } } - get_act_time(); c = get_first_contact(_m);

1 0

git:pd/outbound: Merge branch 'master' into outbound
by Peter Dunkley 14 Mar '13

14 Mar '13

Module: sip-router Branch: pd/outbound Commit: 9e3c6550c02efc1181aba85fc6b7e871fb632da5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e3c655… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 14 10:10:49 2013 +0000 Merge branch 'master' into outbound * master: Makefile.groups: Updated package group for app_java. ---

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013