sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:4.0: seas: fix compiler warning:
by Daniel-Constantin Mierla 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: cb971e61a573d2a024ada52b6036a1cdc56ee68e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb971e6… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 18 15:48:03 2013 -0400 seas: fix compiler warning: - warning: variable flags set but not used [-Wunused-but-set-variable] (cherry picked from commit 21386829d819c06c42871cf5b68d0d3a63ef0222) --- modules/seas/encode_route.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/seas/encode_route.c b/modules/seas/encode_route.c index f49b327..55c99e5 100644 --- a/modules/seas/encode_route.c +++ b/modules/seas/encode_route.c @@ -66,10 +66,9 @@ int encode_route_body(char *hdr,int hdrlen,rr_t *route_parsed,unsigned char *where) { int i=0,k,route_offset; - unsigned char flags,tmp[500]; + unsigned char tmp[500]; rr_t *myroute; - flags=0; for(route_offset=0,i=0,myroute=route_parsed;myroute;myroute=myroute->next,i++){ if((k=encode_route(hdr,hdrlen,myroute,&tmp[route_offset]))<0){ LM_ERR("parsing route number %d\n",i); @@ -127,10 +126,9 @@ int encode_route(char *hdrstart,int hdrlen,rr_t *body,unsigned char *where) int print_encoded_route_body(FILE *fd,char *hdr,int hdrlen,unsigned char *payload,int paylen,char *prefix) { - unsigned char flags, numroutes; + unsigned char numroutes; int i,offset; - flags=payload[0]; fprintf(fd,"%s",prefix); for(i=0;i<paylen;i++) fprintf(fd,"%s%d%s",i==0?"ENCODED CONTACT BODY:[":":",payload[i],i==paylen-1?"]\n":""); @@ -179,10 +177,9 @@ int print_encoded_route(FILE *fd,char *hdr,int hdrlen,unsigned char* payload,int int dump_route_body_test(char *hdr,int hdrlen,unsigned char *payload,int paylen,FILE* fd,char segregationLevel,char *prefix) { - unsigned char flags, numroutes; + unsigned char numroutes; int i,offset; - flags=payload[0]; if(!segregationLevel){ return dump_standard_hdr_test(hdr,hdrlen,(unsigned char*)payload,paylen,fd); }

1 0

git:4.0: seas: fix compiler warning
by Daniel-Constantin Mierla 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: 15ec4ac4c0e815d648bbdf0e676227b93860f290 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15ec4ac… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 18 15:45:50 2013 -0400 seas: fix compiler warning - warning: variable flags2 set but not used [-Wunused-but-set-variable] (cherry picked from commit 200eddad28abd6bc51da3285dd52d5f8c88c4e56) --- modules/seas/encode_digest.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/seas/encode_digest.c b/modules/seas/encode_digest.c index 965d1fd..f355f16 100644 --- a/modules/seas/encode_digest.c +++ b/modules/seas/encode_digest.c @@ -217,10 +217,9 @@ int print_encoded_digest(FILE *fd,char *hdr,int hdrlen,unsigned char* payload,in int dump_digest_test(char *hdr,int hdrlen,unsigned char* payload,int paylen,FILE* fd,char segregationLevel) { int i=2;/* 2*flags */ - unsigned char flags1=0,flags2=0; + unsigned char flags1=0; flags1=payload[0]; - flags2=payload[1]; if(!(segregationLevel & ONLY_URIS)) return dump_standard_hdr_test(hdr,hdrlen,payload,paylen,fd); i=2;

1 0

git:4.0: seas: fix compiler warning:
by Daniel-Constantin Mierla 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: d74129f1d80a38e29b152351d1c0cf4c1faffce4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d74129f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 18 15:42:40 2013 -0400 seas: fix compiler warning: - warning: variable falgs set but not used [-Wunused-but-set-variable] (cherry picked from commit 63736be1e4d2d6e82a0f7be6a85a96ee66c10146) --- modules/seas/encode_content_disposition.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/seas/encode_content_disposition.c b/modules/seas/encode_content_disposition.c index 0b058c6..9e9de34 100644 --- a/modules/seas/encode_content_disposition.c +++ b/modules/seas/encode_content_disposition.c @@ -61,9 +61,7 @@ int encode_content_disposition(char *hdrstart,int hdrlen,struct disposition *bod int print_encoded_content_disposition(FILE* fd,char *hdr,int hdrlen,unsigned char* payload,int paylen,char *prefix) { int i=3;/* flags + urilength */ - unsigned char flags=0; - flags=payload[0]; fprintf(fd,"%s",prefix); for(i=0;i<paylen;i++) fprintf(fd,"%s%d%s",i==0?"ENCODED CONTENT-DISPOSITION=[":":",payload[i],i==paylen-1?"]\n":"");

1 0

git:4.0: dns_cache.c: fix compiler warnings
by Daniel-Constantin Mierla 07 May '13

07 May '13

Module: sip-router Branch: 4.0 Commit: 9374ee177e5c962eee8c47a1ff30683596114c7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9374ee1… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 18 14:09:09 2013 -0400 dns_cache.c: fix compiler warnings - warningâsr_sums[*].r_sum may be used uninitialized in this function [-Wuninitialized] - warningâsr_sums[*].rr may be used uninitialized in this function [-Wuninitialized] (cherry picked from commit b3c8f92fe48ac90802c989c74c3a34cfea065861) --- dns_cache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index b351490..1243c92 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2306,6 +2306,7 @@ inline static struct dns_rr* dns_srv_get_nxt_rr(struct dns_hash_entry* e, servers_up = atomic_get(dns_servers_up); #endif + memset(r_sums, 0, sizeof(struct r_sums_entry) * MAX_SRV_GRP_IDX); rand_w=0; for(rr=e->rr_lst, n=0;rr && (n<*no);rr=rr->next, n++);/* skip *no records*/

1 0

4.0.1 (release) compiler warnings
by Konstantin M. 07 May '13

07 May '13

Hello Distributor ID: Debian Description: Debian GNU/Linux 7.0 (wheezy) Release: 7.0 Codename: wheezy gcc (Debian 4.7.2-5) 4.7.2 CC (gcc) [kamailio] dns_cache.o dns_cache.c: In function 'dns_srv_get_nxt_rr': dns_cache.c:2302:5: warning: 'r_sums[1].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[1].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[2].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[2].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[3].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[3].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[4].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[4].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[5].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[5].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[6].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[6].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[7].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[7].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[8].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[8].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[9].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[9].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[10].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[10].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[11].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[11].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[12].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[12].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[13].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[13].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[14].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[14].rr' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[15].r_sum' may be used uninitialized in this function [-Wuninitialized] dns_cache.c:2302:5: warning: 'r_sums[15].rr' may be used uninitialized in this function [-Wuninitialized] CC (gcc) [kamailio] cfg/cfg_ctx.o cfg/cfg_ctx.c: In function 'cfg_set_now': cfg/cfg_ctx.c:490:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:494:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:564:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:565:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:584:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c: In function 'cfg_commit': cfg/cfg_ctx.c:1125:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1133:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1190:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1225:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1226:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1228:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c: In function 'cfg_add_group_inst': cfg/cfg_ctx.c:1582:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1583:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1585:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1594:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c: In function 'cfg_del_group_inst': cfg/cfg_ctx.c:1678:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1679:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1681:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1692:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1710:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1712:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_ctx.c:1718:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CC (gcc) [kamailio] cfg/cfg_struct.o cfg/cfg_struct.c: In function 'apply_add_var_list': cfg/cfg_struct.c:1091:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] cfg/cfg_struct.c:1092:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

4 5

git:master: Remove "ignore_failed_auth" Parameter from example config - otherwise you may register without correct password .
by admin＠sip-router.org 07 May '13

07 May '13

Module: sip-router Branch: master Commit: acf033559f728e9967eb32f5340b0508a232172b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acf0335… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Tue May 7 22:31:34 2013 +0800 Remove "ignore_failed_auth" Parameter from example config - otherwise you may register without correct password. (the parameter was added for loadtesting only) --- examples/scscf/kamailio.cfg | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index d8da8ab..6a34006 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -231,7 +231,6 @@ modparam("siptrace", "hep_mode_on", 1) # -- ims_auth params -- modparam("ims_auth", "name", URI) modparam("ims_auth", "registration_default_algorithm", REG_AUTH_DEFAULT_ALG) -modparam("ims_auth","ignore_failed_auth",1) #!ifdef CXDX_FORCED_PEER modparam("ims_auth", "cxdx_forced_peer", CXDX_FORCED_PEER) #!endif

1 0

Radius - new style AVP's (misc_radius)
by Victor V. Kustov 07 May '13

07 May '13

Good day! Now I test new style AVP's for radius response storing. Today additional radius responses return in special radpair: SIP-AVP - name, string "email:sr-users@lists.sip-router.org session-timeout#161 nexthopip:h323/0001111@myvoip-gate.kamailio.org" - value. I don't know why developers chose this way. But it's addition kamailio's feature, so let it be. But if radius server responded with standard pairs? Sending Access-Accept of id 60 to 172.16.X.X port 59736 Session-Timeout = 4261674 next-hop-ip = "SIP/00111222333444@cisco-out" SIP-AVP = "email:sr-users@lists.sip-router.org session-timeout#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" session-protocol = "SIP" No chance to get full radius response at this moment. Only parse SIP-AVP pair. This mean that when you wanna integrate K. in existing infrastructure (in my case - billing), u need work with K. and radius. But why, if you already had worked voip devices? I think more flexible solution ADD in misc_radius function to get radpairs as AVP's. See that i got: misc_radius [functions.c:159]: AVP 'Session-Timeout'/0='null'/4261674 has been added misc_radius [functions.c:143]: AVP 'next-hop-ip'/0='SIP/005555777888@cisco-out'/0 has been added misc_radius [functions.c:143]: AVP 'session-protocol'/0='SIP'/0 has been added After radius response i get: $avp(Session-Timeout)=4261674 (integer) $avp(next-hop-ip)="SIP/005555777888@cisco-out" (string) $avp(session-protocol)="SIP" (string) I think its usable and more flexible. I see 3 way to integrate it: 1. additionally with existing radius_load_caller_avps/radius_load_callee_avps (i make same for test) 2. new function in same module, like radius_authorize_request (caller,callee). 3. replace existing style. it's bad for backward compability, of cause. Or it stay my local patch :) If it really needed and usable i may made any (1..3) way with doc and examples :) diff --git a/modules/misc_radius/functions.c b/modules/misc_radius/functions.c index 2a42024..f156939 100644 --- a/modules/misc_radius/functions.c +++ b/modules/misc_radius/functions.c @@ -107,6 +107,60 @@ error: return -1; } +static void generate_avps_rad(VALUE_PAIR* received) +{ + int_str name, val; + unsigned short flags; + VALUE_PAIR *vp; + + vp = received; + + for( ; vp ; vp=vp->next) { + flags = AVP_NAME_STR; + switch(vp->type) + { + case PW_TYPE_STRING: + flags |= AVP_VAL_STR; + name.s.len = strlen(vp->name); + val.s.len = strlen(vp->strvalue); + name.s.s = vp->name; + val.s.s = vp->strvalue; + if (add_avp( flags, name, val ) < 0) { + LM_ERR("unable to create a new AVP\n"); + } else { + LM_DBG("AVP '%.*s'/%d='%.*s'/%d has been added\n", + (flags&AVP_NAME_STR)?name.s.len:4, + (flags&AVP_NAME_STR)?name.s.s:"null", + (flags&AVP_NAME_STR)?0:name.n, + (flags&AVP_VAL_STR)?val.s.len:4, + (flags&AVP_VAL_STR)?val.s.s:"null", + (flags&AVP_VAL_STR)?0:val.n ); + } + continue; + case PW_TYPE_INTEGER: + name.s.len = strlen(vp->name); + name.s.s = vp->name; + val.n = vp->lvalue; + if (add_avp( flags, name, val ) < 0) { + LM_ERR("unable to create a new AVP\n"); + } else { + LM_DBG("AVP '%.*s'/%d='%.*s'/%d has been added\n", + (flags&AVP_NAME_STR)?name.s.len:4, + (flags&AVP_NAME_STR)?name.s.s:"null", + (flags&AVP_NAME_STR)?0:name.n, + (flags&AVP_VAL_STR)?val.s.len:4, + (flags&AVP_VAL_STR)?val.s.s:"null", + (flags&AVP_VAL_STR)?0:val.n ); + } + continue; + default: + LM_ERR("skip attribute type %d (non-string)", vp->type); + continue; + } + return; + } +} + /* Generate AVPs from Radius reply items */ static void generate_avps(struct attr *attrs, VALUE_PAIR* received) @@ -212,6 +266,7 @@ int radius_load_caller_avps(struct sip_msg* _m, char* _caller, char* _s2) LM_DBG("success\n"); rc_avpair_free(send); generate_avps(caller_attrs, received); + generate_avps_rad(received); rc_avpair_free(received); return 1; } else { -- WBR, Victor JID: coyote(a)bks.tv JID: coyote(a)bryansktel.ru I use FREE operation system: 3.8.4-calculate GNU/Linux

1 0

rfc: restructuring source code tree
by Daniel-Constantin Mierla 07 May '13

07 May '13

Hello, among the topics discussed just before the last major release series (4.0.x) was one about restructuring the source code tree. It started mainly as a proposal to move source code belonging to core in a dedicated folder, but there could be more variants. It's time start discussing if we do it, and if yes, how. Here is what I could collect so far. a) no change, keep like it is b) move source code of core in a dedicated folder named 'core' c) move all source code in a folder named src, with following sub-structure src/core - for core src/lib - for internal libraries src/modules - for module Feel free to propose other variants or express your opinion regarding the proposed options. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, San Francisco, USA - June 24-27, 2013 * http://asipto.com/u/katu *

3 4

unsupported event from ERROR to NOTICE or INFO
by Juha Heinanen 04 May '13

04 May '13

if presence module gets subscribe for event is does not support, it prints error message: May 4 08:49:03 sars /usr/sbin/pres-serv[3826]: ERROR: presence [subscribe.c:1030]: Unsupported event header field value xcap-diff in my opinion, it is not really an error. does anyone object if i downgrade the message to NOTICE or INFO? -- juha

1 0

git:4.0: modules/rls: added support for escaped chars in rls-services document
by Juha Heinanen 04 May '13

04 May '13

Module: sip-router Branch: 4.0 Commit: e7a8752ad427f8f23df25edc6bd2e7ba531ac6c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7a8752… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 3 19:53:12 2013 +0300 modules/rls: added support for escaped chars in rls-services document (cherry picked from commit fa9b8664a3b7c7a035c738a37b8ef0ef44190cb8) --- modules/rls/notify.c | 61 ++++++++++++++++++++++++---------------------- modules/rls/subscribe.c | 46 +++++++++++++++++++++++++++------- modules/rls/utils.c | 54 +++++++++++++++++++++++++++++++++++++++++ modules/rls/utils.h | 31 ++++++++++++++++++++++++ 4 files changed, 153 insertions(+), 39 deletions(-) diff --git a/modules/rls/notify.c b/modules/rls/notify.c index f0ec0aa..7b5bec3 100644 --- a/modules/rls/notify.c +++ b/modules/rls/notify.c @@ -48,6 +48,7 @@ #include "../../hashes.h" #include "rls.h" #include "notify.h" +#include "utils.h" #include <libxml/xpath.h> #include <libxml/xpathInternals.h> @@ -1003,7 +1004,7 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, list_func_t function, void* param) { xmlNodePtr node; - char* uri = NULL; + str uri; int res = 0; for(node= list_node->children; node; node= node->next) @@ -1014,16 +1015,33 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, unsigned short port = 0; xmlNodePtr rl_node = NULL; xmlDocPtr rl_doc = NULL; + str unescaped_uri; + char buf[MAX_URI_SIZE]; + - uri= XMLNodeGetNodeContentByName(node, "resource-list", NULL); - - if (uri == NULL) + uri.s = XMLNodeGetNodeContentByName(node, "resource-list", NULL); + if (uri.s == NULL) { LM_ERR("when extracting URI from node\n"); return -1; } + uri.len = strlen(uri.s); + if (uri.len > MAX_URI_SIZE-1) { + LM_ERR("XCAP URI is too long\n"); + return -1; + } + LM_DBG("got resource-list uri <%.*s>\n", uri.len, uri.s); + + unescaped_uri.s = buf; + unescaped_uri.len = 0; + if (un_escape(&uri, &unescaped_uri) < 0) { + LM_ERR("Error un-escaping XCAP URI\n"); + return -1; + } + unescaped_uri.s[unescaped_uri.len] = 0; + LM_DBG("got unescaped uri <%s>\n", unescaped_uri.s); - if(parse_xcap_uri(uri, &hostname, &port, &rl_uri)>0) + if(parse_xcap_uri(unescaped_uri.s, &hostname, &port, &rl_uri)>0) { if (rls_integrated_xcap_server == 1 && (hostname.len == 0 @@ -1034,13 +1052,13 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, { LM_DBG("calling myself for rl_node\n"); res = process_list_and_exec(rl_node, username, domain, function, param); - xmlFree(uri); + xmlFree(uri.s); xmlFreeDoc(rl_doc); } else { LM_ERR("<resource-list/> not found\n"); - xmlFree(uri); + xmlFree(uri.s); return -1; } @@ -1048,7 +1066,7 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, else { LM_ERR("<resource-list/> is not local - unsupported at this time\n"); - xmlFree(uri); + xmlFree(uri.s); return -1; } } @@ -1061,20 +1079,20 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, else if(xmlStrcasecmp(node->name,(unsigned char*)"entry")== 0) { - uri= XMLNodeGetAttrContentByName(node, "uri"); - if(uri== NULL) + uri.s = XMLNodeGetAttrContentByName(node, "uri"); + if(uri.s== NULL) { LM_ERR("when extracting entry uri attribute\n"); return -1; } - LM_DBG("uri= %s\n", uri); - if(function(uri, param)< 0) + LM_DBG("uri= %s\n", uri.s); + if(function(uri.s, param)< 0) { LM_ERR("in function given as a parameter\n"); - xmlFree(uri); + xmlFree(uri.s); return -1; } - xmlFree(uri); + xmlFree(uri.s); } else if(xmlStrcasecmp(node->name,(unsigned char*)"list")== 0) @@ -1253,21 +1271,6 @@ int rls_get_resource_list(str *rl_uri, str *username, str *domain, path.len += 7; checked++; } - else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%5b", 3) == 0) - { - path.s[path.len++] = '['; - checked += 3; - } - else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%5d", 3) == 0) - { - path.s[path.len++] = ']'; - checked += 3; - } - else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%22", 3) == 0) - { - path.s[path.len++] = '\"'; - checked += 3; - } else { path.s[path.len++] = rl_uri->s[checked]; diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index e022c43..5ebd739 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -51,6 +51,7 @@ #include "rls.h" #include "../../mod_fix.h" #include "list.h" +#include "utils.h" int counter= 0; @@ -72,10 +73,12 @@ int remove_expired_rlsubs( subs_t* subs,unsigned int hash_code); /** * return the XML node for rls-services matching uri */ -xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri) +xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* service_uri) { xmlNodePtr root, node; - char* val; + struct sip_uri sip_uri; + str uri, uri_str; + str *normalized_uri; root = XMLDocGetNodeByName(doc, "rls-services", NULL); if(root==NULL) @@ -88,16 +91,39 @@ xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri) { if(xmlStrcasecmp(node->name, (unsigned char*)"service")==0) { - val = XMLNodeGetAttrContentByName(node, "uri"); - if(val!=NULL) + uri.s = XMLNodeGetAttrContentByName(node, "uri"); + if (uri.s == NULL) { - if((uri->len==strlen(val)) && (strncmp(val, uri->s, uri->len)==0)) - { - xmlFree(val); - return node; - } - xmlFree(val); + LM_DBG("failed to fetch 'uri' in service [invalid XML from XCAP]\n"); + continue; + } + uri.len = strlen(uri.s); + normalized_uri = normalize_sip_uri(&uri); + if (normalized_uri->s == NULL || normalized_uri->len == 0) + { + LM_ERR("failed to normalize service URI\n"); + xmlFree(uri.s); + return NULL; + } + xmlFree(uri.s); + if(parse_uri(normalized_uri->s, normalized_uri->len, &sip_uri)< 0) + { + LM_ERR("failed to parse uri\n"); + return NULL; + } + if(uandd_to_uri(sip_uri.user, sip_uri.host, &uri_str)< 0) + { + LM_ERR("failed to construct uri from user and domain\n"); + return NULL; + } + if(uri_str.len== service_uri->len && + strncmp(uri_str.s, service_uri->s, uri_str.len) == 0) + { + pkg_free(uri_str.s); + return node; } + LM_DBG("match not found, service-uri = [%.*s]\n", uri_str.len, uri_str.s); + pkg_free(uri_str.s); } } return NULL; diff --git a/modules/rls/utils.c b/modules/rls/utils.c new file mode 100644 index 0000000..161529c --- /dev/null +++ b/modules/rls/utils.c @@ -0,0 +1,54 @@ +/* + * rls module - resource list server + * + * Copyright (C) 2012 AG Projects + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "../../ut.h" + +#define SIP_PREFIX "sip:" +#define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1 + +str* normalize_sip_uri(const str *uri) +{ + static str normalized_uri; + static str null_str = {NULL, 0}; + static char buf[MAX_URI_SIZE]; + + normalized_uri.s = buf; + if (un_escape((str *)uri, &normalized_uri) < 0) + { + LM_ERR("un-escaping URI\n"); + return &null_str; + } + + normalized_uri.s[normalized_uri.len] = '\0'; + if (strncasecmp(normalized_uri.s, SIP_PREFIX, SIP_PREFIX_LEN) != 0 && strchr(normalized_uri.s, '@') != NULL) + { + memmove(normalized_uri.s+SIP_PREFIX_LEN, normalized_uri.s, normalized_uri.len+1); + memcpy(normalized_uri.s, SIP_PREFIX, SIP_PREFIX_LEN); + normalized_uri.len += SIP_PREFIX_LEN; + } + + return &normalized_uri; +} + +#undef SIP_PREFIX +#undef SIP_PREFIX_LEN diff --git a/modules/rls/utils.h b/modules/rls/utils.h new file mode 100644 index 0000000..4b245e7 --- /dev/null +++ b/modules/rls/utils.h @@ -0,0 +1,31 @@ +/* + * rls module - resource list server + * + * Copyright (C) 2012 AG Projects + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef RLS_URILS_H +#define RLS_UTILS_H + +#include "../../ut.h" + +extern str* normalize_sip_uri(const str *uri); + +#endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013