sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

git:4.1: dispatcher: updated example config to use new db url attributes
by Daniel-Constantin Mierla 21 Jan '14

21 Jan '14

Module: sip-router Branch: 4.1 Commit: 3c57dee17e154b8ff4daf72e76134e124a74652b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c57dee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 15 17:00:45 2014 +0100 dispatcher: updated example config to use new db url attributes (cherry picked from commit a248b53249d76e6b53f72bc64acd4c14fb5db660) --- modules/dispatcher/doc/dispatcher.cfg | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/dispatcher/doc/dispatcher.cfg b/modules/dispatcher/doc/dispatcher.cfg index b573df5..8c0fc4c 100644 --- a/modules/dispatcher/doc/dispatcher.cfg +++ b/modules/dispatcher/doc/dispatcher.cfg @@ -20,6 +20,9 @@ # - define WITH_DEBUG # +#!ifndef DBURL +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" +#!endif ####### Global Parameters ######### @@ -106,8 +109,7 @@ modparam("tm", "fr_timer", 2000) modparam("tm", "fr_inv_timer", 40000) # ----- dispatcher params ----- -modparam("dispatcher", "db_url", - "mysql://openser:openserro@localhost/openser") +modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") @@ -166,8 +168,6 @@ route { # dispatch destinations route(DISPATCH); - - route(RELAY); } @@ -253,7 +253,8 @@ route[DISPATCH] { } xlog("L_DBG", "--- SCRIPT: going to <$ru> via <$du>\n"); t_on_failure("RTF_DISPATCH"); - return; + route(RELAY); + exit; } # Sample failure route

1 0

git:master: dispatcher: readme was updated
by Daniel-Constantin Mierla 21 Jan '14

21 Jan '14

Module: sip-router Branch: master Commit: cdbcef56191e48c0277ff56e078eeaa20946422f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdbcef5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 21 10:22:10 2014 +0100 dispatcher: readme was updated --- modules/dispatcher/README | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/dispatcher/README b/modules/dispatcher/README index c488359..2357883 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -223,7 +223,7 @@ Chapter 1. Admin Guide message attributes. The module can be used as a stateless load balancer, it does not depend - on any call state tracing module. It requires the TM module if you + on any call state tracking module. It requires the TM module if you enable auto-discovery of active/inactive gateways. It is very lightweight, therefore suitable for handling heavy SIP @@ -702,7 +702,14 @@ Note 4.1. ds_select_dst(set, alg) The method selects a destination from addresses set. It returns true if - a new destination is set. + a new destination is set. The selected address is set to dst_uri field + (aka the outbound proxy address or the $du variable), not being visible + in the SIP request. + + If the bit 2 in 'flags' parameter is set, the rest of the addresses + from the destination set is stored in AVP list. You can use + 'ds_next_dst()' to use next address in order to achieve serial forking + to all possible destinations. Meaning of the parameters is as follows: * set - the id of the set from where to pick up destination address.

1 0

git:master: dispatcher: more details on how destination select functions work
by Daniel-Constantin Mierla 21 Jan '14

21 Jan '14

Module: sip-router Branch: master Commit: f210c266311498393b93d66b41e8c08d89cbc731 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f210c26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 21 10:13:51 2014 +0100 dispatcher: more details on how destination select functions work --- modules/dispatcher/doc/dispatcher_admin.xml | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index d375fd0..75debec 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -24,7 +24,7 @@ </para> <para> The module can be used as a stateless load balancer, it does not - depend on any call state tracing module. It requires the TM module if + depend on any call state tracking module. It requires the TM module if you enable auto-discovery of active/inactive gateways. </para> <para> @@ -741,7 +741,15 @@ modparam("dispatcher", "force_dst", 1) </title> <para> The method selects a destination from addresses set. It returns true if - a new destination is set. + a new destination is set. The selected address is set to dst_uri field + (aka the outbound proxy address or the $du variable), not being visible + in the SIP request. + </para> + <para> + If the bit 2 in 'flags' parameter is set, the rest of the addresses from + the destination set is stored in AVP list. You can use 'ds_next_dst()' + to use next address in order to achieve serial forking to all possible + destinations. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -875,7 +883,7 @@ ds_select_dst("1", "$var(a)"); <function moreinfo="none">ds_select_domain(set, alg)</function> </title> <para> - The method selects a destination from addresses set and rewrites the + The method selects a destination from addresses set and rewrites the host and port from R-URI. The parameters have same meaning as for ds_select_dst(). </para>

1 0

git:master: tm: free from and to display names that can be set for local request from seas module
by Daniel-Constantin Mierla 20 Jan '14

20 Jan '14

Module: sip-router Branch: master Commit: 1b53001ad3ad1e9bfd3e64f8e03c35d4e5f54e8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b53001… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 20 17:24:18 2014 +0100 tm: free from and to display names that can be set for local request from seas module - reported and patch by Ziad Habchi --- modules/tm/dlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tm/dlg.c b/modules/tm/dlg.c index 647e34f..05e7d48 100644 --- a/modules/tm/dlg.c +++ b/modules/tm/dlg.c @@ -1216,6 +1216,9 @@ void free_dlg(dlg_t* _d) if (_d->rem_target.s) shm_free(_d->rem_target.s); if (_d->dst_uri.s) shm_free(_d->dst_uri.s); + if (_d->loc_dname.s) shm_free(_d->loc_dname.s); + if (_d->rem_dname.s) shm_free(_d->rem_dname.s); + /* Free all routes in the route set */ shm_free_rr(&_d->route_set); shm_free(_d);

1 0

git:master: kex: update README file
by Ovidiu Sas 20 Jan '14

20 Jan '14

Module: sip-router Branch: master Commit: 70b082b0abfbee473e3742280b0ea72cf0d73a1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70b082b… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Jan 20 10:23:58 2014 -0500 kex: update README file --- modules/kex/README | 267 ++++++++++++++++++++++++---------------------------- 1 files changed, 125 insertions(+), 142 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=70b…

1 0

[tracker] Comment added: Kamailio 4.0.x crash with pua_reginfo : reginfo_handle_notify
by sip-router 19 Jan '14

19 Jan '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#338 - Kamailio 4.0.x crash with pua_reginfo : reginfo_handle_notify User who did this - Devs Voicenter (voicenter) ---------- Is it applied? As i checked source of 4.0.5 i can't see the patched applied to it. Or there was alternative workaround and i'm missing it? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=338#comment1276 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:4.1: xhttp_rpc: fix arg parsing
by Ovidiu Sas 16 Jan '14

16 Jan '14

Module: sip-router Branch: 4.1 Commit: ab7f961dd22af7ce3cb451f30b116cc9a76bd4b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab7f961… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 16 18:02:31 2014 -0500 xhttp_rpc: fix arg parsing (cherry picked from commit 3615f3c26405f1c1bcd3721674e9d87e4b589146) --- modules/xhttp_rpc/xhttp_rpc_fnc.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/xhttp_rpc/xhttp_rpc_fnc.c b/modules/xhttp_rpc/xhttp_rpc_fnc.c index b25405e..5218c2f 100644 --- a/modules/xhttp_rpc/xhttp_rpc_fnc.c +++ b/modules/xhttp_rpc/xhttp_rpc_fnc.c @@ -310,7 +310,16 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg) int i; trim_leading(&ctx->arg2scan); - if (ctx->arg2scan.len) { + + if (ctx->arg2scan.len<=0) { + *arg = XHTTP_RPC_NULL_ARG; + return; + } + if (ctx->arg2scan.len==1 && ctx->arg2scan.s[0]=='\0') { + *arg = XHTTP_RPC_NULL_ARG; + return; + } + else { *arg = ctx->arg2scan; for(i=1; i<arg->len-1; i++) { if(arg->s[i]==' '||arg->s[i]=='\t'|| @@ -322,8 +331,6 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg) i++; ctx->arg2scan.s += i; ctx->arg2scan.len -= i; - } else { - *arg = XHTTP_RPC_NULL_ARG; } return; }

1 0

git:4.0: xhttp_rpc: fix arg parsing
by Ovidiu Sas 16 Jan '14

16 Jan '14

Module: sip-router Branch: 4.0 Commit: 68ecacc317cb617d1e507003d4c7d9a7856b2cfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68ecacc… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 16 18:02:31 2014 -0500 xhttp_rpc: fix arg parsing (cherry picked from commit 3615f3c26405f1c1bcd3721674e9d87e4b589146) --- modules/xhttp_rpc/xhttp_rpc_fnc.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/xhttp_rpc/xhttp_rpc_fnc.c b/modules/xhttp_rpc/xhttp_rpc_fnc.c index b25405e..5218c2f 100644 --- a/modules/xhttp_rpc/xhttp_rpc_fnc.c +++ b/modules/xhttp_rpc/xhttp_rpc_fnc.c @@ -310,7 +310,16 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg) int i; trim_leading(&ctx->arg2scan); - if (ctx->arg2scan.len) { + + if (ctx->arg2scan.len<=0) { + *arg = XHTTP_RPC_NULL_ARG; + return; + } + if (ctx->arg2scan.len==1 && ctx->arg2scan.s[0]=='\0') { + *arg = XHTTP_RPC_NULL_ARG; + return; + } + else { *arg = ctx->arg2scan; for(i=1; i<arg->len-1; i++) { if(arg->s[i]==' '||arg->s[i]=='\t'|| @@ -322,8 +331,6 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg) i++; ctx->arg2scan.s += i; ctx->arg2scan.len -= i; - } else { - *arg = XHTTP_RPC_NULL_ARG; } return; }

1 0

git:master: xhttp_rpc: fix arg parsing
by Ovidiu Sas 16 Jan '14

16 Jan '14

Module: sip-router Branch: master Commit: 3615f3c26405f1c1bcd3721674e9d87e4b589146 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3615f3c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 16 18:02:31 2014 -0500 xhttp_rpc: fix arg parsing --- modules/xhttp_rpc/xhttp_rpc_fnc.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/xhttp_rpc/xhttp_rpc_fnc.c b/modules/xhttp_rpc/xhttp_rpc_fnc.c index b25405e..5218c2f 100644 --- a/modules/xhttp_rpc/xhttp_rpc_fnc.c +++ b/modules/xhttp_rpc/xhttp_rpc_fnc.c @@ -310,7 +310,16 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg) int i; trim_leading(&ctx->arg2scan); - if (ctx->arg2scan.len) { + + if (ctx->arg2scan.len<=0) { + *arg = XHTTP_RPC_NULL_ARG; + return; + } + if (ctx->arg2scan.len==1 && ctx->arg2scan.s[0]=='\0') { + *arg = XHTTP_RPC_NULL_ARG; + return; + } + else { *arg = ctx->arg2scan; for(i=1; i<arg->len-1; i++) { if(arg->s[i]==' '||arg->s[i]=='\t'|| @@ -322,8 +331,6 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg) i++; ctx->arg2scan.s += i; ctx->arg2scan.len -= i; - } else { - *arg = XHTTP_RPC_NULL_ARG; } return; }

1 0

git:4.1: modules/tm: fixed bug where AVPs are not restored correctly if async used within failure route
by Daniel-Constantin Mierla 16 Jan '14

16 Jan '14

Module: sip-router Branch: 4.1 Commit: 4fb71c24a119f53d75500c9bf69275634ea05a60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fb71c2… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 16 13:08:29 2014 +0200 modules/tm: fixed bug where AVPs are not restored correctly if async used within failure route - related to mail by José Seabra on Jan 10 2014 entitiled - kamailio-4.1.1 avp issue within failure routes (cherry picked from commit f3f2f09beda60e1f7f4e6dfc0359f788991aeef6) --- modules/tm/t_reply.c | 93 +++++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 49 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4d9901d..f6fc568 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -856,62 +856,57 @@ void faked_env(struct cell *t, struct sip_msg *msg, int is_async_env) { * otherwise the actions would attempt to look the transaction * up (unnecessary overhead, refcounting) */ - if (!is_async_env) { - /* backup */ - backup_t = get_t(); - backup_branch = get_t_branch(); - backup_msgid = global_msg_id; - /* fake transaction and message id */ - global_msg_id = msg->id; + + /* backup */ + backup_t = get_t(); + backup_branch = get_t_branch(); + backup_msgid = global_msg_id; + /* fake transaction and message id */ + global_msg_id = msg->id; + + if (is_async_env) { + set_t(t, t->async_backup.backup_branch); + } else { set_t(t, T_BR_UNDEFINED); + } - /* make available the avp list from transaction */ - backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); + /* make available the avp list from transaction */ + backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); + backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); + backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); + backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); + backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); + backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); #ifdef WITH_XAVP - backup_xavps = xavp_set_list(&t->xavps_list); + backup_xavps = xavp_set_list(&t->xavps_list); #endif - /* set default send address to the saved value */ - backup_si = bind_address; - bind_address = t->uac[0].request.dst.send_sock; - /* backup lump lists */ - backup_add_rm = t->uas.request->add_rm; - backup_body_lumps = t->uas.request->body_lumps; - backup_reply_lump = t->uas.request->reply_lump; - } else { - global_msg_id = msg->id; - set_t(t, t->async_backup.backup_branch); - } + /* set default send address to the saved value */ + backup_si = bind_address; + bind_address = t->uac[0].request.dst.send_sock; + /* backup lump lists */ + backup_add_rm = t->uas.request->add_rm; + backup_body_lumps = t->uas.request->body_lumps; + backup_reply_lump = t->uas.request->reply_lump; } else { - if (!is_async_env) { - /* restore original environment */ - set_t(backup_t, backup_branch); - global_msg_id = backup_msgid; - set_route_type(backup_route_type); - /* restore original avp list */ - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to); + /* restore original environment */ + set_t(backup_t, backup_branch); + global_msg_id = backup_msgid; + set_route_type(backup_route_type); + /* restore original avp list */ + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to); #ifdef WITH_XAVP - xavp_set_list(backup_xavps); + xavp_set_list(backup_xavps); #endif - bind_address = backup_si; - /* restore lump lists */ - t->uas.request->add_rm = backup_add_rm; - t->uas.request->body_lumps = backup_body_lumps; - t->uas.request->reply_lump = backup_reply_lump; - } else { - /*we don't need to restore anything as there was no "environment" prior - to continuing (we are in a different process)*/ - LOG(L_DBG, "nothing to restore in async continue, useless call\n"); - } + bind_address = backup_si; + /* restore lump lists */ + t->uas.request->add_rm = backup_add_rm; + t->uas.request->body_lumps = backup_body_lumps; + t->uas.request->reply_lump = backup_reply_lump; } }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014