sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
170 discussions

git:master: nathelper(k): documented keepalive_timeout parameter
by Daniel-Constantin Mierla 20 Aug '12

20 Aug '12

Module: sip-router Branch: master Commit: c7f7971fca82f2267cfff732c3d525af1af15938 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7f7971… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 20 09:30:53 2012 +0200 nathelper(k): documented keepalive_timeout parameter --- modules_k/nathelper/README | 109 ++++++++++++++++----------- modules_k/nathelper/doc/nathelper_admin.xml | 29 +++++++ 2 files changed, 95 insertions(+), 43 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c7f…

1 0

git:pd/outbound: Merge branch 'master' into outbound
by Peter Dunkley 19 Aug '12

19 Aug '12

Module: sip-router Branch: pd/outbound Commit: 962fbef66a67c8c4ddf815e492b1f192a50339e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=962fbef… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Aug 19 22:38:13 2012 +0100 Merge branch 'master' into outbound Conflicts: pkg/kamailio/fedora/16/kamailio.spec ---

1 0

git:master: pkg/kamailio/fedora: Updated rel in .spec to dev3
by Peter Dunkley 19 Aug '12

19 Aug '12

Module: sip-router Branch: master Commit: ac45478f8bc32a806edb80874bf8c5e3d5342707 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac45478… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Aug 19 22:30:49 2012 +0100 pkg/kamailio/fedora: Updated rel in .spec to dev3 --- pkg/kamailio/fedora/16/kamailio.spec | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index fdaf822..b1ce046 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 3.4.0 -%define rel dev2%{dist} +%define rel dev3%{dist} @@ -976,6 +976,8 @@ fi %changelog +* Sun Aug 19 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Updated rel to dev3 * Fri Jul 13 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Updated rel to dev2 * Thu Jul 5 2012 Peter Dunkley <peter(a)dunkley.me.uk>

1 0

git:pd/outbound: modules_k/outbound: Renamed nat_uac_test() in this module to ob_nat_uac_test()
by Peter Dunkley 19 Aug '12

19 Aug '12

Module: sip-router Branch: pd/outbound Commit: af16e04d837008e5158f3f0bc9f175b0fc02a08a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af16e04… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Aug 19 22:15:58 2012 +0100 modules_k/outbound: Renamed nat_uac_test() in this module to ob_nat_uac_test() - That way it shouldn't conflict with nathelper:nat_uac_test() if both modules are loaded. --- modules_k/outbound/ob_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index f561931..78045b9 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -42,7 +42,7 @@ static str ob_key = {0, 0}; static cmd_export_t cmds[]= { - { "nat_uac_test", (cmd_function) nat_uac_test_f, + { "ob_nat_uac_test", (cmd_function) nat_uac_test_f, 1, fixup_uint_null, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "bind_ob", (cmd_function) bind_ob,

1 0

git:pd/outbound: modules_k/outbound: Started to fill in function that determines whether Outbound is required
by Peter Dunkley 19 Aug '12

19 Aug '12

Module: sip-router Branch: pd/outbound Commit: 61674b59c6b14aded58fcd9801370b3648f9d21c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61674b5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Aug 19 20:47:43 2012 +0100 modules_k/outbound: Started to fill in function that determines whether Outbound is required --- modules_k/outbound/ob_mod.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index 57d5cf3..f561931 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -22,6 +22,7 @@ */ #include "../../dprint.h" +#include "../../dset.h" #include "../../ip_addr.h" #include "../../mod_fix.h" #include "../../sr_module.h" @@ -36,7 +37,7 @@ MODULE_VERSION static int mod_init(void); -static int ob_force_bflag = -1; +static unsigned int ob_force_bflag = (unsigned int) -1; static str ob_key = {0, 0}; static cmd_export_t cmds[]= @@ -75,8 +76,13 @@ struct module_exports exports= static int mod_init(void) { - if (ob_force_bflag == -1) - LM_INFO("force_outbound_bflag not set\n"); + if (ob_force_bflag == (unsigned int) -1) + ob_force_bflag = 0; + else if (ob_force_bflag >= 8 * sizeof (ob_force_bflag)) { + LM_ERR("force_outbound_bflag (%d) too big!\n", ob_force_bflag); + return -1; + } else + ob_force_bflag = 1 << ob_force_bflag; if (ob_key.s == 0) { @@ -102,6 +108,18 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) int use_outbound(struct sip_msg *msg) { + /* If Outbound is forced return success without any further checks */ + if (isbflagset(0, ob_force_bflag) > 0) + return 1; + + /* Use Outbound when: + # It's an initial request (out-of-dialog INVITE, REGISTER, + SUBSCRIBE, or REFER), with + # A single Via:, and + # Top Route: points to us and has ;ob parameter _OR_ Contact: has + ;ob parameter _OR_ it's a REGISTER with ;+sip.instance + */ + return 0; } @@ -109,7 +127,8 @@ int bind_ob(struct ob_binds *pxb) { if (pxb == NULL) { - LM_WARN("bind_outbound: Cannot load outbound API into NULL pointer\n"); + LM_WARN("bind_outbound: Cannot load outbound API into NULL " + "pointer\n"); return -1; }

1 0

git:master: core: added q_memrchr(...)
by Daniel-Constantin Mierla 19 Aug '12

19 Aug '12

Module: sip-router Branch: master Commit: c8421620772184d28fd5b08d09b1e64cf0a8866a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c842162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 19 12:52:51 2012 +0200 core: added q_memrchr(...) - reverse search for char in a buffer --- ut.h | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ut.h b/ut.h index 5e9e277..8f04736 100644 --- a/ut.h +++ b/ut.h @@ -432,7 +432,7 @@ static inline char* ushort2str(unsigned short u) -/* faster memchr version */ +/* fast memchr version */ static inline char* q_memchr(char* p, int c, unsigned int size) { char* end; @@ -443,7 +443,20 @@ static inline char* q_memchr(char* p, int c, unsigned int size) } return 0; } - + + +/* fast reverse char search */ + +static inline char* q_memrchr(char* p, int c, unsigned int size) +{ + char* end; + + end=p+size-1; + for(;end>=p;end--) { + if (*end==(unsigned char)c) return end; + } + return 0; +} /* returns -1 on error, 1! on success (consistent with int2reverse_hex) */ inline static int reverse_hex2int( char *c, int len, unsigned int* res)

1 0

git:master: core: rephrased debug message about no 2nd via in reply
by Daniel-Constantin Mierla 19 Aug '12

19 Aug '12

Module: sip-router Branch: master Commit: 8bc7114c6a915985ca2f4e9ab50ea608437c7256 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bc7114… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 19 21:29:06 2012 +0200 core: rephrased debug message about no 2nd via in reply --- forward.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index f04087e..b259ecf 100644 --- a/forward.c +++ b/forward.c @@ -799,7 +799,7 @@ int forward_reply(struct sip_msg* msg) || (msg->via2==0) || (msg->via2->error!=PARSE_OK)) { /* no second via => error */ - LOG(L_DBG, "broken reply to forward - no 2nd via\n"); + LOG(L_DBG, "reply cannot be forwarded - no 2nd via\n"); goto error; }

1 0

git:master: core: typedef'ed enum request_method to request_method_t
by Daniel-Constantin Mierla 19 Aug '12

19 Aug '12

Module: sip-router Branch: master Commit: 98301c7e11d4bef786abbd3329287144df02184f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98301c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 19 09:48:42 2012 +0200 core: typedef'ed enum request_method to request_method_t --- parser/msg_parser.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 50b0daa..1783ee8 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -82,7 +82,7 @@ #define SIP_MSG_START(m) ((m)->first_line.u.request.method.s) /*! \brief number methods as power of two to allow bitmap matching */ -enum request_method { +typedef enum request_method { METHOD_UNDEF=0, /*!< 0 - --- */ METHOD_INVITE=1, /*!< 1 - 2^0 */ METHOD_CANCEL=2, /*!< 2 - 2^1 */ @@ -99,7 +99,7 @@ enum request_method { METHOD_REFER=4096, /*!< 4096 - 2^12 */ METHOD_PUBLISH=8192, /*!< 8192 - 2^13 */ METHOD_OTHER=16384 /*!< 16384 - 2^14 */ -}; +} request_method_t; #define FL_FORCE_RPORT (1 << 0) /*!< force rport */ #define FL_FORCE_ACTIVE (1 << 1) /*!< force active SDP */

1 0

git:pd/outbound: modules_k/nathelper: Moved code for nat_uac_test into header files
by Peter Dunkley 19 Aug '12

19 Aug '12

Module: sip-router Branch: pd/outbound Commit: 7376222d183d8122ef64467eae2d8d8dfdc6bc47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7376222… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Aug 19 20:18:51 2012 +0100 modules_k/nathelper: Moved code for nat_uac_test into header files - This is to enable the code to be directly included into other modules and used without requiring nathelper to be loaded. - Specifically, this will be used with Outbound where the nat_uac_test() will be helpful for Outbound-based NAT traversal, but there should be no need to load nathelper too. --- modules_k/nathelper/nat_uac_test.h | 245 ++++++++++++++++++++++++++++++++++++ modules_k/nathelper/nathelper.c | 203 +----------------------------- modules_k/nathelper/nhelpr_funcs.c | 34 +----- modules_k/nathelper/nhelpr_funcs.h | 31 +++++- 4 files changed, 277 insertions(+), 236 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=737…

1 0

git:pd/outbound: modules_k/outbound: Added nat_uac_outbound and tidied up module stub
by Peter Dunkley 19 Aug '12

19 Aug '12

Module: sip-router Branch: pd/outbound Commit: 23e3258e3cb3c025c79570bcfe8395e92645fb16 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23e3258… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Aug 19 20:20:54 2012 +0100 modules_k/outbound: Added nat_uac_outbound and tidied up module stub --- modules_k/outbound/api.h | 12 ++++---- modules_k/outbound/ob_mod.c | 68 ++++++++++++------------------------------- 2 files changed, 25 insertions(+), 55 deletions(-) diff --git a/modules_k/outbound/api.h b/modules_k/outbound/api.h index 117ce49..86f17b3 100644 --- a/modules_k/outbound/api.h +++ b/modules_k/outbound/api.h @@ -24,14 +24,14 @@ #ifndef OB_API_H #define OB_API_H -typedef int (*ob_fn1_t)(int, int, int); -typedef int (*ob_fn2_t)(int, int, int); -typedef int (*ob_fn3_t)(int, int, int); +typedef int (*encode_flow_token_t)(str *, struct receive_info); +typedef int (*decode_flow_token_t)(struct receive_info *, str); +typedef int (*use_outbound_t)(struct sip_msg *); typedef struct ob_binds { - ob_fn1_t ob_fn1; - ob_fn2_t ob_fn2; - ob_fn3_t ob_fn3; + encode_flow_token_t encode_flow_token; + decode_flow_token_t decode_flow_token; + use_outbound_t use_outbound; } ob_api_t; typedef int (*bind_ob_f)(ob_api_t*); diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index 858dac1..57d5cf3 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -22,23 +22,28 @@ */ #include "../../dprint.h" +#include "../../ip_addr.h" +#include "../../mod_fix.h" #include "../../sr_module.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/mi.h" +#include "../nathelper/nat_uac_test.h" + #include "api.h" MODULE_VERSION static int mod_init(void); -static int child_init(int rank); -static void destroy(void); static int ob_force_bflag = -1; static str ob_key = {0, 0}; static cmd_export_t cmds[]= { + { "nat_uac_test", (cmd_function) nat_uac_test_f, + 1, fixup_uint_null, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "bind_ob", (cmd_function) bind_ob, 1, 0, 0, 0 }, @@ -52,51 +57,26 @@ static param_export_t params[]= { 0, 0, 0 } }; -static stat_export_t stats[] = -{ - { 0, 0, 0 } -}; - -static mi_export_t mi_cmds[] = -{ - { 0, 0, 0, 0, 0 } -}; - struct module_exports exports= { "outbound", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* Exported functions */ params, /* Exported parameters */ - stats, /* exported statistics */ - mi_cmds, /* exported MI functions */ + 0, /* exported statistics */ + 0, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ 0, /* response function */ - destroy, /* destroy function */ - child_init /* per-child initialization function */ + 0, /* destroy function */ + 0 /* per-child initialization function */ }; static int mod_init(void) { - if (register_module_stats(exports.name, stats) != 0) - { - LM_ERR("registering core statistics\n"); - return -1; - } - - if (register_mi_mod(exports.name, mi_cmds) != 0) - { - LM_ERR("registering MI commands\n"); - return -1; - } - if (ob_force_bflag == -1) - { - LM_ERR("force_outbound_bflag not set\n"); - return -1; - } + LM_INFO("force_outbound_bflag not set\n"); if (ob_key.s == 0) { @@ -109,28 +89,18 @@ static int mod_init(void) return 0; } -static int child_init(int rank) -{ - /* TODO */ - return 0; -} - -static void destroy(void) -{ - /* TODO */ -} - -int ob_fn1(int p1, int p2, int p3) +int encode_flow_token(str *flow_token, struct receive_info rcv) { + return 0; } -int ob_fn2(int p1, int p2, int p3) +int decode_flow_token(struct receive_info *rcv, str flow_token) { return 0; } -int ob_fn3(int p1, int p2, int p3) +int use_outbound(struct sip_msg *msg) { return 0; } @@ -143,9 +113,9 @@ int bind_ob(struct ob_binds *pxb) return -1; } - pxb->ob_fn1 = ob_fn1; - pxb->ob_fn2 = ob_fn2; - pxb->ob_fn3 = ob_fn3; + pxb->encode_flow_token = encode_flow_token; + pxb->decode_flow_token = decode_flow_token; + pxb->use_outbound = use_outbound; return 0; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012