sr-dev February 2011

sr-dev@lists.kamailio.org

22 participants
125 discussions

git:3.1: tm: free parsed body for faked requests
by Daniel-Constantin Mierla 05 Feb '11

05 Feb '11

Module: sip-router Branch: 3.1 Commit: b374c7383ed711fb12e545e1de9cecd978603fac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b374c73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 5 07:08:53 2011 +0100 tm: free parsed body for faked requests - if sdp body was parsed in a failure route, the structure was left uncleared - reported by Bayan Towfiq, credits for troubleshooting access to live server - credits also to Ovidiu Sas for assistance with sdp parser (cherry picked from commit 7a1a5ffff6a6dbf89f42ccb9f15d588d8bfe62d0) --- modules/tm/t_reply.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 382244f..c18c716 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -909,6 +909,12 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t) hdr->parsed = 0; } } + /* free parsed body added by failure handlers */ + if (faked_req->body) { + if(faked_req->body->free) + faked_req->body->free(&faked_req->body); + faked_req->body = 0; + } }

1 0

git:master: tm: free parsed body for faked requests
by Daniel-Constantin Mierla 05 Feb '11

05 Feb '11

Module: sip-router Branch: master Commit: 7a1a5ffff6a6dbf89f42ccb9f15d588d8bfe62d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a1a5ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 5 07:08:53 2011 +0100 tm: free parsed body for faked requests - if sdp body was parsed in a failure route, the structure was left uncleared - reported by Bayan Towfiq, credits for troubleshooting access to live server - credits also to Ovidiu Sas for assistance with sdp parser --- modules/tm/t_reply.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 382244f..c18c716 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -909,6 +909,12 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t) hdr->parsed = 0; } } + /* free parsed body added by failure handlers */ + if (faked_req->body) { + if(faked_req->body->free) + faked_req->body->free(&faked_req->body); + faked_req->body = 0; + } }

1 0

git:master: topoh: add angle brackets around contact uri
by Daniel-Constantin Mierla 04 Feb '11

04 Feb '11

Module: sip-router Branch: master Commit: 66f80a68a48835b1634da04ead4deadeb89ce7f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66f80a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 4 19:27:10 2011 +0100 topoh: add angle brackets around contact uri - if there are no angle brackets around initial contact uri, add for encoded uri to keep URI parameters properly --- modules/topoh/th_msg.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index a721141..df29ea1 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -247,6 +247,7 @@ int th_mask_contact(sip_msg_t *msg) struct lump* l; str out; str in; + char *p; contact_t *c; if(msg->contact==NULL) @@ -270,6 +271,24 @@ int th_mask_contact(sip_msg_t *msg) LM_ERR("cannot encode contact uri\n"); return -1; } + if(*(in.s-1)!='<') + { + /* add < > around contact uri if not there */ + p = (char*)pkg_malloc(out.len+3); + if(p==NULL) + { + LM_ERR("failed to get more pkg\n"); + pkg_free(out.s); + return -1; + } + *p = '<'; + strncpy(p+1, out.s, out.len); + p[out.len+1] = '>'; + p[out.len+2] = '\0'; + pkg_free(out.s); + out.s = p; + out.len += 2; + } l=del_lump(msg, in.s-msg->buf, in.len, 0); if (l==0)

1 0

git:kamailio_3.0: topoh: more safety checks for bad cseq
by Daniel-Constantin Mierla 04 Feb '11

04 Feb '11

Module: sip-router Branch: kamailio_3.0 Commit: f7de24173f13be1328f89aef15a1718fdc4135dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7de241… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 4 18:26:37 2011 +0100 topoh: more safety checks for bad cseq (cherry picked from commit 7f9b429075fa870b6bfdc4fc1a08c396f6c8eeb5) (cherry picked from commit eb969ad69d341a851e9ee89c73c5006237329f04) --- modules/topoh/th_msg.c | 2 +- modules/topoh/topoh_mod.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index b430e25..237c7c8 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -1033,7 +1033,7 @@ int th_route_direction(sip_msg_t *msg) int th_skip_msg(sip_msg_t *msg) { - if (!get_cseq(msg)) { + if (msg->cseq==NULL || get_cseq(msg)==NULL) { LM_WARN("Invalid/Unparsed CSeq in message. Skipping."); return 1; } diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 8146cbe..850b8be 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -178,7 +178,10 @@ int th_msg_received(void *data) msg.buf = obuf->s; msg.len = obuf->len; - th_prepare_msg(&msg); + if(th_prepare_msg(&msg)!=0) + { + goto done; + } if(th_skip_msg(&msg)) { @@ -260,7 +263,10 @@ int th_msg_sent(void *data) msg.buf = obuf->s; msg.len = obuf->len; - th_prepare_msg(&msg); + if(th_prepare_msg(&msg)!=0) + { + goto done; + } if(th_skip_msg(&msg)) {

1 0

git:3.1: topoh: more safety checks for bad cseq
by Daniel-Constantin Mierla 04 Feb '11

04 Feb '11

Module: sip-router Branch: 3.1 Commit: eb969ad69d341a851e9ee89c73c5006237329f04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb969ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 4 18:26:37 2011 +0100 topoh: more safety checks for bad cseq (cherry picked from commit 7f9b429075fa870b6bfdc4fc1a08c396f6c8eeb5) --- modules/topoh/th_msg.c | 2 +- modules/topoh/topoh_mod.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 5f87971..a721141 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -1040,7 +1040,7 @@ int th_route_direction(sip_msg_t *msg) int th_skip_msg(sip_msg_t *msg) { - if (!get_cseq(msg)) { + if (msg->cseq==NULL || get_cseq(msg)==NULL) { LM_WARN("Invalid/Unparsed CSeq in message. Skipping."); return 1; } diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 87a8a13..eb31fce 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -211,7 +211,10 @@ int th_msg_received(void *data) msg.buf = obuf->s; msg.len = obuf->len; - th_prepare_msg(&msg); + if(th_prepare_msg(&msg)!=0) + { + goto done; + } if(th_skip_msg(&msg)) { @@ -293,7 +296,10 @@ int th_msg_sent(void *data) msg.buf = obuf->s; msg.len = obuf->len; - th_prepare_msg(&msg); + if(th_prepare_msg(&msg)!=0) + { + goto done; + } if(th_skip_msg(&msg)) {

1 0

git:master: topoh: more safety checks for bad cseq
by Daniel-Constantin Mierla 04 Feb '11

04 Feb '11

Module: sip-router Branch: master Commit: 7f9b429075fa870b6bfdc4fc1a08c396f6c8eeb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f9b429… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 4 18:26:37 2011 +0100 topoh: more safety checks for bad cseq --- modules/topoh/th_msg.c | 2 +- modules/topoh/topoh_mod.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 5f87971..a721141 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -1040,7 +1040,7 @@ int th_route_direction(sip_msg_t *msg) int th_skip_msg(sip_msg_t *msg) { - if (!get_cseq(msg)) { + if (msg->cseq==NULL || get_cseq(msg)==NULL) { LM_WARN("Invalid/Unparsed CSeq in message. Skipping."); return 1; } diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index bc7ea8e..ba312b0 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -231,7 +231,10 @@ int th_msg_received(void *data) msg.buf = obuf->s; msg.len = obuf->len; - th_prepare_msg(&msg); + if(th_prepare_msg(&msg)!=0) + { + goto done; + } if(th_skip_msg(&msg)) { @@ -324,7 +327,10 @@ int th_msg_sent(void *data) msg.buf = obuf->s; msg.len = obuf->len; - th_prepare_msg(&msg); + if(th_prepare_msg(&msg)!=0) + { + goto done; + } if(th_skip_msg(&msg)) {

1 0

git:3.1: presence(k): avoid str* alloc for local contact
by Daniel-Constantin Mierla 03 Feb '11

03 Feb '11

Module: sip-router Branch: 3.1 Commit: 09eae6628bcdc060db79af875e8b912460bf5f2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09eae66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 3 23:54:13 2011 +0100 presence(k): avoid str* alloc for local contact - it is not used further an leads to memleak (cherry picked from commit 4462757813b146e2ca4018b1a93636115e2408f6) --- modules_k/presence/subscribe.c | 7 ++----- modules_k/presence/utils_func.h | 37 +++++++++++++------------------------ 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 94bf9d8..23030a3 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -755,7 +755,6 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, { str rec_route= {0, 0}; int rt = 0; - str* contact= NULL; contact_body_t *b; struct to_body *pto, *pfrom = NULL, TO; int lexpire; @@ -962,13 +961,11 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, if((!scontact.s) || (scontact.len== 0)) { - contact= get_local_contact(msg); - if(contact== NULL) + if(ps_fill_local_contact(msg, &subs->local_contact)<0) { - LM_ERR("in function get_local_contact\n"); + LM_ERR("cannot get local contact address\n"); goto error; } - subs->local_contact= *contact; } else subs->local_contact= scontact; diff --git a/modules_k/presence/utils_func.h b/modules_k/presence/utils_func.h index 077fef1..16e427d 100644 --- a/modules_k/presence/utils_func.h +++ b/modules_k/presence/utils_func.h @@ -85,27 +85,19 @@ static inline int uandd_to_uri(str user, str domain, str *out) return 0; } -static inline str* get_local_contact(struct sip_msg* msg) +static inline int ps_fill_local_contact(struct sip_msg* msg, str *contact) { str ip; char* proto; int port; int len; - str* contact; int plen; - contact= (str*)pkg_malloc(sizeof(str)); - if(contact== NULL) - { - LM_ERR("No more memory\n"); - return NULL; - } contact->s= (char*)pkg_malloc(LCONTACT_BUF_SIZE); if(contact->s== NULL) { LM_ERR("No more memory\n"); - pkg_free(contact); - return NULL; + goto error; } memset(contact->s, 0, LCONTACT_BUF_SIZE); @@ -128,18 +120,14 @@ static inline str* get_local_contact(struct sip_msg* msg) else { LM_ERR("unsupported proto\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } ip.s= ip_addr2a(&msg->rcv.dst_ip); if(ip.s== NULL) { LM_ERR("transforming ip_addr to ascii\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } ip.len= strlen(ip.s); port = msg->rcv.dst_port; @@ -154,25 +142,26 @@ static inline str* get_local_contact(struct sip_msg* msg) if(contact->len> LCONTACT_BUF_SIZE - 21) { LM_ERR("buffer overflow\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } len= sprintf(contact->s+contact->len, ":%d;transport=" , port); if(len< 0) { LM_ERR("unsuccessful sprintf\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } contact->len+= len; strncpy(contact->s+ contact->len, proto, plen); contact->len += plen; - return contact; - + return 0; +error: + if(contact->s!=NULL) + pkg_free(contact->s); + contact->s = 0; + contact->len = 0; + return -1; } //str* int_to_str(long int n);

1 0

git:master: presence(k): avoid str* alloc for local contact
by Daniel-Constantin Mierla 03 Feb '11

03 Feb '11

Module: sip-router Branch: master Commit: 4462757813b146e2ca4018b1a93636115e2408f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4462757… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 3 23:54:13 2011 +0100 presence(k): avoid str* alloc for local contact - it is not used further an leads to memleak --- modules_k/presence/subscribe.c | 7 ++----- modules_k/presence/utils_func.h | 37 +++++++++++++------------------------ 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index e96efc0..d37518a 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -921,7 +921,6 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, { str rec_route= {0, 0}; int rt = 0; - str* contact= NULL; contact_body_t *b; struct to_body *pto, *pfrom = NULL, TO; int lexpire; @@ -1128,13 +1127,11 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, if((!scontact.s) || (scontact.len== 0)) { - contact= get_local_contact(msg); - if(contact== NULL) + if(ps_fill_local_contact(msg, &subs->local_contact)<0) { - LM_ERR("in function get_local_contact\n"); + LM_ERR("cannot get local contact address\n"); goto error; } - subs->local_contact= *contact; } else subs->local_contact= scontact; diff --git a/modules_k/presence/utils_func.h b/modules_k/presence/utils_func.h index 077fef1..16e427d 100644 --- a/modules_k/presence/utils_func.h +++ b/modules_k/presence/utils_func.h @@ -85,27 +85,19 @@ static inline int uandd_to_uri(str user, str domain, str *out) return 0; } -static inline str* get_local_contact(struct sip_msg* msg) +static inline int ps_fill_local_contact(struct sip_msg* msg, str *contact) { str ip; char* proto; int port; int len; - str* contact; int plen; - contact= (str*)pkg_malloc(sizeof(str)); - if(contact== NULL) - { - LM_ERR("No more memory\n"); - return NULL; - } contact->s= (char*)pkg_malloc(LCONTACT_BUF_SIZE); if(contact->s== NULL) { LM_ERR("No more memory\n"); - pkg_free(contact); - return NULL; + goto error; } memset(contact->s, 0, LCONTACT_BUF_SIZE); @@ -128,18 +120,14 @@ static inline str* get_local_contact(struct sip_msg* msg) else { LM_ERR("unsupported proto\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } ip.s= ip_addr2a(&msg->rcv.dst_ip); if(ip.s== NULL) { LM_ERR("transforming ip_addr to ascii\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } ip.len= strlen(ip.s); port = msg->rcv.dst_port; @@ -154,25 +142,26 @@ static inline str* get_local_contact(struct sip_msg* msg) if(contact->len> LCONTACT_BUF_SIZE - 21) { LM_ERR("buffer overflow\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } len= sprintf(contact->s+contact->len, ":%d;transport=" , port); if(len< 0) { LM_ERR("unsuccessful sprintf\n"); - pkg_free(contact->s); - pkg_free(contact); - return NULL; + goto error; } contact->len+= len; strncpy(contact->s+ contact->len, proto, plen); contact->len += plen; - return contact; - + return 0; +error: + if(contact->s!=NULL) + pkg_free(contact->s); + contact->s = 0; + contact->len = 0; + return -1; } //str* int_to_str(long int n);

1 0

Load_gw failed
by Thiago Maluf 02 Feb '11

02 Feb '11

Hi Kamailio Users, I'm trying to use LCR module in Kamailio 3.1.1 and I', having some problems with this function (load_gws). I'm my kamailio.cfg , I have this route: # SEARCH DEST route[NUMBER] { xlog("L_ALERT", "NUMBER IS $rU \n"); if ($rU=~"^55211020[0-9]{4}$") { # IS MY USERS route(LDAP_NUM2USER); } else { # NOT IS MY USER if (!load_gws(1,$rU)) { xlog("L_ALERT", "LOAD LOCAL GW FAILED $rU \n"); route(DSER); return; } else { xlog("L_ALERT", "LOAD GW DEBUG $avp(i:709)\n"); } ; if (!next_gw()) { xlog("L_ALERT", "NEXT LOCAL GW FAILED\n"); sl_send_reply("503", "Service not available - No gateways"); return; }; setflag(29); route(RELAY); return; }; }; When my call arrive to load_gws, I have this problem: (2198) ERROR: <core> [action.c:1158]: runtime fixup failed for load_gws param 2 (2198) ERROR: <core> [action.c:1511]: run action error at: /etc/kamailio/kamailio.cfg:472 I already saw the Kamailio Code and this error doesn't make sense. Would somebody Help me with it? Very thanks, Thiago Maluf. ---------------------------------------------------------------- Thiago Maluf Resende Tel: +55 21 9700-9113 e-mail: malufrj(a)gmail.com

2 1

git:carstenbock/ims: - Add a new PVar: $file (Read/Write files)
by Carsten Bock 01 Feb '11

01 Feb '11

Module: sip-router Branch: carstenbock/ims Commit: 486fd5d0b61267e690e8b9f912b9c3bb86ec1a3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=486fd5d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Feb 1 23:37:59 2011 +0100 - Add a new PVar: $file (Read/Write files) --- modules/utils/doc/utils.xml | 12 +++ modules/utils/doc/utils_admin.xml | 47 +++++++++++ modules/utils/util_file.c | 154 +++++++++++++++++++++++++++++++++++++ modules/utils/util_file.h | 36 +++++++++ modules/utils/utils.c | 16 ++++- 5 files changed, 264 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=486…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2011