sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
255 discussions

git:4.0: core: fix TCP connection leak
by Peter Dunkley 01 Oct '13

01 Oct '13

Module: sip-router Branch: 4.0 Commit: e2642ea25cc19344d6e3e7f71e9df1cd7ef2532d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2642ea… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Tue Oct 1 10:52:01 2013 +0100 core: fix TCP connection leak - patch provided by Vitally Aleksandrov (cherry picked from commit 6cfd13cbddd1869ffbc947fdecd77d18a3fcb886) --- msg_translator.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 5783b7e..fa7834f 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2505,9 +2505,11 @@ char* via_builder( unsigned int *len, } else if (con->rcv.proto==PROTO_WSS) { memcpy(line_buf+MY_VIA_LEN-4, "WSS ", 4); } else { + tcpconn_put(con); LOG(L_CRIT, "BUG: via_builder: unknown proto %d\n", con->rcv.proto); return 0; } + tcpconn_put(con); }else if (send_info->proto==PROTO_WSS){ memcpy(line_buf+MY_VIA_LEN-4, "WSS ", 4); }else{

1 0

git:master: core: fix TCP connection leak
by Peter Dunkley 01 Oct '13

01 Oct '13

Module: sip-router Branch: master Commit: 6cfd13cbddd1869ffbc947fdecd77d18a3fcb886 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6cfd13c… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Tue Oct 1 10:52:01 2013 +0100 core: fix TCP connection leak - patch provided by Vitally Aleksandrov --- msg_translator.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index b7d4894..b4581e7 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2509,9 +2509,11 @@ char* via_builder( unsigned int *len, } else if (con->rcv.proto==PROTO_WSS) { memcpy(line_buf+MY_VIA_LEN-4, "WSS ", 4); } else { + tcpconn_put(con); LOG(L_CRIT, "BUG: via_builder: unknown proto %d\n", con->rcv.proto); return 0; } + tcpconn_put(con); }else if (send_info->proto==PROTO_WSS){ memcpy(line_buf+MY_VIA_LEN-4, "WSS ", 4); }else{

1 0

git:tmp/ims_charging: Beautified XML-Doc for IMS-Charging
by Carsten Bock 01 Oct '13

01 Oct '13

Module: sip-router Branch: tmp/ims_charging Commit: 6fdc83ecd7fa5313635a0041e76498704b0c8225 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fdc83e… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 20:46:30 2013 +0200 Beautified XML-Doc for IMS-Charging --- modules/ims_charging/doc/ims_charging_admin.xml | 1111 +++++++++++------------ 1 files changed, 514 insertions(+), 597 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6fd…

4 6

git:master: tm: added t_use_uac_headers() to documentation
by Daniel-Constantin Mierla 01 Oct '13

01 Oct '13

Module: sip-router Branch: master Commit: b5b570f278124bf0456d43a36a7c0eb5eaa9efe6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5b570f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 1 09:34:17 2013 +0200 tm: added t_use_uac_headers() to documentation --- modules/tm/README | 21 +++++++++++++++++++-- modules/tm/doc/functions.xml | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/modules/tm/README b/modules/tm/README index 6b9e8b5..8c6fde0 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -119,6 +119,7 @@ Juha Heinanen 5.47. t_relay_to(proxy, flags) 5.48. t_set_no_e2e_cancel_reason(0|1) 5.49. t_is_set(target) + 5.50. t_use_uac_headers() 6. TM Module API @@ -229,7 +230,8 @@ Juha Heinanen 1.85. t_replicate usage 1.86. t_set_no_e2e_cancel_reason usage 1.87. t_replicate usage - 1.88. event_route[tm:branch-failure] usage + 1.88. t_use_uac_headers usage + 1.89. event_route[tm:branch-failure] usage Chapter 1. Admin Guide @@ -337,6 +339,7 @@ Chapter 1. Admin Guide 5.47. t_relay_to(proxy, flags) 5.48. t_set_no_e2e_cancel_reason(0|1) 5.49. t_is_set(target) + 5.50. t_use_uac_headers() 6. TM Module API @@ -1606,6 +1609,7 @@ modparam("tm", "dns_reuse_rcv_socket", 1) 5.47. t_relay_to(proxy, flags) 5.48. t_set_no_e2e_cancel_reason(0|1) 5.49. t_is_set(target) + 5.50. t_use_uac_headers() 5.1. t_relay([host, port]) @@ -2651,6 +2655,19 @@ if(!t_is_set("failure_route")) LM_DBG("no failure route will be executed for current transaction\n"); ... +5.50. t_use_uac_headers() + + Set internal flags to tell tm to use UAC side for building headers for + local generated requests (ACK, CANCEL) - useful when changing From/To + headers using other functions than uac_replace_[from|to](). + + It returns true. + + Example 1.88. t_use_uac_headers usage +... +t_use_uac_headers(); +... + 6. TM Module API 6.1. Defines @@ -2832,7 +2849,7 @@ action *route) enabled with the t_on_branch_failure function. This event_route uses the BRANCH_FAILURE_ROUTE route type. - Example 1.88. event_route[tm:branch-failure] usage + Example 1.89. event_route[tm:branch-failure] usage ... route { t_on_branch_failure("myroute"); diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index fe37914..fba4e92 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1701,4 +1701,24 @@ if(!t_is_set("failure_route")) </example> </section> + <section id="tm.f.t_use_uac_headers"> + <title> + <function>t_use_uac_headers()</function> + </title> + <para> + Set internal flags to tell tm to use UAC side for building headers for + local generated requests (ACK, CANCEL) - useful when changing From/To + headers using other functions than uac_replace_[from|to](). + </para> + <para>It returns true.</para> + <example> + <title><function>t_use_uac_headers</function> usage</title> + <programlisting> +... +t_use_uac_headers(); +... + </programlisting> + </example> + </section> + </section>

1 0

git:master: tm: new function t_use_uac_headers()
by Daniel-Constantin Mierla 01 Oct '13

01 Oct '13

Module: sip-router Branch: master Commit: 0e71fec1e108e1c9b97486ced8c1328738ca13c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e71fec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 1 09:27:46 2013 +0200 tm: new function t_use_uac_headers() - set internal flags to tell tm to use UAC side for building headers for local generated requests (ACK, CANCEL) - useful when changing From/To headers using other functions than uac_replace_[from|to]() --- modules/tm/tm.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 7df7ade..3bdc7fb 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -303,6 +303,7 @@ static int w_t_drop_replies(struct sip_msg* msg, char* foo, char* bar); static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar); static int w_t_check_trans(struct sip_msg* msg, char* foo, char* bar); static int w_t_is_set(struct sip_msg* msg, char* target, char* bar); +static int w_t_use_uac_headers(sip_msg_t* msg, char* foo, char* bar); /* by default the fr timers avps are not set, so that the avps won't be @@ -483,6 +484,8 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE }, {"t_is_set", w_t_is_set, 1, fixup_t_is_set, ANY_ROUTE }, + {"t_use_uac_headers", w_t_use_uac_headers, 0, 0, + ANY_ROUTE }, {"t_load_contacts", t_load_contacts, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, @@ -2304,6 +2307,18 @@ inline static int w_t_relay_to(struct sip_msg *msg, char *proxy, char *flags) } +static int w_t_use_uac_headers(sip_msg_t* msg, char* foo, char* bar) +{ + tm_cell_t *t; + + t=get_t(); + if (t!=NULL && t!=T_UNDEFINED) { + t->uas.request->msg_flags |= FL_USE_UAC_FROM|FL_USE_UAC_TO; + } + msg->msg_flags |= FL_USE_UAC_FROM|FL_USE_UAC_TO; + + return 1; +} /* rpc docs */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013