sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
166 discussions

kamailio 3.1.3 Presence + XCAP problem, is it a

by laura testi

Hello, do you have any news about this case? About the described scenario: I think the step 4a) may be a bug: the subscription STATUS of B (watcher of A) to A should remain ACTIVE (1) instead of PENDING(2). this state is very strange and that causes the strange step 4b) after A having removed B. Because B does still subscribe A’s presentity! And probably do this causes the incorrect behavior of step 5)? Should the presence server also remove the record of the subscription from A(watcher) to B(presentity) from both active_watchers and watchers tables instead of only from active_wtachers table? Because if A remove B (unsubscribe B), that mean A don’t want to see the presentity of B. Or maybe it’s correct put A’s subscription status of B in TERMINATED(3) instead of removing the record (actually remains in ACTIVE(1)). When the presence server is doing pres_refresh_watchers in step 5), I think it checks the xcap table and see A is watcher of B (A is in B’s presence_allow rule) and is in B’s resource-list, and B is also active_watcher of A in the active_watchers table, A’s subscription status of B is ACTIVE(1) in watchers table, B’s subscription status of A is in Pending(2), it send a NOTIFY to B. That’s really strange! Probabely the step 4) also causes this strange behavior. I think in step 1, in addition to remove the record of A’s subscription of B from active_watchers table, the PS should also remove the record of A’s subscription of B from the watchers table or put the STATUS=TERMINATED. That’s because A is not interested the B’s presentity anymore. In step 4, the PS should not change watchers table, because B’s subscription of A is still active (should not becomes pending), and should not send the Pending notify too. Same for step 5. thanks in advance, laura

13 years, 5 months

Re: [sr-dev] [SR-Users] Green VoIP - energy efficiency and performaces of v3.0

by Jan Janak

On Wed, May 25, 2011 at 06:54, Jeremya <jeremy(a)electrosilk.net> wrote: > These figures pale into insignificance compared to the power required > for standard SIP devices - typically 5-8 watts per device multiplied by > the number of devices. > > When you factor in Gigabit Ethernet the power ups significantly. > > Optimisation at the server level is not significant on any scale. > Optimisation on communications power: i.e. end-devices, DSL & switches > is where the power savings are important. Sure, the total power consumption of the whole system is dominated by the power consumption of end-point devices, there's no doubt about that and the paper says that. Nevertheless, as an ITSP you are typically paying for the energy consumed by your servers and in that case knowing what you can expect and how many servers you need is useful. Modern data-center servers have significant base-line power consumption and a portion of that needs to be attributed to the SIP service running on those servers. -Jan > Daniel-Constantin Mierla wrote: >> Hello, >> >> Jan Janak conducted a very interesting research project regarding >> energy efficiency of VoIP systems during 2010, a collaboration between >> iptel.org and Columbia University. >> >> The team used the source code from sip-router.org GIT repository from >> January 2010, which corresponds to Kamailio (former OpenSER) and SER >> v3.0. The latest stable series v3.1 shares the same internal >> architecture with v3.0. >> >> As part of the research work, Jan could also gather some figures about >> capacity and performances of v3.0 with a quite complex configuration >> file: etc/sip-router-oob.cfg (involving authentication and NAT >> traversal as well). >> >> You can read the paper about energy efficiency at: >> >> - Green VoIP Article: http://asipto.com/u/2j >> >> The draft notes about capacity and performances of v3.0 are available at: >> >> - Performances and Capacity for v3.0 Wiki page: http://asipto.com/u/2k >> >> Some interesting results: >> >> - one instance of SIP server with 500 000 online users (mixed users – >> behind and not NAT routers) – consumed energy 210W >> - one instance of SIP server with 1 000 000 online users (no NAT >> involved) – consumed energy 190W >> - on a 32-bit machine with 4GB of memory and with 2.5GB reserved for >> SIP server, the server could support 43 000 simultaneous TLS >> connections – consumed energy 203W >> - one SIP server instance with 80 000 permanent TCP connections, the >> SIP server could still handle at least 1000 requests per second and a >> connection arrival rate of 1000 new connections per second, done for >> 20 000 new connections. CPU load generated by the SIP server was from >> 6% to 8%. >> >> I added a new section to the draft notes to list the enhancements done >> for the latest stable release (v3.1.x) that contribute to performance >> improvements, like asynchronous TLS, fine tuning of memory for TLS >> connections and raw UDP sockets. >> >> Cheers, >> Daniel >> > > > _______________________________________________ > SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list > sr-users(a)lists.sip-router.org > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users >

13 years, 5 months

lockup("location") doesn't find a "sip" registration if RURI scheme is "sips"

by Iñaki Baz Castillo

Hi, "sip:alice@domain.org" is registered in Kamailio. If the proxy receives a request for "sips:alice@domain.org" and invokes "lookup(location)" the function doesn't retrieve the registration of alice. But it should: RFC 5630 section 3.3: When used as the Request-URI of a request, the SIPS scheme signifies that each hop over which the request is forwarded, until the request reaches the SIP entity responsible for the domain portion of the Request-URI, must be secured with TLS; once it reaches the domain in question it is handled in accordance with local security and routing policy, quite possibly using TLS for any last hop to a UAS. When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. Note the last phrase: When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. This is, the entire path *until* the proxy responsible for the domain in the RURI must be secure (TLS) but it's not required (local policy) that the destination proxy dellivers the request to the destination user using TLS. So IMHO lockup(location) should not inspect the registration schema. Am I wrong? -- Iñaki Baz Castillo <ibc(a)aliax.net>

13 years, 5 months

Load capacity of SER??

by Piyush.Bansal＠relianceada.com

Dear All, I'm using SER as a SIP proxy server for quite a long time. I'm not been able to find its load bearing capacity. If you can help me get a figure in terms of BHCA, that'll be quite helpful. Thanks and Regards, --Piyush Bansal The information contained in this e-mail message is intended only for the use of the individual or entity to which it is addressed. If you are not the intended recipient, you should return it to the sender immediately. Please note that while we scan all e-mails for viruses we cannot guarantee that any e-mail is virus-free and accept no liability for any damage caused by any virus transmitted by this email.

13 years, 5 months

git:master: core: added new preprocessor directive: substdef

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 78d26523c978a709b420c8b383ca36e7c1271913 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78d2652… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 30 23:57:18 2011 +0200 core: added new preprocessor directive: substdef - prototype !!substdef '/regexp/replacement/flags' - separator char '/' can be replaced with any other character to avoid conflicts - it adds a preprocessor substitution like '!!subst' and in addition defines the regexp to replacement, like !!define regexp replacement - useful when you need to replace tokens present as ID and inside string values --- cfg.lex | 6 +++- cfg.y | 3 ++ ppcfg.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- ppcfg.h | 5 ++- 4 files changed, 81 insertions(+), 5 deletions(-) diff --git a/cfg.lex b/cfg.lex index 28e4fbc..d7a3190 100644 --- a/cfg.lex +++ b/cfg.lex @@ -561,6 +561,7 @@ EAT_ABLE [\ \t\b\r] /* pre-processing blocks */ SUBST subst +SUBSTDEF substdef %% @@ -1230,6 +1231,7 @@ SUBST subst addstr(&s_buf, yytext, yyleng); } <INITIAL>{PREP_START}{SUBST} { count(); return SUBST;} +<INITIAL>{PREP_START}{SUBSTDEF} { count(); return SUBSTDEF;} <INITIAL,IFDEF_SKIP>{PREP_START}{IFDEF}{EAT_ABLE}+ { count(); if (pp_ifdef_type(1)) return 1; @@ -1663,7 +1665,7 @@ int pp_define(int len, const char * text) return 0; } -int pp_define_set(int len, char *text) +int pp_define_set(int len, char *text) { if(len<=0) { LOG(L_DBG, "no define value - ignoring\n"); @@ -1700,7 +1702,7 @@ int pp_define_set(int len, char *text) return 0; } -static str *pp_define_get(int len, const char * text) +static str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; int i; diff --git a/cfg.y b/cfg.y index bd44b13..5d0d10b 100644 --- a/cfg.y +++ b/cfg.y @@ -562,6 +562,7 @@ extern char *finame; /*pre-processor*/ %token SUBST +%token SUBSTDEF /* operators, C like precedence */ %right EQUAL @@ -1968,6 +1969,8 @@ event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } + | SUBSTDEF STRING { if(pp_substdef_add($2)<0) YYERROR; } + | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } ; /*exp: rval_expr diff --git a/ppcfg.c b/ppcfg.c index 30754d4..7eb4e64 100644 --- a/ppcfg.c +++ b/ppcfg.c @@ -62,7 +62,7 @@ int pp_subst_add(char *data) se=subst_parser(&subst); if (se==0) { - LM_ERR("bad subst expression:: %s\n", data); + LM_ERR("bad subst expression: %s\n", data); pkg_free(pr); return -2; } @@ -76,9 +76,79 @@ int pp_subst_add(char *data) } pp_subst_rules_tail = pr; + LM_ERR("### added subst expression: %s\n", data); + return 0; } +int pp_substdef_add(char *data) +{ + char c; + char *p; + str defname; + str defvalue; + + if(pp_subst_add(data)<0) { + LM_ERR("subst rule cannot be added\n"); + goto error; + } + + p=data; + c=*p; + if (c=='\\') { + LM_ERR("invalid separator char [%c] in [%s]\n", c, data); + goto error; + } + p++; + /* find regexp */ + defname.s=p; + for ( ; *p; p++) { + /* if unescaped sep. char */ + if ((*p==c) && (*(p-1)!='\\')) + goto found_regexp; + } + LM_ERR("separator [%c] not found after regexp: [%s]\n", c, data); + goto error; + +found_regexp: + defname.len = p - defname.s; + if(defname.len==0) { + LM_ERR("define name too short\n"); + goto error; + } + + p++; + defvalue.s = p; + /* find replacement */ + for ( ; *p; p++) { + /* if unescaped sep. char */ + if ((*p==c) && (*(p-1)!='\\')) + goto found_repl; + } + LM_ERR("separator [%c] not found after replacement: [%s]\n", c, data); + goto error; + +found_repl: + defvalue.len = p - defvalue.s; + + if(pp_define(defname.len, defname.s)<0) { + LM_ERR("cannot set define name\n"); + goto error; + } + if(pp_define_set(defvalue.len, defvalue.s)<0) { + LM_ERR("cannot set define value\n"); + goto error; + } + + LM_DBG("### added substdef: [%.*s]=[%.*s]\n", defname.len, defname.s, + defvalue.len, defvalue.s); + + return 0; + +error: + return 1; +} + int pp_subst_run(char **data) { str* result; diff --git a/ppcfg.h b/ppcfg.h index c3a01f4..8d7ea64 100644 --- a/ppcfg.h +++ b/ppcfg.h @@ -23,10 +23,11 @@ #define _PPCFG_H_ int pp_subst_add(char *data); +int pp_substdef_add(char *data); int pp_subst_run(char **data); -int pp_define(int len, const char * text); -int pp_define_set(int len, char * text); +int pp_define(int len, const char *text); +int pp_define_set(int len, char *text); #endif /*_PPCFG_H_*/

13 years, 5 months

git:master: core: updated man page

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 48e1227c31d5f7dd9c8ce6e3445d5a087d93f4a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48e1227… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 30 23:03:42 2011 +0200 core: updated man page --- sip-router.8 | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/sip-router.8 b/sip-router.8 index aa9c625..39be904 100644 --- a/sip-router.8 +++ b/sip-router.8 @@ -22,6 +22,8 @@ sip-router \- very fast and configurable sip proxy ] [ .BI \-m " shared_mem_size" ] [ +.BI \-M " private_mem_size" +] [ .BI \-w " working\-dir" ] [ .BI \-t " chroot\-dir" @@ -32,7 +34,13 @@ sip-router \- very fast and configurable sip proxy ] [ .BI \-P " pid\-file" ] [ -.BI \-L " modules-dir" +.BI \-G " pgid\-file" +] [ +.BI \-L " modules\-dir" +] [ +.BI \-a " auto\-aliases\-mode" +] [ +.BI \-A " pre\-processor\-define" ] .SH DESCRIPTION @@ -108,6 +116,9 @@ Maximum receive buffer size which will not be exceeded by the auto-probing proce .BI \-m " shared_mem_size" Size of the shared memory which will be allocated (in Megabytes). .TP +.BI \-M " private_mem_size" +Size of the private memory which will be allocated per process (in Megabytes). +.TP .BI \-w " working\-dir" Specifies the working directory. In the very improbable event that .B sip-router @@ -133,10 +144,21 @@ Creates a file containing the pid of the main .B sip-router process. .TP +.BI \-G " pgid\-file" +Creates a file containing the pgid of the main +.B sip-router +process. +.TP .BI \-L " modules\-dir" Specifies the directory where to look for .B sip-router modules (default: /usr/lib/sip-router/modules) +.TP +.BI \-a " auto\-aliases\-mode" +Enable auto-aliases with 'yes' or 'on', disable with 'no' or 'off +.TP +.BI \-A " pre\-processor\-define" +Add config pre-processor define (e.g., -A WITH_AUTH, -A N=1, -A X='"Y"') .SH FILES .PD 0

13 years, 5 months

git:master: kamialio.cfg: sample usage of speed dialing

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7b5d3d76369640ac88872910dd76e61de05ec1e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b5d3d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 30 14:20:39 2011 +0200 kamialio.cfg: sample usage of speed dialing - can be enabled by define WITH_SPEEDDIAL --- etc/kamailio.cfg | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3ee11e4..342c99a 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -51,6 +51,10 @@ # - enable mysql # - define WITH_ALIASDB # +# *** To enable speed dial lookup execute: +# - enable mysql +# - define WITH_SPEEDDIAL +# # *** To enable multi-domain support execute: # - enable mysql # - define WITH_MULTIDOMAIN @@ -229,6 +233,10 @@ loadmodule "permissions.so" loadmodule "alias_db.so" #!endif +#!ifdef WITH_SPEEDDIAL +loadmodule "speeddial.so" +#!endif + #!ifdef WITH_MULTIDOMAIN loadmodule "domain.so" #!endif @@ -349,6 +357,13 @@ modparam("alias_db", "use_domain", MULTIDOMAIN) #!endif +# ----- speedial params ----- +#!ifdef WITH_SPEEDDIAL +modparam("speeddial", "db_url", DBURL) +modparam("speeddial", "use_domain", MULTIDOMAIN) +#!endif + + # ----- domain params ----- #!ifdef WITH_MULTIDOMAIN modparam("domain", "db_url", DBURL) @@ -595,6 +610,12 @@ route[REGISTRAR] { # USER location service route[LOCATION] { +#!ifdef WITH_SPEEDIAL + # search for short dialing - 2-digit extension + if($rU=~"^[0-9][0-9]$") + sd_lookup("speed_dial"); +#!endif + #!ifdef WITH_ALIASDB # search in DB-based aliases alias_db_lookup("dbaliases");

13 years, 5 months

git:master: deb pkg: add start suggestions for mysql, postgresql and radius , suggested from Rick Aldred

by Henning Westerholt

Module: sip-router Branch: master Commit: 33f7e045768298e8e48231820fb0116398d80c2f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33f7e04… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 30 14:17:32 2011 +0200 deb pkg: add start suggestions for mysql, postgresql and radius, suggested from Rick Aldred --- pkg/kamailio/deb/lenny/kamailio.init | 7 ++----- pkg/kamailio/deb/lucid/kamailio.init | 7 ++----- pkg/kamailio/deb/squeeze/kamailio.init | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkg/kamailio/deb/lenny/kamailio.init b/pkg/kamailio/deb/lenny/kamailio.init index e5f50fc..ab54d0c 100644 --- a/pkg/kamailio/deb/lenny/kamailio.init +++ b/pkg/kamailio/deb/lenny/kamailio.init @@ -4,16 +4,13 @@ # Provides: kamailio # Required-Start: $syslog $network $local_fs $time # Required-Stop: $syslog $network $local_fs +# Should-Start: mysql postgresql freeradius +# Should-Stop: mysql postgresql freeradius # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start the Kamailio SIP proxy server # Description: Start the Kamailio SIP proxy server ### END INIT INFO -# -# TODO: -# The following fields should be added (and completed): -# Should-Start: postgresql mysql radius -# Should-Stop: postgresql mysql radius PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/kamailio diff --git a/pkg/kamailio/deb/lucid/kamailio.init b/pkg/kamailio/deb/lucid/kamailio.init index e5f50fc..ab54d0c 100644 --- a/pkg/kamailio/deb/lucid/kamailio.init +++ b/pkg/kamailio/deb/lucid/kamailio.init @@ -4,16 +4,13 @@ # Provides: kamailio # Required-Start: $syslog $network $local_fs $time # Required-Stop: $syslog $network $local_fs +# Should-Start: mysql postgresql freeradius +# Should-Stop: mysql postgresql freeradius # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start the Kamailio SIP proxy server # Description: Start the Kamailio SIP proxy server ### END INIT INFO -# -# TODO: -# The following fields should be added (and completed): -# Should-Start: postgresql mysql radius -# Should-Stop: postgresql mysql radius PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/kamailio diff --git a/pkg/kamailio/deb/squeeze/kamailio.init b/pkg/kamailio/deb/squeeze/kamailio.init index e5f50fc..ab54d0c 100644 --- a/pkg/kamailio/deb/squeeze/kamailio.init +++ b/pkg/kamailio/deb/squeeze/kamailio.init @@ -4,16 +4,13 @@ # Provides: kamailio # Required-Start: $syslog $network $local_fs $time # Required-Stop: $syslog $network $local_fs +# Should-Start: mysql postgresql freeradius +# Should-Stop: mysql postgresql freeradius # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Start the Kamailio SIP proxy server # Description: Start the Kamailio SIP proxy server ### END INIT INFO -# -# TODO: -# The following fields should be added (and completed): -# Should-Start: postgresql mysql radius -# Should-Stop: postgresql mysql radius PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/kamailio

13 years, 5 months

git:master: rtpproxy: close rtpproxy session for INVITE req in failure route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 017687684671933ae181ebecdfb0deddae050cea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0176876… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 18:36:19 2011 +0200 rtpproxy: close rtpproxy session for INVITE req in failure route - update of rtpproxy_manage() to close rtp relay session when executed in failure route --- modules/rtpproxy/rtpproxy.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 8dd83c6..3807954 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -219,6 +219,7 @@ #include "../../socket_info.h" #include "../../mod_fix.h" #include "../../dset.h" +#include "../../route.h" #include "../../modules/tm/tm_load.h" #include "rtpproxy.h" #include "rtpproxy_funcs.h" @@ -1717,7 +1718,10 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) strcpy(newip, cp); } - nosdp = parse_sdp(msg); + if(msg->msg_flags & FL_SDP_BODY) + nosdp = 0; + else + nosdp = parse_sdp(msg); if(msg->first_line.type == SIP_REQUEST) { if(method==METHOD_ACK && nosdp==0) @@ -1727,6 +1731,8 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) msg->msg_flags |= FL_SDP_BODY; if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL) tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; + if(route_type==FAILURE_ROUTE) + return unforce_rtp_proxy_f(msg, 0, 0); return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1, (ip!=NULL)?1:0); }

13 years, 5 months

git:master: kamailio.cfg: reworked nat traversal config

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cf598f3229b7b381fd4d2a381bafbb8f7c0be0d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf598f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 23:30:43 2011 +0200 kamailio.cfg: reworked nat traversal config - groupped the nat traversal login in NATDETECT and NATMANAGE route blocks, simplifying by using rtpproxy_manage() function - nat traversal logic for requests is applied in branch_route for proper optimization of serial/parallel forking --- etc/kamailio.cfg | 90 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 47 insertions(+), 43 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 77cdce9..3ee11e4 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -423,7 +423,7 @@ route { route(REQINIT); # NAT detection - route(NAT); + route(NATDETECT); # handle requests within SIP dialogs route(WITHINDLG); @@ -484,20 +484,15 @@ route { route[RELAY] { -#!ifdef WITH_NAT - if (check_route_param("nat=yes")) { - setbflag(FLB_NATB); - } - if (isflagset(FLT_NATS) || isbflagset(FLB_NATB)) { - route(RTPPROXY); - } -#!endif - /* example how to enable some additional event routes */ + # enable additional event routes for forwarded requests + # - serial forking, RTP relaying handling, a.s.o. + if (is_method("INVITE|SUBSCRIBE")) { + t_on_branch("MANAGE_BRANCH"); + t_on_reply("MANAGE_REPLY"); + } if (is_method("INVITE")) { - #t_on_branch("BRANCH_ONE"); - t_on_reply("REPLY_ONE"); - t_on_failure("FAIL_ONE"); + t_on_failure("MANAGE_FAILURE"); } if (!t_relay()) { @@ -551,6 +546,10 @@ route[WITHINDLG] { setflag(FLT_ACC); # do accounting ... setflag(FLT_ACCFAILED); # ... even if the transaction fails } + if ( is_method("ACK") ) { + # ACK is forwarded statelessy + route(NATMANAGE); + } route(RELAY); } else { if (is_method("SUBSCRIBE") && uri == myself) { @@ -733,11 +732,11 @@ route[AUTH] { } # Caller NAT detection route -route[NAT] { +route[NATDETECT] { #!ifdef WITH_NAT force_rport(); if (nat_uac_test("19")) { - if (method=="REGISTER") { + if (is_method("REGISTER")) { fix_nated_register(); } else { fix_nated_contact(); @@ -749,14 +748,30 @@ route[NAT] { } # RTPProxy control -route[RTPPROXY] { +route[NATMANAGE] { #!ifdef WITH_NAT - if (is_method("BYE")) { - unforce_rtp_proxy(); - } else if (is_method("INVITE")){ - rtpproxy_offer(); + if (is_request()) { + if(has_totag()) { + if(check_route_param("nat=yes")) { + setbflag(FLB_NATB); + } + } + } + if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB))) + return; + + rtpproxy_manage(); + + if (is_request()) { + if (!has_totag()) { + add_rr_param(";nat=yes"); + } + } + if (is_reply()) { + if(isbflagset(FLB_NATB)) { + fix_nated_contact(); + } } - if (!has_totag()) add_rr_param(";nat=yes"); #!endif return; } @@ -842,33 +857,22 @@ route[TOVOICEMAIL] { return; } -# Sample branch router -branch_route[BRANCH_ONE] { - xdbg("new branch at $ru\n"); +# manage outgoing branches +branch_route[MANAGE_BRANCH] { + xdbg("new branch [$T_branch_idx] to $ru\n"); + route(NATMANAGE); } -# Sample onreply route -onreply_route[REPLY_ONE] { +# manage incoming replies +onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); -#!ifdef WITH_NAT - if ((isflagset(FLT_NATS) || isbflagset(FLB_NATB)) - && status=~"(183)|(2[0-9][0-9])") { - rtpproxy_answer(); - } - if (isbflagset("6")) { - fix_nated_contact(); - } -#!endif + if(status=~"[12][0-9][0-9]") + route(NATMANAGE); } -# Sample failure route -failure_route[FAIL_ONE] { -#!ifdef WITH_NAT - if (is_method("INVITE") - && (isbflagset(FLB_NATB) || isflagset(FLT_NATS))) { - unforce_rtp_proxy(); - } -#!endif +# manage failure routing cases +failure_route[MANAGE_FAILURE] { + route(NATMANAGE); if (t_is_canceled()) { exit;

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2011