sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:3.3: rr: use port. len to check for buffer overflow instead of max port len

by Henning Westerholt

Module: sip-router Branch: 3.3 Commit: bcc0888bea5b5e0d105de7e5ebcedc8e1b8836ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcc0888… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Fri Apr 19 11:04:39 2013 +0200 rr: use port.len to check for buffer overflow instead of max port len - reported by Kevin Wojtysiak (from commit 28a8b87885e373bee8cc81985277ae718973fdfd) --- modules_k/rr/loose.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index f5d869f..c33ae2d 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -366,7 +366,7 @@ static inline int get_maddr_uri(str *uri, struct sip_uri *puri) return 0; /* sip: + maddr + : + port */ - if( (puri->maddr_val.len) > (127 - 10) ) + if( (puri->maddr_val.len) > (127 - 6 - puri->port.len) ) { LM_ERR( "Too long maddr parameter\n"); return RR_ERROR;

11 years, 8 months

git:3.3: parser: safety check for max port length in URI

by Henning Westerholt

Module: sip-router Branch: 3.3 Commit: 0e9eafc25ca3240f690469116cee8ff3708eeee7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e9eafc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Tue Apr 9 00:18:35 2013 +0200 parser: safety check for max port length in URI - can't be longer than 5, a port being 16b value - reported by Kevin Wojtysiak (cherry picked from commit 13fd48f89555f5421e8285669e303bcefe44f149) --- parser/parse_uri.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/parser/parse_uri.c b/parser/parse_uri.c index a244cf2..b875827 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -1207,6 +1207,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) goto error_bad_uri; break; /* do nothing, avoids a compilation warning */ } + + if(uri->port.len>5) + goto error_invalid_port; + #ifdef EXTRA_DEBUG /* do stuff */ DBG("parsed uri:\n type=%d user=<%.*s>(%d)\n passwd=<%.*s>(%d)\n" @@ -1270,6 +1274,10 @@ error_bad_port: *p, state, (int)(p-buf), ZSW(buf), (int)(p-buf), len, ZSW(buf), len); goto error_exit; +error_invalid_port: + DBG("parse_uri: bad port in uri: [%.*s] in <%.*s>\n", + uri->port.len, uri->port.s, len, ZSW(buf)); + goto error_exit; error_bad_uri: DBG("parse_uri: bad uri, state %d" " parsed: <%.*s> (%d) / <%.*s> (%d)\n",

11 years, 8 months

loose_route() question

by Juha Heinanen

my proxy (master version) receives this kind of ack to invite: ACK sip:jh@test.fi;gr=urn:uuid:eea2f222-60b6-4ba1-a764-99cc0eb3ba9f SIP/2.0 Route: <sip:Wvip1a55myyd/QXAYmYKJ2DAYmYK5U8=@192.98.102.10:10080;transport=ws;lr> Via: SIP/2.0/WS gammj1mb37kg.invalid;branch=z9hG4bK6981394 Max-Forwards: 69 To: <sip:jh@test.fi>;tag=hosudd4jlh From: "Test" <sip:test@test.fi>;tag=k808o8t8np Call-ID: edbrqn9t6jbvf749ajil CSeq: 2850 ACK Supported: path, outbound, gruu User-Agent: JsSIP 0.3.0 Content-Length: 0 i call loose_route() on it, which returns 2 (route calculation based on flow-token has been successful) and after that $ru/$du are Apr 18 17:56:44 siika /usr/sbin/sip-proxy[14517]: INFO: ru/du = <sip:jh@test.fi;gr=urn:uuid:eea2f222-60b6-4ba1-a764-99cc0eb3ba9f>/<sip:T4Ah7mN1nrM0HgXAYmYKJ2DAYmYK5bA=@192.98.102.10:10080;transport=ws;lr> why is $du set when there is only one route header denoting the proxy itself? how can i now test that routing should be based on r-uri, when $du gets set for no reason? -- juha

11 years, 8 months

git:master: seas: fix warning [-Wunused-result]

by Ovidiu Sas

Module: sip-router Branch: master Commit: e3c0a3abb6045e841fbb4b1b61a518b2b87a217d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3c0a3a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Apr 18 16:03:50 2013 -0400 seas: fix warning [-Wunused-result] - ignoring return value of write, declared with attribute warn_unused_result [-Wunused-result] --- modules/seas/seas_action.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/seas/seas_action.c b/modules/seas/seas_action.c index 7e2e4f1..d1267d5 100644 --- a/modules/seas/seas_action.c +++ b/modules/seas/seas_action.c @@ -1410,7 +1410,9 @@ int as_action_fail_resp(int uac_id,int sip_error,char *err_buf,int i) k+=i; ev_len=htonl(k); memcpy(msg,&ev_len,4); - write(my_as->u.as.action_fd,msg,k); + if(write(my_as->u.as.action_fd,msg,k)<=0){ + LM_DBG("Ignoring error write\n"); + } return 0; }

11 years, 8 months

git:master: seas: fix compiler warning [-Wunused-but-set-variable]

by Ovidiu Sas

Module: sip-router Branch: master Commit: c0f4b6cf664ac552d0c994e99adb13991a37ef28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0f4b6c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Apr 18 16:01:16 2013 -0400 seas: fix compiler warning [-Wunused-but-set-variable] --- modules/seas/statistics.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/seas/statistics.c b/modules/seas/statistics.c index 0dfb66f..31a44c6 100644 --- a/modules/seas/statistics.c +++ b/modules/seas/statistics.c @@ -169,8 +169,10 @@ static inline int assignIndex(int i) */ inline void action_stat(struct cell *t) { - unsigned int seas_dispatch,as_delay; - struct timeval *t1,*t2,*t3; + unsigned int seas_dispatch; + //unsigned int as_delay; + struct timeval *t1,*t2; + //struct timeval *t3; struct statscell *s; struct totag_elem *to; if(t==0) @@ -194,9 +196,9 @@ inline void action_stat(struct cell *t) return; t1=&(s->u.uas.as_relay); t2=&(s->u.uas.event_sent); - t3=&(s->u.uas.action_recvd); + //t3=&(s->u.uas.action_recvd); seas_dispatch = (t2->tv_sec - t1->tv_sec)*1000 + (t2->tv_usec-t1->tv_usec)/1000; - as_delay = (t3->tv_sec - t2->tv_sec)*1000 + (t3->tv_usec-t2->tv_usec)/1000; + //as_delay = (t3->tv_sec - t2->tv_sec)*1000 + (t3->tv_usec-t2->tv_usec)/1000; lock_get(seas_stats_table->mutex); {

11 years, 8 months

git:master: seas: fix compiler warning [-Wunused-but-set-variable]

by Ovidiu Sas

Module: sip-router Branch: master Commit: 12cd241d95b8d38cea6e60676b752f8ef8a2ed8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12cd241… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Apr 18 15:54:14 2013 -0400 seas: fix compiler warning [-Wunused-but-set-variable] --- modules/seas/seas_action.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/seas/seas_action.c b/modules/seas/seas_action.c index bad30e4..7e2e4f1 100644 --- a/modules/seas/seas_action.c +++ b/modules/seas/seas_action.c @@ -811,11 +811,11 @@ int ac_sl_msg(as_p the_as,unsigned char processor_id,unsigned int flags,char *ac str *uri; struct proxy_l *proxy; rr_t *my_route; - int i,k,retval; + int k,retval; //enum sip_protos proto; my_msg=NULL; - i=k=0; + k=0; proxy=0; @@ -936,7 +936,7 @@ int ac_uac_req(as_p the_as,unsigned char processor_id,unsigned int flags,char *a struct cseq_body *cseqb; struct as_uac_param *the_param; dlg_t *my_dlg; - int i,k,retval,uac_id,sip_error,ret,err_ret; + int k,retval,uac_id,sip_error,ret,err_ret; long clen; str headers,body,fake_uri; uac_req_t uac_r; @@ -945,7 +945,7 @@ int ac_uac_req(as_p the_as,unsigned char processor_id,unsigned int flags,char *a my_dlg=NULL; my_msg=NULL; the_param=NULL; - i=k=clen=0; + k=clen=0; net2hostL(uac_id,action,k); @@ -1480,11 +1480,9 @@ void uac_cb(struct cell* t, int type,struct tmcb_params *rcvd_params) as_msg_p my_as_ev=0; int mylen,code,i; struct as_uac_param *ev_info; - struct sip_msg *msg; char *buffer; ev_info=(struct as_uac_param*)*rcvd_params->param; - msg=rcvd_params->rpl; code=rcvd_params->code; buffer=0; if(!ev_info || !ev_info->who){

11 years, 8 months

git:master: seas: fix compiler warning [-Wunused-but-set-variable]

by Ovidiu Sas

Module: sip-router Branch: master Commit: 21e51107a5a08b182abc7bffbac1fec1be27950b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21e5110… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Apr 18 15:51:50 2013 -0400 seas: fix compiler warning [-Wunused-but-set-variable] --- modules/seas/event_dispatcher.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/seas/event_dispatcher.c b/modules/seas/event_dispatcher.c index eb73055..d10cffe 100644 --- a/modules/seas/event_dispatcher.c +++ b/modules/seas/event_dispatcher.c @@ -896,8 +896,8 @@ error: */ int process_unbind_action(as_p as,unsigned char processor_id,unsigned int flags,char *payload,int len) { - int i,k; - k=0; + int i; + for(i=0;i<as->num_binds;i++){ if(as->bound_processor[i] == processor_id) break;

11 years, 8 months

git:master: seas: fix compiler warning:

by Ovidiu Sas

Module: sip-router Branch: master Commit: 2abf2d4a42c05004319e682d2ad07d69bf2fc89e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2abf2d4… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Apr 18 15:50:25 2013 -0400 seas: fix compiler warning: - warning: variable flags set but not used [-Wunused-but-set-variable] --- modules/seas/encode_via.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/seas/encode_via.c b/modules/seas/encode_via.c index 8661055..fa661ef 100644 --- a/modules/seas/encode_via.c +++ b/modules/seas/encode_via.c @@ -69,10 +69,9 @@ int encode_via_body(char *hdr,int hdrlen,struct via_body *via_parsed,unsigned char *where) { int i=0,k,via_offset; - unsigned char flags,tmp[500]; + unsigned char tmp[500]; struct via_body *myvia; - flags=0; if(via_parsed) for(via_offset=0,i=0,myvia=via_parsed;myvia;myvia=myvia->next,i++){ if((k=encode_via(hdr,hdrlen,myvia,&tmp[via_offset]))<0){ @@ -152,10 +151,9 @@ int encode_via(char *hdrstart,int hdrlen,struct via_body *body,unsigned char *wh int print_encoded_via_body(FILE *fd,char *hdr,int hdrlen,unsigned char *payload,int paylen,char *prefix) { - unsigned char flags, numvias; + unsigned char numvias; int i,offset; - flags=payload[0]; fprintf(fd,"%s",prefix); for(i=0;i<paylen;i++) fprintf(fd,"%s%d%s",i==0?"ENCODED VIA BODY:[":":",payload[i],i==paylen-1?"]\n":""); @@ -226,11 +224,9 @@ int print_encoded_via(FILE *fd,char *hdr,int hdrlen,unsigned char* payload,int p int dump_via_body_test(char *hdr,int hdrlen,unsigned char *payload,int paylen,FILE* fd,char segregationLevel) { - unsigned char flags, numvias; + unsigned char numvias; int i,offset; - flags=payload[0]; - if(!segregationLevel){ return dump_standard_hdr_test(hdr,hdrlen,payload,paylen,fd); }

11 years, 8 months

git:master: seas: fix compiler warning:

by Ovidiu Sas

Module: sip-router Branch: master Commit: 21386829d819c06c42871cf5b68d0d3a63ef0222 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2138682… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.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] --- 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); }

11 years, 8 months

git:master: seas: fix compiler warning

by Ovidiu Sas

Module: sip-router Branch: master Commit: 200eddad28abd6bc51da3285dd52d5f8c88c4e56 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=200edda… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.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] --- 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;

11 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013