sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

git:master: modules/avpops: Fix 'uninitialised variable' warning

by Hugh Waite

Module: sip-router Branch: master Commit: 54020b00893ee259baee714d7d17adc6d31f9112 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54020b0… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Nov 22 09:39:40 2013 +0000 modules/avpops: Fix 'uninitialised variable' warning --- modules/avpops/avpops_impl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index ee2e052..ecf31b0 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -1152,8 +1152,8 @@ int ops_check_avp( struct sip_msg* msg, struct fis_param* src, struct search_state st1, st2; unsigned short name_type1; unsigned short name_type2; - struct usr_avp *avp1; - struct usr_avp *avp2; + struct usr_avp *avp1 = NULL; + struct usr_avp *avp2 = NULL; regmatch_t pmatch; int_str avp_name1; int_str avp_name2; @@ -1253,7 +1253,6 @@ cycle1: } else if(val->u.sval->type==PVT_XAVP) { - avp2 = 0; if(xavp2==NULL) if(get_xavp_param(msg, val->u.sval, &xavp2, &xavp2_flags)<0) goto error; @@ -1263,7 +1262,6 @@ cycle1: goto next; } } else { - avp2 = 0; if(pv_get_spec_value(msg, val->u.sval, &xvalue)!=0) { LM_ERR("cannot get dst value\n"); @@ -1286,7 +1284,6 @@ cycle1: check_val.s = val->u.s; check_flags = AVP_VAL_STR; } - avp2 = 0; } cycle2:

10 years, 5 months

git:master: modules/usrloc: Update contact field when updating a contact in the DB

by Hugh Waite

Module: sip-router Branch: master Commit: a55018deb431ef32ee2bcd45610903327850757d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a55018d… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Nov 22 09:35:55 2013 +0000 modules/usrloc: Update contact field when updating a contact in the DB - Fixes FS#368 --- modules/usrloc/ucontact.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 323dc4b..4877c7f 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -650,8 +650,8 @@ int db_update_ucontact_addr(ucontact_t* _c) db_val_t vals1[4]; int n1; - db_key_t keys2[14]; - db_val_t vals2[14]; + db_key_t keys2[15]; + db_val_t vals2[15]; int nr_cols2; @@ -782,6 +782,13 @@ int db_update_ucontact_addr(ucontact_t* _c) vals2[nr_cols2].val.int_val = (int)_c->reg_id; nr_cols2++; + keys2[nr_cols2] = &contact_col; + vals2[nr_cols2].type = DB1_STR; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->c; + LM_DBG("contact:%.*s\n", vals2[nr_cols2].val.str_val.len, vals2[nr_cols2].val.str_val.s); + nr_cols2++; + if (use_domain) { keys1[n1] = &domain_col; vals1[n1].type = DB1_STR; @@ -850,8 +857,8 @@ int db_update_ucontact_ruid(ucontact_t* _c) db_val_t vals1[1]; int n1; - db_key_t keys2[14]; - db_val_t vals2[14]; + db_key_t keys2[15]; + db_val_t vals2[15]; int n2; @@ -978,6 +985,13 @@ int db_update_ucontact_ruid(ucontact_t* _c) vals2[n2].val.int_val = (int)_c->reg_id; n2++; + keys2[n2] = &contact_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->c; + LM_DBG("contact:%.*s\n", vals2[n2].val.str_val.len, vals2[n2].val.str_val.s); + n2++; + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1;

10 years, 5 months

git:master: modules/registrar: Invalidate temporary GRUUs when the Call-ID changes for a sip.instance

by Hugh Waite

Module: sip-router Branch: master Commit: 27eba09b603b265ce4213d238c132249189ae6e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27eba09… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Fri Nov 22 09:28:38 2013 +0000 modules/registrar: Invalidate temporary GRUUs when the Call-ID changes for a sip.instance - Fixes FS#368 --- modules/registrar/save.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index bc816cd..fc5d564 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -716,10 +716,10 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, ptr=_r->contacts; while(ptr) { - ptr0 = ptr; + ptr0 = ptr->next; if(ptr!=c) ul.delete_ucontact(_r, ptr); - ptr=ptr0->next; + ptr=ptr0; } updated=1; } @@ -746,13 +746,32 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r, int _mode, ptr=_r->contacts; while(ptr) { - ptr0 = ptr; + ptr0 = ptr->next; if(ptr!=c) ul.delete_ucontact(_r, ptr); - ptr=ptr0->next; + ptr=ptr0; } updated=1; } + /* If call-id has changed then delete all records with this sip.instance + then insert new record */ + if (ci->instance.s != NULL && + (ci->callid->len != c->callid.len || + strncmp(ci->callid->s, c->callid.s, ci->callid->len) != 0)) + { + ptr = _r->contacts; + while (ptr) + { + ptr0 = ptr->next; + if ((ptr != c) && ptr->instance.len == c->instance.len && + strncmp(ptr->instance.s, c->instance.s, ptr->instance.len) == 0) + { + ul.delete_ucontact(_r, ptr); + } + ptr = ptr0; + } + updated = 1; + } if (ul.update_ucontact(_r, c, ci) < 0) { rerrno = R_UL_UPD_C; LM_ERR("failed to update contact\n");

10 years, 5 months

[tracker] Comment added: Handling t_on_reply when use in event_route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#371 - Handling t_on_reply when use in event_route User who did this - Pawel Sternal (Sternik) ---------- This patch solves my problem. Thank you. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=371#comment1178 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 5 months

git:4.1: sl: README updated

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: b6c109a38f8fca82005166ed73d370a2f974a3db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6c109a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 21 20:24:20 2013 +0100 sl: README updated --- modules/sl/README | 102 ++++++++++++++++++++++++++--------------------------- 1 files changed, 50 insertions(+), 52 deletions(-) diff --git a/modules/sl/README b/modules/sl/README index 447f700..5d7723d 100644 --- a/modules/sl/README +++ b/modules/sl/README @@ -1,4 +1,3 @@ - The SL Module - Statless request handling Bogdan Iancu @@ -10,7 +9,7 @@ Daniel-Constantin Mierla asipto.com Copyright � 2003 FhG FOKUS - _________________________________________________________________ + __________________________________________________________________ Table of Contents @@ -25,10 +24,10 @@ Daniel-Constantin Mierla 3. Functions - 3.1. sl_send_reply(code, reason) - 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward _reply([ code, [ reason ] ]) + 3.1. sl_send_reply(code, reason) + 3.2. send_reply(code, reason) + 3.3. sl_reply_error() + 3.4. sl_forward _reply([ code, [ reason ] ]) 4. Statistics @@ -80,10 +79,10 @@ Chapter 1. Admin Guide 3. Functions - 3.1. sl_send_reply(code, reason) - 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward _reply([ code, [ reason ] ]) + 3.1. sl_send_reply(code, reason) + 3.2. send_reply(code, reason) + 3.3. sl_reply_error() + 3.4. sl_forward _reply([ code, [ reason ] ]) 4. Statistics @@ -114,31 +113,30 @@ Chapter 1. Admin Guide 1. Overview - The SL module allows the SIP server to act as a stateless UA server - and generate replies to SIP requests without keeping state. That is + The SL module allows the SIP server to act as a stateless UA server and + generate replies to SIP requests without keeping state. That is beneficial in many scenarios, in which you wish not to burden server's memory and scale well. - The SL module needs to filter ACKs sent after a local stateless reply + The SL module needs to filter ACKs sent after a local stateless reply to an INVITE was generated. To recognize such ACKs, ser adds a special "signature" in to-tags. This signature is sought for in incoming ACKs, and if included, the ACKs are absorbed. - To speed up the filtering process, the module uses a timeout - mechanism. When a reply is sent, a timer us set. As long as the timer - is valid, the incoming ACK requests will be checked using TO tag - value. Once the timer expires, all the ACK messages are let through - - a long time passed till it sent a reply, so it does not expect any ACK - that have to be blocked. - - The ACK filtering may fail in some rare cases. If you think these - matter to you, better use stateful processing (TM module) for INVITE - processing. Particularly, the problem happens when a UA sends an - INVITE which already has a to-tag in it (e.g., a re-INVITE) and the - server want to reply to it. Then, it will keep the current to-tag, - which will be mirrored in ACK. SER will not see its signature and - forward the ACK downstream. Caused harm is not bad--just a useless ACK - is forwarded. + To speed up the filtering process, the module uses a timeout mechanism. + When a reply is sent, a timer us set. As long as the timer is valid, + the incoming ACK requests will be checked using TO tag value. Once the + timer expires, all the ACK messages are let through - a long time + passed till it sent a reply, so it does not expect any ACK that have to + be blocked. + + The ACK filtering may fail in some rare cases. If you think these + matter to you, better use stateful processing (TM module) for INVITE + processing. Particularly, the problem happens when a UA sends an INVITE + which already has a to-tag in it (e.g., a re-INVITE) and the server + want to reply to it. Then, it will keep the current to-tag, which will + be mirrored in ACK. SER will not see its signature and forward the ACK + downstream. Caused harm is not bad--just a useless ACK is forwarded. 2. Parameters @@ -170,7 +168,7 @@ modparam("sl", "default_reason", "Server Error") 2.3. bind_tm (int) - Controls if SL module should attempt to bind to TM module in order to + Controls if SL module should attempt to bind to TM module in order to send stateful reply when the transaction is created. Default value is 1 (enabled). @@ -182,17 +180,16 @@ modparam("sl", "bind_tm", 0) # feature disabled 3. Functions - 3.1. sl_send_reply(code, reason) - 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward _reply([ code, [ reason ] ]) + 3.1. sl_send_reply(code, reason) + 3.2. send_reply(code, reason) + 3.3. sl_reply_error() + 3.4. sl_forward _reply([ code, [ reason ] ]) -3.1. sl_send_reply(code, reason) +3.1. sl_send_reply(code, reason) - For the current request, a reply is sent back having the given code - and text reason. The reply is sent stateless, totally independent of - the Transaction module and with no retransmission for the INVITE's - replies. + For the current request, a reply is sent back having the given code and + text reason. The reply is sent stateless, totally independent of the + Transaction module and with no retransmission for the INVITE's replies. Meaning of the parameters is as follows: * code - Return code. @@ -203,19 +200,20 @@ modparam("sl", "bind_tm", 0) # feature disabled sl_send_reply("404", "Not found"); ... -3.2. send_reply(code, reason) +3.2. send_reply(code, reason) - For the current request, a reply is sent back having the given code - and text reason. The reply is sent stateful or stateless, depending of - the TM module: if a transaction exists for the current request, then - the reply is sent statefully, otherwise stateless. + For the current request, a reply is sent back having the given code and + text reason. The reply is sent stateful or stateless, depending of the + TM module: if a transaction exists for the current request, then the + reply is sent statefully, otherwise stateless. Meaning of the parameters is as follows: * code - Return code. * reason - Reason phrase. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - BRANCH_ROUTE. + This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. It can + be used on ONREPLY_ROUTE executed by tm module (upon a t_on_reply() + callback). Example 1.5. send_reply usage ... @@ -224,10 +222,10 @@ send_reply("404", "Not found"); send_reply("403", "Invalid user - $fU"); ... -3.3. sl_reply_error() +3.3. sl_reply_error() - Sends back an error reply describing the nature of the last internal - error. Usually this function should be used after a script function + Sends back an error reply describing the nature of the last internal + error. Usually this function should be used after a script function that returned an error code. Example 1.6. sl_reply_error usage @@ -235,11 +233,11 @@ send_reply("403", "Invalid user - $fU"); sl_reply_error(); ... -3.4. sl_forward _reply([ code, [ reason ] ]) +3.4. sl_forward _reply([ code, [ reason ] ]) - Forward statelessy the current received SIP reply, with the option to - change the status code and reason text. The new code has to be in the - same class. The received reply is forwarded as well by core when the + Forward statelessy the current received SIP reply, with the option to + change the status code and reason text. The new code has to be in the + same class. The received reply is forwarded as well by core when the config execution ended, unless it is dropped from config. Meaning of the parameters is as follows:

10 years, 5 months

git:4.1: sl: docs updated to reflect usage of send_reply()

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 93428405a7d9bba3aee3bf317ea76f232739c9af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9342840… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 21 19:14:17 2013 +0100 sl: docs updated to reflect usage of send_reply() (cherry picked from commit e7b73f7e0160eac1ca445201fbf796df0dd13ce0) --- modules/sl/doc/sl_functions.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/sl/doc/sl_functions.xml b/modules/sl/doc/sl_functions.xml index bf58ce0..1420e86 100644 --- a/modules/sl/doc/sl_functions.xml +++ b/modules/sl/doc/sl_functions.xml @@ -59,8 +59,9 @@ sl_send_reply("404", "Not found"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - BRANCH_ROUTE. + This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. + It can be used on ONREPLY_ROUTE executed by tm module (upon a + t_on_reply() callback). </para> <example> <title><function>send_reply</function> usage</title>

10 years, 5 months

git:4.1: sl: allow send_reply() in the route block types supported by t_reply() and sl_send_reply()

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 6125176d04c75d3a3f0b57119696eca2f63c3645 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6125176… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 21 19:09:43 2013 +0100 sl: allow send_reply() in the route block types supported by t_reply() and sl_send_reply() - reported by Juha Heinanen, FS#362 (cherry picked from commit c77aaf38eafe1d3549d266feebf76ac0b50738ea) --- modules/sl/sl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index ab5e737..fb8a1ee 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -99,7 +99,7 @@ static cmd_export_t cmds[]={ {"sl_reply", w_sl_send_reply, 2, fixup_sl_reply, REQUEST_ROUTE}, {"send_reply", w_send_reply, 2, fixup_sl_reply, - REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, @@ -282,6 +282,9 @@ int send_reply(struct sip_msg *msg, int code, str *reason) } } + if(msg->first_line.type==SIP_REPLY) + goto error; + LM_DBG("reply in stateless mode (sl)\n"); ret = sl_send_reply(msg, code, r);

10 years, 5 months

git:master: sl: docs updated to reflect usage of send_reply()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e7b73f7e0160eac1ca445201fbf796df0dd13ce0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7b73f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 21 19:14:17 2013 +0100 sl: docs updated to reflect usage of send_reply() --- modules/sl/doc/sl_functions.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/sl/doc/sl_functions.xml b/modules/sl/doc/sl_functions.xml index bf58ce0..1420e86 100644 --- a/modules/sl/doc/sl_functions.xml +++ b/modules/sl/doc/sl_functions.xml @@ -59,8 +59,9 @@ sl_send_reply("404", "Not found"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - BRANCH_ROUTE. + This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. + It can be used on ONREPLY_ROUTE executed by tm module (upon a + t_on_reply() callback). </para> <example> <title><function>send_reply</function> usage</title>

10 years, 5 months

git:master: sl: README updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 321fb280f81d2e00531feff1562f064a7222ffe9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=321fb28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 21 19:14:36 2013 +0100 sl: README updated --- modules/sl/README | 102 ++++++++++++++++++++++++++--------------------------- 1 files changed, 50 insertions(+), 52 deletions(-) diff --git a/modules/sl/README b/modules/sl/README index 447f700..5d7723d 100644 --- a/modules/sl/README +++ b/modules/sl/README @@ -1,4 +1,3 @@ - The SL Module - Statless request handling Bogdan Iancu @@ -10,7 +9,7 @@ Daniel-Constantin Mierla asipto.com Copyright � 2003 FhG FOKUS - _________________________________________________________________ + __________________________________________________________________ Table of Contents @@ -25,10 +24,10 @@ Daniel-Constantin Mierla 3. Functions - 3.1. sl_send_reply(code, reason) - 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward _reply([ code, [ reason ] ]) + 3.1. sl_send_reply(code, reason) + 3.2. send_reply(code, reason) + 3.3. sl_reply_error() + 3.4. sl_forward _reply([ code, [ reason ] ]) 4. Statistics @@ -80,10 +79,10 @@ Chapter 1. Admin Guide 3. Functions - 3.1. sl_send_reply(code, reason) - 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward _reply([ code, [ reason ] ]) + 3.1. sl_send_reply(code, reason) + 3.2. send_reply(code, reason) + 3.3. sl_reply_error() + 3.4. sl_forward _reply([ code, [ reason ] ]) 4. Statistics @@ -114,31 +113,30 @@ Chapter 1. Admin Guide 1. Overview - The SL module allows the SIP server to act as a stateless UA server - and generate replies to SIP requests without keeping state. That is + The SL module allows the SIP server to act as a stateless UA server and + generate replies to SIP requests without keeping state. That is beneficial in many scenarios, in which you wish not to burden server's memory and scale well. - The SL module needs to filter ACKs sent after a local stateless reply + The SL module needs to filter ACKs sent after a local stateless reply to an INVITE was generated. To recognize such ACKs, ser adds a special "signature" in to-tags. This signature is sought for in incoming ACKs, and if included, the ACKs are absorbed. - To speed up the filtering process, the module uses a timeout - mechanism. When a reply is sent, a timer us set. As long as the timer - is valid, the incoming ACK requests will be checked using TO tag - value. Once the timer expires, all the ACK messages are let through - - a long time passed till it sent a reply, so it does not expect any ACK - that have to be blocked. - - The ACK filtering may fail in some rare cases. If you think these - matter to you, better use stateful processing (TM module) for INVITE - processing. Particularly, the problem happens when a UA sends an - INVITE which already has a to-tag in it (e.g., a re-INVITE) and the - server want to reply to it. Then, it will keep the current to-tag, - which will be mirrored in ACK. SER will not see its signature and - forward the ACK downstream. Caused harm is not bad--just a useless ACK - is forwarded. + To speed up the filtering process, the module uses a timeout mechanism. + When a reply is sent, a timer us set. As long as the timer is valid, + the incoming ACK requests will be checked using TO tag value. Once the + timer expires, all the ACK messages are let through - a long time + passed till it sent a reply, so it does not expect any ACK that have to + be blocked. + + The ACK filtering may fail in some rare cases. If you think these + matter to you, better use stateful processing (TM module) for INVITE + processing. Particularly, the problem happens when a UA sends an INVITE + which already has a to-tag in it (e.g., a re-INVITE) and the server + want to reply to it. Then, it will keep the current to-tag, which will + be mirrored in ACK. SER will not see its signature and forward the ACK + downstream. Caused harm is not bad--just a useless ACK is forwarded. 2. Parameters @@ -170,7 +168,7 @@ modparam("sl", "default_reason", "Server Error") 2.3. bind_tm (int) - Controls if SL module should attempt to bind to TM module in order to + Controls if SL module should attempt to bind to TM module in order to send stateful reply when the transaction is created. Default value is 1 (enabled). @@ -182,17 +180,16 @@ modparam("sl", "bind_tm", 0) # feature disabled 3. Functions - 3.1. sl_send_reply(code, reason) - 3.2. send_reply(code, reason) - 3.3. sl_reply_error() - 3.4. sl_forward _reply([ code, [ reason ] ]) + 3.1. sl_send_reply(code, reason) + 3.2. send_reply(code, reason) + 3.3. sl_reply_error() + 3.4. sl_forward _reply([ code, [ reason ] ]) -3.1. sl_send_reply(code, reason) +3.1. sl_send_reply(code, reason) - For the current request, a reply is sent back having the given code - and text reason. The reply is sent stateless, totally independent of - the Transaction module and with no retransmission for the INVITE's - replies. + For the current request, a reply is sent back having the given code and + text reason. The reply is sent stateless, totally independent of the + Transaction module and with no retransmission for the INVITE's replies. Meaning of the parameters is as follows: * code - Return code. @@ -203,19 +200,20 @@ modparam("sl", "bind_tm", 0) # feature disabled sl_send_reply("404", "Not found"); ... -3.2. send_reply(code, reason) +3.2. send_reply(code, reason) - For the current request, a reply is sent back having the given code - and text reason. The reply is sent stateful or stateless, depending of - the TM module: if a transaction exists for the current request, then - the reply is sent statefully, otherwise stateless. + For the current request, a reply is sent back having the given code and + text reason. The reply is sent stateful or stateless, depending of the + TM module: if a transaction exists for the current request, then the + reply is sent statefully, otherwise stateless. Meaning of the parameters is as follows: * code - Return code. * reason - Reason phrase. - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, - BRANCH_ROUTE. + This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. It can + be used on ONREPLY_ROUTE executed by tm module (upon a t_on_reply() + callback). Example 1.5. send_reply usage ... @@ -224,10 +222,10 @@ send_reply("404", "Not found"); send_reply("403", "Invalid user - $fU"); ... -3.3. sl_reply_error() +3.3. sl_reply_error() - Sends back an error reply describing the nature of the last internal - error. Usually this function should be used after a script function + Sends back an error reply describing the nature of the last internal + error. Usually this function should be used after a script function that returned an error code. Example 1.6. sl_reply_error usage @@ -235,11 +233,11 @@ send_reply("403", "Invalid user - $fU"); sl_reply_error(); ... -3.4. sl_forward _reply([ code, [ reason ] ]) +3.4. sl_forward _reply([ code, [ reason ] ]) - Forward statelessy the current received SIP reply, with the option to - change the status code and reason text. The new code has to be in the - same class. The received reply is forwarded as well by core when the + Forward statelessy the current received SIP reply, with the option to + change the status code and reason text. The new code has to be in the + same class. The received reply is forwarded as well by core when the config execution ended, unless it is dropped from config. Meaning of the parameters is as follows:

10 years, 5 months

git:master: sl: allow send_reply() in the route block types supported by t_reply() and sl_send_reply()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c77aaf38eafe1d3549d266feebf76ac0b50738ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c77aaf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Nov 21 19:09:43 2013 +0100 sl: allow send_reply() in the route block types supported by t_reply() and sl_send_reply() - reported by Juha Heinanen, FS#362 --- modules/sl/sl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index ab5e737..fb8a1ee 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -99,7 +99,7 @@ static cmd_export_t cmds[]={ {"sl_reply", w_sl_send_reply, 2, fixup_sl_reply, REQUEST_ROUTE}, {"send_reply", w_send_reply, 2, fixup_sl_reply, - REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, @@ -282,6 +282,9 @@ int send_reply(struct sip_msg *msg, int code, str *reason) } } + if(msg->first_line.type==SIP_REPLY) + goto error; + LM_DBG("reply in stateless mode (sl)\n"); ret = sl_send_reply(msg, code, r);

10 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2013