sr-dev September 2009

sr-dev@lists.kamailio.org

32 participants
207 discussions

git:master: tm: set T before entering local-request route
by Andrei Pelinescu-Onciul 23 Sep '09

23 Sep '09

Module: sip-router Branch: master Commit: 3cf20fed4d75797eec1ae820da8d8ab9abcdc668 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cf20fe… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 23 20:59:40 2009 +0200 tm: set T before entering local-request route --- modules/tm/uac.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index cd3e1e9..7565763 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -86,6 +86,7 @@ #include "../../receive.h" #include "../../route.h" #include "../../action.h" +#include "t_lookup.h" #endif #define FROM_TAG_LEN (MD5_LEN + 1 /* - */ + CRC16_LEN) /* length of FROM tags */ @@ -205,6 +206,9 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #endif long nhtype; #ifdef WITH_EVENT_LOCAL_REQUEST + struct cell *backup_t; + int backup_branch; + unsigned int backup_msgid; static struct sip_msg lreq; char *buf1; int buf_len1; @@ -353,7 +357,17 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* run the route */ backup_route_type = get_route_type(); set_route_type(LOCAL_ROUTE); + /* set T to the current transaction */ + backup_t=get_t(); + backup_branch=get_t_branch(); + backup_msgid=global_msg_id; + /* fake transaction and message id */ + global_msg_id=lreq.id; + set_t(new_cell, T_BR_UNDEFINED); run_top_route(event_rt.rlist[goto_on_local_req], &lreq, 0); + /* restore original environment */ + set_t(backup_t, backup_branch); + global_msg_id=backup_msgid; set_route_type( backup_route_type ); /* restore original environment */

1 0

git:master: xmlrpc(s): doc updated
by Andrei Pelinescu-Onciul 23 Sep '09

23 Sep '09

Module: sip-router Branch: master Commit: 07599b8befbc37f37372c64b83e84bbc1164e1cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07599b8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 23 16:19:11 2009 +0200 xmlrpc(s): doc updated - escape_cr and double_lf_to_crlf documented --- modules_s/xmlrpc/README | 45 ++++++++++++++++++++++++++++++++++- modules_s/xmlrpc/doc/params.xml | 49 +++++++++++++++++++++++++++++++++++++++ modules_s/xmlrpc/doc/xmlrpc.xml | 10 ++++++++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/modules_s/xmlrpc/README b/modules_s/xmlrpc/README index d1abb54..fed4a70 100644 --- a/modules_s/xmlrpc/README +++ b/modules_s/xmlrpc/README @@ -22,6 +22,8 @@ Jan Janak 1.5.1. route (string) 1.5.2. autoconversion (string) + 1.5.3. escape_cr (integer) + 1.5.4. double_lf_to_crlf (integer) 1.6. Functions @@ -473,6 +475,14 @@ route[XMLRPC]{ dispatch_rpc(); } + Another common problem is CRLF handling. According to the xml spec CR + ('\r') must be escaped (to ) or they will be "normalized" when + parsing the xml document. However some xmlrpc clients do not follow + this rule (e.g. clients based on the python or php xmlrpclib) and send + CRLF unescaped. A possible workaround is to enable automatic LFLF to + CRLF conversion (using the double_lf_to_crlf modules parameter) and + replace CRLF with LFLF in the client queries. + 1.4. Client Examples * examples/xmlrpc_test.pl (basic perl application that builds and @@ -524,6 +534,37 @@ modparam("xmlrpc", "route", "route_for_xmlrpcs") Example 3. Set the autoconversion parameter modparam("xmlrpc", "autoconversion", 1) +1.5.3. escape_cr (integer) + + Enable CR ('\r') escaping in replies. If enabled each '\r' in the + xmlrpc reply will be replaced with "", according to the xml spec. + + It should be turned off only if you suspect interoperability problems + with older clients. + + Default: on. + + Example 4. Set the escape_cr parameter +modparam("xmlrpc", "escape_cr", 1) + +1.5.4. double_lf_to_crlf (integer) + + When enabled double LFs ('\n\n') in the input xmlrpc strings will be + replaced with CR LF ('\r\n'). This makes LF LF behave like an escape + character for CR LF and is needed for compatibility with kamailio tools + and to work around buggy xmlrpc clients that don't escape the CR in CR + LF ('\r' should be escaped to "" otherwise according to the xml + spec "\r\n" will be transformed to '\n'), but need to send CR LF in the + strings (e.g. they use tm.t_uac_wait). + + Note: when this option is turned on, there is no way to send a double + LF ('\n\n'), it will always be transformed in CR LF ('\r\n'). + + Default: off. + + Example 5. Set the double_lf_to_crlf parameter +modparam("xmlrpc", "double_lf_to_crlf", 1) + 1.6. Functions Revision History @@ -545,7 +586,7 @@ modparam("xmlrpc", "autoconversion", 1) function with matching name. If such a function is found then dispatch_rpc() will pass control to the function to handle the request. - Example 4. dispatch_rpc usage + Example 6. dispatch_rpc usage #... modparam("xmlrpc", "route", "XMLRPC"); #... @@ -561,7 +602,7 @@ route[XMLRPC]{ This function can be called from the config script to directly generate an XML-RPC reply. - Example 5. xmlrpc_reply usage + Example 7. xmlrpc_reply usage #... modparam("xmlrpc", "route", "XMLRPC"); #... diff --git a/modules_s/xmlrpc/doc/params.xml b/modules_s/xmlrpc/doc/params.xml index be7fd63..f200b55 100644 --- a/modules_s/xmlrpc/doc/params.xml +++ b/modules_s/xmlrpc/doc/params.xml @@ -67,6 +67,55 @@ modparam("xmlrpc", "autoconversion", 1) </example> </section> + <section id="escape_cr"> + <title><varname>escape_cr</varname> (integer)</title> + <para> + Enable CR ('\r') escaping in replies. If enabled each '\r' in the + xmlrpc reply will be replaced with "&#xD;", according to the + xml spec. + </para> + <para> + It should be turned off only if you suspect interoperability problems + with older clients. + </para> + <para> + Default: on. + </para> + <example> + <title>Set the <varname>escape_cr</varname> parameter</title> + <programlisting> +modparam("xmlrpc", "escape_cr", 1) + </programlisting> + </example> + </section> + + <section id="double_lf_to_crlf"> + <title><varname>double_lf_to_crlf</varname> (integer)</title> + <para> + When enabled double LFs ('\n\n') in the input xmlrpc strings + will be replaced with CR LF ('\r\n'). This makes LF LF behave like + an escape character for CR LF and is needed for compatibility with + kamailio tools and to work around buggy xmlrpc clients that don't + escape the CR in CR LF ('\r' should be escaped to "&#xD;" + otherwise according to the xml spec "\r\n" will be transformed to + '\n'), but need to send CR LF in the strings (e.g. they use + <function>tm.t_uac_wait</function>). + </para> + <para> + Note: when this option is turned on, there is no way to send a double + LF ('\n\n'), it will always be transformed in CR LF ('\r\n'). + </para> + <para> + Default: off. + </para> + <example> + <title>Set the <varname>double_lf_to_crlf</varname> parameter</title> + <programlisting> +modparam("xmlrpc", "double_lf_to_crlf", 1) + </programlisting> + </example> + </section> + <!-- Obsolete (hardwired on in the rpc core functions, cannot be turned off) -andrei diff --git a/modules_s/xmlrpc/doc/xmlrpc.xml b/modules_s/xmlrpc/doc/xmlrpc.xml index 2cdf422..81cf02a 100644 --- a/modules_s/xmlrpc/doc/xmlrpc.xml +++ b/modules_s/xmlrpc/doc/xmlrpc.xml @@ -699,6 +699,16 @@ route[XMLRPC]{ </programlisting> </example> </para> + <para> + Another common problem is CRLF handling. According to the xml spec + CR ('\r') must be escaped (to &#xD;) or they will be "normalized" + when parsing the xml document. However some xmlrpc clients do not + follow this rule (e.g. clients based on the python or php xmlrpclib) + and send CRLF unescaped. A possible workaround is to enable + automatic LFLF to CRLF conversion (using the + <varname>double_lf_to_crlf</varname> modules parameter) and replace + CRLF with LFLF in the client queries. + </para> </section> </section>

1 0

git:master: xmlrpc(s): option for replacing double lf with crlf
by Andrei Pelinescu-Onciul 23 Sep '09

23 Sep '09

Module: sip-router Branch: master Commit: da2a085760f30c8b0afb72555871465e551f0060 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da2a085… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 23 14:12:50 2009 +0200 xmlrpc(s): option for replacing double lf with crlf Added "double_lf_to_crlf" config parameter. When set double LFs in the input xmlrpc strings are replaced with CR LF. This is needed to work around some xmlrpc buggy clients that don't escape CR ('\r' should be escaped to  ). When using one of those buggy clients, use double LF as an escape for CR LF and turn this option on.Turning this option on makes it also more compatible with kamailio tools (kamailio mi xmlrpc always converts double LF to CR LF). Note that when double_lf_to_crlf is on it's not possible to send a double lf. Here is what the xmlrpc modules sees for various combinations of CR and LF in the input, when CR is _not_ escaped: 0 1 (double_lf_to_crlf) \n -> \r \r \r -> \r \r \r\r -> \n\n \r\n \n\n -> \n\n \r\n \r\n -> \n !!! \n !!! \n\r -> \n\n \r\n Note that when double_lf_to_crlf is 0, the xmlrpc module behaves correctly according to the xml specs. --- modules_s/xmlrpc/xmlrpc.c | 37 ++++++++++++++++++++++++++++++------- 1 files changed, 30 insertions(+), 7 deletions(-) diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index 34106bc..0823a20 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -394,6 +394,9 @@ static int xmlrpc_route_no=DEFAULT_RT; static int autoconvert=0; /* in replies, escape CR to &#xD (according to the xml specs) */ static int escape_cr=1; /* default on */ +/* convert double LF to CR LF (when on, LFLF becomes an escape for CRLF, needed + with some xmlrpc clients that are not escaping CR to  )*/ +static int lflf2crlf=0; /* default off */ /* @@ -413,6 +416,7 @@ static param_export_t params[] = { {"route", PARAM_STRING, &xmlrpc_route}, {"autoconversion", PARAM_INT, &autoconvert}, {"escape_cr", PARAM_INT, &escape_cr}, + {"double_lf_to_crlf", PARAM_INT, &lflf2crlf}, {0, 0, 0} }; @@ -1080,6 +1084,7 @@ static time_t xmlrpc2time(const char* str) /* get_* flags: */ #define GET_X_AUTOCONV 1 #define GET_X_NOREPLY 2 +#define GET_X_LFLF2CRLF 4 /* replace "\n\n" with "\r\n" */ /* xml value types */ enum xmlrpc_val_type{ @@ -1294,14 +1299,16 @@ static int get_double(double* val, struct xmlrpc_reply* reply, /** Convert a parameter encoded in XML-RPC to a zero terminated string. * - * @param val A pointer to an integer variable where the result will be - stored. + * @param val A pointer to a char* variable where the result will be + * stored (the result is dynamically allocated, but it's garbage + * collected, so it doesn't have to be freed) * @param reply A pointer to XML-RPC reply being constructed (used to indicate * conversion errors). * @param doc A pointer to the XML-RPC request document. * @param value A pointer to the element containing the parameter to be * converted within the document. * @param flags : GET_X_AUTOCONV - try autoconverting + * GET_X_LFLF2CRLF - replace double '\n' with `\r\n' * GET_X_NOREPLY - do not reply * @return <0 on error, 0 on success */ @@ -1360,6 +1367,18 @@ static int get_string(char** val, struct xmlrpc_reply* reply, ret=0; switch(type){ case XML_T_STR: + if (flags & GET_X_LFLF2CRLF){ + p=val_str; + while(*p){ + if (*p=='\n' && *(p+1)=='\n'){ + *p='\r'; + p+=2; + continue; + } + p++; + } + } + /* no break */ case XML_T_DATE: /* no special conversion */ case XML_T_DOUBLE: /* no special conversion */ if (add_garbage(JUNK_XMLCHAR, val_str, reply) < 0){ @@ -1428,7 +1447,8 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) va_start(ap, fmt); modifiers=0; read = 0; - f=autoconvert?GET_X_AUTOCONV:0; + f=(autoconvert?GET_X_AUTOCONV:0) | + (lflf2crlf?GET_X_LFLF2CRLF:0); while(*fmt) { if (!ctx->act_param) goto error; value = ctx->act_param->xmlChildrenNode; @@ -1737,8 +1757,11 @@ static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...) char* member_name; struct xmlrpc_reply* reply; int ret; + int f; read = 0; + f=(autoconvert?GET_X_AUTOCONV:0) | + (lflf2crlf?GET_X_LFLF2CRLF:0); va_start(ap, fmt); while(*fmt) { member_name = va_arg(ap, char*); @@ -1751,23 +1774,23 @@ static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...) case 't': /* Date and time */ case 'd': /* Integer */ int_ptr = va_arg(ap, int*); - if (get_int(int_ptr, reply, s->doc, value, 0) < 0) goto error; + if (get_int(int_ptr, reply, s->doc, value, f) < 0) goto error; break; case 'f': /* double */ double_ptr = va_arg(ap, double*); - if (get_double(double_ptr, reply, s->doc, value, 0) < 0) + if (get_double(double_ptr, reply, s->doc, value, f) < 0) goto error; break; case 's': /* zero terminated string */ char_ptr = va_arg(ap, char**); - if (get_string(char_ptr, reply, s->doc, value, 0) < 0) goto error; + if (get_string(char_ptr, reply, s->doc, value, f) < 0) goto error; break; case 'S': /* str structure */ str_ptr = va_arg(ap, str*); - if (get_string(&str_ptr->s, reply, s->doc, value, 0) < 0) + if (get_string(&str_ptr->s, reply, s->doc, value, f) < 0) goto error; str_ptr->len = strlen(str_ptr->s); break;

2 2

git:master: xmlrpc(s): escape CR in replies
by Andrei Pelinescu-Onciul 23 Sep '09

23 Sep '09

Module: sip-router Branch: master Commit: 238635d54eff8a176cfaf1fe26322b7de86fdac1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=238635d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 23 12:59:56 2009 +0200 xmlrpc(s): escape CR in replies - escape CR ('\r') in replies: each '\r' is replaced with &xD; - added new parameter: escape_cr which controls CR escaping: if on (default) CR in replies are escaped (according to the xml spec), if off, they are not (which in most cases would result in the xmlrpc client ignoring them). --- modules_s/xmlrpc/xmlrpc.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index f386a88..34106bc 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -392,6 +392,8 @@ static int xmlrpc_route_no=DEFAULT_RT; /* if set, try autoconverting to the requested type if possible (e.g. convert 1 to "1" if string is requested) */ static int autoconvert=0; +/* in replies, escape CR to &#xD (according to the xml specs) */ +static int escape_cr=1; /* default on */ /* @@ -410,6 +412,7 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { {"route", PARAM_STRING, &xmlrpc_route}, {"autoconversion", PARAM_INT, &autoconvert}, + {"escape_cr", PARAM_INT, &escape_cr}, {0, 0, 0} }; @@ -430,6 +433,7 @@ struct module_exports exports = { #define ESC_LT "<" #define ESC_AMP "&" +#define ESC_CR "" static void clean_context(rpc_ctx_t* ctx); @@ -483,6 +487,14 @@ static int add_xmlrpc_reply_esc(struct xmlrpc_reply* reply, str* text) reply->body.len += sizeof(ESC_AMP) - 1; break; + case '\r': + if (likely(escape_cr)){ + memcpy(reply->body.s + reply->body.len, ESC_CR, + sizeof(ESC_CR) - 1); + reply->body.len += sizeof(ESC_CR) - 1; + break; + } + /* no break */ default: reply->body.s[reply->body.len] = text->s[i]; reply->body.len++;

1 0

content about kamailio start error
by zhangchao00001 23 Sep '09

23 Sep '09

Hello professors, i have some questions about kamailio. After i install rtpproxy 0.3version, the kamailio server can't work any more. The following is the error message. Dose any one know the reason? dose the rtpproxy 0.3 change something that kamailio need? Sep 23 11:07:53 [4911] INFO:core:init_mod: initializing module registrar Sep 23 11:07:53 [4911] INFO:core:init_mod: initializing module textops Sep 23 11:07:53 [4911] INFO:core:init_mod: initializing module uri_db Sep 23 11:07:53 [4911] INFO:core:init_mod: initializing module siputils Sep 23 11:07:53 [4911] INFO:core:init_mod: initializing module xlog Sep 23 11:07:53 [4911] INFO:core:init_mod: initializing module acc Sep 23 11:07:53 [4911] INFO:core:probe_max_receive_buffer: using a UDP receive buffer of 255 kb Sep 23 11:07:53 [4911] INFO:core:probe_max_receive_buffer: using a UDP receive buffer of 255 kb Sep 23 11:07:53 [4911] INFO:core:probe_max_receive_buffer: using a UDP receive buffer of 255 kb Sep 23 11:07:57 [4925] ERROR:core:build_req_buf_from_sip_req: out of pkg memory Sep 23 11:07:57 [4925] ERROR:tm:print_uac_request: no more shm_mem Sep 23 11:07:57 [4925] ERROR:tm:t_forward_nonack: failure to add branches Sep 23 11:07:57 [4925] ERROR:tm:_reply_light: failed to allocate shmem buffer Sep 23 11:07:57 [4925] ERROR:tm:relay_reply: no more share memory Sep 23 11:07:57 [4925] ERROR:tm:_reply_light: failed to allocate shmem buffer 网易邮箱用户购物独享现金返还

1 0

DB API and connection keepalive
by Jason Penton 23 Sep '09

23 Sep '09

Hi *, What would be the suggestions regarding having a process / thread that can be used to ping (keepalive) a connection to a particular db backend. I am specifically looking at coding something for mysql (our firewall is closing connections to mysql if they are idle for longer than 30mins). I would like to have a process that would go through all connections and "ping" them every so often. I would imagine each DB impl can either ignore the ping function or actually do something with it. I would imagine this will be useful for a few backend db implementations. Any input before I go ahead? Cheers Jason

6 8

git:master: tm docs update
by Andrei Pelinescu-Onciul 22 Sep '09

22 Sep '09

Module: sip-router Branch: master Commit: d9100ccaadbb3d6cb6696ac6919d8dce163f5abd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9100cc… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 22 19:27:16 2009 +0200 tm docs update Added disable_6xx_block, ruri_matching, via1_matching, pass_provisional_replies, default_code, default_reason, t_set_disable_6xx(), t_set_disable_failover(). --- NEWS | 9 ++ modules/tm/README | 215 +++++++++++++++++++++++++++++++++++------- modules/tm/config.c | 2 +- modules/tm/doc/functions.xml | 55 +++++++++++ modules/tm/doc/params.xml | 176 ++++++++++++++++++++++++++++++++++ 5 files changed, 423 insertions(+), 34 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d91…

1 0

t_uac_wait failure
by jh＠tutpro.com 22 Sep '09

22 Sep '09

when trying to send INVITE using t_uac_wait, i get back response claiming that Content-Type is missing. why, because it seems to be there? -- juha --------------------------------------------------- T 2009/09/22 17:52:37.484316 127.0.0.1:35765 -> 127.0.0.1:6060 [AP] POST /RPC2 HTTP/1.0. Host: 127.0.0.1. Connection: close. User-Agent: XML_RPC Client. Content-Type: text/xml. Content-Length: 972. . ## T 2009/09/22 17:52:37.484745 127.0.0.1:35765 -> 127.0.0.1:6060 [AP] <?xml version="1.0" ?>. <methodCall>. .<methodName>tm.t_uac_wait</methodName>. .<params>. ..<param>. ...<value>. ....<string>INVITE</string>. ...</value>. ..</param>. ..<param>. ...<value>. ....<string>sip:jh_test_fi@192.98.101.10:5074;transport=udp</string>. ...</value>. ..</param>. ..<param>. ...<value>. ....<string>.</string>. ...</value>. ..</param>. ..<param>. ...<value>. ....<string>.</string>. ...</value>. ..</param>. ..<param>. ...<value>. ....<string>From: <sip:click2dial@test.fi>;tag=4ab8e4b575bf1 Call-ID: 4ab8e4b575bf1(a)test.fi Contact: <sip:click2dial@!!> To: <sip:jh@test.fi> CSeq: 1 INVITE Reject-Contact: *;automata="YES" Content-Type: application/sdp </string>. ...</value>. ..</param>. ..<param>. ...<value>. ....<string>v=0 o=click-to-dial 0 0 IN IP4 0.0.0.0 s=session c=IN IP4 0.0.0.0 b=CT:1000 t=0 0 m=audio 9 RTP/AVP 0 a=rtpmap:0 PCMU/8000 </string>. ...</value>. ..</param>. .</params>. </methodCall>. ## T 2009/09/22 17:52:37.485616 127.0.0.1:6060 -> 127.0.0.1:35765 [AP] HTTP/1.0 200 OK. Via: SIP/2.0/TCP 127.0.0.1:35765. Server: SIP Router (2.99.0-dev01-serk (i386/linux)). Content-Length: 278. . <?xml version="1.0"?> <methodResponse> <fault> <value> <struct> <member> <name>faultCode</name> <value><int>400</int></value> </member> <member> <name>faultString</name> <value><string>Content-Type missing</string></value> </member> </struct> </value> </fault> </methodResponse>

2 4

any way to detect local replies in failure route
by Daniel-Constantin Mierla 22 Sep '09

22 Sep '09

While testing the kamailio 3.0 I couldn't find a way to detect in failure route if replies were locally generated, such it could be achieved in 1.5 with: http://kamailio.org/docs/modules/1.5.x/tm.html#id2531261 Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

2 2

git:master: tm: more cfg framework parameters marked as ATOMIC
by Andrei Pelinescu-Onciul 22 Sep '09

22 Sep '09

Module: sip-router Branch: master Commit: 45e905059a12f242abd84e0adf2a5afa613da145 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45e9050… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 22 14:20:54 2009 +0200 tm: more cfg framework parameters marked as ATOMIC --- modules/tm/config.c | 49 +++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/modules/tm/config.c b/modules/tm/config.c index 0e3101e..436406a 100644 --- a/modules/tm/config.c +++ b/modules/tm/config.c @@ -98,55 +98,55 @@ struct cfg_group_tm default_tm_cfg = { void *tm_cfg = &default_tm_cfg; cfg_def_t tm_cfg_def[] = { - {"ruri_matching", CFG_VAR_INT, 0, 1, 0, 0, - "perform Request URI check in tranaction matching"}, - {"via1_matching", CFG_VAR_INT, 0, 1, 0, 0, - "perform first Via header check in tranaction matching"}, - {"fr_timer", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"ruri_matching", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "perform Request URI check in transaction matching"}, + {"via1_matching", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "perform first Via header check in transaction matching"}, + {"fr_timer", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "timer which hits if no final reply for a request " "or ACK for a negative INVITE reply arrives " "(in milliseconds)"}, - {"fr_inv_timer", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"fr_inv_timer", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "timer which hits if no final reply for an INVITE arrives " "after a provisional message was received (in milliseconds)"}, - {"wt_timer", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"wt_timer", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "time for which a transaction stays in memory to absorb " "delayed messages after it completed"}, - {"delete_timer", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"delete_timer", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "time after which a to-be-deleted transaction currently " "ref-ed by a process will be tried to be deleted again."}, - {"retr_timer1", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"retr_timer1", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "initial retransmission period (in milliseconds)"}, - {"retr_timer2", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"retr_timer2", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "maximum retransmission period (in milliseconds)"}, - {"max_inv_lifetime", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"max_inv_lifetime", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "maximum time an invite transaction can live " "from the moment of creation"}, - {"max_noninv_lifetime", CFG_VAR_INT, 0, 0, timer_fixup, 0, + {"max_noninv_lifetime", CFG_VAR_INT | CFG_ATOMIC, 0, 0, timer_fixup, 0, "maximum time a non-invite transaction can live " "from the moment of creation"}, {"noisy_ctimer", CFG_VAR_INT, 0, 1, 0, 0, "if set, INVITE transactions that time-out (FR INV timer) " "will be always replied"}, - {"auto_inv_100", CFG_VAR_INT, 0, 1, 0, 0, + {"auto_inv_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "automatically send 100 to an INVITE"}, {"auto_inv_100_reason", CFG_VAR_STRING, 0, 0, 0, 0, "reason text of the automatically send 100 to an INVITE"}, {"unix_tx_timeout", CFG_VAR_INT, 0, 0, 0, 0, "Unix socket transmission timeout, in milliseconds"}, - {"restart_fr_on_each_reply", CFG_VAR_INT, 0, 1, 0, 0, + {"restart_fr_on_each_reply", CFG_VAR_INT | CFG_ATOMIC , 0, 1, 0, 0, "restart final response timer on each provisional reply"}, - {"pass_provisional_replies", CFG_VAR_INT, 0, 1, 0, 0, + {"pass_provisional_replies", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "enable/disable passing of provisional replies " "to FIFO applications"}, - {"aggregate_challenges", CFG_VAR_INT, 0, 1, 0, 0, + {"aggregate_challenges", CFG_VAR_INT /* not atomic */, 0, 1, 0, 0, "if the final response is a 401 or a 407, aggregate all the " "authorization headers (challenges) " "(rfc3261 requires this to be on)"}, {"unmatched_cancel", CFG_VAR_INT, 0, 2, 0, 0, "determines how CANCELs with no matching transaction are handled " "(0: statefull forwarding, 1: stateless forwarding, 2: drop)"}, - {"default_code", CFG_VAR_INT, 400, 699, 0, 0, + {"default_code", CFG_VAR_INT | CFG_ATOMIC, 400, 699, 0, 0, "default SIP response code sent by t_reply(), if the function " "cannot retrieve its parameters"}, {"default_reason", CFG_VAR_STRING, 0, 0, 0, 0, @@ -160,25 +160,26 @@ cfg_def_t tm_cfg_def[] = { "header fields prefixed by this parameter value are included " "in the CANCEL and negative ACK messages if they were present " "in the outgoing INVITE (depends on reparse_invite)"}, - {"blst_503", CFG_VAR_INT, 0, 1, 0, 0, + {"blst_503", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, blacklist 503 SIP response sources"}, - {"blst_503_def_timeout", CFG_VAR_INT, 0, 0, 0, 0, + {"blst_503_def_timeout", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "default 503 blacklist time (in s), when no Retry-After " "header is present"}, - {"blst_503_min_timeout", CFG_VAR_INT, 0, 0, 0, 0, + {"blst_503_min_timeout", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "minimum 503 blacklist time (in s)"}, - {"blst_503_max_timeout", CFG_VAR_INT, 0, 0, 0, 0, + {"blst_503_max_timeout", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "maximum 503 blacklist time (in s)"}, - {"blst_methods_add", CFG_VAR_INT, 0, 0, 0, 0, + {"blst_methods_add", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "bitmap of method types that trigger blacklisting on " "transaction timeouts"}, - {"blst_methods_lookup", CFG_VAR_INT, 0, 0, 0, 0, + {"blst_methods_lookup", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "Bitmap of method types that are looked-up in the blacklist " "before statefull forwarding"}, {"cancel_b_method", CFG_VAR_INT, 0, 2, cancel_b_flags_fixup, 0, "How to cancel branches on which no replies were received: 0 - fake" " reply, 1 - retransmitting the request, 2 - send cancel"}, - {"reparse_on_dns_failover", CFG_VAR_INT, 0, 1, reparse_on_dns_failover_fixup, 0, + {"reparse_on_dns_failover", CFG_VAR_INT | CFG_ATOMIC, 0, 1, + reparse_on_dns_failover_fixup, 0, "if set to 1, the SIP message after a DNS failover is " "constructed from the outgoing message buffer of the failed " "branch instead of from the received request"},

2 2

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2009