sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
304 discussions

git:master: pipelimit: docs updated with hash_size parameter and pl_check() changes
by Daniel-Constantin Mierla 29 Apr '14

29 Apr '14

Module: sip-router Branch: master Commit: 6ef0bf9e6594e672f7959b5ed3f23474387091b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ef0bf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 22:52:38 2014 +0200 pipelimit: docs updated with hash_size parameter and pl_check() changes --- modules/pipelimit/README | 147 +++++++++++++++++------------ modules/pipelimit/doc/pipelimit_admin.xml | 31 ++++++- 2 files changed, 115 insertions(+), 63 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6ef…

1 0

git:master: pipelimit: added pl_check(pipeid, alg, limit)
by Daniel-Constantin Mierla 29 Apr '14

29 Apr '14

Module: sip-router Branch: master Commit: c1ab03dd1f1d9166df0df1f20e61db0f47ffd37b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1ab03d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 22:35:46 2014 +0200 pipelimit: added pl_check(pipeid, alg, limit) - when alg and limit parameters are given, pl_check() creates the pipe if it doesn't exists - if exists, then no change is done to existing pipe (alg and limit are not changed) --- modules/pipelimit/pipelimit.c | 109 +++++++++++++++++++++++++++++++++++------ 1 files changed, 93 insertions(+), 16 deletions(-) diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index 5aeb071..a2a39b5 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -111,20 +111,24 @@ int _pl_cfg_setpoint; /* desired load, used when reading modparams */ static int mod_init(void); static ticks_t pl_timer_handle(ticks_t, struct timer_ln*, void*); static int w_pl_check(struct sip_msg*, char *, char *); +static int w_pl_check3(struct sip_msg*, char *, char *, char *); static int w_pl_drop_default(struct sip_msg*, char *, char *); static int w_pl_drop_forced(struct sip_msg*, char *, char *); static int w_pl_drop(struct sip_msg*, char *, char *); static void destroy(void); +static int fixup_pl_check3(void** param, int param_no); static cmd_export_t cmds[]={ {"pl_check", (cmd_function)w_pl_check, 1, fixup_spve_null, - 0, REQUEST_ROUTE|LOCAL_ROUTE}, + 0, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, + {"pl_check", (cmd_function)w_pl_check3, 3, fixup_pl_check3, + 0, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, {"pl_drop", (cmd_function)w_pl_drop_default, 0, 0, - 0, REQUEST_ROUTE|LOCAL_ROUTE}, + 0, REQUEST_ROUTE}, {"pl_drop", (cmd_function)w_pl_drop_forced, 1, fixup_uint_null, - 0, REQUEST_ROUTE|LOCAL_ROUTE}, + 0, REQUEST_ROUTE}, {"pl_drop", (cmd_function)w_pl_drop, 2, fixup_uint_uint, - 0, REQUEST_ROUTE|LOCAL_ROUTE}, + 0, REQUEST_ROUTE}, {0,0,0,0,0,0} }; static param_export_t params[]={ @@ -513,24 +517,16 @@ int hash[100] = {18, 50, 51, 39, 49, 68, 8, 78, 61, 75, 53, 32, 45, 77, 31, * (expects pl_lock to be taken), TODO revert to "return" instead of "ret =" * \return -1 if drop needed, 1 if allowed */ -static int pipe_push(struct sip_msg * msg, str *pipeid) +static int pipe_push_direct(pl_pipe_t *pipe) { int ret; - pl_pipe_t *pipe = NULL; - - pipe = pl_pipe_get(pipeid, 1); - if(pipe==NULL) - { - LM_ERR("pipe not found [%.*s]\n", pipeid->len, pipeid->s); - return -2; - } pipe->counter++; switch (pipe->algo) { case PIPE_ALGO_NOP: LM_ERR("no algorithm defined for pipe %.*s\n", - pipeid->len, pipeid->s); + pipe->name.len, pipe->name.s); ret = 2; break; case PIPE_ALGO_TAILDROP: @@ -554,16 +550,29 @@ static int pipe_push(struct sip_msg * msg, str *pipeid) } LM_DBG("pipe=%.*s algo=%d limit=%d pkg_load=%d counter=%d " "load=%2.1lf network_load=%d => %s\n", - pipeid->len, pipeid->s, + pipe->name.len, pipe->name.s, pipe->algo, pipe->limit, pipe->load, pipe->counter, *load_value, *network_load_value, (ret == 1) ? "ACCEPT" : "DROP"); - pl_pipe_release(pipeid); + pl_pipe_release(&pipe->name); return ret; } +static int pipe_push(struct sip_msg * msg, str *pipeid) +{ + pl_pipe_t *pipe = NULL; + + pipe = pl_pipe_get(pipeid, 1); + if(pipe==NULL) + { + LM_ERR("pipe not found [%.*s]\n", pipeid->len, pipeid->s); + return -2; + } + return pipe_push_direct(pipe); +} + /** * runs the current request through the queues * \param msg @@ -579,6 +588,9 @@ static int pl_check(struct sip_msg * msg, str *pipeid) return ret; } +/** + * limit checking with exiting pipes + */ static int w_pl_check(struct sip_msg* msg, char *p1, char *p2) { str pipeid = {0, 0}; @@ -594,6 +606,71 @@ static int w_pl_check(struct sip_msg* msg, char *p1, char *p2) } +/** + * limit checking with creation of pipe if it doesn't exist + */ +static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, + char *p3limit) +{ + int limit; + str pipeid = {0, 0}; + str alg = {0, 0}; + pl_pipe_t *pipe = NULL; + + if(msg==NULL) + return -1; + + if(fixup_get_ivalue(msg, (gparam_t*)p3limit, &limit)!=0 || limit<=0) + { + LM_ERR("invalid limit value\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)p1pipe, &pipeid)!=0 + || pipeid.s == 0) + { + LM_ERR("invalid pipeid parameter"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)p2alg, &alg)!=0 + || alg.s == 0) + { + LM_ERR("invalid algoritm parameter"); + return -1; + } + + pipe = pl_pipe_get(&pipeid, 1); + if(pipe==NULL) + { + LM_DBG("pipe not found [%.*s] - trying to add it\n", + pipeid.len, pipeid.s); + if(pl_pipe_add(&pipeid, &alg, limit)<0) + { + LM_ERR("failed to add pipe [%.*s]\n", + pipeid.len, pipeid.s); + return -2; + } + pipe = pl_pipe_get(&pipeid, 1); + if(pipe==NULL) + { + LM_ERR("failed to retrieve pipe [%.*s]\n", + pipeid.len, pipeid.s); + return -2; + } + } + + return 1; +} + +static int fixup_pl_check3(void** param, int param_no) +{ + if(param_no==1) return fixup_spve_null(param, 1); + if(param_no==2) return fixup_spve_null(param, 1); + if(param_no==3) return fixup_igp_null(param, 1); + return 0; +} + /* timer housekeeping, invoked each timer interval to reset counters */ static ticks_t pl_timer_handle(ticks_t ticks, struct timer_ln* tl, void* data) {

1 0

git:master: pipelimit: added hash_size parameter
by Daniel-Constantin Mierla 29 Apr '14

29 Apr '14

Module: sip-router Branch: master Commit: 4c651606eb9f432404846047e19149a3710a6db3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c65160… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 22:43:27 2014 +0200 pipelimit: added hash_size parameter - can be used to set the number of slots for the internal hash table, which is computed as 2^hash_size (aka 1<<hash_size) - default is 6 (2^6 = 64 slots) --- modules/pipelimit/pipelimit.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index a2a39b5..0fdd06c 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -78,6 +78,7 @@ str_map_t source_names[] = { static int pl_drop_code = 503; static str pl_drop_reason = str_init("Server Unavailable"); +static int pl_hash_size = 6; typedef struct pl_queue { int * pipe; @@ -132,14 +133,15 @@ static cmd_export_t cmds[]={ {0,0,0,0,0,0} }; static param_export_t params[]={ - {"timer_interval", INT_PARAM, &timer_interval}, - {"reply_code", INT_PARAM, &pl_drop_code}, - {"reply_reason", STR_PARAM, &pl_drop_reason.s}, - {"db_url", STR_PARAM, &pl_db_url}, - {"plp_table_name", STR_PARAM, &rlp_table_name}, - {"plp_pipeid_column", STR_PARAM, &rlp_pipeid_col}, - {"plp_limit_column", STR_PARAM, &rlp_limit_col}, - {"plp_algorithm_column", STR_PARAM, &rlp_algorithm_col}, + {"timer_interval", INT_PARAM, &timer_interval}, + {"reply_code", INT_PARAM, &pl_drop_code}, + {"reply_reason", STR_PARAM, &pl_drop_reason.s}, + {"db_url", STR_PARAM, &pl_db_url}, + {"plp_table_name", STR_PARAM, &rlp_table_name}, + {"plp_pipeid_column", STR_PARAM, &rlp_pipeid_col}, + {"plp_limit_column", STR_PARAM, &rlp_limit_col}, + {"plp_algorithm_column", STR_PARAM, &rlp_algorithm_col}, + {"hash_size", INT_PARAM, &pl_hash_size}, {0,0,0} }; @@ -296,7 +298,12 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } - if(pl_init_htable(16)<0) + if(pl_hash_size<=0) + { + LM_ERR("invalid hash size parameter: %d\n", pl_hash_size); + return -1; + } + if(pl_init_htable(1<<pl_hash_size)<0) { LM_ERR("could not allocate pipes htable\n"); return -1;

1 0

git:master: pipelimit: moved log messages out of lock
by Daniel-Constantin Mierla 29 Apr '14

29 Apr '14

Module: sip-router Branch: master Commit: da199e1978313b39553e9fb62012fe55cfd186d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da199e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 21:59:53 2014 +0200 pipelimit: moved log messages out of lock - free allocated cell if the algorithm is invalid --- modules/pipelimit/pl_ht.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/pipelimit/pl_ht.c b/modules/pipelimit/pl_ht.c index f044203..e428644 100644 --- a/modules/pipelimit/pl_ht.c +++ b/modules/pipelimit/pl_ht.c @@ -175,8 +175,8 @@ int pl_pipe_add(str *pipeid, str *algorithm, int limit) (pl_pipe_t*)shm_malloc(sizeof(pl_pipe_t)+(1+pipeid->len)*sizeof(char)); if(cell == NULL) { - LM_ERR("cannot create new cell.\n"); lock_release(&_pl_pipes_ht->slots[idx].lock); + LM_ERR("cannot create new cell.\n"); return -1; } memset(cell, 0, sizeof(pl_pipe_t)+(1+pipeid->len)*sizeof(char)); @@ -189,9 +189,10 @@ int pl_pipe_add(str *pipeid, str *algorithm, int limit) cell->limit = limit; if (str_map_str(algo_names, algorithm, &cell->algo)) { + lock_release(&_pl_pipes_ht->slots[idx].lock); + shm_free(cell); LM_ERR("cannot find algorithm [%.*s].\n", algorithm->len, algorithm->s); - lock_release(&_pl_pipes_ht->slots[idx].lock); return -1; }

1 0

TM: Dynamic Branches
by Jan Gaida 29 Apr '14

29 Apr '14

Hello, In our installation of Kamailio 4.1.1 we need to branch messages and invites to more than 100 clients. The actual implementation only allows 12 branches. We have implemented new functions to be able to control up to 512 branches. Therefore we use several functions to control the bitmap and a dynamic array for uac branches. Every uac initializes with 12 branches as before, but when the limit is reached, new branches are dynamically added to the array. We are still in testing-phase but I would like to know if you would add this feature in some of the next versions. Regards -- *Jan **Gaida* Ingeniero Desarrollo Software C/ Marconi 3 (PTM) 28760 Tres Cantos Spain jan.gaida(a)grupoamper.com | www.grupoamper.com -- This message and any attachments are intended only for the use of the individual to whom they are addressed and it may contain information that is privileged or confidential. If you have received this communication by mistake, please notify us immediately by e-mail or telephone.The storage, recording, use or disclosure of this e-mail and its attachments by anyone other than the intended recipient is strictly prohibited. This message has been verified using antivirus software; however, the sender is not responsible for any damage to hardware or software resulting from the presence of any virus. Este mensaje y cualquier anexo son exclusivamente para la persona a quien van dirigidos y pueden contener información privilegiada o confidencial. Si usted ha recibido esta comunicación por error, le agradecemos notificarlo de inmediato por esta misma vía o por teléfono. Está prohibida su retención, grabación, utilización o divulgación con cualquier propósito. Este mensaje ha sido verificado con software antivirus; sin embargo, el remitente no se hace responsable en caso de que en éste o en los archivos adjuntos haya presencia de algún virus que pueda generar daños en los equipos o programas del destinatario.

2 1

git:master: rtmier: reset avps and xavp lists after route blocks execution
by Daniel-Constantin Mierla 29 Apr '14

29 Apr '14

Module: sip-router Branch: master Commit: 159978cf2a98748f3225155d8946bcbd768b51e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=159978c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 29 20:02:19 2014 +0200 rtmier: reset avps and xavp lists after route blocks execution - avoid leaks if someone is using avp/xavp with rtimer - there is a fake message used there, thus not the normal sip message routing that resets avps/xavps --- modules/rtimer/rtimer_mod.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/rtimer/rtimer_mod.c b/modules/rtimer/rtimer_mod.c index 03a002d..271b888 100644 --- a/modules/rtimer/rtimer_mod.c +++ b/modules/rtimer/rtimer_mod.c @@ -37,6 +37,8 @@ #include "../../socket_info.h" #include "../../dset.h" #include "../../pt.h" +#include "../../usr_avp.h" +#include "../../xavp.h" #include "../../timer_proc.h" #include "../../script_cb.h" #include "../../parser/parse_param.h" @@ -190,6 +192,10 @@ void stm_timer_exec(unsigned int ticks, void *param) set_route_type(REQUEST_ROUTE); run_top_route(main_rt.rlist[rt->route], fmsg, 0); exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif } }

1 0

[tracker] Comment added: DNS SRV lookup in rewritehost port fails
by sip-router 29 Apr '14

29 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#426 - DNS SRV lookup in rewritehost port fails User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you give the log messages for such case with debug=3 in kamailio.cfg ? What are your dns related global parameters in kamailio.cfg? ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=426#comment1424 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

Re: [sr-dev] [SR-Users] OT: Excessive or fatal bounces for yahoo, hotmail, ...
by Daniel-Constantin Mierla 29 Apr '14

29 Apr '14

On 29/04/14 09:51, Daniel Tryba wrote: > On Tuesday 29 April 2014 09:18:41 Daniel-Constantin Mierla wrote: >> Is anyone here aware of similar issues and potential fixes? I guess >> yahoo/hotmail servers simply reject the emails sent by mailman of >> mailing lists. >> >> Any hint would be appreciated... > It's DMARC at work: > > http://www.ietf.org/mail-archive/web/ietf/current/msg87153.html > > The subejct says it all: > "Yahoo breaks every mailing list in the world including the IETF's" > Thanks, the possible solutions found so far: 1) upgrade mailman to 2.1.16 which has an option to replace From header with the address of the mailing list. The really big inconvenient is that all emails will be handled like this, losing the sender information, no matter is from yahoo/hotmail or not. Another inconvenient is that it might require manual installation, since 2.1.16 is not packaged on old debian stable, adding overhead in maintenance ... unless some good sysadmin around here provides some backports 2) ask those people with yahoo/hotmail/... to use different email provider Combined, yahoo+hotmail account for a bit more than 200 addresses on sr-users. What people here prefer? Any other solution? Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

2 2

[tracker] Task opened: DNS SRV lookup in rewritehost port fails
by sip-router 29 Apr '14

29 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Rob Eijgenraam (robeyg) Attached to Project - sip-router Summary - DNS SRV lookup in rewritehost port fails Task Type - Bug Report Category - dns / dns cache Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - 4.1 Due in Version - Undecided Due Date - Undecided Details - Hi, Upgraded kamailio 4.0.3 to 4.1.3 compiled on 23:19:34 Apr 24 2014 with gcc 4.6.3 in rewritehostport SRV DNS lookup does not work any more. It points back to the A record, instead of using the _sip._udp. SRV record according to documentation if you exclude the port number, it will use the DNS SRV lookup. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=426 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

Re: [sr-dev] [SR-Users] OT: Excessive or fatal bounces for yahoo, hotmail, ...
by Henning Westerholt 29 Apr '14

29 Apr '14

Am Dienstag, 29. April 2014, 09:51:32 schrieb Daniel Tryba: > On Tuesday 29 April 2014 09:18:41 Daniel-Constantin Mierla wrote: > > Is anyone here aware of similar issues and potential fixes? I guess > > yahoo/hotmail servers simply reject the emails sent by mailman of > > mailing lists. > > > > Any hint would be appreciated... > > It's DMARC at work: > > http://www.ietf.org/mail-archive/web/ietf/current/msg87153.html > > The subejct says it all: > "Yahoo breaks every mailing list in the world including the IETF's" Hi, thanks for the information. This is bad, especially as it also seems to bounce other (non yahoo subscriber) from the list. The suggestions from the link: Suggestions: * Suspend posting permission of all yahoo.com addresses, to limit damage * Tell Yahoo users to get a new mail account somewhere else, pronto, if they want to continue using mailing lists * If you know people at Yahoo, ask if perhaps this wasn't such a good idea does also not sound really good. Not sure if yahoo will fix this, otherwise we need to upgrade the mailman (as brought up from Daniel in another mail) or remove them. Both options are not really good. @Daniel - I have sended the unsubscribed members from this morning to you over private mail. About 1/3 are not from yahoo, maybe you can bulk subscribe them again. Regards, Henning

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014