sr-dev January 2012

sr-dev@lists.kamailio.org

25 participants
165 discussions

git:master: modules_k/rls: Memory leak in parse_subs_state() in resource_notify.c
by Peter Dunkley 26 Jan '12

26 Jan '12

Module: sip-router Branch: master Commit: 569c0b7adf93773677dd1cc98957c74d40752982 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=569c0b7… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jan 26 13:59:06 2012 +0000 modules_k/rls: Memory leak in parse_subs_state() in resource_notify.c - Also the function didn't appear to be doing quite the right thing. - Found by Paul Pankhurst @ Crocodile RCS and fixed by Peter Dunkley @ Crocodile RCS --- modules_k/rls/resource_notify.c | 68 ++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 36 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index b79e83b..ddee0a3 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -423,46 +423,39 @@ done: } -int parse_subs_state(str auth_state, str** reason, int* expires) +int parse_subs_state(str auth_state, str *reason, int *expires) { str str_exp; - str* res= NULL; char* smc= NULL; int len, flag= -1; - - if( strncmp(auth_state.s, "active", 6)== 0) + if (strncmp(auth_state.s, "active", 6)== 0) flag= ACTIVE_STATE; - if( strncmp(auth_state.s, "pending", 7)== 0) + if (strncmp(auth_state.s, "pending", 7)== 0) flag= PENDING_STATE; - if( strncmp(auth_state.s, "terminated", 10)== 0) + if (strncmp(auth_state.s, "terminated", 10)== 0) { smc= strchr(auth_state.s, ';'); - if(smc== NULL) + if (smc== NULL) { LM_ERR("terminated state and no reason found"); return -1; } - if(strncmp(smc+1, "reason=", 7)) + if (strncmp(smc+1, "reason=", 7)) { LM_ERR("terminated state and no reason found"); return -1; - } - res= (str*)pkg_malloc(sizeof(str)); - if(res== NULL) - { - ERR_MEM(PKG_MEM_STR); - } + } len= auth_state.len- 10- 1- 7; - res->s= (char*)pkg_malloc(len* sizeof(char)); - if(res->s== NULL) + reason->s = (char*) pkg_malloc(len* sizeof(char)); + if (reason->s== NULL) { ERR_MEM(PKG_MEM_STR); } - memcpy(res->s, smc+ 8, len); - res->len= len; + memcpy(reason->s, smc+ 8, len); + reason->len= len; return TERMINATED_STATE; } @@ -473,7 +466,7 @@ int parse_subs_state(str auth_state, str** reason, int* expires) { LM_ERR("active or pending state and no expires parameter found"); return -1; - } + } if(strncmp(smc+1, "expires=", 8)) { LM_ERR("active or pending state and no expires parameter found"); @@ -483,22 +476,16 @@ int parse_subs_state(str auth_state, str** reason, int* expires) str_exp.len= auth_state.s+ auth_state.len- smc- 9; if( str2int(&str_exp, (unsigned int*)expires)< 0) - { + { LM_ERR("while getting int from str\n"); return -1; - } + } return flag; } - return -1; error: - if(res) - { - if(res->s) - pkg_free(res->s); - pkg_free(res); - } + if (reason->s) pkg_free(reason->s); return -1; } @@ -514,7 +501,7 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) int n_query_cols= 0; str auth_state= {0, 0}; int found= 0; - str* reason= NULL; + str reason = {0, 0}; int auth_flag; struct hdr_field* hdr= NULL; int n, expires= -1; @@ -556,7 +543,7 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) } memset(&dialog, 0, sizeof(ua_pres_t)); dialog.watcher_uri= &pto->uri; - if (pto->tag_value.s==NULL || pto->tag_value.len==0 ) + if (pto->tag_value.s==NULL || pto->tag_value.len==0 ) { LM_ERR("to tag value not parsed\n"); goto error; @@ -641,7 +628,7 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) */ if(auth_flag==TERMINATED_STATE) goto done; - LM_ERR("no presence dialog record for non-TERMINATED state uri pres_uri = %.*s watcher_uri = %.*s\n", + LM_ERR("no presence dialog record for non-TERMINATED state uri pres_uri = %.*s watcher_uri = %.*s\n", dialog.pres_uri->len, dialog.pres_uri->s, dialog.watcher_uri->len, dialog.watcher_uri->s); goto error; } @@ -655,9 +642,9 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) /*constructing the xml body*/ if(get_content_length(msg) == 0 ) - { - goto done; - } + { + goto done; + } else { if(content_type.s== 0) @@ -705,8 +692,11 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) query_cols[n_query_cols]= &str_reason_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; - if(reason) - query_vals[n_query_cols].val.str_val= *reason; + if(reason.len > 0) + { + query_vals[n_query_cols].val.str_val.s= reason.s; + query_vals[n_query_cols].val.str_val.len= reason.len; + } else { query_vals[n_query_cols].val.str_val.s = ""; @@ -787,6 +777,9 @@ done: pkg_free(res_id->s); pkg_free(res_id); } + + if (reason.s) pkg_free(reason.s); + free_to_params(&TO); return 1; @@ -796,6 +789,9 @@ error: pkg_free(res_id->s); pkg_free(res_id); } + + if (reason.s) pkg_free(reason.s); + free_to_params(&TO); return -1; }

1 0

git:master: modules/pua Fixed memory leaks in limbxml2
by Anca Vamanu 26 Jan '12

26 Jan '12

Module: sip-router Branch: master Commit: 68295d124ee2d36f3e8d31eac5a76c4d7c89f5b8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68295d1… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Jan 26 15:27:21 2012 +0200 modules/pua Fixed memory leaks in limbxml2 --- modules_k/pua/send_publish.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index 6205994..6bc5d89 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -663,7 +663,7 @@ send_publish: if( body && ret_code) { if(body->s) - free(body->s); + xmlFree(body->s); pkg_free(body); } if(etag.s) @@ -688,7 +688,7 @@ error: if(body&& ret_code) { if(body->s) - free(body->s); + xmlFree(body->s); pkg_free(body); } if(str_hdr)

1 0

git:master: modules/ pua_xmpp Fixed some memory leaks in libxml on error casses
by Anca Vamanu 26 Jan '12

26 Jan '12

Module: sip-router Branch: master Commit: 3c3cc57f6d4938270efbb89426d80a994be1aaa7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c3cc57… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Jan 26 15:14:43 2012 +0200 modules/pua_xmpp Fixed some memory leaks in libxml on error casses --- modules_k/pua_xmpp/xmpp2simple.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules_k/pua_xmpp/xmpp2simple.c b/modules_k/pua_xmpp/xmpp2simple.c index d0bdc1e..f2ae0d1 100644 --- a/modules_k/pua_xmpp/xmpp2simple.c +++ b/modules_k/pua_xmpp/xmpp2simple.c @@ -370,18 +370,19 @@ int build_publish(xmlNodePtr pres_node, int expires) if(resource== NULL) { LM_ERR("no more memory\n"); + xmlFree(uri); return -1; } strcpy(resource, slash+1); slash= '\0'; } pres_uri= euri_xmpp_sip(uri); + xmlFree(uri); if(pres_uri== NULL) { LM_ERR("while encoding xmpp-sip uri\n"); - goto error; - } - xmlFree(uri); + goto error; + } uri_str.s= pres_uri; uri_str.len= strlen(pres_uri); @@ -460,12 +461,12 @@ int presence_subscribe(xmlNodePtr pres_node, int expires,int flag) return -1; } to_uri= duri_xmpp_sip(uri); + xmlFree(uri); if(to_uri== NULL) { LM_ERR("while decoding xmpp--sip uri\n"); goto error; } - xmlFree(uri); to_uri_str.s= to_uri; to_uri_str.len= strlen(to_uri); @@ -476,15 +477,15 @@ int presence_subscribe(xmlNodePtr pres_node, int expires,int flag) goto error; } from_uri= euri_xmpp_sip(uri); + xmlFree(uri); if(from_uri== NULL) { LM_ERR("while encoding xmpp-sip uri\n"); - goto error; - } - xmlFree(uri); + goto error; + } from_uri_str.s= from_uri; from_uri_str.len= strlen(from_uri); - + memset(&subs, 0, sizeof(subs_info_t)); subs.pres_uri= &to_uri_str;

1 0

[tracker] Task opened: Some cases when rtp proxy not change port numbers in media
by sip-router 26 Jan '12

26 Jan '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Magnus Nordström (mnnojd) Attached to Project - sip-router Summary - Some cases when rtp proxy not change port numbers in media Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - Linux Severity - Low Priority - Normal Reported Version - 3.0 Due in Version - Undecided Due Date - Undecided Details - We use the rtp proxy and we have seen problems in some cases when rtp proxy should change port numbers for the media. We have a sip-client which also send position information included in the INVITE. The problem seems to be that the rtp proxy cannot handle the INVITE when the header in parameter "boundary=" has the value between "". And it cannot handle if the body has the parameter "Content-Length:". It results with that the ports will not be changed. May there is some modules which can solve this problem? Here I give three cases with INVITE packets which one is handled fine by rtp proxy. ***** Case 1 - Handles fine by rtp proxy and changes port numbers ***** INVITE ... .... Geolocation: <cid:123@sip.domain.com> Geolocation-Routing: yes Content-Type: multipart/mixed;boundary=MessageBoundary --MessageBoundary Content-Type: application/sdp .... --MessageBoundary Content-Type: application/pidf+xml Content-ID: <123(a)sip.domain.com> .... --MessageBoundary-- ***** Case 2 - rtp proxy dont change the port numbers (problems with "" in boundary value?) ***** INVITE ... .... Geolocation: <cid:123@sip.domain.com> Geolocation-Routing: yes Content-Type: multipart/mixed;boundary="----=_Part_46_780035120.1327568255734" ------=_Part_46_780035120.1327568255734 Content-Type: application/sdp .... ------=_Part_46_780035120.1327568255734 Content-Type: application/pidf+xml Content-ID: <123(a)sip.domain.com> .... ------=_Part_46_780035120.1327568255734-- ***** Case 3 - rtp proxy dont change the port numbers (problems with Content-Length in body?) ***** INVITE ... .... Geolocation: <cid:123@sip.domain.com> Geolocation-Routing: yes Content-Type: multipart/mixed;boundary=MessageBoundary --MessageBoundary Content-Type: application/sdp Content-Length: 454 .... --MessageBoundary Content-Type: application/pidf+xml Content-ID: <123(a)sip.domain.com> Content-Length: 553 .... --MessageBoundary-- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=200 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] Assignee added: Some cases when rtp proxy not change port numbers in media
by sip-router 26 Jan '12

26 Jan '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#200 - Some cases when rtp proxy not change port numbers in media User who did this - Magnus Nordström (mnnojd) http://sip-router.org/tracker/index.php?do=details&task_id=200 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

current master fails to start
by Juha Heinanen 26 Jan '12

26 Jan '12

after a few weeks, i generated new sip router from latest master. if failed to start with these kind of messages: *** glibc detected *** /usr/sbin/sip-proxy: double free or corruption (out): 0x08868750 *** Not starting sip-proxy: invalid configuration file! 0(23949) INFO: tls [tls_init.c:375]: tls: init_tls: disabling compression... Inconsistency detected by ld.so: dl-open.c: 221: dl_open_worker: Assertion `_dl_debug_initialize (0, args->nsid)->r_state == RT_CONSISTENT' failed! an earlier version of sip router master starts ok with the same config. any ideas what is going on? -- juha

4 13

Gentoo ebuild pkg v3.2.1
by caio 25 Jan '12

25 Jan '12

Hello, I want to announce the availability of an ebuild for version 3.2.1 on Gentoo Portage Overlays. Here the git link: http://goo.gl/JXLQ4 The unofficial overlays portage website: * http://gpo.zugaina.org/net-misc/sip-router Remember this is not an official ebuild, and neither it's not at official gentoo portage tree. Henning, can you add/update it at sip-router git repository (pkg/ser/gentoo)? Thank you and best regards, Claudio

1 0

Kamailio support for rfc 6080 - User Agent Profile Delivery
by Owen Lynch 25 Jan '12

25 Jan '12

Hi, I am investigating methods of configuring connected devices, one option is to use SIP, per http://tools.ietf.org/html/rfc6080. It seems that as this is a new proposed standard, there is no support for it yet. Can you advise whether anyone is considering implementing it as a Kamailio module? Thanks, Owen Lynch

2 1

git:master: modules/tmrec: Ported Perl's Time::Period module.
by Andreas Granig 25 Jan '12

25 Jan '12

Module: sip-router Branch: master Commit: 18107462634b8cf55fcc73e397bf9035cf1705f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1810746… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: Wed Jan 25 18:53:24 2012 +0100 modules/tmrec: Ported Perl's Time::Period module. - Make Time::Period (http://search.cpan.org/~pryan/Period-1.20/Period.pm) available as native C implementation. Author: Richard Fuchs <rfuchs(a)sipwise.com> --- modules/tmrec/README | 72 +++++++- modules/tmrec/doc/tmrec_admin.xml | 108 +++++++++++ modules/tmrec/period.c | 369 +++++++++++++++++++++++++++++++++++++ modules/tmrec/period.h | 6 + modules/tmrec/tmrec_mod.c | 53 ++++++ 5 files changed, 607 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=181…

1 0

git:master: modules_k/pua: Last fix (PUA memory leaks) caused crashes in hash-table mode
by Peter Dunkley 25 Jan '12

25 Jan '12

Module: sip-router Branch: master Commit: d9af95bf84ad3ae9ed53ba15c7f518597cefcf3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9af95b… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jan 25 17:27:26 2012 +0000 modules_k/pua: Last fix (PUA memory leaks) caused crashes in hash-table mode - Fix by Paul Pankhurst @ Crocodile RCS --- modules_k/pua/send_publish.c | 13 ++++++++++--- modules_k/pua/send_subscribe.c | 15 +++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index a43bae7..6205994 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -341,7 +341,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) } size= sizeof(ua_pres_t)+ sizeof(str)+ (hentity->pres_uri->len+ hentity->tuple_id.len + - hentity->id.len + etag.len)* sizeof(char); + hentity->id.len)* sizeof(char); if(hentity->extra_headers) size+= sizeof(str)+ hentity->extra_headers->len* sizeof(char); @@ -391,10 +391,14 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) presentity->flag|= hentity->flag; presentity->event|= hentity->event; - presentity->etag.s= (char*)presentity+ size; + presentity->etag.s= (char*)shm_malloc(etag.len* sizeof(char)); + if(presentity->etag.s== NULL) + { + LM_ERR("No more share memory\n"); + goto error; + } memcpy(presentity->etag.s, etag.s, etag.len); presentity->etag.len= etag.len; - size+= presentity->etag.len; if (dbmode==PUA_DB_ONLY) { @@ -417,7 +421,10 @@ done: *ps->param= NULL; } if(dbmode==PUA_DB_ONLY && presentity) + { + shm_free(presentity->etag.s); shm_free(presentity); + } free_results_puadb(res); return; diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index eebb1a4..4269bd0 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -564,7 +564,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) size= sizeof(ua_pres_t)+ 2*sizeof(str)+( pto->uri.len+ pfrom->uri.len+ pto->tag_value.len+ pfrom->tag_value.len +msg->callid->body.len+ record_route.len+ hentity->contact.len+ - hentity->id.len + contact.len)*sizeof(char); + hentity->id.len )*sizeof(char); if(hentity->extra_headers) size+= sizeof(str)+ hentity->extra_headers->len*sizeof(char); @@ -653,10 +653,13 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) } /* write the remote contact filed */ - presentity->remote_contact.s= (char*)presentity+ size; + presentity->remote_contact.s= (char*)shm_malloc(contact.len* sizeof(char)); + if(presentity->remote_contact.s== NULL) + { + ERR_MEM(SHARE_MEM); + } memcpy(presentity->remote_contact.s, contact.s, contact.len); presentity->remote_contact.len= contact.len; - size+= presentity->remote_contact.len; presentity->event|= hentity->event; presentity->flag= hentity->flag; @@ -693,7 +696,11 @@ error: if (presentity!=NULL) { delete_temporary_dialog_puadb(presentity); - if (need_to_free) shm_free(presentity); + if (need_to_free) + { + if (presentity->remote_contact.s) shm_free(presentity->remote_contact.s); + shm_free(presentity); + } } } else

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2012