sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:master: modules_k/outbound: updated documentation

by Peter Dunkley

Module: sip-router Branch: master Commit: 82303dfad79c601767bb8e1a115fd30d1fb3a282 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82303df… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 8 11:27:11 2013 +0000 modules_k/outbound: updated documentation - Fixed some mistakes in the Edge Proxy example - Filled in more detail in the Registrar example --- modules_k/outbound/README | 62 +++++++++++++++++++++++++++- modules_k/outbound/doc/outbound_admin.xml | 62 +++++++++++++++++++++++++++- 2 files changed, 118 insertions(+), 6 deletions(-) diff --git a/modules_k/outbound/README b/modules_k/outbound/README index ff5c195..af8fb1f 100644 --- a/modules_k/outbound/README +++ b/modules_k/outbound/README @@ -140,6 +140,8 @@ route { # must be outbound routed } } + + t_on_failure("FAIL_OUTBOUND"); route(RELAY); } else if (is_method("REGISTER")) { add_path(); @@ -151,7 +153,6 @@ route { } route[RELAY] { - t_on_failure("FAIL_OUTBOUND"); if (!t_relay()) { sl_send_reply("430", "Flow Failed"); } @@ -193,20 +194,75 @@ onreply_route { if ($(hdr(Require)[*])=~"outbound") insert_hf("Flow-Timer: FLOW_TIMER\r\n", "Call-ID"); } + +... } -failure_route[REPLY_OUTBOUND] { +failure_route[FAIL_OUTBOUND] { if (t_branch_timeout() || !t_branch_replied()) { send_reply("430", "Flow Failed"); } } +... Example 1.3. Registrar Configuration ... +loadmodule "tm.so" +... loadmodule "registrar.so" ... +modparam("tm", "contacts_avp", "tm_contacts") +modparam("tm", "contact_flows_avp", "tm_contact_flows") +... +modparam("registrar", "use_path", 1) +modparam("registrar", "path_mode", 2) modparam("registrar", "outbound_mode", 2) -### TBD +... +route[LOCATION] { +... + if (!lookup("location")) { + $var(rc) = $rc; + route(TOVOICEMAIL); + t_newtran(); + switch ($var(rc)) { + case -1: + case -3: + send_reply("404", "Not Found"); + exit; + case -2: + send_reply("405", "Method Not Allowed"); + exit; + } + } + + if (!t_load_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + + if (!t_next_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + + t_on_failure(FAIL_OUTBOUND); +... +} +... +failure_route[FAIL_OUTBOUND] { + if (t_check_status("408|430")) { + if (!t_next_contact_flows() && !t_next_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + } else if (!t_next_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + + t_on_failure(FAIL_OUTBOUND); + route[RELAY]; +} ... 2. Dependencies diff --git a/modules_k/outbound/doc/outbound_admin.xml b/modules_k/outbound/doc/outbound_admin.xml index 8f0b057..28c91d0 100644 --- a/modules_k/outbound/doc/outbound_admin.xml +++ b/modules_k/outbound/doc/outbound_admin.xml @@ -95,6 +95,8 @@ route { # must be outbound routed } } + + t_on_failure("FAIL_OUTBOUND"); route(RELAY); } else if (is_method("REGISTER")) { add_path(); @@ -106,7 +108,6 @@ route { } route[RELAY] { - t_on_failure("FAIL_OUTBOUND"); if (!t_relay()) { sl_send_reply("430", "Flow Failed"); } @@ -148,23 +149,78 @@ onreply_route { if ($(hdr(Require)[*])=~"outbound") insert_hf("Flow-Timer: FLOW_TIMER\r\n", "Call-ID"); } + +... } -failure_route[REPLY_OUTBOUND] { +failure_route[FAIL_OUTBOUND] { if (t_branch_timeout() || !t_branch_replied()) { send_reply("430", "Flow Failed"); } } +... ]]></programlisting> </example> <example> <title>Registrar Configuration</title> <programlisting><![CDATA[ ... +loadmodule "tm.so" +... loadmodule "registrar.so" ... +modparam("tm", "contacts_avp", "tm_contacts") +modparam("tm", "contact_flows_avp", "tm_contact_flows") +... +modparam("registrar", "use_path", 1) +modparam("registrar", "path_mode", 2) modparam("registrar", "outbound_mode", 2) -### TBD +... +route[LOCATION] { +... + if (!lookup("location")) { + $var(rc) = $rc; + route(TOVOICEMAIL); + t_newtran(); + switch ($var(rc)) { + case -1: + case -3: + send_reply("404", "Not Found"); + exit; + case -2: + send_reply("405", "Method Not Allowed"); + exit; + } + } + + if (!t_load_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + + if (!t_next_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + + t_on_failure(FAIL_OUTBOUND); +... +} +... +failure_route[FAIL_OUTBOUND] { + if (t_check_status("408|430")) { + if (!t_next_contact_flows() && !t_next_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + } else if (!t_next_contacts()) { + send_reply("500", "Server Internal Error"); + exit; + } + + t_on_failure(FAIL_OUTBOUND); + route[RELAY]; +} ... ]]></programlisting> </example>

11 years, 11 months

git:master: modules_k/outbound: downgraded and ERR diagnostic to INFO

by Peter Dunkley

Module: sip-router Branch: master Commit: a20893dd6cbf1a5fc7f48d9e8fd1823bbb1ba07f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a20893d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 8 11:01:31 2013 +0000 modules_k/outbound: downgraded and ERR diagnostic to INFO - Thanks to oej for pointing this out --- modules_k/outbound/api.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/outbound/api.h b/modules_k/outbound/api.h index 90e70ef..620b745 100644 --- a/modules_k/outbound/api.h +++ b/modules_k/outbound/api.h @@ -46,7 +46,7 @@ inline static int ob_load_api(ob_api_t *pxb) bind_ob_f bind_ob_exports; if (!(bind_ob_exports = (bind_ob_f)find_export("bind_ob", 1, 0))) { - LM_ERR("Failed to import bind_ob\n"); + LM_INFO("Failed to import bind_ob\n"); return -1; } return bind_ob_exports(pxb);

11 years, 11 months

git:master: modules_k/rr: fixed typo in a diagnostic

by Peter Dunkley

Module: sip-router Branch: master Commit: f57ac2ddaf1a4bbb8178f9fdc2fc408819d41228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f57ac2d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jan 8 11:02:09 2013 +0000 modules_k/rr: fixed typo in a diagnostic - Thanks to oej for pointing this out --- modules_k/rr/rr_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rr/rr_mod.c b/modules_k/rr/rr_mod.c index 764e541..12767a0 100644 --- a/modules_k/rr/rr_mod.c +++ b/modules_k/rr/rr_mod.c @@ -153,7 +153,7 @@ static int mod_init(void) LM_INFO("Bound rr module to outbound module\n"); else { - LM_INFO("oubound module not available\n"); + LM_INFO("outbound module not available\n"); memset(&rr_obb, 0, sizeof(ob_api_t)); }

11 years, 11 months

git:master: msrp: added internal map table to track msrp connections

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ea3cacb10d2cc15f23c3a0c7fead151939873951 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea3cacb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 5 22:00:55 2013 +0100 msrp: added internal map table to track msrp connections - initial version - the table can be enabled via config parameters --- modules/msrp/Makefile | 3 + modules/msrp/README | 155 +++++++++++++--- modules/msrp/doc/msrp_admin.xml | 133 +++++++++++++ modules/msrp/msrp_cmap.c | 405 +++++++++++++++++++++++++++++++++++++++ modules/msrp/msrp_cmap.h | 73 +++++++ modules/msrp/msrp_env.h | 1 + modules/msrp/msrp_mod.c | 104 +++++++++- modules/msrp/msrp_parser.c | 92 +++++++++ modules/msrp/msrp_parser.h | 4 + 9 files changed, 936 insertions(+), 34 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ea3…

11 years, 11 months

Completing outbound

by Peter Dunkley

Hi, I have run out of time to do any more outbound development before the freeze. I have added a page to the wiki here containing my notes on what is required to completely finish the development. I believe that the outbound support that will be in 4.0.0 will be sufficient for a Kamailio installation with separate edge proxies and registrars with flow-timer support. I hope to be able to come back to this later (possibly not until late-February/March at this point) and do more work on outbound for the 4.1.0 release. However, for the time being - unless someone else wants to pick off the last items on the wiki page, I am parking this. The wiki page is here: http://www.kamailio.org/wiki/devel/completing_outbound Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

11 years, 11 months

git:master: core: when printing the listening sockets on startup print also the advertise-port

by Klaus Darilion

Module: sip-router Branch: master Commit: c9de09b99b417aebb8fe84d44dec6c1bff1d8849 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9de09b… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Mon Jan 7 16:22:38 2013 +0100 core: when printing the listening sockets on startup print also the advertise-port --- socket_info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/socket_info.c b/socket_info.c index 9defb2b..f865f43 100644 --- a/socket_info.c +++ b/socket_info.c @@ -2018,7 +2018,7 @@ void print_all_socket_lists() si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); if (si->useinfo.name.s) - printf(" advertise %s", si->useinfo.name.s); + printf(" advertise %s:%d", si->useinfo.name.s, si->useinfo.port_no); printf("\n"); } }

11 years, 11 months

Testing SIP Outbound / RFC5626 (Was: Freezing for next major release)

by Richard Brady

Hi Peter Great work on this! We'd like to help you test. The test I have in mind, which we could create using SIPp, would be to register multiple contacts with the same instance-id (i.e. "sip.instance" param) but different reg-id params. Then send an INVITE to that AoR and make sure the forking is only per instance-id and not per reg-id. This could be repeated in multiple permutations of instance-ids and reg-ids. This would be a test of save() and lookup() more than anything else. Is that what you had in mind? Richard On 3 January 2013 14:13, Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>wrote: > I hope to get the outbound edge proxy and flow timer stuff into master by > Monday, but it could really do with some additional testing especially in > conjunction with the reg-id stuff in registrar/usrloc (which I have no idea > how to use). > > Peter > >

11 years, 11 months

git:oej/permissionsrpc: Fix the test-uri function.

by Olle E. Johansson

Module: sip-router Branch: oej/permissionsrpc Commit: 4c8dd7b4e8bd35b028187ee223b6d818260921b8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c8dd7b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Jan 8 09:33:47 2013 +0100 Fix the test-uri function. Thanks to Daniel for helping me. --- modules_k/permissions/mi.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/modules_k/permissions/mi.c b/modules_k/permissions/mi.c index ee17534..e38bc05 100644 --- a/modules_k/permissions/mi.c +++ b/modules_k/permissions/mi.c @@ -255,46 +255,42 @@ struct mi_root* mi_allow_uri(struct mi_root *cmd, void *param) */ void rpc_test_uri(rpc_t* rpc, void* c) { - str *basenamep, *urip, *contactp; + str basenamep, urip, contactp; char basename[MAX_FILE_LEN + 1]; char uri[MAX_URI_SIZE + 1], contact[MAX_URI_SIZE + 1]; unsigned int allow_suffix_len; - int i; if (rpc->scan(c, "S", &basenamep) != 1) { rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); return; } - LM_DBG("Basename %s length %d strlen(%d)\n", basenamep, basenamep->len, strlen(basenamep)); if (rpc->scan(c, "S", &urip) != 1) { rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); return; } - LM_DBG("URI %s length %d \n", urip, urip->len); if (rpc->scan(c, "S", &contactp) != 1) { rpc->fault(c, 500, "Not enough parameters (basename, URI and contact)"); return; } - LM_DBG("Contact %s length %d size %d\n", contactp, contactp->len, sizeof(contactp->s) - 1); /* For some reason, rtp->scan doesn't set the length properly */ - if (contactp->len > MAX_URI_SIZE) { + if (contactp.len > MAX_URI_SIZE) { rpc->fault(c, 500, "Contact is too long"); return; } allow_suffix_len = strlen(allow_suffix); - if (basenamep->len + allow_suffix_len + 1 > MAX_FILE_LEN) { + if (basenamep.len + allow_suffix_len + 1 > MAX_FILE_LEN) { rpc->fault(c, 500, "Basename is too long"); return; } - memcpy(basename, basenamep->s, basenamep->len); - memcpy(basename + basenamep->len, allow_suffix, allow_suffix_len); - basename[basenamep->len + allow_suffix_len] = 0; - memcpy(uri, urip->s, urip->len); - memcpy(contact, contactp->s, contactp->len); - contact[contactp->len] = 0; - uri[urip->len] = 0; + memcpy(basename, basenamep.s, basenamep.len); + memcpy(basename + basenamep.len, allow_suffix, allow_suffix_len); + basename[basenamep.len + allow_suffix_len] = 0; + memcpy(uri, urip.s, urip.len); + memcpy(contact, contactp.s, contactp.len); + contact[contactp.len] = 0; + uri[urip.len] = 0; if (allow_test(basename, uri, contact) == 1) { rpc->printf(c, "Allowed");

11 years, 11 months

git:oej/permissionsrpc: Merge branch 'master' into oej/permissionsrpc

by Olle E. Johansson

Module: sip-router Branch: oej/permissionsrpc Commit: 10e06eb7b38cfb0909b07ac2e3e4bc9bfb7f2e9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10e06eb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Tue Jan 8 08:52:17 2013 +0100 Merge branch 'master' into oej/permissionsrpc * master: (90 commits) modules_k/registrar: documented new "flow_timer" modparam modules_k/registrar: Added modparam to allow Flow-Timer: to be set in 200 OK response to REGISTER requests modules/rtpproxy: removed LM_DBG that caused compiler warnings modules_k/outbound: Updated the module documentation modules_k/registrar: Updated registrar module documentation to describe the outbound_mode parameter modules_k/registrar: New outbound_mode parameter core: when printing the listening sockets on startup print also the advertise-port pkg/kamailio/(centos|fedora): Updated ver and rel in .spec modules_k/outbound: Updates to outbound module documentation modules_k/outbound: Fixes to outbound code arising from testing modules_k/rr: Updates to rr module documentation for outbound modules_k/rr: Fixes to loose.c from outbound testing sl: fix compilation warnings in sl_forward_reply() dialog: fixed ka_timer linking core: command line option -v replaced with -K msrp: new parameter use_path_addr msrp: added rpc command to list active connections msrp: added internal map table to track msrp connections pipelimit: implemented support for RPC commands Makefile.defs: major version base updated to 4.0.0 ... ---

11 years, 11 months

git:oej/permissionsrpc: Merge branch 'master' into oej/permissionsrpc

by Olle E. Johansson

Module: sip-router Branch: oej/permissionsrpc Commit: b051b01bb8827a9db7463affb4865e6a05f6dbb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b051b01… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 29 09:31:18 2012 +0100 Merge branch 'master' into oej/permissionsrpc While looking at the falling snow outside... * master: modules_s/usrloc: moved to obsolete folder modules_s/registrar: moved to obsolete folder modules_s/.gitkeep: added a placeholder to keep empty modules_s folder for a while Makefile: make TAGS skips the obsolete folder usrloc(k): fixed position of xavp_contact parameter in docs usrloc: store per-contact attributes in database core: fixed xavp level cloning function core: added a fuction that adds an xavp with an xavp value kamctl: regenerated database creation scripts lib/srdb1: added location_attrs table core: check for IP in no_naptr_srv_sip_resolvehost() core: try all srv protocols when not already set registrar(k): restore the location contact xavp upon lookup usrloc(k): option to store xavp per contact core: extended xavp api registrar(k): use only pre-existing branches in lookup_branches() p_usrloc: clean memory in case of malloc error eras, och ett tomt meddelande ---

11 years, 11 months

← Newer
1
...
23
24
25
26
27
28
29
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013