sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
235 discussions

git:3.3: pv: clone result of several string transformations

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.3 Commit: 8e98fd0a708f96c98b942b1fcfa77a5b6e45496d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e98fd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 15 22:45:18 2013 +0200 pv: clone result of several string transformations - it is safer for assigning back to the same variable on which the transformation was applied - reported by Martin Mikkelsen (cherry picked from commit fe7e4a5152674aa9c81c09dd2fc9938d9e9e762e) Conflicts: modules_k/pv/pv_trans.c --- modules_k/pv/pv_trans.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index af455eb..76efe1c 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -94,6 +94,15 @@ char *tr_set_crt_buffer(void) return _tr_buffer; } +#define tr_string_clone_result do { \ + if(val->rs.len>TR_BUFFER_SIZE-1) { \ + LM_ERR("result is too big\n"); \ + return -1; \ + } \ + strncpy(_tr_buffer, val->rs.s, val->rs.len); \ + val->rs.s = _tr_buffer; \ + } while(0); + /*! * \brief Evaluate string transformations * \param msg SIP message @@ -323,6 +332,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { /* to end */ val->rs.s += i; val->rs.len -= i; + tr_string_clone_result; break; } val->rs.s += i; @@ -340,10 +350,12 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, { /* to end */ val->rs.s += val->rs.len-i; val->rs.len = i; + tr_string_clone_result; break; } val->rs.s += val->rs.len-i; val->rs.len = j; + tr_string_clone_result; break; case TR_S_SELECT: @@ -414,6 +426,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = _tr_empty; } } + tr_string_clone_result; break; case TR_S_TOLOWER: @@ -489,6 +502,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(subtype==TR_S_STRIP) val->rs.s += i; val->rs.len -= i; + tr_string_clone_result; break; case TR_S_PREFIXES:

11 years, 5 months

releasing v4.0.2

by Daniel-Constantin Mierla

Hello, I am considering to release kamailio v4.0.2 next week on Wednesday, June 12. Developers that committed fixes on master branch and should be backported, have to do it before. Overall, everyone should keep an eye and be sure their demanded fixes are backported. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, San Francisco, USA - June 24-27, 2013 * http://asipto.com/u/katu *

11 years, 5 months

git:4.0: registrar: regenerated the readme file

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: d54024f873c641c21da197ee7eb3a49746f58229 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d54024f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 12 09:14:14 2013 +0200 registrar: regenerated the readme file --- modules/registrar/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/registrar/README b/modules/registrar/README index f5c80f3..cce005c 100644 --- a/modules/registrar/README +++ b/modules/registrar/README @@ -622,7 +622,7 @@ modparam("registrar", "xavp_cfg", "reg") Example 1.21. Set xavp_rcd parameter ... -modparam("registrar", "xavp_cfg", "ulrcd") +modparam("registrar", "xavp_rcd", "ulrcd") ... 3.23. gruu_enabled (integer)

11 years, 5 months

git:4.0: mtree: use debug level for log message when invalid character in value to be matched

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 81b61679cabd2470becf86700b777cc496f1d330 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81b6167… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 12 09:11:56 2013 +0200 mtree: use debug level for log message when invalid character in value to be matched - more verbose message when an invalid database record is found --- modules/mtree/mtree.c | 284 ++++++++++++++++++++++---------------------- modules/mtree/mtree_mod.c | 166 +++++++++++++------------- 2 files changed, 226 insertions(+), 224 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=81b…

11 years, 5 months

git:4.0: registrar: fixed typo in example of xavp_rcd parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 6b0d759f0dabf36c529c6c7d22c8333e7a8731e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b0d759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 11 18:39:31 2013 +0200 registrar: fixed typo in example of xavp_rcd parameter (cherry picked from commit c228851e068a080050c79107c760f8ab5ffae967) --- modules/registrar/doc/registrar_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index cb55218..772957c 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -689,7 +689,7 @@ modparam("registrar", "xavp_cfg", "reg") <title>Set <varname>xavp_rcd</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("registrar", "xavp_cfg", "ulrcd") +modparam("registrar", "xavp_rcd", "ulrcd") ... </programlisting> </example>

11 years, 5 months

git:4.0: registrar: more debug messages when adding ruid xavp

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 3f1f50068b96ea4bde1a7255842bf07683cbed8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f1f500… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 11 18:37:32 2013 +0200 registrar: more debug messages when adding ruid xavp - free local ruid xavp if cannot be added to root list (cherry picked from commit 9589466916305146fb4f982542c3f3a51126dcef) --- modules/registrar/reply.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 7ed2a05..4b35a47 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -341,7 +341,9 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = c->ruid; - xavp_add_value(&xname, &xval, &xavp); + if(xavp_add_value(&xname, &xval, &xavp)==NULL) { + LM_ERR("cannot add ruid value to xavp\n"); + } } } @@ -351,12 +353,15 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) /* add xavp with details of the record (ruid, ...) */ if(reg_xavp_rcd.s!=NULL) { - if(list==NULL) + if(list==NULL && xavp!=NULL) { /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; xval.v.xavp = xavp; - xavp_add_value(&reg_xavp_rcd, &xval, NULL); + if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { + LM_ERR("cannot add ruid xavp to root list\n"); + xavp_destroy_list(&xavp); + } } }

11 years, 5 months

git:master: mtree: print more details if the record in db is broken

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b5538401a01057318063a4e4646c9e7a2fb967c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b553840… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 12 08:50:26 2013 +0200 mtree: print more details if the record in db is broken --- modules/mtree/mtree_mod.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 50e0d4f..0f4348c 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -566,7 +566,9 @@ static int mt_load_db(str *tname) if(tprefix.s==NULL || tvalue.s==NULL || tprefix.len<=0 || tvalue.len<=0) { - LM_ERR("Error - bad values in db (%p:%p)\n", tprefix.s, tvalue.s); + LM_ERR("Error - bad record in db" + " (prefix: %p/%d - value: %p/%d)\n", + tprefix.s, tprefix.len, tvalue.s, tvalue.len); continue; }

11 years, 5 months

websocket testing in kamailio

by billy

Hi, I've read this discussion from the link http://lists.sip-router.org/pipermail/sr-dev/2012-August/016161.html. I got a similar problem. I'm currently trying to test Kamailio as a websocket server. In the expert view of sipML5 http://sipml5.org/expert.htm, I put the field of WebSocket Server URL=ws://<ip:port of kamailio> and SIP outbound proxy URL=udp://<ip:port of kamailio> and the port for UDP is not the same as for WebSocket. I have a kamailio server with websocket support running. However I got an error in sipML5.org/call.htm that failed to connect to the server. I read from the kamailio log file and found the error like this: DEBUG: <core> [forward.c:462]: check_self: host != me. during the host checking in grep_sock_info, it showed that: checking if host==us: 13==14 && [IP1] == [IP2] where IP1 is the public IP address of my kamailio server and IP2 is the local IP address of my kamailio server. May I ask if I set it wrongly? In sipML5, I put ws://public_IP_kamailio:8080. If I remove this ws setting and use kamailio as outbound proxy only, I can register to kamailio while grep_sock_info shows that - checking if host==us: 18==14 && [realm] == [IP2] where realm is set in sipML5 and kamailio.cfg. IP2 is the local IP address of my kamailio server. As my understanding, I did not set it correctly for messages received over websocket to be forwarded to outbound proxy. Without making DNS changes to support our realm, is there any way to set it through? Or is it possible to use kamailio as a websocket server and a outbound proxy? Could you please give any advices? I'm new to this field. Sorry for my ignorance! Best, Billy -- View this message in context: http://sip-router.1086192.n5.nabble.com/websocket-testing-in-kamailio-tp119… Sent from the Development mailing list archive at Nabble.com.

11 years, 5 months

[tracker] Comment added: DNS failover bugs (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#313 - DNS failover bugs User who did this - Jasmin Schnatterbeck (jasmin) ---------- Hi Daniel, no, I do not have a multi-homed environment. In case the script writer does not force a send socket, the following happens in src - for original request, the receiving socket is being used as send socket - for failover request, no specific send socket stated (just 0) => kamailio uses the first listen socket => a different one than before, if the request was not received on the first listening socket. I fixed dns failover to use the received socket. I attached patches for 4.0 and master. Jasmin ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=313#comment947 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.

11 years, 5 months

git:master: mtree: make log message on not maching character a debug instead of error

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 862e267267ccd58e096f267ac5aab03cee042b7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=862e267… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 11 18:47:54 2013 +0200 mtree: make log message on not maching character a debug instead of error --- modules/mtree/mtree.c | 284 ++++++++++++++++++++++---------------------- modules/mtree/mtree_mod.c | 180 ++++++++++++++-------------- 2 files changed, 232 insertions(+), 232 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=862…

11 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013