sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

git:master: dialog(k): new function to set dialog timeout by internal id
by Daniel-Constantin Mierla 22 Feb '12

22 Feb '12

Module: sip-router Branch: master Commit: 3beef50c69d60fcb372d555a561d8e2258ff5734 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3beef50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 22 22:17:29 2012 +0100 dialog(k): new function to set dialog timeout by internal id - dlg_set_timeout(timeout [, h_entry, h_id]) --- modules_k/dialog/README | 27 +++++++++++++++++ modules_k/dialog/dialog.c | 53 +++++++++++++++++++++++++++++++++ modules_k/dialog/doc/dialog_admin.xml | 44 +++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/README b/modules_k/dialog/README index 36f0187..e29ac45 100644 --- a/modules_k/dialog/README +++ b/modules_k/dialog/README @@ -102,6 +102,7 @@ Alex Balashov 6.11. dlg_bridge(from, to, op) 6.12. dlg_get(callid, ftag, ttag) 6.13. is_known_dlg() + 6.14. dlg_set_timeout(timeout [, h_entry, h_id]) 7. Statistics @@ -217,6 +218,7 @@ Alex Balashov 1.56. dlg_bridge usage 1.57. dlg_get usage 1.58. is_known_dlg() usage + 1.59. dlg_set_timeout usage Chapter 1. Admin Guide @@ -293,6 +295,7 @@ Chapter 1. Admin Guide 6.11. dlg_bridge(from, to, op) 6.12. dlg_get(callid, ftag, ttag) 6.13. is_known_dlg() + 6.14. dlg_set_timeout(timeout [, h_entry, h_id]) 7. Statistics @@ -1063,6 +1066,7 @@ modparam("dialog", "wait_ack", 0) 6.11. dlg_bridge(from, to, op) 6.12. dlg_get(callid, ftag, ttag) 6.13. is_known_dlg() + 6.14. dlg_set_timeout(timeout [, h_entry, h_id]) 6.1. set_dlg_profile(profile,[value]) @@ -1329,6 +1333,29 @@ if(!uri == myself) { } ... +6.14. dlg_set_timeout(timeout [, h_entry, h_id]) + + Set the dialog timeout. Dialog timeout will be updated if it was + already set. If h_entry and h_id parameters are not provided, the + dialog will be searched based on (callid, fromtag, totag) of currently + processed SIP message. + + Meaning of the parameters is as follows: + * timeout - the interval in seconds after which the dialog will time + out. + * h_entry - h_entry value of the iternal dialog identifier. + * h_id - h_id valye if the internal dialog identifier. + + This function can be used from ANY_ROUTE. + + Example 1.59. dlg_set_timeout usage +... +if(dlg_set_timeout("180", "123", "456")) +{ + ... +} +... + 7. Statistics 7.1. active_dialogs diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index a919b62..b89eb9b 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -155,6 +155,7 @@ static int w_dlg_manage(struct sip_msg*, char*, char*); static int w_dlg_bye(struct sip_msg*, char*, char*); static int w_dlg_refer(struct sip_msg*, char*, char*); static int w_dlg_bridge(struct sip_msg*, char*, char*, char*); +static int w_dlg_set_timeout(struct sip_msg*, char*, char*, char*); static int fixup_dlg_bye(void** param, int param_no); static int fixup_dlg_refer(void** param, int param_no); static int fixup_dlg_bridge(void** param, int param_no); @@ -196,6 +197,10 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"is_known_dlg", (cmd_function)w_is_known_dlg, 0, NULL, 0, ANY_ROUTE }, + {"dlg_set_timeout", (cmd_function)w_dlg_set_timeout, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"dlg_set_timeout", (cmd_function)w_dlg_set_timeout, 3,fixup_igp_all, + 0, ANY_ROUTE }, {"load_dlg", (cmd_function)load_dlg, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1068,6 +1073,54 @@ static int w_dlg_bridge(struct sip_msg *msg, char *from, char *to, char *op) return 1; } +/** + * + */ +static int w_dlg_set_timeout(struct sip_msg *msg, char *pto, char *phe, char *phi) +{ + int to = 0; + unsigned int he = 0; + unsigned int hi = 0; + dlg_cell_t *dlg = NULL; + + if(fixup_get_ivalue(msg, (gparam_p)pto, &to)!=0) + { + LM_ERR("no timeout value\n"); + return -1; + } + if(phe!=NULL) + { + if(fixup_get_ivalue(msg, (gparam_p)phe, (int*)&he)!=0) + { + LM_ERR("no hash entry value value\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_p)phi, (int*)&hi)!=0) + { + LM_ERR("no hash id value value\n"); + return -1; + } + dlg = dlg_lookup(he, hi); + } else { + dlg = dlg_get_msg_dialog(msg); + } + + if(dlg==NULL) + { + LM_DBG("no dialog found\n"); + return -1; + } + + if(update_dlg_timer(&dlg->tl, to)<0) { + LM_ERR("failed to update dialog lifetime\n"); + dlg_release(dlg); + return -1; + } + dlg->lifetime = to; + dlg->dflags |= DLG_FLAG_CHANGED; + dlg_release(dlg); + return 1; +} static int fixup_dlg_bye(void** param, int param_no) { diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index b5898c2..714c0fb 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1633,6 +1633,50 @@ if(!uri == myself) { </example> </section> + <section> + <title> + <function moreinfo="none">dlg_set_timeout(timeout [, h_entry, h_id])</function> + </title> + <para> + Set the dialog timeout. Dialog timeout will be updated if it was + already set. If h_entry and h_id parameters are not provided, the + dialog will be searched based on (callid, fromtag, totag) of + currently processed SIP message. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>timeout</emphasis> - the interval in seconds after + which the dialog will time out. + </para> + </listitem> + <listitem> + <para><emphasis>h_entry</emphasis> - h_entry value of the iternal + dialog identifier. + </para> + </listitem> + <listitem> + <para><emphasis>h_id</emphasis> - h_id valye if the internal dialog + identifier. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dlg_set_timeout</function> usage</title> + <programlisting format="linespecific"> +... +if(dlg_set_timeout("180", "123", "456")) +{ + ... +} +... +</programlisting> + </example> + </section> + </section>

1 0

git:master: dialog(k): replaced list of cfg routes with ANY_ROUTE in module exports
by Daniel-Constantin Mierla 22 Feb '12

22 Feb '12

Module: sip-router Branch: master Commit: 1b11548c737e08420d1e82ba18756d7afba940bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b11548… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 22 21:33:07 2012 +0100 dialog(k): replaced list of cfg routes with ANY_ROUTE in module exports --- modules_k/dialog/dialog.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 362fa8c..a919b62 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -165,37 +165,37 @@ static cmd_export_t cmds[]={ {"dlg_manage", (cmd_function)w_dlg_manage, 0,0, 0, REQUEST_ROUTE }, {"set_dlg_profile", (cmd_function)w_set_dlg_profile, 1,fixup_profile, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"set_dlg_profile", (cmd_function)w_set_dlg_profile, 2,fixup_profile, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"unset_dlg_profile", (cmd_function)w_unset_dlg_profile, 1,fixup_profile, 0, FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, {"unset_dlg_profile", (cmd_function)w_unset_dlg_profile, 2,fixup_profile, 0, FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, {"is_in_profile", (cmd_function)w_is_in_profile, 1,fixup_profile, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"is_in_profile", (cmd_function)w_is_in_profile, 2,fixup_profile, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"get_profile_size",(cmd_function)w_get_profile_size2, 2,fixup_get_profile2, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"get_profile_size",(cmd_function)w_get_profile_size3, 3,fixup_get_profile3, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"dlg_setflag", (cmd_function)w_dlg_setflag, 1,fixup_igp_null, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"dlg_resetflag", (cmd_function)w_dlg_resetflag, 1,fixup_igp_null, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"dlg_isflagset", (cmd_function)w_dlg_isflagset, 1,fixup_igp_null, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"dlg_bye",(cmd_function)w_dlg_bye, 1,fixup_dlg_bye, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"dlg_refer",(cmd_function)w_dlg_refer, 2,fixup_dlg_refer, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"dlg_bridge",(cmd_function)w_dlg_bridge, 3,fixup_dlg_bridge, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"dlg_get",(cmd_function)w_dlg_get, 3,fixup_dlg_bridge, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"is_known_dlg", (cmd_function)w_is_known_dlg, 0, NULL, - 0, REQUEST_ROUTE| FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE }, + 0, ANY_ROUTE }, {"load_dlg", (cmd_function)load_dlg, 0, 0, 0, 0}, {0,0,0,0,0,0} };

1 0

git:master: core: helper fixup function for all parameters int/pvar
by Daniel-Constantin Mierla 22 Feb '12

22 Feb '12

Module: sip-router Branch: master Commit: ea5dbe89b4010faf1d4a4c7c4ce97ebbcb46e71d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea5dbe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 22 17:40:33 2012 +0100 core: helper fixup function for all parameters int/pvar --- mod_fix.c | 8 ++++++++ mod_fix.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index f0207e7..3f07f59 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -549,3 +549,11 @@ int fixup_spve_all(void** param, int param_no) { return fixup_spve_null(param, 1); } + +/** + * + */ +int fixup_igp_all(void** param, int param_no) +{ + return fixup_igp_null(param, 1); +} diff --git a/mod_fix.h b/mod_fix.h index 1f264d1..0e4206f 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -129,6 +129,7 @@ int fixup_spve_str(void** param, int param_no); int fixup_free_spve_str(void** param, int param_no); int fixup_spve_all(void** param, int param_no); +int fixup_igp_all(void** param, int param_no); /** get the corresp. free fixup function.*/ free_fixup_function mod_fix_get_fixup_free(fixup_function f);

1 0

git:master: modules_k/presence Fix bug in last commit
by Anca Vamanu 22 Feb '12

22 Feb '12

Module: sip-router Branch: master Commit: 47a0de15f35c67400d980797bbb1d43a270e79cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47a0de1… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Feb 22 18:06:59 2012 +0200 modules_k/presence Fix bug in last commit --- modules_k/presence/subscribe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 3bd6fc6..39f649f 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -1161,6 +1161,9 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, lock_release(&subs_htable[i].lock); } + if(!s) + goto not_found; + found_rec: LM_DBG("Record found in hash_table\n");

1 0

Re: [sr-dev] Problem with TCP and EPOLL
by Paul Pankhurst 21 Feb '12

21 Feb '12

Sorry this was originally posted incorrectly, so I’m reposting.... I have been having problems with TCP under load. What I have been seeing is TCP buffers failing to be serviced and, when wr_timeout exceeds the configured value for tcp_send_timeout, kamailio kills the connection. Increasing tcp_send_timeout doesn't help, even setting this to a big value (such as 45 seconds) just delays the disconnection. Putting some tracing into the code shows that wbufq_add() is repeatedly called, but wbufq_run() is called for that connection far less than I would expect. wbufq_run() is frequently called for other connections. It looks like wbufq_run() doesn't get called when lots of wbufq_add()s are happening for a connection? wbufq_run() only appears to be called for a connection after some time has passed from the last wbufq_add(). The connection in question is a local loopback between the RLS and Presence modules (both running in the same Kamailio instance). However, it may just be a coincidence that this is the affected connection as it is also the one with the most traffic. My suspicion is that the bug is in the io_wait_loop_epoll() routine. Can anybody with experience of this part of the code help? Paul Pankhurst Engineering Director Crocodile RCS Ltd

3 6

debian packages
by Klaus Darilion 21 Feb '12

21 Feb '12

Hi! There are various packaging files for Debian: debian lenny lucid squeeze wheezy I wonder if such a distinction is really needed, and it seems that some of them are not maintained. Which is the best maintained one? Thanks Klaus

3 3

[tracker] Task opened: uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407)
by sip-router 20 Feb '12

20 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - oded resnik (or66) Attached to Project - sip-router Summary - uac_reg.c uac_reg_tm_callback does not support Proxy Authentication (407) Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - I use kamailio-3.2.2 (from RPM build on fedora). My sip provider uses Proxy Authentication (ps->code == 407). The registration fails. A test with ekiga.net with is using (ps->code == 401) is OK !. My analysis is that uac_reg.c:00431 uac_reg_tm_callback does not implement handling of Proxy Authentication. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=204 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: ndb_redis: try to reconnect if query to redis server fails
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Module: sip-router Branch: master Commit: 4a6a2cfd2df535c0f293d0d944685a702b45af0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a6a2cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 17 15:46:12 2012 +0100 ndb_redis: try to reconnect if query to redis server fails - credits to Javier Gallart for testing --- modules/ndb_redis/redis_client.c | 63 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 9f4ffc4..234bb3a 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -199,6 +199,61 @@ redisc_server_t *redisc_get_server(str *name) /** * */ +int redisc_reconnect_server(redisc_server_t *rsrv) +{ + char *addr; + unsigned int port, db; + param_t *pit = NULL; + struct timeval tv; + + tv.tv_sec = 1; + tv.tv_usec = 0; + addr = "127.0.0.1"; + port = 6379; + db = 0; + for (pit = rsrv->attrs; pit; pit=pit->next) + { + if(pit->name.len==4 && strncmp(pit->name.s, "addr", 4)==0) { + addr = pit->body.s; + addr[pit->body.len] = '\0'; + } else if(pit->name.len==4 && strncmp(pit->name.s, "port", 4)==0) { + if(str2int(&pit->body, &port) < 0) + port = 6379; + } else if(pit->name.len==2 && strncmp(pit->name.s, "db", 2)==0) { + if(str2int(&pit->body, &db) < 0) + db = 0; + } + } + if(rsrv->ctxRedis!=NULL) { + redisFree(rsrv->ctxRedis); + rsrv->ctxRedis = NULL; + } + + rsrv->ctxRedis = redisConnectWithTimeout(addr, port, tv); + if(!rsrv->ctxRedis) + goto err; + if (rsrv->ctxRedis->err) + goto err2; + if (redisCommandNR(rsrv->ctxRedis, "PING")) + goto err2; + if (redisCommandNR(rsrv->ctxRedis, "SELECT %i", db)) + goto err2; + + return 0; + +err2: + LM_ERR("error communicating with redis server [%.*s] (%s:%d/%d): %s\n", + rsrv->sname->len, rsrv->sname->s, addr, port, db, rsrv->ctxRedis->errstr); + return -1; +err: + LM_ERR("failed to connect to redis server [%.*s] (%s:%d/%d)\n", + rsrv->sname->len, rsrv->sname->s, addr, port, db); + return -1; +} + +/** + * + */ int redisc_exec(str *srv, str *cmd, str *argv1, str *argv2, str *argv3, str *res) { @@ -237,6 +292,14 @@ int redisc_exec(str *srv, str *cmd, str *argv1, str *argv2, str *argv3, c = cmd->s[cmd->len]; cmd->s[cmd->len] = '\0'; rpl->rplRedis = redisCommand(rsrv->ctxRedis, cmd->s); + if(rpl->rplRedis == NULL) + { + /* null reply, reconnect and try again */ + if(redisc_reconnect_server(rsrv)==0) + { + rpl->rplRedis = redisCommand(rsrv->ctxRedis, cmd->s); + } + } cmd->s[cmd->len] = c; return 0; }

1 0

Kamailio in VUC session, next Friday, Feb 17
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Hello, there will be a VoIP Users Conference (VUC) session dedicated to Kamailio SIP Server next week, Friday, February 17, starting with 17:00GMT. VUC is an online weekly audio conferencing event, you can connect via SIP and IRC to interact with the other participants. More details (including the ways to connect) are available at: * http://www.kamailio.org/w/2012/02/kamailio-at-voipuserconference-fri-feb-17… Join the event to learn about latest developments and future plans for the project, ask questions about your interested topics. Spreading the word about the event is also appreciated. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 2

dialog2 modules
by Daniel-Constantin Mierla 17 Feb '12

17 Feb '12

Hi Jason, I was looking briefly over the dialog2 module in your branch. Is no database (persistence) support for it? Anyhow, from my point of view it can be added to master branch, so it is more visible and interested people can start playing with it. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012