sr-dev December 2010

sr-dev@lists.kamailio.org

16 participants
114 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; }

13 years, 4 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…

13 years, 5 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, 7 months

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, 9 months

how to enable sctp?

by Juha Heinanen

i have tried to enable sctp by including in debian/rules SCTP=1 and by including SCTP=$(SCTP) in make params. in cfg file, i have enable_sctp=1 but when i start sr, it does not report listening on sctp, only udp, tcp, and tls. i have not found anything about sctp in sr README/INSTALL etc files in source dir. question: how to enable sctp? -- juha

14 years

[tracker] Task opened: segfault on loading dialplan module 3.1.1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Bayan (bayan) Attached to Project - sip-router Summary - segfault on loading dialplan module 3.1.1 Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - High Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - Version 3.1.1 segfaults on loading dialplan when loading a row with match_op 1. When the match mode was changed to 0 it works To isolate the bug we loaded kamailio dialplan module with the very simple match_op 1 regex row in the database (Postgres) and took a backtrace of the segfault. # select * from coreout_dialplan; id | dpid | pr | match_op | match_exp | match_len | subst_exp | repl_exp | attrs -----+------+----+----------+-----------+-----------+-----------+----------+------- 482 | 100 | 1 | 1 | ^201$ | 0 | | NJ | Backtrace is below: Program terminated with signal 11, Segmentation fault. #0 0x00007f435151e5da in build_rule (values=0x0) at dp_db.c:388 388 GET_STR_VALUE(repl_exp, values, 6); (gdb) bt #0 0x00007f435151e5da in build_rule (values=0x0) at dp_db.c:388 #1 0x00007f435151fb1f in dp_load_db () at dp_db.c:261 #2 0x00007f4351520182 in init_db_data () at dp_db.c:110 #3 0x00007f43515205f5 in init_data () at dp_db.c:176 #4 0x00007f435151b15d in mod_init () at dialplan.c:189 #5 0x00000000004db076 in init_mod (m=0x8fb170) at sr_module.c:872 #6 0x00000000004daff4 in init_mod (m=0x8fb570) at sr_module.c:869 #7 0x00000000004dc022 in init_modules () at sr_module.c:899 #8 0x0000000000463ec9 in main (argc=5845616, argv=0x7fff86a4ac18) at main.c:2339 (gdb) p repl_exp $1 = {s = 0x4 <Address 0x4 out of bounds>, len = 1366451880} (gdb) p values $2 = (db_val_t *) 0x0 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=109 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.

14 years

git:master: xhttp: safety checks for null parameter values

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b5866451f323aa892bb48ba86424d6a45d8108b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b586645… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 31 00:40:32 2010 +0100 xhttp: safety checks for null parameter values --- modules/xhttp/xhttp_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/xhttp/xhttp_mod.c b/modules/xhttp/xhttp_mod.c index 22ebcc4..1c5ff7e 100644 --- a/modules/xhttp/xhttp_mod.c +++ b/modules/xhttp/xhttp_mod.c @@ -362,7 +362,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, { str tbuf; - if(ctype->len>0) + if(ctype!=NULL && ctype->len>0) { /* add content-type */ tbuf.len=sizeof("Content-Type: ") - 1 + ctype->len + CRLF_LEN; @@ -386,7 +386,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, pkg_free(tbuf.s); } - if(body->len>0) + if(body!=NULL && body->len>0) { if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) < 0) {

14 years

git:master: dialplan: specific reply for translation failure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4abe2eec5305de4157dc2d0d5dd9511f43c77bf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4abe2ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 31 00:00:26 2010 +0100 dialplan: specific reply for translation failure - 404 no translation returned if dp_translate MI command fails to do dialplan translate - added extra debug message --- modules/dialplan/dialplan.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index eb546be..4c86778 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -532,10 +532,12 @@ static struct mi_root * mi_translate(struct mi_root *cmd, void *param) return init_mi_tree(404, "Empty input parameter", 21); } + LM_DBG("trying to translate %.*s with dpid %i\n", + input.len, input.s, idp->dp_id); if (translate(NULL, input, &output, idp, &attrs)!=0){ LM_DBG("could not translate %.*s with dpid %i\n", input.len, input.s, idp->dp_id); - return 0; + return init_mi_tree(404, "No translation", 14); } LM_DBG("input %.*s with dpid %i => output %.*s\n", input.len, input.s, idp->dp_id, output.len, output.s);

14 years

char *s & int len --> to int (Kamailio code)

by Iñaki Baz Castillo

Hi, when Kamailio/SER parses a number (like Content-Length value) I assume it doesn't use atoi() or strol() C core functions as they are too much flexible (allow negative values, hexadecimal notation) and worse: they search until a char is not suitable for an integer/long. A bit dangerous as when parsing a stream we don't know if the next position in memory contains a digit or not. So could I be pointed to the exact function in Kamailio/SER code converting the Content-Length string value (pointer + lentgh) to an integer? Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years

git:3.1: modules_k/pv: Fix microsecond respresentation of $TV(Sn)

by Alex Hermann

Module: sip-router Branch: 3.1 Commit: 3b1f81896b36cb98f3a98c2c63ca64f80bc2bd65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b1f818… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Dec 28 13:44:53 2010 +0100 modules_k/pv: Fix microsecond respresentation of $TV(Sn) Make sure <100000us isn't off by multiple powers of 10. eg make sure 5us isn't printed as 0.5 sec by padding with 0's (cherry picked from commit a4545d8d23d9de3c6cf18329a822b677d9527047) --- modules_k/pv/pv_time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index f904080..399170c 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -245,7 +245,7 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, LM_ERR("unable to get time val attributes\n"); return pv_get_null(msg, param, res); } - s.len = snprintf(_timeval_ts_buf, 32, "%u.%u", + s.len = snprintf(_timeval_ts_buf, 32, "%u.%06u", (unsigned int)tv.tv_sec, (unsigned int)tv.tv_usec); if(s.len<0) return pv_get_null(msg, param, res);

14 years

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2010