sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
255 discussions

git:master: nathelper: use dedicated function for testing via address against source ip

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0b10377df11977d7ddd7e6bf30fe060d1fe200aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b10377… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 1 11:48:39 2014 +0100 nathelper: use dedicated function for testing via address against source ip - reported by Igor Potjevlesch - previous used functions was checking the presence of rport and received parameters, ending in a wrong result for nat testing --- modules/nathelper/nathelper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 7626ed6..0cda937 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -1556,7 +1556,7 @@ nat_uac_test_f(struct sip_msg* msg, char* str1, char* str2) * test if source address of signaling is different from * address advertised in Via */ - if ((tests & NAT_UAC_TEST_RCVD) && received_test(msg)) + if ((tests & NAT_UAC_TEST_RCVD) && received_via_test(msg)) return 1; /* * test for occurrences of RFC1918 addresses in Contact

10 years

git:master: tmx: proper indentation to match the module style

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6c14b13f118dc20daec39bdde40c030c14e2d9c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c14b13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 1 11:53:23 2014 +0100 tmx: proper indentation to match the module style --- modules/tmx/t_var.c | 80 +++++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index 09fd673..55919c5 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -493,8 +493,8 @@ int pv_get_tm_reply_code(struct sip_msg *msg, pv_param_t *param, break; case CORE_ONREPLY_ROUTE: /* t_check() above has the side effect of setting T and - REFerencing T => we must unref and unset it for the - main/core onreply_route. */ + REFerencing T => we must unref and unset it for the + main/core onreply_route. */ _tmx_tmb.t_unref(msg); /* no break */ case TM_ONREPLY_ROUTE: @@ -546,8 +546,8 @@ int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, switch (get_route_type()) { case CORE_ONREPLY_ROUTE: /* t_check() above has the side effect of setting T and - REFerencing T => we must unref and unset it for the - main/core onreply_route. */ + REFerencing T => we must unref and unset it for the + main/core onreply_route. */ _tmx_tmb.t_unref(msg); /* no break */ case TM_ONREPLY_ROUTE: @@ -635,26 +635,26 @@ int pv_parse_t_name(pv_spec_p sp, str *in) if(strncmp(in->s, "flags", 5) == 0) sp->pvp.pvn.u.isname.name.n = 5; else goto error; - break; + break; case 8: if(strncmp(in->s, "id_label", 8)==0) sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "id_index", 8)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; - break; + break; case 10: if(strncmp(in->s, "reply_code", 10)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "reply_type", 10)==0) sp->pvp.pvn.u.isname.name.n = 3; else goto error; - break; + break; case 12: if(strncmp(in->s, "branch_index", 12)==0) sp->pvp.pvn.u.isname.name.n = 4; else goto error; - break; + break; default: goto error; } @@ -709,38 +709,38 @@ int pv_get_t(struct sip_msg *msg, pv_param_t *param, } int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, - pv_value_t *res) + pv_value_t *res) { - tm_cell_t *t; - int branch; - - if ((msg == NULL) || (param == NULL)) return -1; - - t = _tmx_tmb.t_gett(); - if ((t == NULL) || (t == T_UNDEFINED)) { - /* no T */ - return pv_get_null(msg, param, res); - } - - switch(param->pvn.u.isname.name.n) { - case 5: - switch (get_route_type()) { - case FAILURE_ROUTE: - case BRANCH_FAILURE_ROUTE: - /* use the reason of the winning reply */ - if ((branch=_tmx_tmb.t_get_picked_branch()) < 0) { - LM_CRIT("no picked branch (%d) for a final response" - " in MODE_ONFAILURE\n", branch); - return -1; - } - res->ri = t->uac[branch].branch_flags; - res->flags = PV_VAL_INT; - LM_DBG("branch flags is [%u]\n", res->ri); - break; - default: - LM_ERR("unsupported route_type %d\n", get_route_type()); - return -1; + tm_cell_t *t; + int branch; + + if ((msg == NULL) || (param == NULL)) return -1; + + t = _tmx_tmb.t_gett(); + if ((t == NULL) || (t == T_UNDEFINED)) { + /* no T */ + return pv_get_null(msg, param, res); } - } - return 0; + + switch(param->pvn.u.isname.name.n) { + case 5: + switch (get_route_type()) { + case FAILURE_ROUTE: + case BRANCH_FAILURE_ROUTE: + /* use the reason of the winning reply */ + if ((branch=_tmx_tmb.t_get_picked_branch()) < 0) { + LM_CRIT("no picked branch (%d) for a final response" + " in MODE_ONFAILURE\n", branch); + return -1; + } + res->ri = t->uac[branch].branch_flags; + res->flags = PV_VAL_INT; + LM_DBG("branch flags is [%u]\n", res->ri); + break; + default: + LM_ERR("unsupported route_type %d\n", get_route_type()); + return -1; + } + } + return 0; }

10 years

git:master: nat_traversal: use dedicated function for testing via address against source ip

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c6c4230fb0c4ca18f5c681c7195d3e1531255f3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6c4230… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 1 11:50:15 2014 +0100 nat_traversal: use dedicated function for testing via address against source ip --- modules/nat_traversal/nat_traversal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/nat_traversal/nat_traversal.c b/modules/nat_traversal/nat_traversal.c index 6fd09d7..2f0ffbe 100644 --- a/modules/nat_traversal/nat_traversal.c +++ b/modules/nat_traversal/nat_traversal.c @@ -820,7 +820,7 @@ test_source_address(struct sip_msg *msg) Bool different_ip, different_port; int via1_port; - different_ip = received_test(msg); + different_ip = received_via_test(msg); via1_port = (msg->via1->port ? msg->via1->port : SIP_PORT); different_port = (msg->rcv.src_port != via1_port);

10 years

git:master: core: dedicated function to check Via address with source ip

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 194743bf0de92ae09fdc817e57863f6bdb159539 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=194743b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 1 11:47:19 2014 +0100 core: dedicated function to check Via address with source ip - received_via_test() as alternative to received_test() which looks also for rport and received parameters, confusing nat detection tests --- msg_translator.c | 12 +++++++++++- msg_translator.h | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 6f36492..df1a753 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -252,7 +252,8 @@ static int check_via_address(struct ip_addr* ip, str *name, } -/* check if IP address in Via != source IP address of signaling */ +/* check if IP address in Via != source IP address of signaling, + * or the sender requires adding rport or received values */ int received_test( struct sip_msg *msg ) { int rcvd; @@ -263,6 +264,15 @@ int received_test( struct sip_msg *msg ) return rcvd; } +/* check if IP address in Via != source IP address of signaling */ +int received_via_test( struct sip_msg *msg ) +{ + int rcvd; + + rcvd = (check_via_address(&msg->rcv.src_ip, &msg->via1->host, + msg->via1->port, received_dns)!=0); + return rcvd; +} static char * warning_builder( struct sip_msg *msg, unsigned int *returned_len) { diff --git a/msg_translator.h b/msg_translator.h index a87c69b..01b5619 100644 --- a/msg_translator.h +++ b/msg_translator.h @@ -129,9 +129,13 @@ int branch_builder( unsigned int hash_index, char* id_builder(struct sip_msg* msg, unsigned int *id_len); -/* check if IP address in Via != source IP address of signaling */ +/* check if IP address in Via != source IP address of signaling, + * or the sender is asking to set the values for rport or received */ int received_test( struct sip_msg *msg ); +/* check if IP address in Via != source IP address of signaling */ +int received_via_test( struct sip_msg *msg ); + /* builds a char* buffer from message headers without body * first line is excluded in case of skip_first_line=1 */

10 years

Stats/counter objects

by Olle E. Johansson

Hi! I just want to remind all developers about the coolness of the core stats/counters. We have two modules that handle these - stats and counters, but in the core it's the same. If you use them in a module there's a lot of benefits: - You have locking - They can be exposed in "kamctl monitor" - They can be read over the RPC interface in kamcmd, over HTTP/XMLRPC or JSONRPC and sockets - They can be exposed in snmpstats Be cool. Add a counter to a module today! Every day. One per day to Christmas! And yes, using the modules anyone writing a kamailio routing script can add counters that behave in the same way! Amazing, isn't it? /O

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014