sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:master: xmlrpc(s): option for replacing double lf with crlf

by Andrei Pelinescu-Onciul

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;

15 years, 3 months

git:master: xmlrpc(s): escape CR in replies

by Andrei Pelinescu-Onciul

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++;

15 years, 3 months

content about kamailio start error

by zhangchao00001

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 网易邮箱用户购物独享现金返还

15 years, 3 months

DB API and connection keepalive

by Jason Penton

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

15 years, 3 months

git:master: tm docs update

by Andrei Pelinescu-Onciul

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…

15 years, 3 months

t_uac_wait failure

by jh＠tutpro.com

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>

15 years, 3 months

any way to detect local replies in failure route

by Daniel-Constantin Mierla

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/

15 years, 3 months

git:master: tm: more cfg framework parameters marked as ATOMIC

by Andrei Pelinescu-Onciul

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"},

15 years, 3 months

git:master: core: minor macro fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: cfa35518d7517092efef75d2d296f4340f1dfb53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfa3551… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 22 16:34:04 2009 +0200 core: minor macro fix --- ut.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ut.h b/ut.h index 1d207bd..6861af7 100644 --- a/ut.h +++ b/ut.h @@ -174,7 +174,7 @@ struct msgid_var{ /* return the value or 0 if the msg_id doesn't match */ #define get_msgid_val(var, id, type)\ - (type)((type)((var).msgid!=(id))-1)&((var).u.type##_val) + ((type)((type)((var).msgid!=(id))-1)&((var).u.type##_val)) #define set_msgid_val(var, id, type, value)\ do{\

15 years, 3 months

git:master: tm: disable 6xx or failover on a per message basis

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4f03bb4d8f3d274f2a1f123dc527d2b702b6ad7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f03bb4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 22 16:27:16 2009 +0200 tm: disable 6xx or failover on a per message basis Added support for disabling 6xx special handling and dns failover on a per transaction basis: - t_set_disable_6xx(0|1): disable(1)/enable(0) 6xx rfc special handling. - t_set_disable_failover(0|1): disable/enable dns failover. They both work either on the current transaction (if it was already created) or on the next transaction that will be created (e.g. t_set_disable_6xx(1); t_relay() works). --- modules/tm/h_table.h | 3 ++ modules/tm/t_funcs.c | 3 +- modules/tm/t_funcs.h | 3 +- modules/tm/t_fwd.c | 5 ++- modules/tm/t_lookup.c | 17 ++++++---- modules/tm/t_reply.c | 8 ++-- modules/tm/tm.c | 83 +++++++++++++++++++++++++++++++++++------------- 7 files changed, 84 insertions(+), 38 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 463507a..90abd64 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -273,6 +273,9 @@ struct totag_elem { /* don't generate automatically an ACK for local transaction */ # define T_NO_AUTO_ACK (1<<7) #endif + +#define T_DISABLE_6xx (1<<8) /* treat 6xx as a normal reply */ +#define T_DISABLE_FAILOVER (1<<9) /* don't perform dns failover */ #define T_DONT_FORK (T_CANCELED|T_6xx) /* unsigned short should be enough for a retr. timer: max. 65535 ticks => diff --git a/modules/tm/t_funcs.c b/modules/tm/t_funcs.c index 33d141d..51407f7 100644 --- a/modules/tm/t_funcs.c +++ b/modules/tm/t_funcs.c @@ -90,7 +90,8 @@ static int contacts_avp_index = 0; int tm_error = 0; /* delayed tm error */ -struct msgid_var user_auto_inv_100; +struct msgid_var user_cell_set_flags; /* extra cell->flags to be set */ +struct msgid_var user_cell_reset_flags; /* extra cell->flags to be reset */ /* ----------------------------------------------------- */ int send_pr_buffer( struct retr_buf *rb, void *buf, int len diff --git a/modules/tm/t_funcs.h b/modules/tm/t_funcs.h index 53d9da1..04ca2d7 100644 --- a/modules/tm/t_funcs.h +++ b/modules/tm/t_funcs.h @@ -74,7 +74,8 @@ struct entry; struct cell; extern int tm_error; /* delayed tm error */ -extern struct msgid_var user_auto_inv_100; +extern struct msgid_var user_cell_set_flags; +extern struct msgid_var user_cell_reset_flags; extern int fr_inv_timer_avp_type; extern int_str fr_inv_timer_avp; diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 2ef3025..bde61ce 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -649,8 +649,9 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, int ret; ret=-1; - if (cfg_get(core, core_cfg, use_dns_failover) && - !((t->flags & T_DONT_FORK) || uac_dont_fork(old_uac)) && + if (cfg_get(core, core_cfg, use_dns_failover) && + !((t->flags & (T_DONT_FORK|T_DISABLE_FAILOVER)) || + uac_dont_fork(old_uac)) && dns_srv_handle_next(&old_uac->dns_h, 0)){ if (lock_replies){ /* use reply lock to guarantee nobody is adding a branch diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index 1fe5755..58e6fbc 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1243,7 +1243,6 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) struct sip_msg *shm_msg; unsigned int timeout; /* avp timeout gets stored here (in s) */ ticks_t lifetime; - int v; shm_msg=new_cell->uas.request; new_cell->from.s=shm_msg->from->name.s; @@ -1259,13 +1258,17 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) new_cell->method=new_cell->uas.request->first_line.u.request.method; if (p_msg->REQ_METHOD==METHOD_INVITE){ - new_cell->flags |= T_IS_INVITE_FLAG; - if (unlikely(v=get_msgid_val(user_auto_inv_100, p_msg->id, int))) - /* 1 = set, -1 = reset */ - new_cell->flags|=T_AUTO_INV_100 & (!(v+1)-1); - else - new_cell->flags|=T_AUTO_INV_100 & + /* set flags */ + new_cell->flags |= T_IS_INVITE_FLAG | + get_msgid_val(user_cell_set_flags, p_msg->id, int); + new_cell->flags|=T_AUTO_INV_100 & (!cfg_get(tm, tm_cfg, tm_auto_inv_100) -1); + new_cell->flags|=T_DISABLE_6xx & + (!cfg_get(tm, tm_cfg, disable_6xx) -1); + /* reset flags */ + new_cell->flags &= + (~ get_msgid_val(user_cell_reset_flags, p_msg->id, int)); + lifetime=(ticks_t)get_msgid_val(user_inv_max_lifetime, p_msg->id, int); if (likely(lifetime==0)) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 6458d2e..28e635e 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1086,10 +1086,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, if (picked_branch==-2) { /* branches open yet */ *should_store=1; *should_relay=-1; - if (new_code>=600 && new_code<=699 && - !cfg_get(tm, tm_cfg, disable_6xx)){ - if (!(Trans->flags & T_6xx)){ - /* cancel only the first time we get a 6xx */ + if (new_code>=600 && new_code<=699){ + if (!(Trans->flags & (T_6xx | T_DISABLE_6xx))){ + /* cancel only the first time we get a 6xx and only + if the 6xx handling is not disabled */ prepare_to_cancel(Trans, cancel_bitmap, 0); Trans->flags|=T_6xx; } diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 64d32fd..22d7da1 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -228,6 +228,8 @@ static int w_t_reset_retr(struct sip_msg* msg, char* foo, char* bar); static int w_t_set_max_lifetime(struct sip_msg* msg, char* inv, char* noninv); static int w_t_reset_max_lifetime(struct sip_msg* msg, char* foo, char* bar); static int t_set_auto_inv_100(struct sip_msg* msg, char* on_off, char* foo); +static int t_set_disable_6xx(struct sip_msg* msg, char* on_off, char* foo); +static int t_set_disable_failover(struct sip_msg* msg, char* on_off, char* f); static int t_branch_timeout(struct sip_msg* msg, char*, char*); static int t_branch_replied(struct sip_msg* msg, char*, char*); static int t_any_timeout(struct sip_msg* msg, char*, char*); @@ -361,6 +363,10 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_set_auto_inv_100", t_set_auto_inv_100, 1, fixup_var_int_1, REQUEST_ROUTE}, + {"t_set_disable_6xx", t_set_disable_6xx, 1, fixup_var_int_1, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, + {"t_set_disable_failover", t_set_disable_failover, 1, fixup_var_int_1, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE }, {"t_branch_timeout", t_branch_timeout, 0, 0, FAILURE_ROUTE}, {"t_branch_replied", t_branch_replied, 0, 0, FAILURE_ROUTE}, {"t_any_timeout", t_any_timeout, 0, 0, @@ -1525,31 +1531,62 @@ int w_t_reset_max_lifetime(struct sip_msg* msg, char* foo, char* bar) return t_reset_max_lifetime(); } + + +/* helper macro, builds a function for setting a cell flag from the script. + e.g. T_SET_FLAG_GEN_FUNC(t_set_foo, T_FOO) => + static int t_set_foo(struct sip_msg* msg, char*, char* ) + that will expect fparam as first param and will set or reset T_FOO + in the current or next to be created transaction. */ +#define T_SET_FLAG_GEN_FUNC(fname, T_FLAG_NAME) \ +static int fname(struct sip_msg* msg, char* p1, char* p2) \ +{ \ + int state; \ + struct cell* t; \ + unsigned int set_flags; \ + unsigned int reset_flags; \ + \ + if (get_int_fparam(&state, msg, (fparam_t*)p1) < 0) return -1; \ + t=get_t(); \ + /* in REPLY_ROUTE and FAILURE_ROUTE T will be set to current transaction; \ + * in REQUEST_ROUTE T will be set only if the transaction was already \ + * created; if not -> use the static variables */ \ + if (!t || t==T_UNDEFINED ){ \ + set_flags=get_msgid_val(user_cell_set_flags, msg->id, int); \ + reset_flags=get_msgid_val(user_cell_reset_flags, msg->id, int); \ + if (state){ \ + /* set */ \ + set_flags|= T_FLAG_NAME; \ + reset_flags&=~T_FLAG_NAME; \ + }else{ \ + /* reset */ \ + set_flags&=~T_FLAG_NAME; \ + reset_flags|=T_FLAG_NAME; \ + } \ + set_msgid_val(user_cell_set_flags, msg->id, int, set_flags); \ + set_msgid_val(user_cell_reset_flags, msg->id, int, reset_flags); \ + }else{ \ + if (state) \ + t->flags|=T_FLAG_NAME; \ + else \ + t->flags&=~T_FLAG_NAME; \ + } \ + return 1; \ +} + + + /* set automatically sending 100 replies on/off for the current or * next to be created transaction */ -static int t_set_auto_inv_100(struct sip_msg* msg, char* p1, char* p2) -{ - int state; - struct cell* t; - - if (get_int_fparam(&state, msg, (fparam_t*)p1) < 0) return -1; - t=get_t(); - /* in REPLY_ROUTE and FAILURE_ROUTE T will be set to current transaction; - * in REQUEST_ROUTE T will be set only if the transaction was already - * created; if not -> use the static variables */ - if (!t || t==T_UNDEFINED ){ - if (state) - set_msgid_val(user_auto_inv_100, msg->id, int, 1); /* set */ - else - set_msgid_val(user_auto_inv_100, msg->id, int, -1); /* reset */ - }else{ - if (state) - t->flags|=T_AUTO_INV_100; - else - t->flags&=~T_AUTO_INV_100; - } - return 1; -} +T_SET_FLAG_GEN_FUNC(t_set_auto_inv_100, T_AUTO_INV_100) + + +/* set 6xx handling for the current or next to be created transaction */ +T_SET_FLAG_GEN_FUNC(t_set_disable_6xx, T_DISABLE_6xx) + + +/* disable dns failover for the current transaction */ +T_SET_FLAG_GEN_FUNC(t_set_disable_failover, T_DISABLE_FAILOVER)

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev