sr-dev November 2010

sr-dev@lists.kamailio.org

17 participants
108 discussions

git:master: modules_k/nathelper: add_contact_alias adds <> s around contact URI

by Juha Heinanen

Module: sip-router Branch: master Commit: 3ff9594a30eff2d18e6ea0595c5f82f878eaca1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ff9594… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Nov 26 10:37:30 2010 +0200 modules_k/nathelper: add_contact_alias adds <>s around contact URI Make sure that Contact URI is surrounded by <> when adding ;alias parameter. Otherwise, ;alias parameter may be interpreted as header parameter, because the syntax seems to be ambiguous. (cherry picked from commit f5ef15fee0c3bf09adf2506effa0895f72af9034) --- modules_k/nathelper/nathelper.c | 69 +++++++++++++++++++++++++++++++------- 1 files changed, 56 insertions(+), 13 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 51c1086..52c5e5f 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -786,7 +786,7 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) struct lump *anchor; struct sip_uri uri; struct ip_addr *ip; - char *param, *at, *port, *start; + char *lt, *gt, *param, *at, *port, *start; /* Do nothing if Contact header does not exist */ if (!msg->contact) { @@ -816,25 +816,63 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) return 2; } - /* Add alias param */ + /* Check if function has been called already */ if ((c->uri.s < msg->buf) || (c->uri.s > (msg->buf + msg->len))) { LM_ERR("you can't call alias_contact twice, check your config!\n"); return -1; } + + /* Check if Contact URI needs to be enclosed in <>s */ + lt = gt = param = NULL; + at = memchr(msg->contact->body.s, '<', msg->contact->body.len); + if (at == NULL) { + lt = (char*)pkg_malloc(1); + if (!lt) { + LM_ERR("no pkg memory left for lt sign\n"); + goto err; + } + *lt = '<'; + anchor = anchor_lump(msg, msg->contact->body.s - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for beginning of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, lt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \"<\" failed\n"); + goto err; + } + gt = (char*)pkg_malloc(1); + if (!gt) { + LM_ERR("no pkg memory left for gt sign\n"); + goto err; + } + *gt = '>'; + anchor = anchor_lump(msg, msg->contact->body.s + + msg->contact->body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump for end of contact body failed\n"); + goto err; + } + if (insert_new_lump_before(anchor, gt, 1, 0) == 0) { + LM_ERR("insert_new_lump_before for \">\" failed\n"); + goto err; + } + } + + /* Create ;alias param */ param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); - return -1; + goto err; } at = param; append_str(at, SALIAS, SALIAS_LEN); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { - pkg_free(param); LM_ERR("failed to copy source ip\n"); - return -1; + goto err; } at = at + ip_len; append_chr(at, '~'); @@ -842,9 +880,8 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) append_str(at, port, len); append_chr(at, '~'); if ((msg->rcv.proto < PROTO_UDP) || (msg->rcv.proto > PROTO_SCTP)) { - pkg_free(param); LM_ERR("invalid transport protocol\n"); - return -1; + goto err; } append_chr(at, msg->rcv.proto + '0'); param_len = at - param; @@ -854,18 +891,24 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) } else { start = uri.host.s + uri.host.len; } + + /* Add ;alias param */ anchor = anchor_lump(msg, start - msg->buf, 0, 0); if (anchor == NULL) { - pkg_free(param); - LM_ERR("anchor_lump failed\n"); - return -1; + LM_ERR("anchor_lump for ;alias param failed\n"); + goto err; } if (insert_new_lump_after(anchor, param, param_len, 0) == 0) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(param); - return -1; + LM_ERR("insert_new_lump_after for ;alias param failed\n"); + goto err; } return 1; + + err: + if (lt) pkg_free(lt); + if (gt) pkg_free(gt); + if (param) pkg_free(param); + return -1; }

12 years, 10 months

git:master: modules/tm: new implementation of load_contacts()/next_contacts ()

by Juha Heinanen

Module: sip-router Branch: master Commit: e973bbe5e7310861f77b17ce0afaf1cca35fe48a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e973bbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 28 15:38:41 2010 +0300 modules/tm: new implementation of load_contacts()/next_contacts() - Simpler implementation of load_contacts()/next_contacts() functions based on recent changes related to Request-URI handling. - Function next_contacts() does not anymore set any timers. Check contact_avp and call t_set_fr() before calling t_relay() instead. - Removed fr_timer_next module parameter, because it is not needed anymore. --- modules/tm/README | 255 ++++++++++++++------------------------ modules/tm/doc/functions.xml | 51 +++----- modules/tm/doc/params.xml | 73 ----------- modules/tm/doc/tm.xml | 15 +-- modules/tm/t_serial.c | 279 ++++++++++++------------------------------ modules/tm/tm.c | 1 - 6 files changed, 190 insertions(+), 484 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e97…

12 years, 11 months

lockup("location") doesn't find a "sip" registration if RURI scheme is "sips"

by Iñaki Baz Castillo

Hi, "sip:alice@domain.org" is registered in Kamailio. If the proxy receives a request for "sips:alice@domain.org" and invokes "lookup(location)" the function doesn't retrieve the registration of alice. But it should: RFC 5630 section 3.3: When used as the Request-URI of a request, the SIPS scheme signifies that each hop over which the request is forwarded, until the request reaches the SIP entity responsible for the domain portion of the Request-URI, must be secured with TLS; once it reaches the domain in question it is handled in accordance with local security and routing policy, quite possibly using TLS for any last hop to a UAS. When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. Note the last phrase: When used by the originator of a request (as would be the case if they employed a SIPS URI as the address- of-record of the target), SIPS dictates that the entire request path to the target domain be so secured. This is, the entire path *until* the proxy responsible for the domain in the RURI must be secure (TLS) but it's not required (local policy) that the destination proxy dellivers the request to the destination user using TLS. So IMHO lockup(location) should not inspect the registration schema. Am I wrong? -- Iñaki Baz Castillo <ibc(a)aliax.net>

13 years, 1 month

question about module function arguments

by Juha Heinanen

i understood that module functions can now have an arbitrary number of string, int and pseudo var arguments, where string arguments can possibly also contain pseudo variables. some time ago i asked an example on how this is done, but didn't get any reply. so i'll try again. for example, allow_trusted function is now defined like this: {"allow_trusted", (cmd_function)allow_trusted_2, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE | FAILURE_ROUTE}, how can i add a third argument to the function without needing to define yet another fixup_pvar_pvar_something? -- juha

13 years, 3 months

Moving from 1.3.4

by Andrew O. Zhukov

Need your suggestion. I'm just comletely satisfied of openser 1.3.4 fuction set. However, it's going down too recently(3-5 times per month) in the last half year. Some of gdb output applyed. Can you suggest me the best stabile version for relocation. Thanks in advance. -------------------------- core.27986 Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 0x0000000000443315 in pv_get_authattr (msg=0x2aaaae6685a8, param=0x763958, res=0x7fff701d7860) at pvar.c:1319 1319 res->rs.s =((auth_body_t*)(hdr->parsed))->digest.username.user.s; ------------------ core.29065: Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 0x000000000048e679 in fm_free (qm=0x7389e0, p=<value optimized out>) at mem/f_malloc.c:125 125 if (frag->size <= (*f)->size) break; --------------- core.29063: Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 fm_status (qm=0x7389e0) at mem/f_malloc.c:513 513 size+=f->size,f=f->u.nxt_free,i++,j++){ -------------------------- core.27985: Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 fm_status (qm=0x7389e0) at mem/f_malloc.c:513 513 size+=f->size,f=f->u.nxt_free,i++,j++){ (gdb) print i $1 = 383 (gdb) print j $2 = 1 (gdb) print f $3 = (struct fm_frag *) 0x6366373364393531 (gdb) print size $4 = 3631135185266580216 (gdb) print f->u.nxt_free Cannot access memory at address 0x6366373364393539 (gdb) print f->size Cannot access memory at address 0x6366373364393531 ------------------------------------------ core.29790: Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 fm_malloc (qm=0x7389e0, size=<value optimized out>) at mem/f_malloc.c:267 267 if ((*f)->size>=size) goto found; (gdb) print size $1 = <value optimized out> (gdb) print *f $2 = (struct fm_frag *) 0x12 ----------------------------------------- core.2156: Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 fm_status (qm=0x7389e0) at mem/f_malloc.c:513 513 size+=f->size,f=f->u.nxt_free,i++,j++){ (gdb) print size $1 = 4268969821966590315 (gdb) print f $2 = (struct fm_frag *) 0x373365383d676174 (gdb) print i $3 = 0 (gdb) print j $4 = 1 ---------------------------------------------------------------------------- core.2157: Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 sip_msg_cloner (org_msg=0x770a50, sip_msg_len=0x7fff9430d31c) at sip_msg.c:327 327 for(prm=via->param_lst;prm;prm=prm->next) ------------------------------------------------------- core.32225 Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 0x00002aaaacbf78fb in acc_log_request (rq=0x2aaaae4fd0e8) at acc.c:223 223 memcpy(p, val_arr[i].s, val_arr[i].len); (gdb) print i $1 = 8 (gdb) print val_arr[i].len $2 = 6 (gdb) print val_arr[i].s $3 = 0x5e2c34 <Address 0x5e2c34 out of bounds> (gdb) print p $4 = 0x0 ---------------------------- core.21832 Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 0x00002aaaacbf78fb in acc_log_request (rq=0x2aaaae72baa0) at acc.c:223 223 memcpy(p, val_arr[i].s, val_arr[i].len); (gdb) print p $1 = 0x0 (gdb) print i $2 = 8 (gdb) print val_arr[i].s $3 = 0x636084 <Address 0x636084 out of bounds> (gdb) print val_arr[i].len $4 = 6 ------------------- core.24808: Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 11, Segmentation fault. #0 fm_status (qm=0x7389e0) at mem/f_malloc.c:513 513 size+=f->size,f=f->u.nxt_free,i++,j++){ (gdb) print size $1 = 8317892 (gdb) print f $2 = (struct fm_frag *) 0xc (gdb) print i $3 = 367 (gdb) print j $4 = 1 (gdb) q -- Andrew O. Zhukov Telegroup Ukraine Technical director. Phone 380-44-2308228 Cell 380-67-4017256 Fax 380-44-2386027

13 years, 7 months

Releasing Kamailio 3.1.1

by Daniel-Constantin Mierla

Hello, there are almost 2 months since release of Kamailio 3.1.0, so it is time for 3.1.1 as there were several important fixes done. I propose Thursday, next week, by that time we should sort out most of the issues reported lately. Other opinions? Cheers, Daniel -- Daniel-Constantin Mierla Kamailio (OpenSER) Advanced Training Jan 24-26, 2011, Irvine, CA, USA http://www.asipto.com

13 years, 7 months

git:kamailio_3.0: drouting: do not call init child for PROC_INIT

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 405466638c9cc6231614979f2e89e500d2a7a2fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4054666… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 30 23:16:19 2010 +0100 drouting: do not call init child for PROC_INIT - avoid opening a database connection before forking - reported by several people in context of Postgress async lib calls (cherry picked from commit 907936449b2543966a5b3b2fe821d406c2293799) --- modules_k/drouting/drouting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index a5cacf2..28a9d80 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -410,7 +410,7 @@ error: static int dr_child_init(int rank) { /* only workers needs DB connection */ - if (rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_MAIN || rank==PROC_TCP_MAIN || rank==PROC_INIT) return 0; /* init DB connection */

13 years, 7 months

git:3.1: drouting: do not call init child for PROC_INIT

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 1e204f4bbcc84271f509838182539476577fc77a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e204f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 30 23:16:19 2010 +0100 drouting: do not call init child for PROC_INIT - avoid opening a database connection before forking - reported by several people in context of Postgress async lib calls (cherry picked from commit 907936449b2543966a5b3b2fe821d406c2293799) --- modules_k/drouting/drouting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 45f36c2..aa09ef4 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -411,7 +411,7 @@ error: static int dr_child_init(int rank) { /* only workers needs DB connection */ - if (rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_MAIN || rank==PROC_TCP_MAIN || rank==PROC_INIT) return 0; /* init DB connection */

13 years, 7 months

git:master: drouting: do not call init child for PROC_INIT

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 907936449b2543966a5b3b2fe821d406c2293799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9079364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 30 23:16:19 2010 +0100 drouting: do not call init child for PROC_INIT - avoid opening a database connection before forking - reported by several people in context of Postgress async lib calls --- modules_k/drouting/drouting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 45f36c2..aa09ef4 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -411,7 +411,7 @@ error: static int dr_child_init(int rank) { /* only workers needs DB connection */ - if (rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_MAIN || rank==PROC_TCP_MAIN || rank==PROC_INIT) return 0; /* init DB connection */

13 years, 7 months

invalid type (3) or nul (0) version columns for trusted (kamailio 3.1 latest from git)

by Robert Verspuy

I've got a strange issue with the latest kamailio. I also had this problem with kamailio 3.0.3 downloaded from the webpage. I can start kamailio, but after a while (sometimes within one minuten, sometimes after an hour), I get the following log errors: Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [db.c:387]: invalid type (3) or nul (0) version columns for trusted Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [db.c:405]: querying version for table trusted Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: permissions [trusted.c:249]: error during table version check. Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [sr_module.c:832]: init_mod_child(): Error while initializing module permissions (//lib/kamailio/modules_k/permissions.so) Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [pt.c:481]: ERROR: fork_tcp_process(): init_child failed for process 10, pid 26621, "tcp receiver child=0" Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [tcp_main.c:4811]: ERROR: tcp_main: fork failed: Success Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: : <core> [pass_fd.c:103]: ERROR: recv_all: 1st recv on 21 failed: Connection reset by peer Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: : <core> [tcp_main.c:3323]: ERROR: handle_tcp_child: read from tcp child 0 (pid 26621, no 10) Connection reset by peer [104] Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: : <core> [pass_fd.c:293]: ERROR: receive_fd: EOF on 19 Oct 12 15:46:24 sp01 /sbin/kamailio[26611]: ALERT: <core> [main.c:738]: child process 26621 exited normally, status=255 Oct 12 15:46:24 sp01 /sbin/kamailio[26611]: INFO: <core> [main.c:756]: INFO: terminating due to SIGCHLD Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: INFO: <core> [main.c:807]: INFO: signal 15 received Looking at the error message, it thinks that the column type of table_version in the table version is a string (type 3), and it should be an int (type 1). But in the database it really is an int. When I run kamailio with debugging on level 5, I see that it's trying to run the "select table_version from version where table_name='trusted'" several times when kamailio starts (for every child thread). And then minutes, of even an hour later, it suddenly continues with that check, but based on a database response from another query. This is the "select password from subscriber ....etc...". And that column is indeed an string. I'm using PostgreSQL 8.4 as server, but maybe someone has seen this before, or now where I have to start looking? I first saw it yesterday when started to use the permissions module. I only see this with the trusted table, And always it uses the "select password from subscriber ... " response when giving this error. So is this an error in the permissions module / trusted.c file? or something in auth_db that's not freeing the response correctly? Strange thing is, that is sometimes happens very quick, and sometimes it can take an half hour or hour. I can mail the full log if anybody is interested and thinks he/she can help me. With kind regards, Robert Verspuy -- *Exa-Omicron* Patroonsweg 10 3892 DB Zeewolde Tel.: 088-OMICRON (66 427 66) http://www.exa-omicron.nl

13 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2010