sr-dev April 2010

sr-dev@lists.kamailio.org

27 participants
495 discussions

git:kamailio_3.0: tm: kamailio flavour enables local-request event
by Daniel-Constantin Mierla 20 Apr '10

20 Apr '10

Module: sip-router Branch: kamailio_3.0 Commit: 11837819caad6234f337ac3843d720a9b664a330 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1183781… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 22:06:46 2010 +0200 tm: kamailio flavour enables local-request event - will execute event_route[tm:local-request] - reported by Alex Balashov (cherry picked from commit e4bd74c1718ea2218f2ad426537641cc9ef71d7d) --- modules/tm/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/Makefile b/modules/tm/Makefile index 0c60918..93807ca 100644 --- a/modules/tm/Makefile +++ b/modules/tm/Makefile @@ -11,4 +11,8 @@ NAME=tm.so LIBS= DEFS+= -DSER_MOD_INTERFACE +ifeq ($(INSTALL_FLAVOUR),kamailio) +DEFS+= -DWITH_EVENT_LOCAL_REQUEST +endif # INSTALL_FLAVOUR + include ../../Makefile.modules

1 0

git:master: tm: kamailio flavour enables local-request event
by Daniel-Constantin Mierla 20 Apr '10

20 Apr '10

Module: sip-router Branch: master Commit: e4bd74c1718ea2218f2ad426537641cc9ef71d7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4bd74c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 22:06:46 2010 +0200 tm: kamailio flavour enables local-request event - will execute event_route[tm:local-request] - reported by Alex Balashov --- modules/tm/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/Makefile b/modules/tm/Makefile index 0c60918..93807ca 100644 --- a/modules/tm/Makefile +++ b/modules/tm/Makefile @@ -11,4 +11,8 @@ NAME=tm.so LIBS= DEFS+= -DSER_MOD_INTERFACE +ifeq ($(INSTALL_FLAVOUR),kamailio) +DEFS+= -DWITH_EVENT_LOCAL_REQUEST +endif # INSTALL_FLAVOUR + include ../../Makefile.modules

1 0

[LCR] Bug in load_gws(pvar) in Kamailio 1.5
by Iñaki Baz Castillo 20 Apr '10

20 Apr '10

Hi, I set "from_uri = out" in "lcr" table. Then I call: $var(destination) = "out"; load_gws("$var(destination)") or: $var(destination) = "no-out"; load_gws("$var(destination)") or: $var(destination) = "no-out-lalala"; load_gws("$var(destination)") In any case LCR matches the rules of "lcr" table with "from_uri = out" !!! If I set: $var(destination) = "nooooo"; load_gws("$var(destination)") then rules are not loaded (as expected). So it seems that load_gws(pvar) does an internal match like: if table_from_uri =~ /PVAR_VALUE/ IMHO it should do: if table_from_uri =~ /^PVAR_VALUE$/ -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 6

git:master: pv: use local buffer to return empty val after s.strip
by Daniel-Constantin Mierla 20 Apr '10

20 Apr '10

Module: sip-router Branch: master Commit: 3691d7b9a1142eaeba2521fe01d3c1c6e9ceef2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3691d7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 17:45:25 2010 +0200 pv: use local buffer to return empty val after s.strip - further assignments may want to ensure it is zero-terminated and cause crash - reported by Juha Heinanen --- modules_k/pv/pv_trans.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 9ddd125..dbe2ab7 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -442,7 +442,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, break; if(i>=val->rs.len) { - val->rs.s = ""; + _tr_buffer[0] = '\0'; + val->rs.s = _tr_buffer; val->rs.len = 0; break; }

1 0

[tracker] Task closed: speex, sems and mi_datagram with quotes
by sip-router 20 Apr '10

20 Apr '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#7 - speex, sems and mi_datagram with quotes User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: The MI command coming from sems must escape inner double-quotes. Otherwise it breaks MI cmd format, where multiline parameters are enclosed in double-quotes and followed by new line. FYI, last sems supports SIP natively, MI communication is pretty much obsolete. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=7 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] Comment added: In daemonize mode parent process should exit with error (-1) if main process fails to start (Attachment added)
by sip-router 20 Apr '10

20 Apr '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#66 - In daemonize mode parent process should exit with error (-1) if main process fails to start User who did this - marius zbihlei (marius.zbihlei) ---------- - Replaced the blocking read() with a more versatile select() that timeout after 30 s - Formatted the patch - Fixed a double close of the write fd of the pipe in the main process - TODO: better handling of EINTR in case of select() ---------- 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=66#comment80 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] Task closed: Change syntax of fr_{inv}_timer_avp parameters of tm module
by sip-router 20 Apr '10

20 Apr '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#2 - Change syntax of fr_{inv}_timer_avp parameters of tm module User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: TM support now $avp(name) format. The old one is still possible as alternative, subject to be removed in near future. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=2 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

git:master: pv: added strip and striptail transformations
by Daniel-Constantin Mierla 20 Apr '10

20 Apr '10

Module: sip-router Branch: master Commit: 6783e5e3e9a00cd60afcd9e25f3425f22f006a29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6783e5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 20 16:04:55 2010 +0200 pv: added strip and striptail transformations - s.strip and s.striptail transformations to remove prefix or suffix from pseudo-variables - straightforward option instead of more complex format of s.substr for these two common operations in sip routing --- modules_k/pv/pv_trans.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_trans.h | 3 +- 2 files changed, 78 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index d9120de..9ddd125 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -415,6 +415,42 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = st; break; + case TR_S_STRIP: + case TR_S_STRIPTAIL: + if(tp==NULL) + { + LM_ERR("strip invalid parameters\n"); + return -1; + } + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(tp->type==TR_PARAM_NUMBER) + { + i = tp->v.n; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_INT))) + { + LM_ERR("select cannot get p1\n"); + return -1; + } + i = v.ri; + } + val->flags = PV_VAL_STR; + val->ri = 0; + if(i<=0) + break; + if(i>=val->rs.len) + { + val->rs.s = ""; + val->rs.len = 0; + break; + } + if(subtype==TR_S_STRIP) + val->rs.s += i; + val->rs.len -= i; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -1277,6 +1313,46 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==5 && strncasecmp(name.s, "strip", 5)==0) { + t->subtype = TR_S_STRIP; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid strip transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid strip transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; + } else if(name.len==9 && strncasecmp(name.s, "striptail", 9)==0) { + t->subtype = TR_S_STRIPTAIL; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid striptail transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid striptail transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index c9e57c2..acd81db 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -38,7 +38,8 @@ enum _tr_s_subtype { TR_S_NONE=0, TR_S_LEN, TR_S_INT, TR_S_MD5, TR_S_SUBSTR, TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, - TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER + TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, + TR_S_STRIP, TR_S_STRIPTAIL }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

Patches to get proper status code in daemonize mode
by Iñaki Baz Castillo 20 Apr '10

20 Apr '10

Hi, I've submitted some patches to the SR tracker in order to improve something that I consider buggy (and for sure it is): http://sip-router.org/tracker/index.php?do=details&task_id=66 As explained in the tracker, in daemonize mode kamailio doesn't return the proper status code. If for example the listen address is not local or a DB connection uses an invalid password, then the command "kamailio" would return 0 (OK) anyway (even if it fails to start). This occurs because all those checking (socket, DB connections...) are performed *after* invoking daemonize() so the parent process (which could be invoked by "/etc/init.d/kamailio start") returns 0 knowing nothing about those errors. In fact the only checking done before daemonizing is the config file parsing. The patches I've upload to the tracker improve/fix it by doing the following: - 'daemonize()' function doesn't exit the parent process, instead the parent process gets blocked in 'main()' function reading a pipe. - When the main process initializes the modules, sockets and so, it writes into the pipe so the parent process exists with 0. - If the main process fails to start then the pipe write fd is closed with no more processes writting into it so the parent process detects it and exists with -1 error. I've checked it and works ok. You can try to set a wrong MySQL password or a wrong listen address and run kamailio in daemonize mode. Check the exit status so you will get error code rather than 0 (as occurs without these changes). This is strongly required when working with HeartBeat (and any other software managing daemons) because HeartBeat relies on the init script returned status codes. Imagine for example that a MySQL password is changed. For any reason HeartBeat decides to change the service to nodo-2. This is what would happen without the proposed changes: - HeartBeat invokes "/etc/init.d/kamailio start". - It returns 0 even if it fails to start due to MySQL password. - HeartBeat invokes periodically "/etc/init.d/kamailio monitor" (similar to "status") which would return 1 (it's not running). - Then HeartBeat tries to start it again. And of course, it receives 0 again. - Loop... This is, a init script return codes are *important* and current SR/Kamailio doesn't do it well as it fails in daemonize mode. I will use these patches in production very soon as I'm building some platforms of Kamailio+HeartBeat and this is really required. If somebody could review than patches it should be great. Regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

5 15

tcp_send ERRORs => WARNINGs?
by jh＠tutpro.com 20 Apr '10

20 Apr '10

if tcp uas is not reachable, sr prints ERRORs to syslog: Apr 20 13:23:10 localhost /usr/sbin/sip-proxy[22508]: INFO: Routing first INVITE to <sip:foo@192.98.102.10:4040;transport=tcp> and <<null>> Apr 20 13:23:10 localhost /usr/sbin/sip-proxy[22508]: ERROR: tm [../../forward.h:169]: msg_send: ERROR: tcp_send failed Apr 20 13:23:10 localhost /usr/sbin/sip-proxy[22508]: ERROR: tm [t_fwd.c:1249]: ERROR: t_send_branch: sending request on branch 0 failed since this is not really an error, would it be possible to downgrade the messages to WARNINGs? -- juha

2 1

← Newer
1
...
34
35
36
37
38
39
40
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2010