sr-dev May 2014

sr-dev@lists.kamailio.org

34 participants
240 discussions

git:master: core: allow listening on tls without listening on tcp
by Daniel-Constantin Mierla 21 May '14

21 May '14

Module: sip-router Branch: master Commit: eea7f9d04090a736c8a0f2b2a350c08635cc8e39 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eea7f9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 21 09:55:46 2014 +0200 core: allow listening on tls without listening on tcp - reported in FS#425 --- main.c | 12 ++++++++++++ tcp_main.c | 11 +++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/main.c b/main.c index 89115a4..bcfcf9f 100644 --- a/main.c +++ b/main.c @@ -1787,6 +1787,18 @@ static int calc_proc_no(void) tcp_e_listeners = tcp_cfg_children_no; } tcp_listeners += tcp_e_listeners; +#ifdef USE_TLS + tcp_e_listeners = 0; + for (si=tls_listen, tcp_listeners=0, tcp_e_listeners=0; si; si=si->next) { + if(si->workers>0) + tcp_listeners += si->workers; + else { + if(tcp_listeners==0) + tcp_e_listeners = tcp_cfg_children_no; + } + } + tcp_listeners += tcp_e_listeners; +#endif tcp_children_no = tcp_listeners; #endif #ifdef USE_SCTP diff --git a/tcp_main.c b/tcp_main.c index 701f90f..5a43d2c 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -4934,6 +4934,17 @@ int tcp_init_children() } } } +#ifdef USE_TLS + for(si=tls_listen; si; si=si->next) { + if(si->workers>0) { + si->workers_tcpidx = i - si->workers + 1; + for(r=0; r<si->workers; r++) { + tcp_children[i].mysocket = si; + i--; + } + } + } +#endif tcp_sockets_gworkers = (i != tcp_children_no-1)?(1 + i + 1):0; /* create the tcp sock_info structures */

1 0

git:master: dispatcher: ds_select_dst/domain can take args as string ( not only int)
by Ovidiu Sas 20 May '14

20 May '14

Module: sip-router Branch: master Commit: 196c65fdc5d2526d3c777b22ec37eef200cd08ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=196c65f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue May 20 13:47:44 2014 -0400 dispatcher: ds_select_dst/domain can take args as string (not only int) - internal converion of string->int (if possible) --- modules/dispatcher/dispatcher.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index b07cc24..b7a5236 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -545,23 +545,39 @@ static void destroy(void) } +#define GET_VALUE(param_name,param,i_value,s_value,value_flags) do{ \ + if(get_is_fparam(&(i_value), &(s_value), msg, (fparam_t*)(param), &(value_flags))!=0) { \ + LM_ERR("no %s value\n", (param_name)); \ + return -1; \ + } \ +}while(0) + /** * */ static int w_ds_select(struct sip_msg* msg, char* set, char* alg, int mode) { + unsigned int algo_flags, set_flags; + str s_algo = {NULL, 0}; + str s_set = {NULL, 0}; int a, s; if(msg==NULL) return -1; - if(fixup_get_ivalue(msg, (gparam_p)set, &s)!=0) - { - LM_ERR("no dst set value\n"); + GET_VALUE("destination set", set, s, s_set, set_flags); + if (!(set_flags&PARAM_INT)) { + if (set_flags&PARAM_STR) + LM_ERR("unable to get destination set from [%.*s]\n", s_set.len, s_set.s); + else + LM_ERR("unable to get destination set\n"); return -1; } - if(fixup_get_ivalue(msg, (gparam_p)alg, &a)!=0) - { - LM_ERR("no alg value\n"); + GET_VALUE("algorithm", alg, a, s_algo, algo_flags); + if (!(algo_flags&PARAM_INT)) { + if (algo_flags&PARAM_STR) + LM_ERR("unable to get algorithm from [%.*s]\n", s_algo.len, s_algo.s); + else + LM_ERR("unable to get algorithm\n"); return -1; }

1 0

git:master: sr_module: new fixup function: get_is_fparam()
by Ovidiu Sas 20 May '14

20 May '14

Module: sip-router Branch: master Commit: 8a334551001bdd658b39901c43fc12fe89c82b5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a33455… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue May 20 13:45:40 2014 -0400 sr_module: new fixup function: get_is_fparam() - retrieve parameter value as string or/and integer (if possible) --- sr_module.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sr_module.h | 11 +++++++ 2 files changed, 105 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index 3fb98a6..a47b9de 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1776,6 +1776,100 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param) return 0; } +/** Get the function parameter value as string or/and integer (if possible). + * @return 0 - Success + * -1 - Cannot get value + */ +int get_is_fparam(int* i_dst, str* s_dst, struct sip_msg* msg, fparam_t* param, unsigned int *flags) +{ + int_str val; + int ret; + avp_t* avp; + str tmp; + pv_value_t pv_val; + + *flags = 0; + switch(param->type) { + case FPARAM_INT: + *i_dst = param->v.i; + *flags |= PARAM_INT; + return 0; + case FPARAM_REGEX: + case FPARAM_UNSPEC: + case FPARAM_STRING: + s_dst->s = param->v.asciiz; + s_dst->len = strlen(param->v.asciiz); + *flags |= PARAM_STR; + break; + case FPARAM_STR: + *s_dst = param->v.str; + *flags |= PARAM_STR; + break; + case FPARAM_AVP: + avp = search_first_avp(param->v.avp.flags, param->v.avp.name, + &val, 0); + if (unlikely(!avp)) { + DBG("Could not find AVP from function parameter '%s'\n", + param->orig); + return -1; + } + if (avp->flags & AVP_VAL_STR) { + *s_dst = val.s; + *flags |= PARAM_STR; + if (str2int(&val.s, (unsigned int*)i_dst) < 0) { + ERR("Could not convert AVP string value to int\n"); + return -1; + } + } else { + *i_dst = val.n; + *flags |= PARAM_INT; + } + break; + case FPARAM_SELECT: + ret = run_select(&tmp, param->v.select, msg); + if (unlikely(ret < 0 || ret > 0)) return -1; + if (unlikely(str2int(&tmp, (unsigned int*)i_dst) < 0)) { + ERR("Could not convert select result to int\n"); + return -1; + } + *flags |= PARAM_INT; + break; + case FPARAM_PVS: + if (likely(pv_get_spec_value(msg, param->v.pvs, &pv_val)==0)) { + if ((pv_val.flags&(PV_VAL_NULL|PV_VAL_INT))==PV_VAL_INT){ + *i_dst=pv_val.ri; + *flags |= PARAM_INT; + } + if ((pv_val.flags&(PV_VAL_NULL|PV_VAL_STR))==PV_VAL_STR){ + *s_dst=pv_val.rs; + *flags |= PARAM_STR; + } + }else{ + ERR("Could not get PV\n"); + return -1; + } + break; + case FPARAM_PVE: + s_dst->s=pv_get_buffer(); + s_dst->len=pv_get_buffer_size(); + if (unlikely(pv_printf(msg, param->v.pve, s_dst->s, &s_dst->len)!=0)){ + ERR("Could not convert the PV-formated string to str\n"); + s_dst->len=0; + return -1; + } + *flags |= PARAM_STR; + break; + } + + /* Let's convert to int, if possible */ + if (!(*flags & PARAM_INT) && (*flags & PARAM_STR) && str2sint(s_dst, i_dst) == 0) + *flags |= PARAM_INT; + + if (!*flags) return -1; + + return 0; +} + /** * Retrieve the compiled RegExp. * @return: 0 for success, negative on error. diff --git a/sr_module.h b/sr_module.h index 14f9936..4d906b0 100644 --- a/sr_module.h +++ b/sr_module.h @@ -630,6 +630,17 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param); int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param); /** + * @brief Get the function parameter value as integer/string + * @param i_dst int destination + * @param s_dst string destination + * @param msg SIP message + * @param param function parameters + * @param flags flags to indicate destiantions + * @return 0 on success, 1 on error, e.g. cannot get value + */ +int get_is_fparam(int* i_dst, str* s_dst, struct sip_msg* msg, fparam_t* param, unsigned int *flags); + +/** * @brief Get the function parameter value as compiled regular expression * @param dst string destination * @param msg SIP message

1 0

kamailio 4.1 segfault with MySQL auth
by Peter Villeneuve 20 May '14

20 May '14

Hi, I posted previously on this issue but never got any replies. Has anyone had this experience with 4.1? It seems that as soon as a UAC tries to register, Kamailio segfaults: May 20 09:41:00 vmhost /usr/sbin/kamailio[27806]: ALERT: <core> [main.c:775]: handle_sigs(): child process 27813 exited by a signal 11 May 20 09:41:00 vmhost /usr/sbin/kamailio[27806]: ALERT: <core> [main.c:778]: handle_sigs(): core was not generated May 20 09:41:00 vmhost /usr/sbin/kamailio[27806]: INFO: <core> [main.c:790]: handle_sigs(): INFO: terminating due to SIGCHLD May 20 09:41:00 vmhost kernel: [251087.555502] kamailio[27813]: *segfault at* 7fa5d1d0a1dc ip 0000000000536104 sp 00007fffaade6c20 error 4 in kamailio[400000+27a000] May 20 09:41:00 vmhost /usr/sbin/kamailio[27812]: INFO: <core> [main.c:841]: sig_usr(): INFO: signal 15 received

3 9

[tracker] Task closed: websocket and xmlrpc cause invalid increase of core:unsupported_methods stats
by sip-router 20 May '14

20 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#432 - websocket and xmlrpc cause invalid increase of core:unsupported_methods stats User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: closing due to "quick fix" by daniel. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=432 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

git:master: kex: count unsupported methods only for SIP requests
by Daniel-Constantin Mierla 20 May '14

20 May '14

Module: sip-router Branch: master Commit: d931ce355d994fbd12c7c60d766ff0d12c4829d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d931ce3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 20 16:14:32 2014 +0200 kex: count unsupported methods only for SIP requests - reported by Juha Heinanen, FS#432 --- modules/kex/core_stats.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/kex/core_stats.c b/modules/kex/core_stats.c index 55118db..8fcba9d 100644 --- a/modules/kex/core_stats.c +++ b/modules/kex/core_stats.c @@ -122,6 +122,8 @@ static int km_cb_req_stats(struct sip_msg *msg, unsigned int flags, void *param) { update_stat(rcv_reqs, 1); + if(!IS_SIP(msg)) + return 1; if(msg->first_line.u.request.method_value==METHOD_OTHER) update_stat(unsupported_methods, 1); return 1;

1 0

[tracker] Comment added: websocket and xmlrpc cause invalid increase of core:unsupported_methods stats
by sip-router 20 May '14

20 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#432 - websocket and xmlrpc cause invalid increase of core:unsupported_methods stats User who did this - Daniel-Constantin Mierla (miconda) ---------- A quick fix would be to count only if protocol is SIP. For later, would be good to parse these methods and keep internal id for faster comparison (then will become automatically recognized), but will require to review more parts of the code. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=432#comment1476 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

[tracker] Task opened: websocket and xmlrpc cause invalid increase of core:unsupported_methods stats
by sip-router 20 May '14

20 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - websocket and xmlrpc cause invalid increase of core:unsupported_methods stats Task Type - Bug Report Category - Core Status - New Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - each xmlrpc request and websocket connection setup causes invalid increase of core:unsupported_methods stats. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=432 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

[tracker] Task closed: bogus core statistics?
by sip-router 20 May '14

20 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#430 - bogus core statistics? User who did this - Juha Heinanen (jh) Reason for closing: Deferred Additional comments about closing: i'm closing this item and will create a new one in order to simplify the issue. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=430 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

git:master: modules/siputils: generate error message if parsing of is_gruu () uri fails
by Juha Heinanen 20 May '14

20 May '14

Module: sip-router Branch: master Commit: 365a60772de9c1d2f19ecf52b12f6d75b348e996 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=365a607… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue May 20 16:22:58 2014 +0300 modules/siputils: generate error message if parsing of is_gruu() uri fails --- modules/siputils/sipops.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/siputils/sipops.c b/modules/siputils/sipops.c index 357d92c..5394458 100644 --- a/modules/siputils/sipops.c +++ b/modules/siputils/sipops.c @@ -92,7 +92,7 @@ int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2) { - str s1; + str s1, *s2; sip_uri_t turi; sip_uri_t *puri; @@ -103,12 +103,17 @@ int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2) LM_ERR("cannot get first parameter\n"); return -8; } - if(parse_uri(s1.s, s1.len, &turi)!=0) - return -1; + if(parse_uri(s1.s, s1.len, &turi)!=0) { + LM_ERR("parsing of uri '%.*s' failed\n", s1.len, s1.s); + return -1; + } puri = &turi; } else { - if(parse_sip_msg_uri(msg)<0) - return -1; + if(parse_sip_msg_uri(msg)<0) { + s2 = GET_RURI(msg); + LM_ERR("parsing of uri '%.*s' failed\n", s2->len, s2->s); + return -1; + } puri = &msg->parsed_uri; } if(puri->gr.s!=NULL)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2014