sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:oej/permissionsrpc: Strlen of str works but not str->s
by Olle E. Johansson 08 Jan '13

08 Jan '13

Module: sip-router Branch: oej/permissionsrpc Commit: e447cf03ddfb790b21f89fb4c8ed476e904e6620 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e447cf0… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 20:01:00 2012 +0100 Strlen of str works but not str->s --- modules_k/permissions/mi.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/permissions/mi.c b/modules_k/permissions/mi.c index c86388e..ee17534 100644 --- a/modules_k/permissions/mi.c +++ b/modules_k/permissions/mi.c @@ -261,21 +261,21 @@ void rpc_test_uri(rpc_t* rpc, void* c) unsigned int allow_suffix_len; int i; - if (rpc->scan(c, ".S", &basenamep) != 1) { + if (rpc->scan(c, "S", &basenamep) != 1) { rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); return; } - //LM_DBG("Basename %s length %d \n", basenamep, basenamep->len); - if (rpc->scan(c, ".S", &urip) != 1) { + LM_DBG("Basename %s length %d strlen(%d)\n", basenamep, basenamep->len, strlen(basenamep)); + if (rpc->scan(c, "S", &urip) != 1) { rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); return; } - //LM_DBG("URI %s length %d \n", urip, urip->len); - if (rpc->scan(c, ".S", &contactp) != 1) { + LM_DBG("URI %s length %d \n", urip, urip->len); + if (rpc->scan(c, "S", &contactp) != 1) { rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); return; } - //LM_DBG("Contact %s length %d size %d\n", contactp, contactp->len, sizeof(contactp->s) - 1); + LM_DBG("Contact %s length %d size %d\n", contactp, contactp->len, sizeof(contactp->s) - 1); /* For some reason, rtp->scan doesn't set the length properly */ if (contactp->len > MAX_URI_SIZE) {

1 0

git:oej/permissionsrpc: Merge branch 'master' into oej/permissionsrpc
by Olle E. Johansson 08 Jan '13

08 Jan '13

Module: sip-router Branch: oej/permissionsrpc Commit: db8780f0b296537bd56c6c1aaeec08d7be5a6788 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db8780f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 17:59:34 2012 +0100 Merge branch 'master' into oej/permissionsrpc * master: (21 commits) Revert "Changing to kamcmd" kamcmd changes Changing to kamcmd kamcmd Updating docs Change "sercmd" to "kamcmd" in module documentation files - README kamctl Fix typo that causes the "trusted" help to be printed twice and "address" zero times kamctl Change "sercmd" to "kamcmd" in help texts Fixing compiler warnings modules_s/permissions: moved to obsolete folder modules_s/textops: moved to obsolete folder textopsx: added functions that operate on header value modules_k/domain: bind_domain api function takes one param modules_k/htable: removed unused variable nathelper(k): new test 128 to check port in contact against source port modules_s/nathelper: moved to obsolete folder nathelper(k): added the select for rewriting the contact core: proper pv buffer reinitialization dialog(k): Reworked dlg_set_timeout_by_profile() code to change dialog timeouts outside of a profile lock. modules/app_lua: Updated app_lua to support URI lookup in registrar modules_k/registrar: Extended C-API to include a URI lookup ... ddelande ---

1 0

git:master: modules/cdp: added omitted statistics files
by Jason Penton 08 Jan '13

08 Jan '13

Module: sip-router Branch: master Commit: ecba6cf229f849dd6390bbb2b9e9e70628fd0bd7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecba6cf… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Jan 8 11:00:16 2013 +0200 modules/cdp: added omitted statistics files --- modules/cdp/statistics.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ modules/cdp/statistics.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 0 deletions(-) diff --git a/modules/cdp/statistics.c b/modules/cdp/statistics.c new file mode 100644 index 0000000..248026d --- /dev/null +++ b/modules/cdp/statistics.c @@ -0,0 +1,56 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Smile Communications, jason.penton(a)smilecoms.com + * Copyright (C) 2012 Smile Communications, richard.good(a)smilecoms.com + * + * The initial version of this code was written by Dragos Vingarzan + * (dragos(dot)vingarzan(at)fokus(dot)fraunhofer(dot)de and the + * Fruanhofer Institute. It was and still is maintained in a separate + * branch of the original SER. We are therefore migrating it to + * Kamailio/SR and look forward to maintaining it from here on out. + * 2011/2012 Smile Communications, Pty. Ltd. + * ported/maintained/improved by + * Jason Penton (jason(dot)penton(at)smilecoms.com and + * Richard Good (richard(dot)good(at)smilecoms.com) as part of an + * effort to add full IMS support to Kamailio/SR using a new and + * improved architecture + * + * NB: Alot of this code was originally part of OpenIMSCore, + * FhG Fokus. + * Copyright (C) 2004-2006 FhG Fokus + * Thanks for great work! This is an effort to + * break apart the various CSCF functions into logically separate + * components. We hope this will drive wider use. We also feel + * that in this way the architecture is more complete and thereby easier + * to manage in the Kamailio/SR environment + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "statistics.h" + +unsigned long get_avg_cdp_response_time() { + + long rpls_received = get_stat_val(replies_received); + if (!rpls_received) + return 0; + + return get_stat_val(replies_response_time)/rpls_received; +} + diff --git a/modules/cdp/statistics.h b/modules/cdp/statistics.h new file mode 100644 index 0000000..889697f --- /dev/null +++ b/modules/cdp/statistics.h @@ -0,0 +1,57 @@ +/* + * $Id$ + * + * Copyright (C) 2012 Smile Communications, jason.penton(a)smilecoms.com + * Copyright (C) 2012 Smile Communications, richard.good(a)smilecoms.com + * + * The initial version of this code was written by Dragos Vingarzan + * (dragos(dot)vingarzan(at)fokus(dot)fraunhofer(dot)de and the + * Fruanhofer Institute. It was and still is maintained in a separate + * branch of the original SER. We are therefore migrating it to + * Kamailio/SR and look forward to maintaining it from here on out. + * 2011/2012 Smile Communications, Pty. Ltd. + * ported/maintained/improved by + * Jason Penton (jason(dot)penton(at)smilecoms.com and + * Richard Good (richard(dot)good(at)smilecoms.com) as part of an + * effort to add full IMS support to Kamailio/SR using a new and + * improved architecture + * + * NB: Alot of this code was originally part of OpenIMSCore, + * FhG Fokus. + * Copyright (C) 2004-2006 FhG Fokus + * Thanks for great work! This is an effort to + * break apart the various CSCF functions into logically separate + * components. We hope this will drive wider use. We also feel + * that in this way the architecture is more complete and thereby easier + * to manage in the Kamailio/SR environment + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef STATISTICS_H_ +#define STATISTICS_H_ + +#include "../../lib/kcore/statistics.h" + +stat_var* stat_cdp_timeouts; +stat_var* replies_received; +stat_var* replies_response_time; + +unsigned long get_avg_cdp_response_time(); + +#endif /* STATISTICS_H_ */

1 0

git:master: md5.h: fixed types for Sun Solaris
by Jason Penton 08 Jan '13

08 Jan '13

Module: sip-router Branch: master Commit: ff1c7f3756bf7c2175b7209ccc13ab0cbf6cb4f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff1c7f3… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Jan 7 11:02:06 2013 +0200 md5.h: fixed types for Sun Solaris --- md5.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/md5.h b/md5.h index 211a131..f094d10 100644 --- a/md5.h +++ b/md5.h @@ -22,6 +22,13 @@ /* Probably not the proper place, but will do for Debian: */ #include <sys/types.h> +/* fix types for Sun Solaris */ +#if defined(__SVR4) || defined(__sun) + typedef uint8_t u_int8_t; + typedef uint32_t u_int32_t; + typedef uint64_t u_int64_t; +#endif + typedef struct MD5Context { u_int32_t state[4]; /* state */ u_int64_t count; /* number of bits, mod 2^64 */

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Jason Penton 08 Jan '13

08 Jan '13

Module: sip-router Branch: master Commit: 5fc244a81ff4749bd8cb0196a1baecd8a721191a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fc244a… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Jan 8 11:01:37 2013 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:master: modules/sipcapture: fixed defines for Solaris
by Jason Penton 08 Jan '13

08 Jan '13

Module: sip-router Branch: master Commit: da1d8d1a9315d187b050468aa33772253f10e47b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da1d8d1… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Jan 7 12:47:11 2013 +0200 modules/sipcapture: fixed defines for Solaris --- modules/sipcapture/hep.h | 5 +++-- modules/sipcapture/sipcapture.h | 10 ++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/sipcapture/hep.h b/modules/sipcapture/hep.h index 122f943..ea0046e 100644 --- a/modules/sipcapture/hep.h +++ b/modules/sipcapture/hep.h @@ -30,6 +30,7 @@ #ifdef __OS_solaris typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; +typedef uint32_t u_int32_t; #define IPPROTO_IPIP IPPROTO_ENCAP /* Solaris IPIP protocol has name ENCAP */ #endif @@ -154,11 +155,11 @@ struct hep_generic_recv { #ifdef USE_IPV6 hep_chunk_ip6_t *hep_src_ip6; hep_chunk_ip6_t *hep_dst_ip6; -#endif +#endif hep_chunk_uint8_t *proto_t; hep_chunk_uint32_t *capt_id; hep_chunk_uint16_t *keep_tm; - hep_chunk_str_t *auth_key; + hep_chunk_str_t *auth_key; hep_chunk_t *payload_chunk; } __attribute__((packed)); diff --git a/modules/sipcapture/sipcapture.h b/modules/sipcapture/sipcapture.h index 89fd1da..08707e5 100644 --- a/modules/sipcapture/sipcapture.h +++ b/modules/sipcapture/sipcapture.h @@ -23,12 +23,6 @@ * */ -#ifdef __OS_solaris -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -#define IPPROTO_IPIP IPPROTO_ENCAP /* Solaris IPIP protocol has name ENCAP */ -#endif - struct _sipcapture_object { str method; str reply_reason; @@ -64,8 +58,8 @@ struct _sipcapture_object { str rtp_stat; int type; long long tmstamp; - str node; - str msg; + str node; + str msg; #ifdef STATISTICS stat_var *stat; #endif

1 0

git:master: modules/cdp: housekeeping
by Jason Penton 08 Jan '13

08 Jan '13

1 0

git:master: modules_k/registrar: documented new "flow_timer" modparam
by Peter Dunkley 08 Jan '13

08 Jan '13

Module: sip-router Branch: master Commit: 9a10ed3334804f520ecdab03f1019a19e13e0494 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a10ed3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 8 00:24:47 2013 +0000 modules_k/registrar: documented new "flow_timer" modparam --- modules_k/registrar/README | 66 +++++++++++++++++++------- modules_k/registrar/doc/registrar_admin.xml | 42 +++++++++++++++++ 2 files changed, 90 insertions(+), 18 deletions(-) diff --git a/modules_k/registrar/README b/modules_k/registrar/README index 5df026e..5d57e8e 100644 --- a/modules_k/registrar/README +++ b/modules_k/registrar/README @@ -59,6 +59,7 @@ Bogdan-Andre Iancu 3.22. xavp_rcd (string) 3.23. gruu_enabled (integer) 3.24. outbound_mode (integer) + 3.25. flow_timer (integer) 4. Functions @@ -110,15 +111,16 @@ Bogdan-Andre Iancu 1.21. Set xavp_rcd parameter 1.22. Set gruu_enabled parameter 1.23. Set outbound_mode parameter - 1.24. save usage - 1.25. lookup usage - 1.26. lookup_branches usage - 1.27. registered usage - 1.28. add_sock_hdr usage - 1.29. unregister usage - 1.30. reg_fetch_contacts usage - 1.31. reg_free_contacts usage - 1.32. $ulc(name) usage + 1.24. Set flow_timer parameter + 1.25. save usage + 1.26. lookup usage + 1.27. lookup_branches usage + 1.28. registered usage + 1.29. add_sock_hdr usage + 1.30. unregister usage + 1.31. reg_fetch_contacts usage + 1.32. reg_free_contacts usage + 1.33. $ulc(name) usage Chapter 1. Admin Guide @@ -160,6 +162,7 @@ Chapter 1. Admin Guide 3.22. xavp_rcd (string) 3.23. gruu_enabled (integer) 3.24. outbound_mode (integer) + 3.25. flow_timer (integer) 4. Functions @@ -274,6 +277,7 @@ Chapter 1. Admin Guide 3.22. xavp_rcd (string) 3.23. gruu_enabled (integer) 3.24. outbound_mode (integer) + 3.25. flow_timer (integer) 3.1. default_expires (integer) @@ -655,6 +659,32 @@ modparam("registrar", "gruu_enabled", 0) modparam("registrar", "outbound_mode", 2) ... +3.25. flow_timer (integer) + + If set to 0 then this module will not add a Flow-Timer: header to 200 + OK responses to REGISTER requests. + + If set to > 0 then this module will add a Flow-Timer: header containing + this value to 200 OK responses to REGISTER requests. This parameter may + only be set to a value > 0 when outbound_mode is set to 2. + + When set to a value > 0 this parameter should be set to slightly less + than the connection timeout value between the UAC and the network (this + corresponds to the core tcp_connection_lifetime option and websocket + keepalive_timeout modparam). This parameter is most useful when you + have a single edge proxy/registrar. If you are using a separate SIP + Outbound Edge Proxy you should consider leaving this parameter set to 0 + and adding the Flow-Timer: header on the Edge Proxy (as this allows you + to keep all of the timer values for a specific flow in one + configuration - that of the Edge Proxy). + + Default value is 0. + + Example 1.24. Set flow_timer parameter +... +modparam("registrar", "flow_timer", 25) +... + 4. Functions 4.1. save(domain, [, flags [, uri]]) @@ -703,7 +733,7 @@ modparam("registrar", "outbound_mode", 2) This function can be used from REQUEST_ROUTE and REPLY_ROUTE. - Example 1.24. save usage + Example 1.25. save usage ... save("location"); save("location", "0x01"); @@ -736,7 +766,7 @@ save("location", "0x00", "sip:test@kamailio.org"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.25. lookup usage + Example 1.26. lookup usage ... lookup("location"); switch ($retcode) { @@ -762,7 +792,7 @@ switch ($retcode) { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.26. lookup_branches usage + Example 1.27. lookup_branches usage ... lookup_branches("location"); ... @@ -781,7 +811,7 @@ lookup_branches("location"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.27. registered usage + Example 1.28. registered usage ... if (registered("location")) { sl_send_reply("100", "Trying"); @@ -801,7 +831,7 @@ if (registered("location")) { This function can be used from REQUEST_ROUTE. - Example 1.28. add_sock_hdr usage + Example 1.29. add_sock_hdr usage ... add_sock_hdr("Sock-Info"); ... @@ -819,7 +849,7 @@ add_sock_hdr("Sock-Info"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.29. unregister usage + Example 1.30. unregister usage ... unregister("location", "$ru"); unregister("location", "sip:user@kamailio.org"); @@ -841,7 +871,7 @@ unregister("location", "sip:user@kamailio.org"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.30. reg_fetch_contacts usage + Example 1.31. reg_fetch_contacts usage ... reg_fetch_contacts("location", "$ru", "callee"); reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); @@ -860,7 +890,7 @@ reg_fetch_contacts("location", "sip:user@kamailio.org", "caller"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.31. reg_free_contacts usage + Example 1.32. reg_free_contacts usage ... reg_free_contacts("callee"); ... @@ -926,7 +956,7 @@ reg_free_contacts("callee"); The pseudo-variable accepts positive index value to access a specific contact record. - Example 1.32. $ulc(name) usage + Example 1.33. $ulc(name) usage ... if(reg_fetch_contacts("location", "$fu", "caller")) { diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index f59e8f6..9df5e0d 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -765,6 +765,48 @@ modparam("registrar", "outbound_mode", 2) </example> </section> + <section> + <title><varname>flow_timer</varname> (integer)</title> + <para> + If set to 0 then this module will not add a Flow-Timer: header + to 200 OK responses to REGISTER requests. + </para> + <para> + If set to > 0 then this module will add a Flow-Timer: header + containing this value to 200 OK responses to REGISTER requests. + This parameter may only be set to a value > 0 when + <emphasis>outbound_mode</emphasis> is set to 2. + </para> + <para> + When set to a value > 0 this parameter should be set to slightly + less than the connection timeout value between the UAC and the + network (this corresponds to the core + <emphasis>tcp_connection_lifetime</emphasis> option and + <emphasis>websocket</emphasis> + <emphasis>keepalive_timeout</emphasis> modparam). This parameter + is most useful when you have a single edge proxy/registrar. If + you are using a separate SIP Outbound Edge Proxy you should + consider leaving this parameter set to 0 and adding the + Flow-Timer: header on the Edge Proxy (as this allows you to + keep all of the timer values for a specific flow in one + configuration - that of the Edge Proxy). + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>flow_timer</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "flow_timer", 25) +... + </programlisting> + </example> + </section> + + </section>

1 0

git:master: modules_k/registrar: Added modparam to allow Flow-Timer: to be set in 200 OK response to REGISTER requests
by Peter Dunkley 08 Jan '13

08 Jan '13

Module: sip-router Branch: master Commit: e18905ea53c2c5d4a565de596e2c2913ede6466f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e18905e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 8 00:24:13 2013 +0000 modules_k/registrar: Added modparam to allow Flow-Timer: to be set in 200 OK response to REGISTER requests --- modules_k/registrar/reg_mod.c | 8 ++++++++ modules_k/registrar/reg_mod.h | 6 ++++++ modules_k/registrar/reply.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index 4f83696..bbc6e11 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -120,6 +120,7 @@ sruid_t _reg_sruid; int reg_gruu_enabled = 1; int reg_outbound_mode = 0; +int reg_flow_timer = 0; /* Populate this AVP if testing for specific registration instance. */ char *reg_callid_avp_param = 0; @@ -224,6 +225,7 @@ static param_export_t params[] = { {"xavp_rcd", STR_PARAM, &reg_xavp_rcd.s }, {"gruu_enabled", INT_PARAM, &reg_gruu_enabled }, {"outbound_mode", INT_PARAM, &reg_outbound_mode }, + {"flow_timer", INT_PARAM, &reg_flow_timer }, {0, 0, 0} }; @@ -380,6 +382,12 @@ static int mod_init(void) return -1; } + if (reg_flow_timer < 0 || reg_flow_timer > REG_FLOW_TIMER_MAX + || (reg_flow_timer > 0 && reg_outbound_mode != REG_OUTBOUND_REQUIRE)) { + LM_ERR("bad value for flow_timer\n"); + return -1; + } + /* fix the flags */ sock_flag = (sock_flag!=-1)?(1<<sock_flag):0; tcp_persistent_flag = (tcp_persistent_flag!=-1)?(1<<tcp_persistent_flag):0; diff --git a/modules_k/registrar/reg_mod.h b/modules_k/registrar/reg_mod.h index 04d31fa..7074590 100644 --- a/modules_k/registrar/reg_mod.h +++ b/modules_k/registrar/reg_mod.h @@ -71,6 +71,11 @@ #define REG_OUTBOUND_SUPPORTED 1 #define REG_OUTBOUND_REQUIRE 2 +/* Maximum of 999 to keep flow-timer to 3 digits + - make sure to update reply.c:add_flow_timer() if the number of digits + increases! */ +#define REG_FLOW_TIMER_MAX 999 + extern int nat_flag; extern int tcp_persistent_flag; extern int received_avp; @@ -89,6 +94,7 @@ extern int path_mode; extern int path_use_params; extern int reg_gruu_enabled; extern int reg_outbound_mode; +extern int reg_flow_timer; extern str sock_hdr_name; extern int sock_flag; diff --git a/modules_k/registrar/reply.c b/modules_k/registrar/reply.c index 5ce444e..b7b387a 100644 --- a/modules_k/registrar/reply.c +++ b/modules_k/registrar/reply.c @@ -581,6 +581,29 @@ static int add_supported(struct sip_msg* _m, str* _p) LUMP_RPL_HDR | LUMP_RPL_NODUP); return 0; } + +#define FLOW_TIMER "Flow-Timer: " +#define FLOW_TIMER_LEN (sizeof(FLOW_TIMER) - 1) + +static int add_flow_timer(struct sip_msg* _m) +{ + char* buf; + int lump_len; + + /* Add three as REG_FLOW_TIMER_MAX is 999 - three digits */ + buf = (char*)pkg_malloc(FLOW_TIMER_LEN + 3 + CRLF_LEN); + if (!buf) { + LM_ERR("no pkg memory left\n"); + return -1; + } + lump_len = snprintf(buf, FLOW_TIMER_LEN + 3 + CRLF_LEN, + "%.*s%d%.*s", + FLOW_TIMER_LEN, FLOW_TIMER, + reg_flow_timer, + CRLF_LEN, CRLF); + add_lump_rpl(_m, buf, lump_len, LUMP_RPL_HDR | LUMP_RPL_NODUP); + return 0; +} /*! \brief * Send a reply @@ -630,6 +653,11 @@ int reg_send_reply(struct sip_msg* _m) case REG_OUTBOUND_REQUIRE: if (add_require(_m, &outbound_str) < 0) return -1; + + if (reg_flow_timer > 0) { + if (add_flow_timer(_m) < 0) + return -1; + } /* Fall-thru */ case REG_OUTBOUND_SUPPORTED: if (add_supported(_m, &outbound_str) < 0)

1 0

git:master: modules/rtpproxy: removed LM_DBG that caused compiler warnings
by Juha Heinanen 07 Jan '13

07 Jan '13

Module: sip-router Branch: master Commit: 2aa85480330e368154e2d1c407380ba06f66d3f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2aa8548… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Jan 7 21:59:18 2013 +0200 modules/rtpproxy: removed LM_DBG that caused compiler warnings --- modules/rtpproxy/rtpproxy.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 401c2bb..124118b 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -1464,8 +1464,6 @@ insert_candidates(struct sip_msg *msg, char *where, str *ip, unsigned int port, append_str(at, rtp_port.s, rtp_port.len); append_str(at, " typ relay\r\n", 12); - LM_DBG("inserting '%.*s'\n", at - buf, buf); - anchor = anchor_lump(msg, where - msg->buf, 0, 0); if (anchor == 0) { LOG(L_ERR, "insert_candidates: can't get anchor\n");

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013