sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:pd/outbound: modules_k/outbound: Updates to outbound module documentation

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 9f636841675f9cdd5a4baf768784564be71660b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f63684… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jan 6 19:32:45 2013 +0000 modules_k/outbound: Updates to outbound module documentation --- modules_k/outbound/README | 72 +++++++++++++++++++++++++++-- modules_k/outbound/doc/outbound_admin.xml | 72 +++++++++++++++++++++++++++-- 2 files changed, 136 insertions(+), 8 deletions(-) diff --git a/modules_k/outbound/README b/modules_k/outbound/README index 8a98e0c..d1d920b 100644 --- a/modules_k/outbound/README +++ b/modules_k/outbound/README @@ -117,12 +117,70 @@ modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") ... route { -... - if (is_method("INVITE|SUBSCRIBE")) + route(REQINIT); + ... + t_check_trans(); + + if (is_method("INVITE|SUBSCRIBE")) { record_route(); - else if (is_method("REGISTER")) + + if ($rU==$null) { + sl_send_reply("484", "Address Incomplete"); + exit; + } + + if (!loose_route()) { + switch($rc) { + case -2: + # Flow-token has been tampered with + sl_send_reply("403", "Forbidden"); + exit; + case -1: + # Handle -1 here if all dialog forming requests + # must be outbound routed + } + } + route(RELAY); + } else if (is_method("REGISTER")) { add_path(); + if (!t_relay("### Registrar ###")) { + sl_reply_error(); + } + exit; + } +} + +route[RELAY] { + t_on_failure("FAIL_OUTBOUND"); + if (!t_relay()) { + sl_send_reply("430", "Flow Failed"); + } + exit; +} ... +route[WITHINDLG] { + if (has_totag()) { + if (!loose_route()) { + switch($rc) { + case -2: + sl_send_reply("403", "Forbidden"); + exit; + case -1: + if (is_method("ACK")) { + if (t_check_trans()) { + t_relay(); + exit; + } else { + exit; + } + } + sl_send_reply("404", "Not Found"); + } + } else { + route(RELAY); + } + exit; + } } ... onreply_route { @@ -137,11 +195,17 @@ onreply_route { } } +failure_route[REPLY_OUTBOUND] { + if (t_branch_timeout() || !t_branch_replied()) { + send_reply("430", "Flow Failed"); + } +} + Example 1.3. Registrar Configuration ... loadmodule "registrar.so" ... -modparam("registrar", "outbound_mode", 2) +TBD ... 2. Dependencies diff --git a/modules_k/outbound/doc/outbound_admin.xml b/modules_k/outbound/doc/outbound_admin.xml index 992c0c4..97e718d 100644 --- a/modules_k/outbound/doc/outbound_admin.xml +++ b/modules_k/outbound/doc/outbound_admin.xml @@ -72,12 +72,70 @@ modparam("websocket", "keepalive_timeout", FLOW_TIMER+5) modparam("outbound", "flow_token_key", "!!!Kamailio rocks!!!") ... route { -... - if (is_method("INVITE|SUBSCRIBE")) + route(REQINIT); + ... + t_check_trans(); + + if (is_method("INVITE|SUBSCRIBE")) { record_route(); - else if (is_method("REGISTER")) + + if ($rU==$null) { + sl_send_reply("484", "Address Incomplete"); + exit; + } + + if (!loose_route()) { + switch($rc) { + case -2: + # Flow-token has been tampered with + sl_send_reply("403", "Forbidden"); + exit; + case -1: + # Handle -1 here if all dialog forming requests + # must be outbound routed + } + } + route(RELAY); + } else if (is_method("REGISTER")) { add_path(); + if (!t_relay("### Registrar ###")) { + sl_reply_error(); + } + exit; + } +} + +route[RELAY] { + t_on_failure("FAIL_OUTBOUND"); + if (!t_relay()) { + sl_send_reply("430", "Flow Failed"); + } + exit; +} ... +route[WITHINDLG] { + if (has_totag()) { + if (!loose_route()) { + switch($rc) { + case -2: + sl_send_reply("403", "Forbidden"); + exit; + case -1: + if (is_method("ACK")) { + if (t_check_trans()) { + t_relay(); + exit; + } else { + exit; + } + } + sl_send_reply("404", "Not Found"); + } + } else { + route(RELAY); + } + exit; + } } ... onreply_route { @@ -91,6 +149,12 @@ onreply_route { insert_hf("Flow-Timer: FLOW_TIMER\r\n", "Call-ID"); } } + +failure_route[REPLY_OUTBOUND] { + if (t_branch_timeout() || !t_branch_replied()) { + send_reply("430", "Flow Failed"); + } +} ]]></programlisting> </example> <example> @@ -99,7 +163,7 @@ onreply_route { ... loadmodule "registrar.so" ... -modparam("registrar", "outbound_mode", 2) +TBD ... ]]></programlisting> </example>

11 years, 11 months

git:pd/outbound: Merge branch 'master' into outbound

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 0b108c83ba7138c760fa86c9274633c92b7193a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b108c8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jan 6 19:37:22 2013 +0000 Merge branch 'master' into outbound * master: pkg/kamailio/(centos|fedora): Updated ver and rel in .spec 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 sl: new function sl_forward_reply(...) core: added function to remove an exiting lump structure from internal list dialog2: generate and add missing README for dialog2 module Do not bind with libser_cmd, this is not required. Added Debian-Packaging for IMS modules - Add group for IMS modules - Added convenience rule to build packages for current debian-stable ims modules: don't link with -lrt on macosx auth_ims: don't link with -lrt on darwin os kamailio.cfg: xhttp left only in kamailio-oob.cfg modules/rtpproxy: rtpproxy_manage can now add ice relay candidates parser/sdp: fixed freeing of ice attributes ---

11 years, 11 months

git:pd/outbound: modules_k/rr: Updates to rr module documentation for outbound

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: b0ee720bec6d188615b98e8b107100fc5158e839 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0ee720… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jan 6 19:32:04 2013 +0000 modules_k/rr: Updates to rr module documentation for outbound --- modules_k/rr/README | 5 +++++ modules_k/rr/doc/rr_admin.xml | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/modules_k/rr/README b/modules_k/rr/README index d7ec9ff..b06521c 100644 --- a/modules_k/rr/README +++ b/modules_k/rr/README @@ -321,6 +321,11 @@ modparam("rr", "enable_socket_mismatch_warning", 0) details (grep for “route set” is a good starting point in this comprehensive RFC). + Return codes: + * 1 - route calculation has been successful + * -1 - route calculation has been unsuccessful + * -2 - outbound flow-token shows evidence of tampering + This function can be used from REQUEST_ROUTE. Example 1.7. loose_route usage diff --git a/modules_k/rr/doc/rr_admin.xml b/modules_k/rr/doc/rr_admin.xml index 1d77e5a..3162b70 100644 --- a/modules_k/rr/doc/rr_admin.xml +++ b/modules_k/rr/doc/rr_admin.xml @@ -292,6 +292,26 @@ modparam("rr", "enable_socket_mismatch_warning", 0) this comprehensive RFC). </para> <para> + Return codes: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>1</emphasis> - route calculation has been successful + </para> + </listitem> + <listitem> + <para> + <emphasis>-1</emphasis> - route calculation has been unsuccessful + </para> + </listitem> + <listitem> + <para> + <emphasis>-2</emphasis> - outbound flow-token shows evidence of tampering + </para> + </listitem> + </itemizedlist> + <para> This function can be used from REQUEST_ROUTE. </para> <example>

11 years, 11 months

git:master: pkg/kamailio/(centos|fedora): Updated ver and rel in .spec

by Peter Dunkley

Module: sip-router Branch: master Commit: 94e9bd8f15e192ee8b1c14d759129992b35435bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94e9bd8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jan 6 19:36:39 2013 +0000 pkg/kamailio/(centos|fedora): Updated ver and rel in .spec --- pkg/kamailio/fedora/16/kamailio.spec | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 4b4273f..98eb431 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio -%define ver 3.4.0 -%define rel dev7%{dist} +%define ver 4.0.0 +%define rel dev8%{dist} @@ -493,7 +493,7 @@ fi %doc %{_docdir}/kamailio/modules/README.db_flatstore %doc %{_docdir}/kamailio/modules/README.db2_ops %doc %{_docdir}/kamailio/modules/README.debugger -#%doc %{_docdir}/kamailio/modules/README.dialog2 +%doc %{_docdir}/kamailio/modules/README.dialog2 %doc %{_docdir}/kamailio/modules/README.enum %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1054,6 +1054,8 @@ fi %changelog +* Sun Jan 6 2013 Peter Dunkley <peter(a)dunkley.me.uk> + - Updated ver to 4.0.0 and rel to dev8 * Mon Dec 31 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Added dialog2 and IMS modules to the build * Fri Dec 21 2012 Peter Dunkley <peter(a)dunkley.me.uk>

11 years, 11 months

rpc->scan in ctl

by Olle E. Johansson

Hi! In my RPC adventures, I came upon a problem that I fail to fix. Like many other functions, rpc->scan is used to get a str from the command line (using kamcmd). If I understand right, kamcmd use binrpc in the ctl module. The original function in MI checks the length of the string given as an argument. If I do that, like checking contactp->len then the length is a few million characters... I can read the actual string, so that part of the data seems right. Anyone that experienced the same? /O

11 years, 11 months

Big TCP message

by Amit Elbaz

Hi, While sending a big TCP SIP message (15K+), I get "tcp_read: buffer overrun, dropping" message. this happens after a few fragments have been sent, and then i get this message and the connection resets. is it possible to set the max-buffer size through configuration? if so, where? Thanks, Amit.

11 years, 11 months

two new compiler warnings

by Juha Heinanen

CC (cc) [M sl.so] sl.o sl.c: In function ‘w_sl_forward_reply’: sl.c:367: warning: ‘oldncode’ may be used uninitialized in this function sl.c:366: warning: ‘oldscode[2]’ may be used uninitialized in this function -- juha

11 years, 11 months

git:3.3: dialog: fixed ka_timer linking

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 6dda5c447f656c99cc84956b161cc9c977b06dd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dda5c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 6 15:24:39 2013 +0100 dialog: fixed ka_timer linking - patch by Rinor Hoxha (cherry picked from commit ddcef074088df261ce3fb98adfbb1b76b73c30a6) --- modules_k/dialog/dlg_hash.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 28468b3..d307f9d 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -189,7 +189,7 @@ int dlg_ka_run(ticks_t ti) } if(*dlg_ka_list_head == *dlg_ka_list_tail) { *dlg_ka_list_head = NULL; - *dlg_ka_list_head = NULL; + *dlg_ka_list_tail = NULL; } *dlg_ka_list_head = dka->next; lock_release(dlg_ka_list_lock); @@ -213,7 +213,7 @@ int dlg_ka_run(ticks_t ti) if(*dlg_ka_list_tail!=NULL) (*dlg_ka_list_tail)->next = dka; if(*dlg_ka_list_head==NULL) - *dlg_ka_list_tail = dka; + *dlg_ka_list_head = dka; *dlg_ka_list_tail = dka; lock_release(dlg_ka_list_lock); }

11 years, 11 months

git:master: sl: fix compilation warnings in sl_forward_reply()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3f0f60d22d5577965b50821b1c7d0835c898c3f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f0f60d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 6 15:28:28 2013 +0100 sl: fix compilation warnings in sl_forward_reply() - reported by Juha Heinanen --- modules/sl/sl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 6d05569..925d98e 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -393,12 +393,12 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) LM_ERR("invalid reply reason value\n"); return -1; } + /* backup old values */ + oldscode[0] = msg->first_line.u.reply.status.s[0]; + oldscode[1] = msg->first_line.u.reply.status.s[1]; + oldscode[2] = msg->first_line.u.reply.status.s[2]; + oldncode = msg->first_line.u.reply.statuscode; if(code!=NULL) { - /* backup old values */ - oldscode[0] = msg->first_line.u.reply.status.s[0]; - oldscode[1] = msg->first_line.u.reply.status.s[1]; - oldscode[2] = msg->first_line.u.reply.status.s[2]; - oldncode = msg->first_line.u.reply.statuscode; /* update status code directly in msg buffer */ msg->first_line.u.reply.statuscode = (code->s[0]-'0')*100 + (code->s[1]-'0')*10 + code->s[2]-'0';

11 years, 11 months

git:master: dialog: fixed ka_timer linking

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ddcef074088df261ce3fb98adfbb1b76b73c30a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddcef07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 6 15:24:39 2013 +0100 dialog: fixed ka_timer linking - patch by Rinor Hoxha --- modules_k/dialog/dlg_hash.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index c9f38bb..3aee269 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -189,7 +189,7 @@ int dlg_ka_run(ticks_t ti) } if(*dlg_ka_list_head == *dlg_ka_list_tail) { *dlg_ka_list_head = NULL; - *dlg_ka_list_head = NULL; + *dlg_ka_list_tail = NULL; } *dlg_ka_list_head = dka->next; lock_release(dlg_ka_list_lock); @@ -213,7 +213,7 @@ int dlg_ka_run(ticks_t ti) if(*dlg_ka_list_tail!=NULL) (*dlg_ka_list_tail)->next = dka; if(*dlg_ka_list_head==NULL) - *dlg_ka_list_tail = dka; + *dlg_ka_list_head = dka; *dlg_ka_list_tail = dka; lock_release(dlg_ka_list_lock); }

11 years, 11 months

← Newer
1
...
26
27
28
29
30
31
32
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