sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:ser_core_cvs: sctp: fix partial delivery point setting on linux

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: f9437a7d00b7eb8fcfa7facec9a3c90555fc7901 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9437a7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 21 15:24:57 2009 +0000 sctp: fix partial delivery point setting on linux To disable partial delivery, the partial delivery point should be set to the socket receive buffer size. However on linux SO_RCVBUF will return twice the value (the "real" value, which is twice the value used when setting SO_RCVBUF) and SCTP_PARTIAL_DELIVERY_POINT expects value/2. --- sctp_server.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index 077947d..424def8 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -195,6 +195,8 @@ static int sctp_init_sock_opt_common(int s) { struct sctp_event_subscribe es; int optval; + int pd_point; + int saved_errno; socklen_t optlen; int sctp_err; @@ -267,13 +269,34 @@ static int sctp_init_sock_opt_common(int s) /* try to continue */ optval=0; } - if (setsockopt(s, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT, - (void*)&optval, sizeof(optval)) ==-1){ - LOG(L_ERR, "ERROR: sctp_init_sock_opt_common: setsockopt: " +#ifdef __OS_linux + optval/=2; /* in linux getsockopt() returns twice the set value */ +#endif + pd_point=optval; + saved_errno=0; + while(pd_point && + setsockopt(s, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT, + (void*)&pd_point, sizeof(pd_point)) ==-1){ + if (!saved_errno) + saved_errno=errno; + pd_point--; + } + + if (pd_point!=optval){ + if (pd_point==0){ + /* all attempts failed */ + LOG(L_ERR, "ERROR: sctp_init_sock_opt_common: setsockopt: " "SCTP_PARTIAL_DELIVERY_POINT (%d): %s\n", optval, strerror(errno)); - sctp_err++; - /* try to continue */ + sctp_err++; + /* try to continue */ + }else{ + /* success but to a lower value (might not be disabled) */ + LOG(L_WARN, "setsockopt SCTP_PARTIAL_DELIVERY_POINT set to %d, but" + " the socket rcvbuf is %d (higher values fail with" + " \"%s\" [%d])\n", + pd_point, optval, strerror(saved_errno), saved_errno); + } } #else #warning no sctp lib support for SCTP_PARTIAL_DELIVERY_POINT, consider upgrading

15 years, 7 months

git:ser_core_cvs: tcp: typo fixes when blacklisting on error

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 71eae780d57f486e27fa946ff603da1e89fb2839 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71eae78… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 21 15:24:15 2009 +0000 tcp: typo fixes when blacklisting on error - because of a '=' instead of a '==' a tcp connection that failed after some time was always blacklisted with BLST_ERR_CONNECT (even in cases when BLST_ERR_SEND should have been used). - same thing for blacklisting on read failure. Reported-by: Libor Chocholaty <libor(a)iptel.org> --- tcp_main.c | 2 +- tcp_read.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 21c4c80..7a9b52e 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3498,7 +3498,7 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, tcpconn); } if (unlikely(ev & POLLERR)){ - if (unlikely(tcpconn->state=S_CONN_CONNECT)){ + if (unlikely(tcpconn->state==S_CONN_CONNECT)){ #ifdef USE_DST_BLACKLIST if (cfg_get(core, core_cfg, use_dst_blacklist)) dst_blacklist_su(BLST_ERR_CONNECT, tcpconn->rcv.proto, diff --git a/tcp_read.c b/tcp_read.c index ab69242..7d45d53 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -149,7 +149,7 @@ again: bytes_read=0; /* nothing has been read */ }else if (errno == EINTR) goto again; else{ - if (unlikely(c->state=S_CONN_CONNECT)){ + if (unlikely(c->state==S_CONN_CONNECT)){ switch(errno){ case ECONNRESET: #ifdef USE_DST_BLACKLIST

15 years, 7 months

TLS patch for the TM module

by Nils Ohlmeier

Hi, while testing TLS at SIPit 24 I encoutered the following problem: Two UAs were successfully registered via TLS connections and they had Contacts with just IP addresses and the transport parameter set to TLS. If one UA tried to call the other the INVITE was rejected by the TM module with the following log message: ERROR: uri2dst: bad transport for sips uri: 3 So when I looked up which is transport 3 I was surprised to see the 3 is actually TLS. Which is absolutely the right transport for a SIPS URI. The if condition before this error message checks if the transport is equal to TCP. This makes no sense to me. Thus I assume that this if condition was just a typo and created the attached patch which fixes this issue in 3 places in ut.h. Please let me know if I can commit the attached patch. Cheers Nils Index: ut.h =================================================================== RCS file: /cvsroot/ser/sip_router/modules/tm/ut.h,v retrieving revision 1.26 diff -a -u -r1.26 ut.h --- ut.h 11 Aug 2008 17:41:16 -0000 1.26 +++ ut.h 21 May 2009 08:13:24 -0000 @@ -123,7 +123,7 @@ } if (parsed_uri.type==SIPS_URI_T){ - if ((parsed_uri.proto!=PROTO_TCP) && (parsed_uri.proto!=PROTO_NONE)){ + if ((parsed_uri.proto!=PROTO_TLS) && (parsed_uri.proto!=PROTO_NONE)){ LOG(L_ERR, "ERROR: uri2proxy: bad transport for sips uri: %d\n", parsed_uri.proto); return 0; @@ -181,7 +181,7 @@ } if (parsed_uri.type==SIPS_URI_T){ - if ((parsed_uri.proto!=PROTO_TCP) && (parsed_uri.proto!=PROTO_NONE)){ + if ((parsed_uri.proto!=PROTO_TLS) && (parsed_uri.proto!=PROTO_NONE)){ LOG(L_ERR, "ERROR: get_uri_send_info: bad transport for" " sips uri: %d\n", parsed_uri.proto); return -1; @@ -254,7 +254,7 @@ } if (parsed_uri.type==SIPS_URI_T){ - if ((parsed_uri.proto!=PROTO_TCP) && (parsed_uri.proto!=PROTO_NONE)){ + if ((parsed_uri.proto!=PROTO_TLS) && (parsed_uri.proto!=PROTO_NONE)){ LOG(L_ERR, "ERROR: uri2dst: bad transport for sips uri: %d\n", parsed_uri.proto); return 0;

15 years, 7 months

git:master: htable: document event_route[htable:mod-init]

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6f22852feb1afa87a520b97f456e14cb3c254736 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f22852… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 20 21:08:56 2009 +0300 htable: document event_route[htable:mod-init] --- modules_k/htable/README | 23 +++++++++++++++++++++++ modules_k/htable/doc/htable_admin.xml | 21 +++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/README b/modules_k/htable/README index eac4bc6..03a5956 100644 --- a/modules_k/htable/README +++ b/modules_k/htable/README @@ -50,6 +50,10 @@ Elena-Ramona Modroiu 6.1. sht_reload 6.2. sht_dump + 7. Event routes + + 7.1. htable:mod-init + List of Examples 1.1. Accessing $sht(htname=>key) @@ -104,6 +108,10 @@ Chapter 1. Admin Guide 6.1. sht_reload 6.2. sht_dump + 7. Event routes + + 7.1. htable:mod-init + 1. Overview The module adds a hash table container to configuration language. The @@ -434,3 +442,18 @@ sht_rm_value_re("ha=>.*"); :sht_dump:_reply_fifo_file_ _hash_table_name_ _empty_line_ + +7. Event routes + + 7.1. htable:mod-init + +7.1. htable:mod-init + + When defined, the module calls event_route[htable:mod-init] after all + modules have been initialised. A typical use case is to initialise + items in hash tables. The event route is executed only once. +... +event_route[htable:mod-init] { + $sht(a=>x) = 1; +} +... diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index 783db8e..fbb0a3a 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -553,6 +553,27 @@ sht_rm_value_re("ha=>.*"); </programlisting> </section> </section> + <section> + <title>Event routes</title> + <section> + <title> + <function moreinfo="none">htable:mod-init</function> + </title> + <para> + When defined, the module calls event_route[htable:mod-init] after + all modules have been initialised. A typical use case is to + initialise items in hash tables. The event route is executed only + once. + </para> + <programlisting format="linespecific"> +... +event_route[htable:mod-init] { + $sht(a=>x) = 1; +} +... + </programlisting> + </section> + </section> </chapter>

15 years, 7 months

git:master: core: parse_cseq wrong use of parse_method fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f3bda7478c760f01009180e7416cbd2c9d4eebba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3bda74… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed May 20 19:06:43 2009 +0200 core: parse_cseq wrong use of parse_method fix - parse_method renamed to parse_method_advance(), made static and changed to check if the method name ends with a non-token char. - added parse_method_name() for parsing a single method name with known length (no leading or trailing whitespace). - changed parse_cseq() to use parse_method_name() (it's previous use of parse_method() had the side effect of setting the method name to ""). Reported-by: Henning Westerholt <henning.westerholt(a)1und1.de> --- parser/parse_cseq.c | 4 +- parser/parse_methods.c | 176 +++++++++++++++++++++++++++++++++++++++++------- parser/parse_methods.h | 2 +- 3 files changed, 155 insertions(+), 27 deletions(-) diff --git a/parser/parse_cseq.c b/parser/parse_cseq.c index 23dbf42..1778b28 100644 --- a/parser/parse_cseq.c +++ b/parser/parse_cseq.c @@ -74,8 +74,8 @@ char* parse_cseq(char *buf, char* end, struct cseq_body* cb) cb->method.len=t-cb->method.s; /* Cache method id */ - if (parse_method(&cb->method, &cb->method_id) == 0) { - LOG(L_ERR, "ERROR: parse_cseq: Cannot parse method string\n"); + if (parse_method_name(&cb->method, &cb->method_id)!=0){ + LOG(L_ERR, "Cannot parse method string\n"); goto error; } diff --git a/parser/parse_methods.c b/parser/parse_methods.c index 3ba42ce..6c145ee 100644 --- a/parser/parse_methods.c +++ b/parser/parse_methods.c @@ -43,24 +43,149 @@ static int token_char(char _c) (_c == '*') || (_c == '_') || (_c == '+') || (_c == '`') || (_c == '\'') || (_c == '~') || (_c == '+') || (_c == '`'); } - - + + + +/** Parse a string containing a method. + * Parse a method pointed by s & assign its enum bit to method. The string + * _must_ contain _only_ the method (without trailing or heading whitespace). + * @return 0 on success, -1 on error + */ +int parse_method_name(str* s, enum request_method* method) + { + if (unlikely(!s || !method)) { + LOG(L_ERR, "Invalid parameter value\n"); + return -1; + } + + if (unlikely(!s->len || (s->s==0))) { + DBG("No input\n"); + *method = METHOD_OTHER; + return 0; + } + + switch ((s->s)[0]) { + /* ordered after probability of aparition on a normal proxy */ + case 'R': + case 'r': + if (likely((s->len == 8) && + !strncasecmp(s->s + 1, "egister", 7))) { + *method = METHOD_REGISTER; + return 0; + } + if (likely((s->len==5) && !strncasecmp(s->s + 1, "efer", 4))) { + *method = METHOD_REFER; + return 0; + } + break; + case 'A': + case 'a': + if (likely((s->len==3) && !strncasecmp(s->s + 1, "ck", 2))) { + *method = METHOD_ACK; + return 0; + } + break; + case 'I': + case 'i': + if (likely((s->len==6) && !strncasecmp(s->s + 1, "nvite", 5))){ + *method = METHOD_INVITE; + return 0; + } + if (likely((s->len==4) && !strncasecmp(s->s + 1, "nfo", 3))) { + *method = METHOD_INFO; + return 0; + } + break; + case 'P': + case 'p': + if (likely((s->len==5) && !strncasecmp(s->s + 1, "rack", 4))) { + *method = METHOD_PRACK; + return 0; + } + if (likely((s->len==7) && !strncasecmp(s->s + 1, "ublish", 6))) { + *method = METHOD_PUBLISH; + return 0; + } + break; + case 'C': + case 'c': + if (likely((s->len==6) && !strncasecmp(s->s + 1, "ancel", 5))) { + *method = METHOD_CANCEL; + return 0; + } + break; + case 'B': + case 'b': + if (likely((s->len==3) && !strncasecmp(s->s + 1, "ye", 2))) { + *method = METHOD_BYE; + return 0; + } + break; + case 'M': + case 'm': + if (likely((s->len==7) && !strncasecmp(s->s + 1, "essage", 6))) { + *method = METHOD_MESSAGE; + return 0; + } + break; + case 'O': + case 'o': + if (likely((s->len==7) && !strncasecmp(s->s + 1, "ptions", 6))) { + *method = METHOD_OPTIONS; + return 0; + } + break; + case 'S': + case 's': + if (likely((s->len==9) && !strncasecmp(s->s + 1, "ubscribe", 8))) { + *method = METHOD_SUBSCRIBE; + return 0; + } + break; + case 'N': + case 'n': + if (likely((s->len==6) && !strncasecmp(s->s + 1, "otify", 5))){ + *method = METHOD_NOTIFY; + return 0; + } + break; + case 'U': + case 'u': + if (likely((s->len==6) && !strncasecmp(s->s + 1, "pdate", 5))){ + *method = METHOD_UPDATE; + return 0; + } + break; + default: + break; + } +/* unknown method */ + *method = METHOD_OTHER; + return 0; +} + + + /* * Parse a method pointed by _next, assign its enum bit to _method, and update * _next past the method. Returns 1 if parse succeeded and 0 otherwise. */ -int parse_method(str* _next, enum request_method* _method) +static int parse_method_advance(str* _next, enum request_method* _method) { - if (!_next || !_method) { - LOG(L_ERR, "parse_method: Invalid parameter value\n"); + char* end; + + if (unlikely(!_next || !_method)) { + LOG(L_ERR, "Invalid parameter value\n"); return 0; } - if (!_next->len || !_next->s) { - DBG("parse_method: No input\n"); + if (unlikely(!_next->len || !_next->s)) { + DBG("No input\n"); + *_method = METHOD_OTHER; return 1; } - + end=_next->s+_next->len; + switch ((_next->s)[0]) { case 'A': case 'a': @@ -68,7 +193,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_ACK; _next->len -= 3; _next->s += 3; - return 1; + goto found; } else { goto unknown; } @@ -79,7 +204,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_BYE; _next->len -= 3; _next->s += 3; - return 1; + goto found; } else { goto unknown; } @@ -90,7 +215,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_CANCEL; _next->len -= 6; _next->s += 6; - return 1; + goto found; } else { goto unknown; } @@ -103,14 +228,14 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_INFO; _next->len -= 4; _next->s += 4; - return 1; + goto found; } if ((_next->len > 5) && !strncasecmp(_next->s + 2, "vite", 4)) { *_method = METHOD_INVITE; _next->len -= 6; _next->s += 6; - return 1; + goto found; } } goto unknown; @@ -121,7 +246,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_MESSAGE; _next->len -= 7; _next->s += 7; - return 1; + goto found; } else { goto unknown; } @@ -132,7 +257,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_NOTIFY; _next->len -= 6; _next->s += 6; - return 1; + goto found; } else { goto unknown; } @@ -143,7 +268,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_OPTIONS; _next->len -= 7; _next->s += 7; - return 1; + goto found; } else { goto unknown; } @@ -154,13 +279,13 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_PRACK; _next->len -= 5; _next->s += 5; - return 1; + goto found; } if ((_next->len > 6) && !strncasecmp(_next->s + 1, "ublish", 6)) { *_method = METHOD_PUBLISH; _next->len -= 7; _next->s += 7; - return 1; + goto found; } goto unknown; @@ -172,14 +297,14 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_REFER; _next->len -= 5; _next->s += 5; - return 1; + goto found; } if ((_next->len > 7) && !strncasecmp(_next->s + 2, "gister", 6)) { *_method = METHOD_REGISTER; _next->len -= 8; _next->s += 8; - return 1; + goto found; } } goto unknown; @@ -190,7 +315,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_SUBSCRIBE; _next->len -= 9; _next->s += 9; - return 1; + goto found; } else { goto unknown; } @@ -201,7 +326,7 @@ int parse_method(str* _next, enum request_method* _method) *_method = METHOD_UPDATE; _next->len -= 6; _next->s += 6; - return 1; + goto found; } else { goto unknown; } @@ -209,7 +334,7 @@ int parse_method(str* _next, enum request_method* _method) default: goto unknown; } - + unknown: if (token_char(*(_next->s))) { do { @@ -221,6 +346,9 @@ int parse_method(str* _next, enum request_method* _method) } else { return 0; } +found: + /* check if the method really ends here (if not return 0) */ + return (_next->s>=end) || (!token_char(*(_next->s))); } @@ -252,7 +380,7 @@ int parse_method(str* _next, enum request_method* _method) } while (1) { - if (parse_method(&next, &method)) { + if (parse_method_advance(&next, &method)) { *_methods |= method; } else { LOG(L_ERR, "ERROR: parse_methods: Invalid method\n"); diff --git a/parser/parse_methods.h b/parser/parse_methods.h index 867484f..15ca2b9 100644 --- a/parser/parse_methods.h +++ b/parser/parse_methods.h @@ -39,7 +39,7 @@ */ int parse_methods(str* _body, unsigned int* _methods); -int parse_method(str* _next, enum request_method* _method); +int parse_method_name(str* s, enum request_method* _method); #endif /* PARSE_METHODS_H */

15 years, 7 months

tm reply matching, differences to kamailio

by Henning Westerholt

Hi all, during my tests for the cr module i noticed some differences in the reply matching in sr tm and kamailio tm. My test "26" basically test the (cr) failure_route functionality with a simple sipp scenario. On kamailio 1.5 branch my test is successful, the 503 reply is matched against the first INVITE and the failure_route is entered. On sip-router its not matched, a local 408 is generated after some time. I've attached the sip trace and the debug logs from both tests runs. Perhaps the sip-router tm is more strict in the matching, so because of some problem in the sipp scenario it don't match? Would be cool if somebody with more experiences with sr tm could take a look to this. The scenario, configuration and test is test/unit/failure_route.xml, 26.cfg and 26.sh (same directory). Thanks, Henning

15 years, 7 months

git:master: test: commit preliminary changes for tm+cr debugging

by Henning Westerholt

Module: sip-router Branch: master Commit: 80d8cc1c42bb8bae7dfb477bf6157dcbda33c129 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80d8cc1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 20 16:08:50 2009 +0200 test: commit preliminary changes for tm+cr debugging --- test/unit/26.cfg | 9 ++++++--- test/unit/26.sh | 42 ++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/test/unit/26.cfg b/test/unit/26.cfg index 33cdc03..0953b60 100644 --- a/test/unit/26.cfg +++ b/test/unit/26.cfg @@ -1,4 +1,6 @@ -debug=2 +debug=3 +memdbg=6 +memlog=6 loadpath "../../modules_k" loadmodule "sl" loadmodule "../../modules/tm/tm.so" @@ -6,6 +8,7 @@ loadmodule "tmx" loadmodule "xlog" loadmodule "maxfwd" loadmodule "pv" +loadmodule "kex" loadmodule "../../modules/carrierroute/carrierroute.so" loadmodule "mi_fifo" @@ -27,7 +30,6 @@ route{ setflag(2); # user route - xlog("user $rU, domain $rd"); if(cr_user_carrier("$rU", "$rd", "$avp(s:11)")) { $avp(s:10)="domain0"; if (!cr_route("$avp(s:11)", "$avp(s:10)", "$rU", "$rU", "call_id", "$avp(s:13)")) { @@ -50,6 +52,7 @@ route{ } failure_route[1] { + xlog("entered failure route with result $T_reply_code"); revert_uri(); if (!cr_next_domain("$avp(s:11)", "$avp(s:10)", "$rU", "$avp(s:12)", "$T_reply_code", "$avp(s:10)")) { xlog("L_ERR", "cr_next_domain failed\n"); @@ -61,7 +64,7 @@ failure_route[1] { } $avp(s:12) = $rd+":"+$rp; t_on_failure("1"); - append_branch(); + km_append_branch(); if (!t_relay()) { xlog("L_ERR", "t_relay failed\n"); exit; diff --git a/test/unit/26.sh b/test/unit/26.sh index 30ea3de..591f1e2 100755 --- a/test/unit/26.sh +++ b/test/unit/26.sh @@ -87,24 +87,26 @@ sleep 1 # ret=$? # killall sipp &> /dev/null #fi; -#sleep 2 -if [ "$ret" -eq 0 ] ; then - sipp -sn uas -bg -i localhost -m 10 -p 9000 &> /dev/null - sipp -sn uac -s 49721123456786 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null - ret=$? -fi; -if [ "$ret" -eq 0 ] ; then - sipp -sn uas -bg -i localhost -m 10 -p 10000 &> /dev/null - sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null - ret=$? -fi; +#if [ "$ret" -eq 0 ] ; then +# sipp -sn uas -bg -i localhost -m 10 -p 9000 &> /dev/null +# sipp -sn uac -s 49721123456786 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null +# ret=$? +#fi; +#sleep 1 + +#if [ "$ret" -eq 0 ] ; then +# sipp -sn uas -bg -i localhost -m 10 -p 10000 &> /dev/null +# sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null +# ret=$? +#fi; +#sleep 2 if [ "$ret" -eq 0 ] ; then killall sipp &> /dev/null - sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null - sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null + sipp -sf failure_route.xml -bg -i localhost -m 1 -p 10000 &> /dev/null + sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 1 -p 5061 #&> /dev/null ret=$? fi; @@ -113,13 +115,13 @@ flags, mask, next_domain) values ('4', '3', '1', '49', '127.0.0.1:10000', '4..', $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code, flags, mask, next_domain) values ('5', '3', '1', '49', '127.0.0.1:10000', '486', '0', '0', '2');" -if [ ! "$ret" -eq 0 ] ; then - $CTL fifo cr_reload_routes - killall sipp &> /dev/null - sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null - sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null - ret=$? -fi; +#if [ ! "$ret" -eq 0 ] ; then +# $CTL fifo cr_reload_routes +# killall sipp &> /dev/null +# sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null +# sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null +# ret=$? +#fi; $KILL

15 years, 7 months

git:master: htable: documented sht_dump MI command

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 7c9393307fed500f2d24139405d829491c98885e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c93933… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Wed May 20 15:02:58 2009 +0300 htable: documented sht_dump MI command --- modules_k/htable/README | 284 ++++++++++++++++++++------------- modules_k/htable/doc/htable_admin.xml | 25 +++- 2 files changed, 196 insertions(+), 113 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7c9…

15 years, 7 months

new feature: event_route

by Daniel-Constantin Mierla

Hello, I just introduced support for a new type of route in configuration file - event_route. The prototype for it is: event_route[groupid:eventid] { [actions] } The main purpose for it is to allow modules (and core) to be able to execute code written in configuration file when a specific event happens, without altering the config grammar. Also, in short term, the modules that fire events should be able to impose what type of actions can be used in the respective event_route - now functions allowed in request route can be used. First module that uses this feature is htable, executing an event route only once, when all modules were initialized. A typical use case is to initialize some items in a hash table. Example: modparam("htable", "htable", "a=>size=4;") event_route[htable:mod-init] { $sht(a=>calls-to::10.10.10.10) = 0; $sht(a=>max-calls-to::10.10.10.10) = 100; } route { if(is_method("INVITE") && !has_totag()) { switch($rd) { case "10.10.10.10": lock("calls-to::10.10.10.10"); $sht(a=>calls-to::10.10.10.10) = $sht(a=>calls-to::10.10.10.10) + 1; unlock("calls-to::10.10.10.10"); if($sht(a=>calls-to::10.10.10.10)>$sht(a=>max-calls-to::10.10.10.10)) { sl_send_reply("500", "To many calls to .10"); exit; } break; ... } } } This system will be used to get kamailio's error_route and local_route functionalities. Other cases I have in mind now are: - auto-expired dialog route introduced in kamailio 1.5.0 to become event_route[dialog:auto-expired] - call event route when a location record has expired on timer: event_route[usrloc:auto-expired] making available via PV details of expired contact - rtimer module routes to become event routes Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

15 years, 7 months

git:master: kex: documentation for km_append_branch()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5b04225bf842ce2354ce17cd50ca3c808617bbdb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b04225… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 19:34:29 2009 +0200 kex: documentation for km_append_branch() --- modules_k/kex/README | 22 ++++++++++++++++++++++ modules_k/kex/doc/kex_admin.xml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README index 104ca84..b5e1986 100644 --- a/modules_k/kex/README +++ b/modules_k/kex/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 3.4. setbflag(flag [, branch]) 3.5. isbflagset(flag [, branch]) 3.6. resetsflag(flag [, branch]) + 3.7. km_append_branch([uri]) 4. Exported MI Functions @@ -50,6 +51,7 @@ Daniel-Constantin Mierla 1.4. setbflag usage 1.5. setbflag usage 1.6. resetsflag usage + 1.7. km_append_branch usage Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 3.4. setbflag(flag [, branch]) 3.5. isbflagset(flag [, branch]) 3.6. resetsflag(flag [, branch]) + 3.7. km_append_branch([uri]) 4. Exported MI Functions @@ -109,6 +112,7 @@ Chapter 1. Admin Guide 3.4. setbflag(flag [, branch]) 3.5. isbflagset(flag [, branch]) 3.6. resetsflag(flag [, branch]) + 3.7. km_append_branch([uri]) 3.1. setsflag(flag) @@ -221,6 +225,24 @@ if(isbflagset("1")) resetbflag("1"); ... +3.7. km_append_branch([uri]) + + Append a new branch to SIP request. + + Meaning of the parameters is as follows: + * uri - SIP URI of the new destination. If omitted then the R-URI is + used. It can be static string or a string with pseudo-variables + that will be evaluated at runtime. + + This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. + + Example 1.7. km_append_branch usage +... +km_append_branch(); +... +km_append_branch("sip:alice@sip-router.org"); +... + 4. Exported MI Functions 4.1. arg diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml index 9bd4298..7fff6a3 100644 --- a/modules_k/kex/doc/kex_admin.xml +++ b/modules_k/kex/doc/kex_admin.xml @@ -247,6 +247,36 @@ resetbflag("1"); </programlisting> </example> </section> + <section> + <title><function moreinfo="none">km_append_branch([uri])</function></title> + <para> + Append a new branch to SIP request. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>uri</emphasis> - SIP URI of the new destination. If + omitted then the R-URI is used. It can be static string or + a string with pseudo-variables that will be evaluated at + runtime. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. + </para> + <example> + <title><function>km_append_branch</function> usage</title> + <programlisting format="linespecific"> +... +km_append_branch(); +... +km_append_branch("sip:alice@sip-router.org"); +... +</programlisting> + </example> + </section> </section> <section>

15 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009