sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: textopsx: added functions that operate on header value
by Daniel-Constantin Mierla 22 Dec '12

22 Dec '12

Module: sip-router Branch: master Commit: ba6119e3b4d84d8ba656c2a44fdafe3a2c31595f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba6119e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 22 14:26:18 2012 +0100 textopsx: added functions that operate on header value - imported from modules_s/texops and replaced the xlog-% style with pvar-$ style --- modules/textopsx/README | 234 ++++++ modules/textopsx/doc/functions.xml | 361 ++++++++++ modules/textopsx/textopsx.c | 1394 ++++++++++++++++++++++++++++++++++++ 3 files changed, 1989 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ba6…

1 0

git:pd/outbound: modules_k/outbound: Filled in functions to encode and decode flow tokens
by Peter Dunkley 22 Dec '12

22 Dec '12

Module: sip-router Branch: pd/outbound Commit: 1db38af24d8808a9a2045c7bac25581199717a2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1db38af… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Dec 22 13:07:58 2012 +0000 modules_k/outbound: Filled in functions to encode and decode flow tokens --- modules_k/outbound/Makefile | 2 +- modules_k/outbound/ob_mod.c | 108 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 2 deletions(-) diff --git a/modules_k/outbound/Makefile b/modules_k/outbound/Makefile index 148a900..e877c04 100644 --- a/modules_k/outbound/Makefile +++ b/modules_k/outbound/Makefile @@ -18,7 +18,7 @@ else LIBS= $(shell pkg-config --libs libssl) endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index fbbee03..63e922f 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -20,7 +20,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ +#include <openssl/hmac.h> +#include "../../basex.h" #include "../../dprint.h" #include "../../dset.h" #include "../../ip_addr.h" @@ -90,14 +92,118 @@ static int mod_init(void) return 0; } +/* Structure of flow token + + <HMAC-SHA1-80><protocol><dst_ip><dst_port><src_ip><src_port> + 10 + 1 + 16 + 2 + 16 + 2 + = 47 bytes + + IP addresses will always be 16 bytes. When an IPv4 address is used the + address will be encoded in the first four bytes and the last four bytes will + be ignored. + + base64 encoded size: ceiling((47+2)/3)*4 = 68 bytes +*/ + +#define UNENC_FLOW_TOKEN_LENGTH 47 +#define SHA1_LENGTH 20 +#define SHA1_80_LENGTH 10 +#define FLOW_TOKEN_START_POS (SHA1_80_LENGTH) +static unsigned char unenc_flow_token[UNENC_FLOW_TOKEN_LENGTH]; +static unsigned char hmac_sha1[EVP_MAX_MD_SIZE]; + int encode_flow_token(str *flow_token, struct receive_info rcv) { - + int pos = FLOW_TOKEN_START_POS, i; + + if (flow_token == NULL) + { + LM_ERR("bad string pointer\n"); + return -1; + } + + /* Encode protocol information */ + unenc_flow_token[pos++] = rcv.proto; + + /* Encode destination address */ + for (i = 0; i < 16; i++) + unenc_flow_token[pos++] = rcv.dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv.dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv.dst_port & 0xff; + + /* Encode source address */ + for (i = 0; i < 16; i++) + unenc_flow_token[pos++] = rcv.src_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv.dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv.dst_port & 0xff; + + /* HMAC-SHA1 the calculated flow token, truncate to 80 bits, and + prepend onto the flow token */ + HMAC(EVP_sha1(), ob_key.s, ob_key.len, + &unenc_flow_token[FLOW_TOKEN_START_POS], + UNENC_FLOW_TOKEN_LENGTH - FLOW_TOKEN_START_POS, + hmac_sha1, NULL); + memcpy(unenc_flow_token, &hmac_sha1[SHA1_LENGTH - SHA1_80_LENGTH], + SHA1_80_LENGTH); + + /* base64 encode the entire flow token and store for the caller to + use */ + flow_token->s = pkg_malloc(base64_enc_len(UNENC_FLOW_TOKEN_LENGTH)); + if (flow_token->s == NULL) + { + LM_ERR("allocating package memory\n"); + return -1; + } + flow_token->len = base64_enc(unenc_flow_token, UNENC_FLOW_TOKEN_LENGTH, + (unsigned char *) flow_token->s, + base64_enc_len(UNENC_FLOW_TOKEN_LENGTH)); + return 0; } int decode_flow_token(struct receive_info *rcv, str flow_token) { + int pos = FLOW_TOKEN_START_POS, i; + + if (flow_token.len != base64_enc_len(UNENC_FLOW_TOKEN_LENGTH)) + { + LM_ERR("bad flow token length. Length is %d, expected %d\n", + flow_token.len, UNENC_FLOW_TOKEN_LENGTH); + return -1; + } + + /* base64 decode the flow token */ + base64_dec((unsigned char *) flow_token.s, flow_token.len, + unenc_flow_token, UNENC_FLOW_TOKEN_LENGTH); + + /* HMAC-SHA1 the flow token (after the hash) and compare with the + truncated hash at the start of the flow token. */ + HMAC(EVP_sha1(), ob_key.s, ob_key.len, + &unenc_flow_token[FLOW_TOKEN_START_POS], + UNENC_FLOW_TOKEN_LENGTH - FLOW_TOKEN_START_POS, + hmac_sha1, NULL); + if (memcmp(unenc_flow_token, &hmac_sha1[SHA1_LENGTH - SHA1_80_LENGTH], + SHA1_80_LENGTH) != 0) + { + LM_ERR("flow token failed validation\n"); + return -1; + } + + /* Decode protocol information */ + rcv->proto = unenc_flow_token[pos++]; + + /* Decode destination address */ + for (i = 0; i < 16; i++) + rcv->dst_ip.u.addr[i] = unenc_flow_token[pos++]; + rcv->dst_port = ((unenc_flow_token[pos++] << 8) & 0xff) + | (unenc_flow_token[pos++] & 0xff); + + /* Decode source address */ + for (i = 0; i < 16; i++) + rcv->src_ip.u.addr[i] = unenc_flow_token[pos++]; + rcv->src_port = ((unenc_flow_token[pos++] << 8) & 0xff) + | (unenc_flow_token[pos++] & 0xff); + return 0; }

1 0

pike compiler warnings
by Juha Heinanen 22 Dec '12

22 Dec '12

it would be nice to get rid of these: CC (cc) [M pike.so] pike_rpc.o pike_rpc.c: In function ‘traverse_subtree’: pike_rpc.c:40: warning: passing argument 3 of ‘pike_top_add_entry’ from incompatible pointer type pike_top.h:19: note: expected ‘unsigned int *’ but argument is of type ‘short unsigned int *’ pike_rpc.c:40: warning: passing argument 4 of ‘pike_top_add_entry’ from incompatible pointer type pike_top.h:19: note: expected ‘unsigned int *’ but argument is of type ‘short unsigned int *’ pike_rpc.c:43: warning: passing argument 3 of ‘pike_top_add_entry’ from incompatible pointer type pike_top.h:19: note: expected ‘unsigned int *’ but argument is of type ‘short unsigned int *’ pike_rpc.c:43: warning: passing argument 4 of ‘pike_top_add_entry’ from incompatible pointer type pike_top.h:19: note: expected ‘unsigned int *’ but argument is of type ‘short unsigned int *’ pike_rpc.c: In function ‘pike_top’: pike_rpc.c:141: warning: statement with no effect -- juha

2 2

git:pd/outbound: Merge branch 'master' into outbound
by Peter Dunkley 22 Dec '12

22 Dec '12

Module: sip-router Branch: pd/outbound Commit: 83d07c9a0f883ba08f863103127b96893d1bc92b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83d07c9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Dec 22 11:04:04 2012 +0000 Merge branch 'master' into outbound * master: 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. ---

1 0

git:master: modules_k/domain: bind_domain api function takes one param
by Juha Heinanen 22 Dec '12

22 Dec '12

Module: sip-router Branch: master Commit: 1a09692be74ef8c4f0dc56801bce6a2fb351536d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a09692… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Dec 22 12:26:29 2012 +0200 modules_k/domain: bind_domain api function takes one param --- modules_k/domain/api.h | 2 +- modules_k/domain/domain_mod.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/domain/api.h b/modules_k/domain/api.h index a6d5ddf..777cea4 100644 --- a/modules_k/domain/api.h +++ b/modules_k/domain/api.h @@ -32,7 +32,7 @@ typedef struct domain_api { } domain_api_t; typedef int (*bind_domain_t)(domain_api_t* api); -int bind_domain(domain_api_t* api); +extern int bind_domain(domain_api_t* api); #endif diff --git a/modules_k/domain/domain_mod.c b/modules_k/domain/domain_mod.c index 507f873..961ded2 100644 --- a/modules_k/domain/domain_mod.c +++ b/modules_k/domain/domain_mod.c @@ -128,7 +128,7 @@ static cmd_export_t cmds[] = { {"lookup_domain", (cmd_function)w_lookup_domain, 2, fixup_pvar_str, fixup_free_pvar_str, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, - {"bind_domain", (cmd_function)bind_domain, 0, 0, 0, 0}, + {"bind_domain", (cmd_function)bind_domain, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} };

1 0

git:master: modules_k/htable: removed unused variable
by Juha Heinanen 22 Dec '12

22 Dec '12

Module: sip-router Branch: master Commit: a60a7ca8010a66703a90768b42ae16342c50107d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a60a7ca… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Dec 22 11:33:13 2012 +0200 modules_k/htable: removed unused variable --- modules_k/htable/htable.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index c019b74..1aa5326 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -554,7 +554,6 @@ static void htable_rpc_get(rpc_t* rpc, void* c) { ht_t *ht; ht_cell_t *htc; /*!< One HT cell */ void* th; - void* ih; void* vh; if (rpc->scan(c, "SS", &htname, &keyname) < 2) {

1 0

git:master: modules_s/nathelper: moved to obsolete folder
by Daniel-Constantin Mierla 22 Dec '12

22 Dec '12

Module: sip-router Branch: master Commit: f7ef4b3d54dd462648330dfa4522d067376178ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7ef4b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 22 09:28:18 2012 +0100 modules_s/nathelper: moved to obsolete folder - use the other module with same name - pings from config can be done with uac module, uac_req_send() --- {modules_s => obsolete}/nathelper/Makefile | 0 {modules_s => obsolete}/nathelper/README | 0 {modules_s => obsolete}/nathelper/TODO | 0 {modules_s => obsolete}/nathelper/doc/Makefile | 0 .../nathelper/doc/functions.xml | 0 .../nathelper/doc/nathelper.xml | 0 {modules_s => obsolete}/nathelper/doc/params.xml | 0 {modules_s => obsolete}/nathelper/nathelper.c | 0 {modules_s => obsolete}/nathelper/nathelper.cfg | 0 {modules_s => obsolete}/nathelper/nathelper.h | 0 {modules_s => obsolete}/nathelper/natping.c | 0 {modules_s => obsolete}/nathelper/nhelpr_funcs.c | 0 {modules_s => obsolete}/nathelper/nhelpr_funcs.h | 0 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_s/nathelper/Makefile b/obsolete/nathelper/Makefile similarity index 100% rename from modules_s/nathelper/Makefile rename to obsolete/nathelper/Makefile diff --git a/modules_s/nathelper/README b/obsolete/nathelper/README similarity index 100% rename from modules_s/nathelper/README rename to obsolete/nathelper/README diff --git a/modules_s/nathelper/TODO b/obsolete/nathelper/TODO similarity index 100% rename from modules_s/nathelper/TODO rename to obsolete/nathelper/TODO diff --git a/modules_s/nathelper/doc/Makefile b/obsolete/nathelper/doc/Makefile similarity index 100% rename from modules_s/nathelper/doc/Makefile rename to obsolete/nathelper/doc/Makefile diff --git a/modules_s/nathelper/doc/functions.xml b/obsolete/nathelper/doc/functions.xml similarity index 100% rename from modules_s/nathelper/doc/functions.xml rename to obsolete/nathelper/doc/functions.xml diff --git a/modules_s/nathelper/doc/nathelper.xml b/obsolete/nathelper/doc/nathelper.xml similarity index 100% rename from modules_s/nathelper/doc/nathelper.xml rename to obsolete/nathelper/doc/nathelper.xml diff --git a/modules_s/nathelper/doc/params.xml b/obsolete/nathelper/doc/params.xml similarity index 100% rename from modules_s/nathelper/doc/params.xml rename to obsolete/nathelper/doc/params.xml diff --git a/modules_s/nathelper/nathelper.c b/obsolete/nathelper/nathelper.c similarity index 100% rename from modules_s/nathelper/nathelper.c rename to obsolete/nathelper/nathelper.c diff --git a/modules_s/nathelper/nathelper.cfg b/obsolete/nathelper/nathelper.cfg similarity index 100% rename from modules_s/nathelper/nathelper.cfg rename to obsolete/nathelper/nathelper.cfg diff --git a/modules_s/nathelper/nathelper.h b/obsolete/nathelper/nathelper.h similarity index 100% rename from modules_s/nathelper/nathelper.h rename to obsolete/nathelper/nathelper.h diff --git a/modules_s/nathelper/natping.c b/obsolete/nathelper/natping.c similarity index 100% rename from modules_s/nathelper/natping.c rename to obsolete/nathelper/natping.c diff --git a/modules_s/nathelper/nhelpr_funcs.c b/obsolete/nathelper/nhelpr_funcs.c similarity index 100% rename from modules_s/nathelper/nhelpr_funcs.c rename to obsolete/nathelper/nhelpr_funcs.c diff --git a/modules_s/nathelper/nhelpr_funcs.h b/obsolete/nathelper/nhelpr_funcs.h similarity index 100% rename from modules_s/nathelper/nhelpr_funcs.h rename to obsolete/nathelper/nhelpr_funcs.h

1 0

git:master: nathelper(k): new test 128 to check port in contact against source port
by Daniel-Constantin Mierla 22 Dec '12

22 Dec '12

Module: sip-router Branch: master Commit: bf3acaf0895d900c15e3455cba225226f3debf62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf3acaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 22 09:42:35 2012 +0100 nathelper(k): new test 128 to check port in contact against source port - used for nat_uac_test() - imported from ser flavour --- modules_k/nathelper/README | 3 ++ modules_k/nathelper/doc/nathelper_admin.xml | 5 ++++ modules_k/nathelper/nathelper.c | 31 ++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletions(-) diff --git a/modules_k/nathelper/README b/modules_k/nathelper/README index a11f2f8..36c4629 100644 --- a/modules_k/nathelper/README +++ b/modules_k/nathelper/README @@ -503,6 +503,9 @@ fix_nated_register(); * 32 - test if the source IP address of signaling is a RFC1918 address * 64 - test if the source connection of signaling is a WebSocket + * 128 - test if the Contact URI port differs from the source port of + the request (Warning: this is might be legal or even intended + combination in non natted scenarios) All flags can be bitwise combined, the test returns true if any of the tests identified a NAT. diff --git a/modules_k/nathelper/doc/nathelper_admin.xml b/modules_k/nathelper/doc/nathelper_admin.xml index bc4c8d7..ba8f866 100644 --- a/modules_k/nathelper/doc/nathelper_admin.xml +++ b/modules_k/nathelper/doc/nathelper_admin.xml @@ -570,6 +570,11 @@ fix_nated_register(); <emphasis>64</emphasis> - test if the source connection of signaling is a WebSocket </para></listitem> + <listitem><para> + <emphasis>128</emphasis> - test if the Contact URI port differs + from the source port of the request (Warning: this is might be legal + or even intended combination in non natted scenarios) + </para></listitem> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 9f72795..a38fea4 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -244,6 +244,7 @@ MODULE_VERSION #define NAT_UAC_TEST_RPORT 0x10 #define NAT_UAC_TEST_O_1918 0x20 #define NAT_UAC_TEST_WS 0x40 +#define NAT_UAC_TEST_C_PORT 0x80 #define DEFAULT_RTPP_SET_ID 0 @@ -1397,6 +1398,27 @@ contact_1918(struct sip_msg* msg) } /* + * test if source port of signaling is different from + * port advertised in Contact + */ +static int +contact_rport(struct sip_msg* msg) +{ + struct sip_uri uri; + contact_t* c; + + if (get_contact_uri(msg, &uri, &c) == -1) { + return -1; + } + + if (msg->rcv.src_port != (uri.port_no ? uri.port_no : SIP_PORT)) { + return 1; + } else { + return 0; + } +} + +/* * test for occurrence of RFC1918 IP address in SDP */ static int @@ -1496,12 +1518,19 @@ nat_uac_test_f(struct sip_msg* msg, char* str1, char* str2) return 1; /* - * tests prototype to check whether the message arrived on a WebSocket + * test prototype to check whether the message arrived on a WebSocket */ if ((tests & NAT_UAC_TEST_WS) && (msg->rcv.proto == PROTO_WS || msg->rcv.proto == PROTO_WSS)) return 1; + /* + * test if source port of signaling is different from + * port advertised in Contact + */ + if ((tests & NAT_UAC_TEST_C_PORT) && (contact_rport(msg) > 0)) + return 1; + /* no test succeeded */ return -1;

1 0

git:master: nathelper(k): added the select for rewriting the contact
by Daniel-Constantin Mierla 22 Dec '12

22 Dec '12

Module: sip-router Branch: master Commit: b2ef844bfdcce46d6a1b88f60ff2fe4d1de30855 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2ef844… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 22 09:24:11 2012 +0100 nathelper(k): added the select for rewriting the contact - exsting in the ser flavour version --- modules_k/nathelper/README | 41 +++++++++++--- modules_k/nathelper/doc/nathelper_admin.xml | 22 +++++++ modules_k/nathelper/nathelper.c | 80 +++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 8 deletions(-) diff --git a/modules_k/nathelper/README b/modules_k/nathelper/README index b516c8d..a11f2f8 100644 --- a/modules_k/nathelper/README +++ b/modules_k/nathelper/README @@ -78,6 +78,10 @@ Ovidiu Sas 7.1. nh_enable_ping + 8. Selects + + 8.1. @nathelper.rewrite_contact[n] + 2. Frequently Asked Questions List of Examples @@ -102,6 +106,7 @@ Ovidiu Sas 1.18. $rr_count usage 1.19. $rr_top_count usage 1.20. nh_enable_ping usage + 1.21. @nathelper.rewrite_contact usage Chapter 1. Admin Guide @@ -148,6 +153,10 @@ Chapter 1. Admin Guide 7.1. nh_enable_ping + 8. Selects + + 8.1. @nathelper.rewrite_contact[n] + 1. Overview This is a module to help with NAT traversal and reuse of tcp @@ -396,7 +405,7 @@ modparam("nathelper", "keepalive_timeout", 120) 5.7. add_contact_alias([ip_addr, port, proto]) 5.8. handle_ruri_alias() -5.1. fix_nated_contact() +5.1. fix_nated_contact() Rewrites Contact HF to contain request's source address:port. @@ -408,7 +417,7 @@ modparam("nathelper", "keepalive_timeout", 120) if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; ... -5.2. fix_nated_sdp(flags [, ip_address]) +5.2. fix_nated_sdp(flags [, ip_address]) Alters the SDP information in orer to facilitate NAT traversal. What changes to be performed may be controled via the "flags" parameter. @@ -436,7 +445,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_contact();}; if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; ... -5.3. add_rcv_param([flag]), +5.3. add_rcv_param([flag]), Add received parameter to Contact header fields or Contact URI. The parameter will contain URI created from the source IP, port, and @@ -460,7 +469,7 @@ add_rcv_param(); # add the parameter to the Contact header add_rcv_param("1"); # add the parameter to the Contact URI ... -5.4. fix_nated_register() +5.4. fix_nated_register() The function creates a URI consisting of the source IP, port, and protocol and stores the URI in an Attribute-Value-Pair. The URI will be @@ -478,7 +487,7 @@ add_rcv_param("1"); # add the parameter to the Contact URI fix_nated_register(); ... -5.5. nat_uac_test(flags) +5.5. nat_uac_test(flags) Tries to guess if client's request originated behind a nat. The parameter determines what heuristics is used. @@ -501,14 +510,14 @@ fix_nated_register(); This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. -5.6. is_rfc1918(ip_address) +5.6. is_rfc1918(ip_address) Determines if the address in the parameter is an rfc1918 address. The parameter allows pseudo-variables usage. This function can be used from ANY_ROUTE. -5.7. add_contact_alias([ip_addr, port, proto]) +5.7. add_contact_alias([ip_addr, port, proto]) Adds ;alias=ip~port~transport parameter to contact URI containing either received ip, port, and transport protocol or those given as @@ -528,7 +537,7 @@ fix_nated_register(); }; ... -5.8. handle_ruri_alias() +5.8. handle_ruri_alias() Checks if Request URI has alias param and if so, removes it and sets $du based on its value. Note that this means that routing of request is @@ -607,6 +616,22 @@ fix_nated_register(); $ kamctl fifo nh_enable_ping 1 ... +8. Selects + + 8.1. @nathelper.rewrite_contact[n] + +8.1. @nathelper.rewrite_contact[n] + + Get n-th Contact value with IP:Port rewritten to source ip:port. N is + counted from 1. Only IP:port is rewritten, remaining part are left + unchanged. Full nameaddr is supported. + + Example 1.21. @nathelper.rewrite_contact usage +... +$c = @nathelper.rewrite_contact[1]; +... +$c2 = @nathelper.rewrite_contact[1].nameaddr.uri; + Chapter 2. Frequently Asked Questions 2.1. What happend with "rtpproxy_disable" parameter? diff --git a/modules_k/nathelper/doc/nathelper_admin.xml b/modules_k/nathelper/doc/nathelper_admin.xml index 21f3b2b..bc4c8d7 100644 --- a/modules_k/nathelper/doc/nathelper_admin.xml +++ b/modules_k/nathelper/doc/nathelper_admin.xml @@ -736,5 +736,27 @@ $ &ctltool; fifo nh_enable_ping 1 </section> + <section> + <title>Selects</title> + + <section id="nathelper.rewrite_contact"> + <title>@nathelper.rewrite_contact[n]</title> + <para> + Get n-th Contact value with IP:Port rewritten to source ip:port. N is counted from 1. + Only IP:port is rewritten, remaining part are left unchanged. Full nameaddr is supported. + </para> + <example> + <title>@nathelper.rewrite_contact usage</title> + <programlisting> +... +$c = @nathelper.rewrite_contact[1]; +... +$c2 = @nathelper.rewrite_contact[1].nameaddr.uri; + </programlisting> + </example> + </section> + + </section> + </chapter> diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 27bc1d2..9f72795 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -220,6 +220,7 @@ #include "../../socket_info.h" #include "../../mod_fix.h" #include "../../dset.h" +#include "../../select.h" #include "../registrar/sip_msg.h" #include "../usrloc/usrloc.h" #include "nathelper.h" @@ -440,6 +441,27 @@ struct module_exports exports = { static int +sel_nathelper(str* res, select_t* s, struct sip_msg* msg) +{ + + /* dummy */ + return 0; +} + +static int sel_rewrite_contact(str* res, select_t* s, struct sip_msg* msg); + +SELECT_F(select_any_nameaddr) + +select_row_t sel_declaration[] = { + { NULL, SEL_PARAM_STR, STR_STATIC_INIT("nathelper"), sel_nathelper, SEL_PARAM_EXPECTED}, + { sel_nathelper, SEL_PARAM_STR, STR_STATIC_INIT("rewrite_contact"), sel_rewrite_contact, CONSUME_NEXT_INT }, + + { sel_rewrite_contact, SEL_PARAM_STR, STR_STATIC_INIT("nameaddr"), select_any_nameaddr, NESTED | CONSUME_NEXT_STR}, + + { NULL, SEL_PARAM_INT, STR_NULL, NULL, 0} +}; + +static int fixup_fix_sdp(void** param, int param_no) { pv_elem_t *model; @@ -689,6 +711,8 @@ mod_init(void) nets_1918[i].netaddr = ntohl(addr.s_addr) & nets_1918[i].mask; } + register_select_table(sel_declaration); + return 0; } @@ -2292,3 +2316,59 @@ done: /* let the core handle further the reply */ return 1; } + +static int +sel_rewrite_contact(str* res, select_t* s, struct sip_msg* msg) +{ + static char buf[500]; + contact_t* c; + int n, def_port_fl, len; + char *cp; + str hostport; + struct sip_uri uri; + + res->len = 0; + n = s->params[2].v.i; + if (n <= 0) { + LOG(L_ERR, "ERROR: rewrite_contact[%d]: zero or negative index not supported\n", n); + return -1; + } + c = 0; + do { + if (contact_iterator(&c, msg, c) < 0 || !c) + return -1; + n--; + } while (n > 0); + + if (parse_uri(c->uri.s, c->uri.len, &uri) < 0 || uri.host.len <= 0) { + LOG(L_ERR, "rewrite_contact[%d]: Error while parsing Contact URI\n", s->params[2].v.i); + return -1; + } + len = c->len - uri.host.len; + if (uri.port.len > 0) + len -= uri.port.len; + def_port_fl = (msg->rcv.proto == PROTO_TLS && msg->rcv.src_port == SIPS_PORT) || (msg->rcv.proto != PROTO_TLS && msg->rcv.src_port == SIP_PORT); + if (!def_port_fl) + len += 1/*:*/+5/*port*/; + if (len > sizeof(buf)) { + LOG(L_ERR, "ERROR: rewrite_contact[%d]: contact too long\n", s->params[2].v.i); + return -1; + } + hostport = uri.host; + if (uri.port.len > 0) + hostport.len = uri.port.s + uri.port.len - uri.host.s; + + res->s = buf; + res->len = hostport.s - c->name.s; + memcpy(buf, c->name.s, res->len); + cp = ip_addr2a(&msg->rcv.src_ip); + if (def_port_fl) { + res->len+= snprintf(buf+res->len, sizeof(buf)-res->len, "%s", cp); + } else { + res->len+= snprintf(buf+res->len, sizeof(buf)-res->len, "%s:%d", cp, msg->rcv.src_port); + } + memcpy(buf+res->len, hostport.s+hostport.len, c->len-(hostport.s+hostport.len-c->name.s)); + res->len+= c->len-(hostport.s+hostport.len-c->name.s); + + return 0; +}

1 0

[tracker] Task closed: pv_buffer_slots generates seg fault
by sip-router 22 Dec '12

22 Dec '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#259 - pv_buffer_slots generates seg fault User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch in master branch. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=259 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.

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012