sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: xcap_client: set table version to 4
by Daniel-Constantin Mierla 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: ab36b2b10e2f99ab584ec916bccc2a40c4fa394f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab36b2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 20 09:28:44 2012 +0200 xcap_client: set table version to 4 - reported by Gnaneshwar Gatla --- modules_k/xcap_client/xcap_client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/xcap_client/xcap_client.c b/modules_k/xcap_client/xcap_client.c index 0551c67..c3f4049 100644 --- a/modules_k/xcap_client/xcap_client.c +++ b/modules_k/xcap_client/xcap_client.c @@ -51,7 +51,7 @@ MODULE_VERSION -#define XCAP_TABLE_VERSION 3 +#define XCAP_TABLE_VERSION 4 static int mod_init(void); static int child_init(int rank);

1 0

support r-uri pattern in lcr module
by Andreas Granig 20 Apr '12

20 Apr '12

Hi, I'd like to intoduce a way to perform pattern matching on the R-URI in addition to the plain prefix matching of R-URI-User. The use case is for example to only allow numeric destinations on one gw, whereas another one could accept alphanumeric ones as well (e.g. plain SIP peers compared to peers towards PSTN gateways). In order to keep the current functionality as is, I'd introduce a destination mode column with values 1 (default) for normal prefix matching and 2 for regex matching, and either extend the length of the prefix column or introduce a ruri_pattern column (because the name "prefix" would be misleading, but I'm reluctant to rename it due to backwards compatibility), which is only used if mode==2. Any comments/opinions on that? Andreas

2 3

Kamailio v3.2.3 Released
by Daniel-Constantin Mierla 19 Apr '12

19 Apr '12

Hello, Kamailio SIP Server v3.2.3 stable release is out. This is a maintenance release of the latest stable branch, 3.2, that includes fixes since release of v3.2.2. There is no change to database schema or configuration language structure that you have to do on installations of v3.2.0, v3.2.1 or v3.2.2. Deployments running previous v3.2.x versions are strongly recommended to be upgraded to v3.2.3. For more details about version 3.2.3 (including links and hints to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2012/04/kamailio-v3-2-3-released/ RPMs and Debian/Ubuntu packages will be available soon. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

1 0

git:master: modules/app_lua: Updated to handle optional parameters to handle_subscribe() and rls_handle_subscribe()
by Peter Dunkley 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: 4fc8134ccc57957c96530600ddcf613769e0d2bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fc8134… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 19 18:05:59 2012 +0100 modules/app_lua: Updated to handle optional parameters to handle_subscribe() and rls_handle_subscribe() --- modules/app_lua/app_lua_exp.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index beb4ccd..ce69a1d 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -1724,13 +1724,28 @@ static int lua_sr_pres_handle_subscribe(lua_State *L) return app_lua_return_error(L); } - if(lua_gettop(L)!=0) + if(lua_gettop(L)==0) + ret = _lua_presenceb.handle_subscribe0(env_L->msg); + else if (lua_gettop(L)==1) + { + str wuri; + struct sip_uri parsed_wuri; + + wuri.s = (char *) lua_tostring(L, -1); + wuri.len = strlen(wuri.s); + if (parse_uri(wuri.s, wuri.len, &parsed_wuri)) + { + LM_ERR("failed to parse watcher URI\n"); + return app_lua_return_error(L); + } + ret = _lua_presenceb.handle_subscribe(env_L->msg, parsed_wuri.user, parsed_wuri.host); + } + else { LM_ERR("incorrect number of arguments\n"); return app_lua_return_error(L); } - ret = _lua_presenceb.handle_subscribe(env_L->msg, NULL, NULL); return app_lua_return_int(L, ret); } @@ -2015,13 +2030,28 @@ static int lua_sr_rls_handle_subscribe(lua_State *L) return app_lua_return_error(L); } - if(lua_gettop(L)!=0) + if(lua_gettop(L)==0) + ret = _lua_rlsb.rls_handle_subscribe0(env_L->msg); + else if (lua_gettop(L)==1) + { + str wuri; + struct sip_uri parsed_wuri; + + wuri.s = (char *) lua_tostring(L, -1); + wuri.len = strlen(wuri.s); + if (parse_uri(wuri.s, wuri.len, &parsed_wuri)) + { + LM_ERR("failed to parse watcher URI\n"); + return app_lua_return_error(L); + } + ret = _lua_rlsb.rls_handle_subscribe(env_L->msg, parsed_wuri.user, parsed_wuri.host); + } + else { LM_ERR("incorrect number of arguments\n"); return app_lua_return_error(L); } - ret = _lua_rlsb.rls_handle_subscribe(env_L->msg, NULL, NULL); return app_lua_return_int(L, ret); }

1 0

git:master: modules_k/presence: Updated handle_subscribe() so that an optional parameter can be used to specify watcher URI
by Peter Dunkley 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: 63ab6b482bf2be1fb706dfe4ff0dd27caf79a26f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63ab6b4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 19 17:57:00 2012 +0100 modules_k/presence: Updated handle_subscribe() so that an optional parameter can be used to specify watcher URI - This means that you can use URIs from different SIP headers (for example, P-Asserted-Identity:) as the watcher URI. - If the parameter to handle_subscribe() is not use the From: URI is used as the watcher URI. --- modules_k/presence/README | 15 ++- modules_k/presence/bind_presence.c | 1 + modules_k/presence/bind_presence.h | 4 +- modules_k/presence/doc/presence_admin.xml | 10 ++- modules_k/presence/hash.c | 12 ++- modules_k/presence/notify.c | 47 ++++++--- modules_k/presence/notify.h | 2 + modules_k/presence/presence.c | 75 ++++++++------ modules_k/presence/subscribe.c | 152 +++++++++++++++++++++++------ modules_k/presence/subscribe.h | 11 ++- 10 files changed, 235 insertions(+), 94 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=63a…

1 0

git:master: modules_k/presence_xml: Updated to use watcher_user and watcher_domain fields in subs_t
by Peter Dunkley 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: 23455ed6e08cecd5fe7b22cdb3acd2440435f5b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23455ed… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 19 17:59:26 2012 +0100 modules_k/presence_xml: Updated to use watcher_user and watcher_domain fields in subs_t - Currently uses the from_user and from_domain fields which are no longer correct. --- modules_k/presence_xml/xcap_auth.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/presence_xml/xcap_auth.c b/modules_k/presence_xml/xcap_auth.c index 9838a06..3f0fee4 100644 --- a/modules_k/presence_xml/xcap_auth.c +++ b/modules_k/presence_xml/xcap_auth.c @@ -170,7 +170,7 @@ xmlNodePtr get_rule_node(subs_t* subs, xmlDocPtr xcap_tree ) int valid= 0; - uandd_to_uri(subs->from_user, subs->from_domain, &w_uri); + uandd_to_uri(subs->watcher_user, subs->watcher_domain, &w_uri); if(w_uri.s == NULL) { LM_ERR("while creating uri\n");

1 0

git:master: modules_k/rls: Updated rls_handle_subscribe() so that an optional parameter can be used to specify watcher URI
by Peter Dunkley 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: b90adb0da092ebf651a88b9cd1a21b3ae0cb8251 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b90adb0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 19 18:03:54 2012 +0100 modules_k/rls: Updated rls_handle_subscribe() so that an optional parameter can be used to specify watcher URI - This is useful when you want to use a URI from another SIP header (for example, P-Asserted-Identity:) as the watcher URI. - When the parameter is not used the From: URI is used as the watcher URI. --- modules_k/rls/README | 13 ++++-- modules_k/rls/api.h | 4 +- modules_k/rls/doc/rls_admin.xml | 8 +++- modules_k/rls/notify.c | 2 +- modules_k/rls/resource_notify.c | 40 +++++++++++--------- modules_k/rls/rls.c | 26 ++++++++++-- modules_k/rls/rls.h | 4 +- modules_k/rls/rls_db.c | 54 ++++++++++++++++++--------- modules_k/rls/subscribe.c | 79 +++++++++++++++++++++++++++++--------- modules_k/rls/subscribe.h | 4 +- 10 files changed, 165 insertions(+), 69 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b90…

1 0

git:master: rtpproxy: Updated README from xml doc.
by Andreas Granig 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: 4bdd3b99e2b22a298195cf65be28ffb95d7ba8a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bdd3b9… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Thu Apr 19 18:07:58 2012 +0200 rtpproxy: Updated README from xml doc. --- modules/rtpproxy/README | 145 +++++++++++++++++++++++++++++------------------ 1 files changed, 89 insertions(+), 56 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4bd…

1 0

git:master: rtpproxy(k): Send Via branch to rtpproxy
by Andreas Granig 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: c4ea425076504248e1fd8f9022b3bf56c2293a83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4ea425… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Thu Apr 19 17:42:52 2012 +0200 rtpproxy(k): Send Via branch to rtpproxy - Introduce force/unforce options "1" and "2" to optionally send first or second Via branch to rtpproxy, respectively. This can be used to stop only a specific branch in the rtp proxy, which is needed for complex serial looping scenarios where in a race condition a new branch is processed before a previous branch is cancelled, where the cancel would whipe the whole call from the rtp proxy instead of just the old branch, causing the subsequent rtp proxy lookup to fail. --- modules/rtpproxy/doc/rtpproxy_admin.xml | 49 ++++++++++++++- modules/rtpproxy/rtpproxy.c | 105 +++++++++++++++++++++++------- modules/rtpproxy/rtpproxy_funcs.c | 24 +++++++ modules/rtpproxy/rtpproxy_funcs.h | 1 + 4 files changed, 153 insertions(+), 26 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c4e…

3 2

git:master: core: Move parse_via_header to correct place.
by Andreas Granig 19 Apr '12

19 Apr '12

Module: sip-router Branch: master Commit: a075952dd0970b3ab5f7e403c88f954c2743ce80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a075952… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Thu Apr 19 17:38:29 2012 +0200 core: Move parse_via_header to correct place. - Move parse_via_header(...) from select_core to parser to avoid compiler warnings when accessing it from modules. --- parser/parse_via.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ parser/parse_via.h | 8 +++++++ select_core.c | 54 -------------------------------------------------- 3 files changed, 64 insertions(+), 54 deletions(-) diff --git a/parser/parse_via.c b/parser/parse_via.c index 5c54e09..1ed1004 100644 --- a/parser/parse_via.c +++ b/parser/parse_via.c @@ -68,6 +68,7 @@ #include "../ip_addr.h" #include "parse_via.h" #include "parse_def.h" +#include "msg_parser.h" @@ -2662,3 +2663,58 @@ void free_via_list(struct via_body* vb) pkg_free(foo); } } + +int parse_via_header( struct sip_msg *msg, int n, struct via_body** q) +{ + struct hdr_field *p; + struct via_body *pp = NULL; + int i; + + switch (n) { + case 1: + case 2: + if (!msg->h_via1 && (parse_headers(msg,HDR_VIA_F,0)==-1 || !msg->h_via1)) { + DBG("bad msg or missing VIA1 header \n"); + return -1; + } + pp = msg->h_via1->parsed; + if (n==1) break; + pp = pp->next; + if (pp) break; + + if (!msg->h_via2 && (parse_headers(msg,HDR_VIA2_F,0)==-1 || !msg->h_via2)) { + DBG("bad msg or missing VIA2 header \n"); + return -1; + } + pp = msg->h_via2->parsed; + break; + default: + if (!msg->eoh && (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->eoh)) { + ERR("bad msg while parsing to EOH \n"); + return -1; + } + p = msg->h_via1; + i = n; + while (i && p) { + if (p->type == HDR_VIA_T) { + i--; + pp = p->parsed; + while (i && (pp->next)) { + i--; + pp = pp->next; + } + } + p = p->next; + } + if (i > 0) { + DBG("missing VIA[%d] header\n", n); + return -1; + } + } + if (pp) { + *q = pp; + return 0; + } else + return -1; +} + diff --git a/parser/parse_via.h b/parser/parse_via.h index 9f899a0..5c7f3c1 100644 --- a/parser/parse_via.h +++ b/parser/parse_via.h @@ -48,6 +48,8 @@ #include "../str.h" +struct sip_msg; + /* via param types * WARNING: keep in sync with parse_via.c FIN_HIDDEN... * and with tm/sip_msg.c via_body_cloner @@ -124,4 +126,10 @@ char* parse_via(char* buffer, char* end, struct via_body *vb); void free_via_list(struct via_body *vb); +/* + * Get one Via header + */ +int parse_via_header( struct sip_msg *msg, int n, struct via_body** q); + + #endif /* PARSE_VIA_H */ diff --git a/select_core.c b/select_core.c index ea9d5a1..94fa162 100644 --- a/select_core.c +++ b/select_core.c @@ -332,60 +332,6 @@ int select_contact_params(str* res, select_t* s, struct sip_msg* msg) return 1; } -int parse_via_header( struct sip_msg *msg, int n, struct via_body** q) -{ - struct hdr_field *p; - struct via_body *pp = NULL; - int i; - - switch (n) { - case 1: - case 2: - if (!msg->h_via1 && (parse_headers(msg,HDR_VIA_F,0)==-1 || !msg->h_via1)) { - DBG("bad msg or missing VIA1 header \n"); - return -1; - } - pp = msg->h_via1->parsed; - if (n==1) break; - pp = pp->next; - if (pp) break; - - if (!msg->h_via2 && (parse_headers(msg,HDR_VIA2_F,0)==-1 || !msg->h_via2)) { - DBG("bad msg or missing VIA2 header \n"); - return -1; - } - pp = msg->h_via2->parsed; - break; - default: - if (!msg->eoh && (parse_headers(msg,HDR_EOH_F,0)==-1 || !msg->eoh)) { - ERR("bad msg while parsing to EOH \n"); - return -1; - } - p = msg->h_via1; - i = n; - while (i && p) { - if (p->type == HDR_VIA_T) { - i--; - pp = p->parsed; - while (i && (pp->next)) { - i--; - pp = pp->next; - } - } - p = p->next; - } - if (i > 0) { - DBG("missing VIA[%d] header\n", n); - return -1; - } - } - if (pp) { - *q = pp; - return 0; - } else - return -1; -} - int select_via(str* res, select_t* s, struct sip_msg* msg) { struct via_body *p = NULL;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012