sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:4.0: modules/outbound: Warn during mod_init() if STUN is not built or enabled

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: 00c4469624392cb252d65ecf0e53dd64cfb9bb87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00c4469… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 15:04:07 2013 +0000 modules/outbound: Warn during mod_init() if STUN is not built or enabled - STUN is required for outbound with UDP. Don't want to stop Kamailio starting when the outbound module is loaded and STUN is not available - but a warning seems appropriate. (cherry picked from commit 85b26219f9e4c3c8c7c990a4897d40645b4ad6e7) --- modules/outbound/ob_mod.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 7cf0c74..fb110d8 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -98,6 +98,15 @@ static int mod_init(void) "random bytes\n", ob_key.len); } +#ifndef USE_STUN + LM_WARN("STUN support not built-in. UDP keep-alive not supported.\n"); +#else + if (stun_allow_stun != 1) + { + LM_WARN("STUN disabled. UDP keep-alive not supported.\n"); + } +#endif + return 0; }

11 years, 9 months

git:4.0: modules/rr: only use flow-token for routing if it doesn' t point to the source of the request

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: 70217018e5a72c80cee37bc5a722b769890fc64c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7021701… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 15:43:02 2013 +0000 modules/rr: only use flow-token for routing if it doesn't point to the source of the request (cherry picked from commit 874669f483e1efba032bd695eb6cee4275673874) --- modules/rr/loose.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index b7fa243..268522c 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -513,12 +513,15 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, ret = rr_obb.decode_flow_token(&rcv, flow_token); if (ret == -2) { - LM_INFO("no flow token found - outbound not in use\n"); + LM_DBG("no flow token found - outbound not in use\n"); return 0; } else if (ret == -1) { LM_ERR("failed to decode flow token\n"); return -1; - } else { + } else if (!ip_addr_cmp(&rcv.src_ip, &_m->rcv.src_ip) + || rcv.src_port != _m->rcv.src_port) { + LM_DBG("\"incoming\" request found. Using flow-token for" + "routing\n"); /* First, force the local socket */ si = find_si(&rcv.dst_ip, rcv.dst_port, rcv.proto); @@ -546,9 +549,9 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, rcv.src_ip.af == AF_INET6 ? "]" : "", rcv.src_port, get_proto_name(rcv.proto)); - - return 1; } + + return 1; } /*!

11 years, 9 months

git:4.0: modules/outbound: Fixed bug in outbound mod_init

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: ac9f143b3cd2422a3fb2c3ca5e29724ed65ab43d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac9f143… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 14:07:04 2013 +0000 modules/outbound: Fixed bug in outbound mod_init (cherry picked from commit c924645fcfb706fc20ed715a00531d785f99cbde) --- modules/outbound/ob_mod.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 37b0a60..4c4e7ea 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -85,12 +85,17 @@ static int mod_init(void) return -1; } - if (RAND_bytes((unsigned char *) ob_key.s, OB_KEY_LEN) == 0) + if ((ob_key.s = shm_malloc(OB_KEY_LEN)) == NULL) { - LM_ERR("unable to get %d cryptographically strong pseudo-" - "random bytes\n", OB_KEY_LEN); + LM_ERR("Failed to allocate memory for flow-token key\n"); + return -1; } ob_key.len = OB_KEY_LEN; + if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) + { + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", ob_key.len); + } return 0; }

11 years, 9 months

git:4.0: modules/outbound: The flow-token key is now automatically generated

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: 6acbeef9ff574c079aaeeea72924905a0426c922 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6acbeef… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 12:14:31 2013 +0000 modules/outbound: The flow-token key is now automatically generated - Uses OpenSSL RAND_bytes() to select 20 cryptographically strong pseudo-random bytes for the key. - Flow-token key can no longer be manually set. (cherry picked from commit f474e85616f6f98a6ac193c7425f6c85af8efa20) --- modules/outbound/README | 33 ++++-------------------------- modules/outbound/doc/outbound_admin.xml | 21 ------------------- modules/outbound/ob_mod.c | 20 ++++++------------ 3 files changed, 12 insertions(+), 62 deletions(-) diff --git a/modules/outbound/README b/modules/outbound/README index 3e6aa97..08c6038 100644 --- a/modules/outbound/README +++ b/modules/outbound/README @@ -4,7 +4,7 @@ Peter Dunkley Crocodile RCS Ltd - Copyright � 2012 Crocodile RCS Ltd + Copyright © 2012 Crocodile RCS Ltd __________________________________________________________________ Table of Contents @@ -24,7 +24,6 @@ Peter Dunkley 3. Parameters 3.1. force_outbound_flag (integer) - 3.2. flow_token_key (string) 4. Functions 5. MI Commands @@ -35,7 +34,6 @@ Peter Dunkley 1.2. Edge Proxy Configuration 1.3. Registrar Configuration 1.4. Set force_outbound_flag parameter - 1.5. Set flow_token_key parameter Chapter 1. Admin Guide @@ -54,7 +52,6 @@ Chapter 1. Admin Guide 3. Parameters 3.1. force_outbound_flag (integer) - 3.2. flow_token_key (string) 4. Functions 5. MI Commands @@ -87,9 +84,9 @@ make all responses to REGISTERs. When using TCP or TLS as the SIP transport care should be taken to set - the "tcp_connection_lifetime" on the Edge Proxy to a value slightly + the “tcp_connection_lifetime” on the Edge Proxy to a value slightly larger than the interval the Registrar is using for flow timer. Setting - "tcp_connection_lifetime" to less than the interval could cause + “tcp_connection_lifetime” to less than the interval could cause connections to be lost, and setting it to a value much larger than the interval will keep connections open far longer than is required (which is wasteful). @@ -97,9 +94,9 @@ make all Application-layer keep-alives are optional when the underlying transport already has a keep-alive mechanism. The WebSocket transport has a transport-layer keep-alive. When using the WebSocket transport - the "keepalive_timeout" should be set to a value a little greater than + the “keepalive_timeout” should be set to a value a little greater than the Registrar flow timer interval and a little less than the - "tcp_connection_lifetime". + “tcp_connection_lifetime”. Example 1.2. Edge Proxy Configuration ... @@ -114,8 +111,6 @@ loadmodule "path.so" ... modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) ... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... route { route(REQINIT); ... @@ -284,7 +279,6 @@ failure_route[FAIL_OUTBOUND] { 3. Parameters 3.1. force_outbound_flag (integer) - 3.2. flow_token_key (string) 3.1. force_outbound_flag (integer) @@ -299,23 +293,6 @@ failure_route[FAIL_OUTBOUND] { modparam("outbound", "force_outbound_flag", 1) ... -3.2. flow_token_key (string) - - The outbound flow token is generated using the algorithm described in - RFC 5626 section 5.2. This algorithm requires a 20 octet crypto random - key that is unique for each Edge Proxy. - -Note - - If this 20 character string is not set Kamailio will not start. - - Default value is: "". - - Example 1.5. Set flow_token_key parameter -... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... - 4. Functions None diff --git a/modules/outbound/doc/outbound_admin.xml b/modules/outbound/doc/outbound_admin.xml index 837e0da..2e5d21e 100644 --- a/modules/outbound/doc/outbound_admin.xml +++ b/modules/outbound/doc/outbound_admin.xml @@ -69,8 +69,6 @@ loadmodule "path.so" ... modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) ... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... route { route(REQINIT); ... @@ -274,25 +272,6 @@ modparam("outbound", "force_outbound_flag", 1) </programlisting> </example> </section> - <section> - <title><varname>flow_token_key</varname> (string)</title> - <para>The outbound flow token is generated using the algorithm - described in RFC 5626 section 5.2. This algorithm requires a 20 - octet crypto random key that is unique for each Edge Proxy. - </para> - <note><para>If this 20 character string is not set &kamailio; - will not start.</para></note> - <para><emphasis>Default value is: "".</emphasis></para> - <example> - <title>Set <varname>flow_token_key</varname> parameter - </title> - <programlisting format="linespecific"> -... -modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") -... -</programlisting> - </example> - </section> </section> <section> diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 775d0b6..37b0a60 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -21,6 +21,7 @@ * */ #include <openssl/hmac.h> +#include <openssl/rand.h> #include "../../basex.h" #include "../../dprint.h" @@ -39,6 +40,8 @@ MODULE_VERSION +#define OB_KEY_LEN 20 + static int mod_init(void); static unsigned int ob_force_flag = (unsigned int) -1; @@ -55,7 +58,6 @@ static cmd_export_t cmds[]= static param_export_t params[]= { { "force_outbound_flag", INT_PARAM, &ob_force_flag }, - { "flow_token_key", STR_PARAM, &ob_key.s}, { 0, 0, 0 } }; @@ -83,20 +85,12 @@ static int mod_init(void) return -1; } - if (ob_key.s == 0) + if (RAND_bytes((unsigned char *) ob_key.s, OB_KEY_LEN) == 0) { - LM_ERR("flow_token_key not set\n"); - return -1; - } - else - ob_key.len = strlen(ob_key.s); - - if (ob_key.len != 20) - { - LM_ERR("flow_token_key wrong length. Expected 20 got %d\n", - ob_key.len); - return -1; + LM_ERR("unable to get %d cryptographically strong pseudo-" + "random bytes\n", OB_KEY_LEN); } + ob_key.len = OB_KEY_LEN; return 0; }

11 years, 9 months

git:4.0: index on 4.0: 9a57697 rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv ( cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6)

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: 368b07fc76ee2bb0c292b7be4f06c7646036b605 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=368b07f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 01:11:14 2013 +0000 index on 4.0: 9a57697 rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv (cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6) --- modules/outbound/README | 33 ++--------- modules/outbound/doc/outbound_admin.xml | 21 ------- modules/outbound/ob_mod.c | 34 ++++++++--- modules/rr/record.c | 94 +++++++++++++++++++++++------- 4 files changed, 101 insertions(+), 81 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=368…

11 years, 9 months

git:4.0: Revert "index on 4.0: 9a57697 rtpproxy: fix spelling error in docs , reported from Victor V. Kustov, coyote at bks dot tv ( cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6)"

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: 3c6f137ab904166cff791fab98008da2f5ebdc84 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c6f137… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 01:15:13 2013 +0000 Revert "index on 4.0: 9a57697 rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv (cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6)" This reverts commit 368b07fc76ee2bb0c292b7be4f06c7646036b605. --- modules/outbound/README | 33 +++++++++-- modules/outbound/doc/outbound_admin.xml | 21 +++++++ modules/outbound/ob_mod.c | 34 +++-------- modules/rr/record.c | 94 +++++++----------------------- 4 files changed, 81 insertions(+), 101 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3c6…

11 years, 9 months

git:4.0: WIP on 4.0: 9a57697 rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv ( cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6)

by Peter Dunkley

Module: sip-router Branch: 4.0 Commit: b2a5e9dce705309ec1700ae10aa45663197c81de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2a5e9d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 01:11:15 2013 +0000 WIP on 4.0: 9a57697 rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv (cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6) ---

11 years, 9 months

git:master: modules/outbound: updated edge proxy example in README

by Peter Dunkley

Module: sip-router Branch: master Commit: 60953cd884af7d070ce44844a874f2bd75833998 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60953cd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 29 01:08:02 2013 +0000 modules/outbound: updated edge proxy example in README --- modules/outbound/README | 161 ++++++++++++++++++++++--------- modules/outbound/doc/outbound_admin.xml | 159 +++++++++++++++++++++--------- 2 files changed, 225 insertions(+), 95 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=609…

11 years, 9 months

[tracker] Comment added: usrloc module stops updating some records in db_mode 2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Jordan (jordan) ---------- Please ignore my last comment. I misread your previous post as saying consistency instead of "inconsistency". I will wait for your comments after reviewing the code. Let me know if you need any additional information. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278#comment804 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.

11 years, 9 months

git:master: snmpstats Adding another list of TCP settings

by Olle E. Johansson

Module: sip-router Branch: master Commit: f6b72765da5cf12f8dc1e4157a3e526d5d0aa956 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6b7276… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Mar 28 22:50:59 2013 +0100 snmpstats Adding another list of TCP settings Just a few more to go, then TLS --- modules/snmpstats/kamailioNet.c | 631 ++++++++++++++++++++++++++++++++++- modules/snmpstats/kamailioNet.h | 20 +- modules/snmpstats/mibs/KAMAILIO-MIB | 195 +++++++++-- 3 files changed, 803 insertions(+), 43 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f6b…

11 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013