sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: kamailio.cfg: coherent formating

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: be1ed10d61918285bdbb3686ac8d43a31f5e63bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be1ed10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 19 21:55:24 2014 +0200 kamailio.cfg: coherent formating - compacted some sub-routes by reducing if-block identation with returns --- etc/kamailio.cfg | 151 +++++++++++++++++++++++++---------------------------- 1 files changed, 71 insertions(+), 80 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 0070520..4125c47 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -461,8 +461,7 @@ request_route { route(NATDETECT); # CANCEL processing - if (is_method("CANCEL")) - { + if (is_method("CANCEL")) { if (t_check_trans()) { route(RELAY); } @@ -491,8 +490,7 @@ request_route { record_route(); # account only INVITEs - if (is_method("INVITE")) - { + if (is_method("INVITE")) { setflag(FLT_ACC); # do accounting } @@ -507,8 +505,7 @@ request_route { # handle registrations route(REGISTRAR); - if ($rU==$null) - { + if ($rU==$null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; @@ -521,7 +518,7 @@ request_route { route(LOCATION); } - +# Wrapper for relaying requests route[RELAY] { # enable additional event routes for forwarded requests @@ -584,66 +581,66 @@ route[REQINIT] { # Handle requests within SIP dialogs route[WITHINDLG] { - if (has_totag()) { - # sequential request withing a dialog should - # take the path determined by record-routing - if (loose_route()) { - route(DLGURI); - if (is_method("BYE")) { - setflag(FLT_ACC); # do accounting ... - setflag(FLT_ACCFAILED); # ... even if the transaction fails - } - else if ( is_method("ACK") ) { - # ACK is forwarded statelessy - route(NATMANAGE); - } - else if ( is_method("NOTIFY") ) { - # Add Record-Route for in-dialog NOTIFY as per RFC 6665. - record_route(); - } + if (!has_totag()) return; + + # sequential request withing a dialog should + # take the path determined by record-routing + if (loose_route()) { + route(DLGURI); + if (is_method("BYE")) { + setflag(FLT_ACC); # do accounting ... + setflag(FLT_ACCFAILED); # ... even if the transaction fails + } + else if ( is_method("ACK") ) { + # ACK is forwarded statelessy + route(NATMANAGE); + } + else if ( is_method("NOTIFY") ) { + # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + record_route(); + } + route(RELAY); + exit; + } + + if (is_method("SUBSCRIBE") && uri == myself) { + # in-dialog subscribe requests + route(PRESENCE); + exit; + } + if ( is_method("ACK") ) { + if ( t_check_trans() ) { + # no loose-route, but stateful ACK; + # must be an ACK after a 487 + # or e.g. 404 from upstream server route(RELAY); + exit; } else { - if (is_method("SUBSCRIBE") && uri == myself) { - # in-dialog subscribe requests - route(PRESENCE); - exit; - } - if ( is_method("ACK") ) { - if ( t_check_trans() ) { - # no loose-route, but stateful ACK; - # must be an ACK after a 487 - # or e.g. 404 from upstream server - route(RELAY); - exit; - } else { - # ACK without matching transaction ... ignore and discard - exit; - } - } - sl_send_reply("404","Not here"); + # ACK without matching transaction ... ignore and discard + exit; } - exit; } + sl_send_reply("404","Not here"); + exit; } # Handle SIP registrations route[REGISTRAR] { - if (is_method("REGISTER")) - { - if(isflagset(FLT_NATS)) - { - setbflag(FLB_NATB); - # uncomment next line to do SIP NAT pinging - ## setbflag(FLB_NATSIPPING); - } - if (!save("location")) - sl_reply_error(); + if (!is_method("REGISTER")) return; - exit; + if(isflagset(FLT_NATS)) { + setbflag(FLB_NATB); +#!ifdef WITH_NATSIPPING + # do SIP NAT pinging + setbflag(FLB_NATSIPPING); +#!endif } + if (!save("location")) + sl_reply_error(); + exit; } -# USER location service +# User location service route[LOCATION] { #!ifdef WITH_SPEEDDIAL @@ -676,8 +673,7 @@ route[LOCATION] { } # when routing via usrloc, log the missed calls also - if (is_method("INVITE")) - { + if (is_method("INVITE")) { setflag(FLT_ACCMISSED); } @@ -685,7 +681,7 @@ route[LOCATION] { exit; } -# Presence server route +# Presence server processing route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE")) return; @@ -698,14 +694,12 @@ route[PRESENCE] { } #!ifdef WITH_PRESENCE - if (!t_newtran()) - { + if (!t_newtran()) { sl_reply_error(); exit; } - if(is_method("PUBLISH")) - { + if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { @@ -716,21 +710,19 @@ route[PRESENCE] { #!endif # if presence enabled, this part will not be executed - if (is_method("PUBLISH") || $rU==$null) - { + if (is_method("PUBLISH") || $rU==$null) { sl_send_reply("404", "Not here"); exit; } return; } -# Authentication route +# IP authorization and user uthentication route[AUTH] { #!ifdef WITH_AUTH #!ifdef WITH_IPAUTH - if((!is_method("REGISTER")) && allow_source_address()) - { + if((!is_method("REGISTER")) && allow_source_address()) { # source IP allowed return; } @@ -749,8 +741,7 @@ route[AUTH] { } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here - if (from_uri!=myself && uri!=myself) - { + if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } @@ -759,7 +750,7 @@ route[AUTH] { return; } -# Caller NAT detection route +# Caller NAT detection route[NATDETECT] { #!ifdef WITH_NAT force_rport(); @@ -776,7 +767,7 @@ route[NATDETECT] { return; } -# RTPProxy control +# RTPProxy control and singaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) { @@ -820,11 +811,11 @@ route[DLGURI] { # Routing to foreign domains route[SIPOUT] { - if (!uri==myself) - { - append_hf("P-hint: outbound\r\n"); - route(RELAY); - } + if (uri==myself) return; + + append_hf("P-hint: outbound\r\n"); + route(RELAY); + exit; } # PSTN GW routing @@ -881,7 +872,7 @@ route[XMLRPC] { } #!endif -# route to voicemail server +# Routing to voicemail server route[TOVOICEMAIL] { #!ifdef WITH_VOICEMAIL if(!is_method("INVITE|SUBSCRIBE")) @@ -910,20 +901,20 @@ route[TOVOICEMAIL] { return; } -# manage outgoing branches +# Manage outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); route(NATMANAGE); } -# manage incoming replies +# Manage incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") route(NATMANAGE); } -# manage failure routing cases +# Manage failure routing cases failure_route[MANAGE_FAILURE] { route(NATMANAGE);

10 years, 2 months

git:refs/tags/4.1.6: ChangeLog: content updated for v4.1.6

by Victor Seva

Module: sip-router Branch: refs/tags/4.1.6 Commit: 010d57c95a361a0c761dbe143b7b0788146f16ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=010d57c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 18 16:08:07 2014 +0200 ChangeLog: content updated for v4.1.6 --- ChangeLog | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 424 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=010…

10 years, 2 months

git:lazedo/kazoo: Merge branch 'master' into lazedo/kazoo

by Luis Azedo

Module: sip-router Branch: lazedo/kazoo Commit: 9ec57ffb50542755e6ce0ff7d83fb42a943ad42d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ec57ff… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: Fri Sep 19 12:25:41 2014 +0100 Merge branch 'master' into lazedo/kazoo ---

10 years, 2 months

git:master: kazoo : missing options & corrections to publish. regenerated README

by Luis Azedo

Module: sip-router Branch: master Commit: cab397a9a89a735cb12004c3f8721247ae6aba9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cab397a… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: Fri Sep 19 06:39:38 2014 +0100 kazoo : missing options & corrections to publish. regenerated README --- modules/kazoo/README | 87 +++++++++++------------------------------------ modules/kazoo/defs.h | 13 +++++-- modules/kazoo/kz_pua.c | 42 +++++++++++++++++----- 3 files changed, 62 insertions(+), 80 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cab…

10 years, 2 months

git:master: kazoo : handle target-uri properly

by Luis Azedo

Module: sip-router Branch: master Commit: c59ebbd8f63e9b447d5aba79c06d6206e33b2436 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c59ebbd… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: Wed Sep 17 02:04:48 2014 +0100 kazoo : handle target-uri properly --- modules/kazoo/defs.h | 4 ++-- modules/kazoo/kazoo.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/kazoo/defs.h b/modules/kazoo/defs.h index c4627d8..f832c7e 100644 --- a/modules/kazoo/defs.h +++ b/modules/kazoo/defs.h @@ -75,11 +75,11 @@ <state>%.*s</state>\ <local>\ <identity>%.*s</identity>\ -<target uri=\"sip:%.*s\"/>\ +<target uri=\"%.*s\"/>\ </local>\ <remote>\ <identity>%.*s</identity>\ -<target uri=\"sip:%.*s\"/>\ +<target uri=\"%.*s\"/>\ </remote>\ </dialog>\ </dialog-info>" diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index af98c33..2f96e8a 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -78,7 +78,7 @@ str dbk_consumer_event_subkey = str_init("Event-Name"); int dbk_internal_loop_count = 5; int dbk_consumer_loop_count = 10; int dbk_consumer_ack_loop_count = 20; -int dbk_include_entity = 0; +int dbk_include_entity = 1; int dbk_pua_mode = 1; int dbk_single_consumer_on_reconnect = 1;

10 years, 2 months

git:lazedo/kazoo: kazoo : missing options & corrections to publish. regenerated README

by Luis Azedo

Module: sip-router Branch: lazedo/kazoo Commit: 53a4de9eefd7777f8b8f70e90265bc7e1f43d9bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53a4de9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: Fri Sep 19 06:39:38 2014 +0100 kazoo : missing options & corrections to publish. regenerated README --- modules/kazoo/README | 87 +++++++++++------------------------------------ modules/kazoo/defs.h | 13 +++++-- modules/kazoo/kz_pua.c | 42 +++++++++++++++++----- 3 files changed, 62 insertions(+), 80 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=53a…

10 years, 2 months

git:master: evapi: use EVENT_ROUTE as route block identifier

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 27a26dad73819eff7c0fe0c18cac54f64ec69718 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27a26da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 18 18:32:20 2014 +0200 evapi: use EVENT_ROUTE as route block identifier - for event routes executed by the module --- modules/evapi/evapi_dispatch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 2e64d37..6ee7e3d 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -122,7 +122,7 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt) fmsg = &tmsg; evapi_set_msg_env(fmsg, evenv); backup_rt = get_route_type(); - set_route_type(REQUEST_ROUTE); + set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); run_top_route(event_rt.rlist[rt], fmsg, 0); set_route_type(backup_rt);

10 years, 2 months

Kamailio v4.1.6 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v4.1.6 stable release is out. This is a maintenance release of the latest stable branch, 4.1, that includes fixes since release of v4.1.5. There is no change to database schema or configuration language structure that you have to do on installations of v4.1.x. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.1.6. For more details about version 4.1.6 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2014/09/kamailio-v4-1-6-released/ Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

10 years, 2 months

git:4.1: ChangeLog: content updated for v4.1.6

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 010d57c95a361a0c761dbe143b7b0788146f16ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=010d57c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 18 16:08:07 2014 +0200 ChangeLog: content updated for v4.1.6 --- ChangeLog | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 424 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=010…

10 years, 2 months

git:4.1: Makefile.defs: version set to 4.1.6

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: 895be72fff0ebbb8041737c567db2e7a72b1493e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=895be72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 18 15:29:32 2014 +0200 Makefile.defs: version set to 4.1.6 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 053c684..a7034fc 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,7 +164,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 1 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory manager switcher

10 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014