sr-dev February 2011

sr-dev@lists.kamailio.org

22 participants
124 discussions

git:master: - Updated patch and example config after testing.

by Carsten Bock

Module: sip-router Branch: master Commit: 7dfe7c223f779b039e86ef0b5ab0c8cc1785613a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7dfe7c2… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Feb 10 23:46:58 2011 +0100 - Updated patch and example config after testing. --- modules/rtpproxy/test/kamailio.cfg | 10 +++--- modules/rtpproxy/test/rtpproxy.patch | 58 +++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/modules/rtpproxy/test/kamailio.cfg b/modules/rtpproxy/test/kamailio.cfg index 5c36c3b..0d5c73f 100644 --- a/modules/rtpproxy/test/kamailio.cfg +++ b/modules/rtpproxy/test/kamailio.cfg @@ -28,7 +28,7 @@ auto_aliases=no tos=0x80 # ------------------ module loading ---------------------------------- -mpath="/usr/local/lib/kamailio/modules_k/:/usr/local/lib/kamailio/modules/" +mpath="sip-router/modules_k:sip-router/modules" # To Check/modufy the maximum forwards loadmodule "maxfwd.so" # Transaction-Module @@ -70,7 +70,7 @@ loadmodule "registrar.so" modparam("rtpproxy", "rtpproxy_sock", "udp:localhost:22222") # Nathelper: RTP-Proxy Timeout modparam("rtpproxy", "rtpproxy_tout", 3) -modparam("rtpproxy", "timeout_socket", "http://localhost:8000/RPC2") +modparam("rtpproxy", "timeout_socket", "xmlrpc:http://localhost:8000/RPC2") # ----------------- Settings for max-fwd --------------- # Max-Forward-Module: Set the maximum to 20 @@ -122,7 +122,7 @@ modparam("dialog", "db_mode", 0) # The number of dialogs to be fetched per loop #modparam("dialog", "db_fetch_rows", 120) -modparam("registrar", "max_expires", 60); +modparam("registrar", "max_expires", 10); modparam("registrar", "received_avp", "$avp(i:100)"); modparam("nathelper", "received_avp", "$avp(i:100)"); @@ -197,7 +197,7 @@ route { ################################################################################################################## # Use RTP-Proxy ############################################################################################################### - if (!force_rtp_proxy("arf")) { + if (!rtpproxy_offer("arf")) { sl_send_reply("503", "No RTP-Relay available"); exit; } @@ -346,7 +346,7 @@ onreply_route[1] { fix_nated_contact(); # Content-Length prüfen if (!search("^Content-Length:[ ]*0")) { - force_rtp_proxy("arf"); + rtpproxy_answer("arf"); } } } diff --git a/modules/rtpproxy/test/rtpproxy.patch b/modules/rtpproxy/test/rtpproxy.patch index 3fc23b8..3d2e8b4 100644 --- a/modules/rtpproxy/test/rtpproxy.patch +++ b/modules/rtpproxy/test/rtpproxy.patch @@ -7589,7 +7589,7 @@ index 54c1a60..1c88b99 100644 +AC_SUBST(LIBS_XMLRPC) AC_OUTPUT diff --git a/rtpp_command.c b/rtpp_command.c -index c5734ae..1afae6a 100644 +index c5734ae..d6072de 100644 --- a/rtpp_command.c +++ b/rtpp_command.c @@ -69,6 +69,9 @@ struct proto_cap proto_caps[] = { @@ -7610,22 +7610,51 @@ index c5734ae..1afae6a 100644 requested_nsamples = -1; ia[0] = ia[1] = NULL; -@@ -965,17 +969,30 @@ handle_command(struct cfg *cf, int controlfd, double dtime) +@@ -468,7 +472,7 @@ handle_command(struct cfg *cf, int controlfd, double dtime) + } + call_id = argv[1]; + if (op == UPDATE || op == LOOKUP || op == PLAY) { +- max_argc = (op == UPDATE ? 8 : 6); ++ max_argc = (op == PLAY ? 6 : 8); + if (argc < 5 || argc > max_argc) { + rtpp_log_write(RTPP_LOG_ERR, cf->stable.glog, "command syntax error"); + reply_error(&cf->stable, controlfd, &raddr, rlen, cookie, 4); +@@ -478,7 +482,7 @@ handle_command(struct cfg *cf, int controlfd, double dtime) + to_tag = argv[5]; + if (op == PLAY && argv[0][1] != '\0') + playcount = atoi(argv[0] + 1); +- if (op == UPDATE && argc > 6) { ++ if (op != PLAY && argc > 6) { + socket_name_u = argv[6]; + if (strncmp("unix:", socket_name_u, 5) == 0) + socket_name_u += 5; +@@ -965,25 +969,39 @@ handle_command(struct cfg *cf, int controlfd, double dtime) } pthread_mutex_lock(&cf->glock); -+ - if (op == UPDATE) { +- if (op == UPDATE) { - if (cf->timeout_handler->socket_name == NULL && socket_name_u != NULL) - rtpp_log_write(RTPP_LOG_ERR, spa->log, "must permit notification socket with -n"); ++ ++ if ((op == UPDATE) || (op == LOOKUP)){ if (spa->timeout_data.notify_tag != NULL) { free(spa->timeout_data.notify_tag); spa->timeout_data.notify_tag = NULL; } - if (cf->timeout_handler->socket_name != NULL && socket_name_u != NULL) { - if (strcmp(cf->timeout_handler->socket_name, socket_name_u) != 0) { +- if (cf->timeout_handler->socket_name != NULL && socket_name_u != NULL) { +- if (strcmp(cf->timeout_handler->socket_name, socket_name_u) != 0) { - rtpp_log_write(RTPP_LOG_ERR, spa->log, "invalid socket name %s", socket_name_u); - socket_name_u = NULL; +- } else { ++ spa->timeout_data.handler = NULL; ++ if (socket_name_u != NULL) { ++ if (cf->timeout_handler != NULL && cf->timeout_handler->socket_name != NULL ++ && strlen(cf->timeout_handler->socket_name) == strlen(socket_name_u) ++ && strcmp(cf->timeout_handler->socket_name, socket_name_u) != 0) { + rtpp_log_write(RTPP_LOG_INFO, spa->log, "setting timeout handler"); + spa->timeout_data.handler = cf->timeout_handler; + spa->timeout_data.notify_tag = strdup(notify_tag); ++ } else { + rtpp_log_write(RTPP_LOG_INFO, spa->log, "setting custom timeout handler (%s)", socket_name_u); + my_timeout_h = malloc(sizeof(struct rtpp_timeout_handler)); + if (my_timeout_h == NULL) { @@ -7636,15 +7665,20 @@ index c5734ae..1afae6a 100644 + if(my_timeout_h->socket_name != NULL) { + strcpy(my_timeout_h->socket_name, socket_name_u); + spa->timeout_data.handler = my_timeout_h; -+ spa->timeout_data.notify_tag = strdup(notify_tag); ++ if (notify_tag != NULL) spa->timeout_data.notify_tag = strdup(notify_tag); ++ else spa->timeout_data.notify_tag = NULL; + } else { + rtpp_log_write(RTPP_LOG_ERR, spa->log, "Unable to allocate memory"); + free(my_timeout_h); + } + } - } else { - rtpp_log_write(RTPP_LOG_INFO, spa->log, "setting timeout handler"); - spa->timeout_data.handler = cf->timeout_handler; + } +- } else if (socket_name_u == NULL && spa->timeout_data.handler != NULL) { +- spa->timeout_data.handler = NULL; +- rtpp_log_write(RTPP_LOG_INFO, spa->log, "disabling timeout handler"); + } + } + diff --git a/rtpp_notify.c b/rtpp_notify.c index e92c9ec..35982bf 100644 --- a/rtpp_notify.c @@ -7798,7 +7832,7 @@ index e92c9ec..35982bf 100644 wi->th->connected = 0; rtpp_log_ewrite(RTPP_LOG_ERR, wi->glog, "failed to send timeout notification"); diff --git a/rtpp_session.c b/rtpp_session.c -index 03e3d8a..78b2135 100644 +index 03e3d8a..44a34fa 100644 --- a/rtpp_session.c +++ b/rtpp_session.c @@ -41,6 +41,7 @@ @@ -7815,7 +7849,7 @@ index 03e3d8a..78b2135 100644 free(sp->timeout_data.notify_tag); +#ifdef ENABLE_XMLRPC + // In case we use a custom timeout handler, we have to free it. -+ if (sp->timeout_data.handler != &cf->timeout_handler) { ++ if (sp->timeout_data.handler && (sp->timeout_data.handler != &cf->timeout_handler)) { + free(sp->timeout_data.handler->socket_name); + free(sp->timeout_data.handler); + }

13 years, 10 months

git:master: - Updated the patch and the Protocol towards the RTP-Proxy ( removed the timeout-socket-type)

by Carsten Bock

Module: sip-router Branch: master Commit: e5552b2b75684d17be6cd0adf2c78cce4b1fa45d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5552b2… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Feb 10 22:12:04 2011 +0100 - Updated the patch and the Protocol towards the RTP-Proxy (removed the timeout-socket-type) --- modules/rtpproxy/doc/rtpproxy_admin.xml | 31 +- modules/rtpproxy/rtpproxy.c | 12 +- modules/rtpproxy/test/rtpproxy.patch | 7817 ++++++++++++++++++++++++++++++- 3 files changed, 7614 insertions(+), 246 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e55…

13 years, 10 months

git:master: modules_s/nathelper: rtpproxy functionality removed

by Ovidiu Sas

Module: sip-router Branch: master Commit: 564067f1a35a60d5a111f5f808c5f0f03fa5eab5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=564067f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Feb 10 11:11:55 2011 -0500 modules_s/nathelper: rtpproxy functionality removed - for rtpproxy functionality please use rtpproxy module from modules --- modules_s/nathelper/README | 296 ++----- modules_s/nathelper/doc/functions.xml | 125 --- modules_s/nathelper/nathelper.c | 1561 --------------------------------- modules_s/nathelper/nathelper.h | 21 - 4 files changed, 97 insertions(+), 1906 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=564…

13 years, 10 months

git:master: modules_s/nathelper: rtpproxy functionality removed

by Ovidiu Sas

Module: sip-router Branch: master Commit: 59c8621c61072d4b9c54903e06baab2b3147668f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59c8621… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Feb 10 11:09:40 2011 -0500 modules_s/nathelper: rtpproxy functionality removed - for rtpproxy functionality please use rtpproxy module from modules --- modules_s/nathelper/examples/4to6.cfg | 113 ----------------- modules_s/nathelper/examples/alg.cfg | 104 --------------- modules_s/nathelper/nathelper_rtpp.cfg | 73 ----------- modules_s/nathelper/rtpproxy_stream.c | 216 -------------------------------- modules_s/nathelper/rtpproxy_stream.h | 37 ------ 5 files changed, 0 insertions(+), 543 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=59c…

13 years, 10 months

git:master: cfg framework: accept 0 int value within a group instance

by Miklos Tirpak

Module: sip-router Branch: master Commit: eedafa45ff4040d0a0f362b8fac6604be63ed7d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eedafa4… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Feb 10 14:50:33 2011 +0100 cfg framework: accept 0 int value within a group instance - The parameter verification of new_add_var() was wrong, it did not accept NULL values which can be the case with integer 0. - char* NULL and str {NULL, 0} are also valid values --- cfg/cfg_struct.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 6e93379..4e247cd 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -876,8 +876,8 @@ int new_add_var(str *group_name, unsigned int group_id, str *var_name, cfg_add_var_t *add_var = NULL, **add_var_p; int len; - if (type && (!var_name || !val)) { - LOG(L_ERR, "ERROR: new_add_var(): Missing variable/value specification\n"); + if (type && !var_name) { + LOG(L_ERR, "ERROR: new_add_var(): Missing variable specification\n"); goto error; } if (type) @@ -929,24 +929,32 @@ int new_add_var(str *group_name, unsigned int group_id, str *var_name, case CFG_VAR_STR: len = ((str *)val)->len; - add_var->val.s.s = (char *)pkg_malloc(sizeof(char) * len); - if (!add_var->val.s.s) { - LOG(L_ERR, "ERROR: new_add_var(): Not enough memory\n"); - goto error; + if (len) { + add_var->val.s.s = (char *)pkg_malloc(sizeof(char) * len); + if (!add_var->val.s.s) { + LOG(L_ERR, "ERROR: new_add_var(): Not enough memory\n"); + goto error; + } + memcpy(add_var->val.s.s, ((str *)val)->s, len); + } else { + add_var->val.s.s = NULL; } add_var->val.s.len = len; - memcpy(add_var->val.s.s, ((str *)val)->s, len); break; case CFG_VAR_STRING: - len = strlen((char *)val); - add_var->val.ch = (char *)pkg_malloc(sizeof(char) * (len + 1)); - if (!add_var->val.ch) { - LOG(L_ERR, "ERROR: new_add_var(): Not enough memory\n"); - goto error; + if (val) { + len = strlen((char *)val); + add_var->val.ch = (char *)pkg_malloc(sizeof(char) * (len + 1)); + if (!add_var->val.ch) { + LOG(L_ERR, "ERROR: new_add_var(): Not enough memory\n"); + goto error; + } + memcpy(add_var->val.ch, (char *)val, len); + add_var->val.ch[len] = '\0'; + } else { + add_var->val.ch = NULL; } - memcpy(add_var->val.ch, (char *)val, len); - add_var->val.ch[len] = '\0'; break; default:

13 years, 10 months

git:master: tm: t_pick_branch() cannot ingnore the pending blined UACs

by Miklos Tirpak

Module: sip-router Branch: master Commit: 17fc9913737cf3314d317d9b62cfd3dc05f8376e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17fc991… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Feb 10 14:26:14 2011 +0100 tm: t_pick_branch() cannot ingnore the pending blined UACs Empty branches shall be considered pending branches before their final response is set. When all the responses were dropped in failure route and a new blind UAC was added, t_pick_branch() did not realize that there is still at least one pending branch, it returned an error instead. Later on, the blind UAC was tried to be canceled causing deadlock. --- modules/tm/t_reply.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index c18c716..e65d1b9 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1042,8 +1042,11 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) } continue; } - /* skip 'empty branches' */ - if (!t->uac[b].request.buffer) continue; + /* skip 'empty branches' + * An empty branch without a final response is still considered + * to be a pending, incomplete branch. */ + if ((!t->uac[b].request.buffer) && (t->uac[b].last_received>=200)) + continue; /* there is still an unfinished UAC transaction; wait now! */ if ( t->uac[b].last_received<200 ) return -2;

13 years, 10 months

git:carstenbock/ims: - First start of the Reg-AVP's implementation: Ported the database consistency from modules_s/ser. The ucontact now contains a new item: avps, which holds the avps to a contact.

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 2230c677c1134a46fdf727f0043db027ad66415b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2230c67… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Feb 9 20:32:39 2011 +0100 - First start of the Reg-AVP's implementation: Ported the database consistency from modules_s/ser. The ucontact now contains a new item: avps, which holds the avps to a contact. --- modules_k/usrloc/doc/usrloc_admin.xml | 18 ++++ modules_k/usrloc/reg_avps_db.c | 177 +++++++++++++++++++++++++++++++++ modules_k/usrloc/reg_avps_db.h | 10 ++ modules_k/usrloc/ucontact.c | 61 +++++++++--- modules_k/usrloc/ucontact.h | 2 + modules_k/usrloc/udomain.c | 30 ++++-- modules_k/usrloc/ul_mod.c | 6 +- modules_k/usrloc/ul_mod.h | 1 + 8 files changed, 281 insertions(+), 24 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=223…

13 years, 10 months

fosdem 2011 presentation about p_usrloc

by Henning Westerholt

Hello, this year the FOSDEM developer conference was a again a really nice event, the first time with an own room dedicated completely to open source telephony solutions! If you're interested in our presentation about the new p_usrloc module and how to scale location services with Kamailio, you can find it at the usual place on our webserver: http://kamailio.org/events/2011-fosdem/p_usrloc.pdf Best regards, Henning

13 years, 10 months

git:mariuszbihlei/consistent_hashing: modules_k/ p_usrloc Added consistent hashing API and sample usage from p_usrloc

by Marius Zbihlei

Module: sip-router Branch: mariuszbihlei/consistent_hashing Commit: 51361cd2996ae13911d8cf71c56c97ac4510e5e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=51361cd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Feb 9 16:21:43 2011 +0200 modules_k/p_usrloc Added consistent hashing API and sample usage from p_usrloc TODO: automatic detection (or via kamctl/xmlrpc) or changed location count. ATM restart is needed TODO: increasing hash count causes a M/(n+1) users (average) to become unreachable for maximum expiry time --- lib/kcore/consistent_hash.c | 150 +++++++++++++++++++++++++++++++++++++ lib/kcore/consistent_hash.h | 62 +++++++++++++++ modules_k/p_usrloc/p_usrloc_mod.c | 18 ++++- modules_k/p_usrloc/p_usrloc_mod.h | 8 ++- modules_k/p_usrloc/ul_db_handle.c | 25 +++++-- modules_k/p_usrloc/ul_db_layer.c | 2 +- test/unit/50.cfg | 5 +- 7 files changed, 257 insertions(+), 13 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=513…

13 years, 10 months

Fosdem2011 presentation: SIP Web20 Lua

by Daniel-Constantin Mierla

Hello, the presentation I did during Fosdem in Brussels last weekend is available at: http://www.kamailio.org/events/2011-fosdem/dcm-sip-web-lua.pdf The focus was to show how to interact with Kamailio via HTTP and how Kamailio can interact with Web services via HTTP, using Lua to make it easier. There are slides for a demo config of sending asynchronous notifications to Twitter on missed calls (using modules app_lua, mqueue, sqlops and rtimer). Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

13 years, 10 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2011