sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

git:master: dispatcher(k): updated description of flags field
by Daniel-Constantin Mierla 09 Feb '12

09 Feb '12

Module: sip-router Branch: master Commit: 8b180f5834081a5500cac6938452c29d60d9f41a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b180f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 9 15:42:00 2012 +0100 dispatcher(k): updated description of flags field --- modules_k/dispatcher/README | 8 ++++++-- modules_k/dispatcher/doc/dispatcher_admin.xml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index e1cfd68..cffcc6d 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -988,8 +988,12 @@ sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080 SIP URI format). Optionally, these fields can be followed by: - * flags: 1 - destination inactive, 2 - destination in probing mode -- - you can do bitwise OR to set both flags + * flags (listed by index - can be bitwise mask of values): 0 (value + 1) - inactive destination; 1 (value 2) - temporary trying + destination (in the way to become inactive if it does not reply to + keepalives - there is a module parameter to set the threshold of + failures); 2 (value 4) - admin disabled destination; 3 (value 8) - + probing destination (sending keep alives); * priority: sets the priority in destination list (based on it is done the initial ordering inside the set) * attributes: extra filed in form of name1=value1;...;nameN=valueN. diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index ce0cb93..83f6c70 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -1227,8 +1227,12 @@ sercmd dispatcher.set_state ip 2 sip:127.0.0.1:5080 </para> <itemizedlist> <listitem> - <para>flags: 1 - destination inactive, 2 - destination in probing - mode -- you can do bitwise OR to set both flags</para> + <para>flags (listed by index - can be bitwise mask of values): + 0 (value 1) - inactive destination; 1 (value 2) - temporary trying + destination (in the way to become inactive if it does not reply to + keepalives - there is a module parameter to set the threshold of + failures); 2 (value 4) - admin disabled destination; 3 (value 8) + - probing destination (sending keep alives);</para> </listitem> <listitem> <para>priority: sets the priority in destination list (based on it

1 0

[tracker] Task closed: sr.pv.get fails for retrieving index header variable in Lua
by sip-router 08 Feb '12

08 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#202 - sr.pv.get fails for retrieving index header variable in Lua User who did this - Ovidiu Sas (osas) Reason for closing: Fixed Additional comments about closing: Fixed in trunk and 3.2 branch. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=202 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:3.2: Proper parsing for PVs
by Ovidiu Sas 08 Feb '12

08 Feb '12

Module: sip-router Branch: 3.2 Commit: 5fc59c44a6dbc97049a985b5b2f7280510b293b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fc59c4… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Feb 7 19:12:36 2012 -0500 Proper parsing for PVs Closes FS#202 - sr.pv.get fails for retrieving index header variable in Lua (cherry picked from commit 8b9a98e8a8205b2214bf3503afea8aece20e2396) --- pvapi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pvapi.c b/pvapi.c index 940f017..d1ebfe6 100644 --- a/pvapi.c +++ b/pvapi.c @@ -125,7 +125,7 @@ int pv_locate_name(str *in) { /* name with parenthesis: $(...) */ pcount = 1; - for(i=1; i<in->len; i++) + for(i=2; i<in->len; i++) { if(in->s[i]==PV_LNBRACKET) pcount++; @@ -135,6 +135,7 @@ int pv_locate_name(str *in) return i+1; } /* non-closing name parenthesis */ + LM_ERR("non-closing name parenthesis [%.*s]\n",in->len,in->s); return -1; } @@ -167,6 +168,7 @@ int pv_locate_name(str *in) return i+1; } /* non-closing inner-name parenthesis */ + LM_ERR("non-closing inner-name parenthesis [%.*s]\n",in->len,in->s); return -1; }

1 0

[tracker] Task closed: support for parsing URNs
by sip-router 08 Feb '12

08 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#201 - support for parsing URNs User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=201 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: support for parsing URNs
by sip-router 08 Feb '12

08 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#201 - support for parsing URNs User who did this - Daniel-Constantin Mierla (miconda) ---------- Committed to master branch. I replaced URN_T with URN_URI_T to match existing naming pattern for URI schema. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=201#comment498 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] User took ownership: support for parsing URNs
by sip-router 08 Feb '12

08 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#201 - support for parsing URNs More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=201 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: core/selects: handle URN_URI_T
by Daniel-Constantin Mierla 08 Feb '12

08 Feb '12

Module: sip-router Branch: master Commit: 9c9e5a330ddd6be06087af4e2ed2a6d9262f4593 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c9e5a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 8 10:22:49 2012 +0100 core/selects: handle URN_URI_T --- select_core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/select_core.c b/select_core.c index 42f6aff..ea9d5a1 100644 --- a/select_core.c +++ b/select_core.c @@ -921,6 +921,7 @@ int select_uri_hostport(str* res, select_t* s, struct sip_msg* msg) break; case SIP_URI_T: case TEL_URI_T: + case URN_URI_T: strncpy(p+select_uri_p->host.len, ":5060", 5); break; case ERROR_URI_T: @@ -949,6 +950,7 @@ int select_uri_proto(str* res, select_t* s, struct sip_msg* msg) break; case SIP_URI_T: case TEL_URI_T: + case URN_URI_T: proto_type_to_str(PROTO_UDP, res); break; case ERROR_URI_T:

1 0

git:master: parser/uri: support for URN
by Daniel-Constantin Mierla 08 Feb '12

08 Feb '12

Module: sip-router Branch: master Commit: fecefaf10f6fc4d9bfd6cf7fec4312ea8c8479ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fecefaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 8 10:19:00 2012 +0100 parser/uri: support for URN - uri parser has support for URNs (e.g. urn:service:sos.fire) - t_relay does not break on RURI with URNs - PVs are set as follows: $ru= "urn:service:sos.fire" $rz= "urn" $rU= "service" $rd= "sos.fire" - refer to http://tools.ietf.org/html/draft-ietf-ecrit-framework-13#page-29 for SIP signaling requirements for SIP proxy servers. - patch by Wolfgang Kampichler, closes FS#201 --- parser/msg_parser.h | 2 +- parser/parse_uri.c | 19 +++++++++++++++++-- parser/parse_uri.h | 3 +-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index eee2948..44f5adb 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -174,7 +174,7 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ (((m)->new_uri.s && (m)->new_uri.len) ? (&(m)->new_uri) : (&(m)->first_line.u.request.uri)) -enum _uri_type{ERROR_URI_T=0, SIP_URI_T, SIPS_URI_T, TEL_URI_T, TELS_URI_T}; +enum _uri_type{ERROR_URI_T=0, SIP_URI_T, SIPS_URI_T, TEL_URI_T, TELS_URI_T, URN_URI_T}; typedef enum _uri_type uri_type; enum _uri_flags{ URI_USER_NORMALIZE=1, diff --git a/parser/parse_uri.c b/parser/parse_uri.c index affe44f..e6cedcf 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -132,6 +132,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) #define SIP_SCH 0x3a706973 #define SIPS_SCH 0x73706973 #define TEL_SCH 0x3a6c6574 +#define URN_SCH 0x3a6e7275 #define case_port( ch, var) \ case ch: \ @@ -381,7 +382,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) port_no=0; state=URI_INIT; memset(uri, 0, sizeof(struct sip_uri)); /* zero it all, just to be sure*/ - /*look for sip:, sips: or tel:*/ + /*look for sip:, sips: ,tel: or urn:*/ if (len<5) goto error_too_short; scheme=buf[0]+(buf[1]<<8)+(buf[2]<<16)+(buf[3]<<24); scheme|=0x20202020; @@ -392,6 +393,8 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) else goto error_bad_uri; }else if (scheme==TEL_SCH){ uri->type=TEL_URI_T; + }else if (scheme==URN_SCH){ + uri->type=URN_URI_T; }else goto error_bad_uri; s=p; @@ -955,8 +958,13 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) uri->user.len=0; break; case URI_PASSWORD_ALPHA: + /* it might be an urn, check scheme and set host */ + if (scheme==URN_SCH){ + uri->host.s=s; + uri->host.len=p-s; + DBG("parsed urn scheme...\n"); /* this is the port, it can't be the passwd */ - goto error_bad_port; + }else goto error_bad_port; case URI_HOST_P: case URI_HOST6_END: uri->host.s=s; @@ -1140,6 +1148,9 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) uri->host.s=""; uri->host.len=0; break; + /* urn: do nothing */ + case URN_URI_T: + break; case ERROR_URI_T: LOG(L_ERR, "ERROR: parse_uri unexpected error (BUG?)\n"); goto error_bad_uri; @@ -1302,6 +1313,7 @@ str s_sip = STR_STATIC_INIT("sip"); str s_sips = STR_STATIC_INIT("sips"); str s_tel = STR_STATIC_INIT("tel"); str s_tels = STR_STATIC_INIT("tels"); +str s_urn = STR_STATIC_INIT("urn"); static str s_null = STR_STATIC_INIT(""); inline void uri_type_to_str(uri_type type, str *s) { @@ -1318,6 +1330,9 @@ inline void uri_type_to_str(uri_type type, str *s) { case TELS_URI_T: *s = s_tels; break; + case URN_URI_T: + *s = s_urn; + break; default: *s = s_null; } diff --git a/parser/parse_uri.h b/parser/parse_uri.h index b949966..0dbc4c7 100644 --- a/parser/parse_uri.h +++ b/parser/parse_uri.h @@ -37,8 +37,7 @@ #include "../str.h" #include "../parser/msg_parser.h" - -extern str s_sip, s_sips, s_tel, s_tels; +extern str s_sip, s_sips, s_tel, s_tels, s_urn; /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri

1 0

git:master: pv: return of urn schema for $rz if it is the case
by Daniel-Constantin Mierla 08 Feb '12

08 Feb '12

Module: sip-router Branch: master Commit: e032a85cb2917dcb3dceff6f177f791d181dd803 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e032a85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 8 10:21:56 2012 +0100 pv: return of urn schema for $rz if it is the case - patch by Wolfgang Kampichler, FS#201 --- modules_k/pv/pv_core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index edfacad..1edaa77 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -57,6 +57,7 @@ static str pv_uri_scheme[] = { { "sips", 4 }, { "tel", 3 }, { "tels", 4 }, + { "urn", 3 }, { 0, 0 } };

1 0

[tracker] User took ownership: sr.pv.get fails for retrieving index header variable in Lua
by sip-router 08 Feb '12

08 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Ovidiu Sas has taken ownership of the following task: FS#202 - sr.pv.get fails for retrieving index header variable in Lua More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=202 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
6
7
8
9
10
11
12
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012