sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
249 discussions

Crash bug
by Alex Balashov 11 May '15

11 May '15

Hello, I'm running kamailio:4.2:df86f2a9a09339687af5914b85fe8bd8f8f1f575 and am getting a periodic crash, once every few days, in response to a CANCEL message. The basic back trace is like this: (gdb) where #0 0x000000000044fed2 in del_nonshm_lump (lump_list=0x7f48f5681440) at data_lump.c:677 #1 0x00007f48f5404a15 in free_faked_req (faked_req=0x7f48f5680ea0, t=0x7f46ee6faeb0) at t_reply.c:975 #2 0x00007f48f5405bdf in run_failure_handlers (t=0x7f46ee6faeb0, rpl=0xffffffffffffffff, code=487, extra_flags=0) at t_reply.c:1061 #3 0x00007f48f54084e4 in t_should_relay_response (Trans=0x7f46ee6faeb0, new_code=487, branch=0, should_store=0x7fffce5605e0, should_relay=0x7fffce5605e4, cancel_data=0x7fffce5606b0, reply=0xffffffffffffffff) at t_reply.c:1406 #4 0x00007f48f540b045 in relay_reply (t=0x7f46ee6faeb0, p_msg=0xffffffffffffffff, branch=0, msg_status=487, cancel_data=0x7fffce5606b0, do_put_on_wait=1) at t_reply.c:1809 #5 0x00007f48f5386832 in cancel_branch (t=0x7f46ee6faeb0, branch=0, reason=0x0, flags=10) at t_cancel.c:276 #6 0x00007f48f53aff4a in e2e_cancel (cancel_msg=0x7f48f68d69d8, t_cancel=0x7f46ee8d9c30, t_invite=0x7f46ee6faeb0) at t_fwd.c:1373 #7 0x00007f48f53b4bd0 in t_relay_cancel (p_msg=0x7f48f68d69d8) at t_fwd.c:1967 #8 0x00007f48f53deaa7 in w_t_relay_cancel (p_msg=0x7f48f68d69d8, _foo=0x0, _bar=0x0) at tm.c:1743 #9 0x000000000041d364 in do_action (h=0x7fffce560fc0, a=0x7f48f6689f70, msg=0x7f48f68d69d8) at action.c:1088 #10 0x0000000000429a7a in run_actions (h=0x7fffce560fc0, a=0x7f48f6689f70, msg=0x7f48f68d69d8) at action.c:1583 #11 0x000000000042a0df in run_actions_safe (h=0x7fffce5622b0, a=0x7f48f6689f70, msg=0x7f48f68d69d8) at action.c:1648 #12 0x0000000000541158 in rval_get_int (h=0x7fffce5622b0, msg=0x7f48f68d69d8, i=0x7fffce561498, rv=0x7f48f668a1e0, cache=0x0) at rvalue.c:924 #13 0x0000000000545390 in rval_expr_eval_int (h=0x7fffce5622b0, msg=0x7f48f68d69d8, res=0x7fffce561498, rve=0x7f48f668a1d8) at rvalue.c:1918 #14 0x0000000000545786 in rval_expr_eval_int (h=0x7fffce5622b0, msg=0x7f48f68d69d8, res=0x7fffce561920, rve=0x7f48f668a948) at rvalue.c:1926 #15 0x000000000041ce4e in do_action (h=0x7fffce5622b0, a=0x7f48f668c260, msg=0x7f48f68d69d8) at action.c:1064 #16 0x0000000000429a7a in run_actions (h=0x7fffce5622b0, a=0x7f48f6689808, msg=0x7f48f68d69d8) at action.c:1583 #17 0x000000000041d2cd in do_action (h=0x7fffce5622b0, a=0x7f48f668c960, msg=0x7f48f68d69d8) at action.c:1079 #18 0x0000000000429a7a in run_actions (h=0x7fffce5622b0, a=0x7f48f667c628, msg=0x7f48f68d69d8) at action.c:1583 #19 0x000000000042a1a7 in run_top_route (a=0x7f48f667c628, msg=0x7f48f68d69d8, c=0x0) at action.c:1669 #20 0x0000000000507e1a in receive_msg ( buf=0xa6f760 "CANCEL sip:yyy@xxx:5060 SIP/2.0\r\nVia: SIP /2.0/UDP xxx:5060;branch=z9hG4bK08f.3dc6f0e1.0\r\nFrom: \"yyy\" <sip:yyy@xxx>;tag=D78eD8FB3SDgc\r\nCall-ID: e5e48a99-48dd-1233-96b7-782bcb13da6a\r\nTo: <sip:xxx@xxx:5060>\r\nCSeq: 73049624 CANCEL\r\nMax-Forwards: 32\r\nUser-Agent: OpenSIPS (1.9.1-notls (x86_64/linux))\r\nContent-Length: 0\r\n\r\n", len=394, rcv_info=0x7fffce5625a0) at receive.c:216 #21 0x00000000006074ae in udp_rcv_loop () at udp_server.c:521 #22 0x00000000004a5f0b in main_loop () at main.c:1629 #23 0x00000000004ab8bf in main (argc=11, argv=0x7fffce5629c8) at main.c:2578 I'll send a 'thread apply all bt full' privately due to the amount of private addresses in there, but a quick glance suggests a possible problem is here: #5 0x00007f48f5386832 in cancel_branch (t=0x7f46ee6faeb0, branch=0, reason=0x0, flags=10) at t_cancel.c:276 cancel = 0x1 <Address 0x1 out of bounds> len = 32584 crb = 0x7f46ee6fb0b0 irb = 0x7f46ee6fb028 ret = 1 tmp_cd = {cancel_bitmap = 0, reason = {cause = 0, u = {text = { s = 0x0, len = 0}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 0}}}} pcbuf = 0x7f46ee6fb0c0 __FUNCTION__ = "cancel_branch" #6 0x00007f48f53aff4a in e2e_cancel (cancel_msg=0x7f48f68d69d8, t_cancel=0x7f46ee8d9c30, t_invite=0x7f46ee6faeb0) at t_fwd.c:1373 cancel_bm = 1 reason = 0x0 free_reason = 0 i = 0 lowest_error = 0 ret = 32584 tmcb = {req = 0x137f66ce710, rpl = 0x7f48f68d69d8, param = 0xf48ab828, code = -158504488, flags = 32584, branch = 0, t_rbuf = 0xf80f668f9a0, dst = 0xce5622b0, send_buf = { s = 0x1ffffffff <Address 0x1ffffffff out of bounds>, len = -304107664}} __FUNCTION__ = "e2e_cancel" #7 0x00007f48f53b4bd0 in t_relay_cancel (p_msg=0x7f48f68d69d8) at t_fwd.c:1967 t_invite = 0x7f46ee6faeb0 t = 0x7f46ee8d9c30 ret = -323705680 new_tran = 1 Thanks, -- Alex -- Alex Balashov - Principal Evariste Systems LLC 303 Perimeter Center North Suite 300 Atlanta, GA 30346 United States Tel: +1-678-954-0670 Web: http://www.evaristesys.com/

3 42

[kamailio] Added implementation for force_send_interface to also support IPv6. (#142)
by smititelu 05 May '15

05 May '15

Only IPv4 was supported before. Added socket support for IPv6 (link locals included). Also updated documentation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/142 -- Commit Summary -- * Added implementation for force_send_interface to also support IPv6. Thus, data can be exchanged with rtpproxy over IPv4 and IPv6. * Updated documentation for IPv6 force_send_interface. -- File Changes -- M modules/rtpengine/doc/rtpengine_admin.xml (7) M modules/rtpengine/rtpengine.c (188) -- Patch Links -- https://github.com/kamailio/kamailio/pull/142.patch https://github.com/kamailio/kamailio/pull/142.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/142

2 4

acc, dialog: dialog duration for timed-out dialogs change
by Lucian Balaceanu 05 May '15

05 May '15

Hi, I would like to propose a patch in which the dialog duration displayed in the cdrs is: /0 -> timed-out not acknowledged dialogs duration from creation to timeout -> timed-out acknowledged dialogs / I am still testing the solution for the master branch while tests pass on a previous version. Any comments on the code? (I am not particularly proud of the string defines in the dlg_cb.h, but am unsure where to include some const variable accessible to both acc and dialog to pass as calback param for dialog expiration) Thank you, Lucian Balaceanu

2 3

ndb_redis compilation issues
by Alex Balashov 03 May '15

03 May '15

Hello, I have a problem with building hiredis + ndb_redis. The problem is with hiredis rather than ndb_redis directly, but I am not sure how to best handle it and would be grateful for any advice. The problem is that somewhere with the recent Hiredis 0.13.0 release[1], they came to use the following nested struct in the hiredis.h header: --- /* Context for a connection to Redis */ typedef struct redisContext { ... struct { char *path; } unix; /* line 158 */ ... } redisContext; --- It appears the GNU compilers do not like the use of 'unix' as an identifier: --- [root@proxy ndb_redis]# make CC (gcc) [M ndb_redis.so] ndb_redis_mod.o In file included from redis_client.h:27, from ndb_redis_mod.c:38: /usr/local/include/hiredis/hiredis.h:158: error: expected identifier or ‘(’ before numeric constant make: *** [ndb_redis_mod.o] Error 1 --- Indeed, a quick test against a normal gcc installation on CentOS 6.6 reveals that 'unix' is a defined constant: --- [root@proxy ~]# echo -e "#include <stdio.h>\n#include <stdlib.h>\nint main() { printf(\"%d\\\n\", unix); return 1; }" > ns.c [root@proxy ~]# make ns cc ns.c -o ns [root@proxy ~]# ./ns 1 --- The authors of hiredis themselves note this problem in a recent commit: --- commit d8145d79ce715054980938c751067ebaa541573c Author: Jan-Erik Rediger <janerik(a)fnordig.de> Date: Thu Apr 16 22:51:32 2015 +0200 Always compile with C99 standard. Turns out: gnu9x defines `unix` to 1, making it unusable as a variable name. --- So, their solution is to compile with -std=c99, which works fine. The problem is that a) ndb_redis isn't compiled with -std=c99 and b) my superficial effort at making it compile that way did not bear fruit: --- [root@rproxy01 ndb_redis]# make MOD_CFLAGS='-fPIC -DPIC $(CFLAGS) -std=c99' CC (gcc) [M ndb_redis.so] ndb_redis_mod.o In file included from ../../parser/../mem/shm_mem.h:47, from ../../parser/../ut.h:64, from ../../parser/../ip_addr.h:50, from ../../parser/msg_parser.h:61, from ../../sr_module.h:62, from ndb_redis_mod.c:32: /usr/include/sys/ipc.h:25:3: warning: #warning "Files using this header must be compiled with _SVID_SOURCE or _XOPEN_SOURCE" In file included from ../../parser/../mem/../atomic/atomic_native.h:53, from ../../parser/../mem/../futexlock.h:44, from ../../parser/../mem/../lock_ops.h:85, from ../../parser/../mem/shm_mem.h:75, from ../../parser/../ut.h:64, from ../../parser/../ip_addr.h:50, from ../../parser/msg_parser.h:61, from ../../sr_module.h:62, from ndb_redis_mod.c:32: ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_inc_int’: ../../parser/../mem/../atomic/atomic_x86.h:226: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:226: error: (Each undeclared identifier is reported only once ../../parser/../mem/../atomic/atomic_x86.h:226: error: for each function it appears in.) ../../parser/../mem/../atomic/atomic_x86.h:226: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_dec_int’: ../../parser/../mem/../atomic/atomic_x86.h:227: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:227: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_and_int’: ../../parser/../mem/../atomic/atomic_x86.h:228: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:228: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_or_int’: ../../parser/../mem/../atomic/atomic_x86.h:229: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:229: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_inc_and_test_int’: ../../parser/../mem/../atomic/atomic_x86.h:230: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:230: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_dec_and_test_int’: ../../parser/../mem/../atomic/atomic_x86.h:231: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:231: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_get_and_set_int’: ../../parser/../mem/../atomic/atomic_x86.h:232: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:232: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_cmpxchg_int’: ../../parser/../mem/../atomic/atomic_x86.h:233: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:233: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_add_int’: ../../parser/../mem/../atomic/atomic_x86.h:234: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:234: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_inc_long’: ../../parser/../mem/../atomic/atomic_x86.h:236: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:236: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_dec_long’: ../../parser/../mem/../atomic/atomic_x86.h:237: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:237: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_and_long’: ../../parser/../mem/../atomic/atomic_x86.h:238: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:238: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_or_long’: ../../parser/../mem/../atomic/atomic_x86.h:239: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:239: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_inc_and_test_long’: ../../parser/../mem/../atomic/atomic_x86.h:240: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:240: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_dec_and_test_long’: ../../parser/../mem/../atomic/atomic_x86.h:241: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:241: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_get_and_set_long’: ../../parser/../mem/../atomic/atomic_x86.h:242: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:242: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_cmpxchg_long’: ../../parser/../mem/../atomic/atomic_x86.h:243: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:243: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘atomic_add_long’: ../../parser/../mem/../atomic/atomic_x86.h:244: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:244: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘mb_atomic_set_int’: ../../parser/../mem/../atomic/atomic_x86.h:299: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:299: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘mb_atomic_set_long’: ../../parser/../mem/../atomic/atomic_x86.h:312: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:312: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘mb_atomic_get_int’: ../../parser/../mem/../atomic/atomic_x86.h:331: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:331: error: expected ‘;’ before ‘volatile’ ../../parser/../mem/../atomic/atomic_x86.h: In function ‘mb_atomic_get_long’: ../../parser/../mem/../atomic/atomic_x86.h:342: error: ‘asm’ undeclared (first use in this function) ../../parser/../mem/../atomic/atomic_x86.h:342: error: expected ‘;’ before ‘volatile’ In file included from ../../parser/../mem/../lock_ops.h:85, from ../../parser/../mem/shm_mem.h:75, from ../../parser/../ut.h:64, from ../../parser/../ip_addr.h:50, from ../../parser/msg_parser.h:61, from ../../sr_module.h:62, from ndb_redis_mod.c:32: ../../parser/../mem/../futexlock.h: In function ‘futex_get’: ../../parser/../mem/../futexlock.h:110: warning: implicit declaration of function ‘syscall’ ndb_redis_mod.c: At top level: ../../parser/parse_param.h:156: warning: inline function ‘parse_param’ declared but never defined make: *** [ndb_redis_mod.o] Error 1 --- There are two separate problems here: 1) My invocation of 'make' above may betray an insufficient understanding the Makefile chain & build process. Is there something I'm doing wrong there? 2) In choosing to work around the issue this way, hiredis has imposed the requirement on GNU C users to compile any applications utilising hiredis with C99 themselves. This doesn't seem like a good solution. Is there a more 'elegant' fix here? It seems to me they ought to rename that 'unix' struct member. The blame-worthy hiredis commit seems to be this one: --- commit d9e0b0f6abfbb8918f73607bdfcc707d0df3fd41 Author: Jan-Erik Rediger <janerik(a)fnordig.de> Date: Thu Apr 16 19:28:12 2015 +0200 Implement a reconnect method for the client context Originally implemented by @abedra as part of #306. In case a write or read times out, we force an error state, because we can't guarantuee that the next read will get the right data. Instead we need to reconnect to have a clean-state connection, which is now easily possible with this method. i.e. /* Context for a connection to Redis */ typedef struct redisContext { int err; /* Error flags, 0 when there is no error */ @@ -136,6 +141,20 @@ typedef struct redisContext { int flags; char *obuf; /* Write buffer */ redisReader *reader; /* Protocol reader */ + + enum redisConnectionType connection_type; + struct timeval *timeout; + + struct { + char *host; + char *source_addr; + int port; + } tcp; + + struct { + char *path; + } unix; + } redisContext; --- Reverting to the parent commit, b872919463fbc04c3a8fde113cb9ae89dfcb3859, seems to fix the problem. That's my workaround for now. Thanks! -- Alex [1] Around 16 Apr 2015. -- Alex Balashov | Principal | Evariste Systems LLC 303 Perimeter Center North, Suite 300 Atlanta, GA 30346 United States Tel: +1-800-250-5920 (toll-free) / +1-678-954-0671 (direct) Web: http://www.evaristesys.com/, http://www.csrpswitch.com/

2 3

Change SIP message within module
by Cockhootec Yahrabee 29 Apr '15

29 Apr '15

Hi, I am trying to develop module for Kamailio and I am wondering how to change some of SDP fields. I have function where I cast `sip_msg`'s `body` to `sdp_info` structure and within this function I am changing some fields in `sessions` and `streams` list. I am able to see changes when I am printing them after message leaves the function but Kamailio sends the original message not the changed one. Do I need somehow let the Kamailio know that the message was changed and it should rebuild `buf` field? Or I need to change directly `buf` field within `sip_msg`? If you need some more details to be able to help me with my problem please ask freely. Or maybe if I need to rephrase my problem just let me know. Thanks in advance

2 3

git:master:e1d68c3c: etc: don't set fifo and ctl socket in config files
by Daniel-Constantin Mierla 28 Apr '15

28 Apr '15

Module: kamailio Branch: master Commit: e1d68c3cb8c5a0630fc81313a8bb176646e9ccb6 URL: https://github.com/kamailio/kamailio/commit/e1d68c3cb8c5a0630fc81313a8bb176… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-28T15:34:44+02:00 etc: don't set fifo and ctl socket in config files - modparams were commented, to be used as samples if needed to be changed - the default values are enough for proper packaging and use of run_dir in order to avoid security exposures of /tmp dir --- Modified: etc/kamailio-basic.cfg Modified: etc/kamailio-oob.cfg Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e1d68c3cb8c5a0630fc81313a8bb176… Patch: https://github.com/kamailio/kamailio/commit/e1d68c3cb8c5a0630fc81313a8bb176… --- diff --git a/etc/kamailio-basic.cfg b/etc/kamailio-basic.cfg index 55685d5..b20de64 100644 --- a/etc/kamailio-basic.cfg +++ b/etc/kamailio-basic.cfg @@ -191,10 +191,10 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/etc/kamailio-oob.cfg b/etc/kamailio-oob.cfg index db786d0..2de8a2b 100644 --- a/etc/kamailio-oob.cfg +++ b/etc/kamailio-oob.cfg @@ -315,10 +315,10 @@ loadmodule "xhttp_pi.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 78f6ee1..1190e80 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -288,10 +288,10 @@ loadmodule "debugger.so" # ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") +#modparam("mi_fifo", "fifo_name", "/var/run/kamailio/kamailio_fifo") # ----- ctl params ----- -modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +#modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # ----- tm params ----- # auto-discard branches from previous serial forking leg

1 0

git:master:a9a21822: core/docbook: updated the entity for ctl socket file name
by Daniel-Constantin Mierla 28 Apr '15

28 Apr '15

Module: kamailio Branch: master Commit: a9a21822a6a4ec3c886f42be1447e8e8cc4a3291 URL: https://github.com/kamailio/kamailio/commit/a9a21822a6a4ec3c886f42be1447e8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-28T15:32:03+02:00 core/docbook: updated the entity for ctl socket file name --- Modified: docbook/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/a9a21822a6a4ec3c886f42be1447e8e… Patch: https://github.com/kamailio/kamailio/commit/a9a21822a6a4ec3c886f42be1447e8e… --- diff --git a/docbook/entities.xml b/docbook/entities.xml index 2498298..4081ec1 100644 --- a/docbook/entities.xml +++ b/docbook/entities.xml @@ -47,7 +47,7 @@ <!ENTITY ser "SER"> <!ENTITY sername "SIP Express Router"> <!ENTITY sercmd "kamcmd"> -<!ENTITY ctlsocket "ser_ctl"> +<!ENTITY ctlsocket "kamailio_ctl"> <!ENTITY serhome "http://iptel.org/ser"> <!ENTITY serbugs "http://sip-router.org/tracker">

1 0

git:master:106b1afa: ctl: updates about the default value for binrpc parameter
by Daniel-Constantin Mierla 28 Apr '15

28 Apr '15

Module: kamailio Branch: master Commit: 106b1afa6135e82c58aa942e8a4be67debddb8a7 URL: https://github.com/kamailio/kamailio/commit/106b1afa6135e82c58aa942e8a4be67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-28T15:31:26+02:00 ctl: updates about the default value for binrpc parameter - it creates the ctl file inside /var/run/kamailio --- Modified: modules/ctl/README Modified: modules/ctl/doc/ctl.xml Modified: modules/ctl/doc/ctl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/106b1afa6135e82c58aa942e8a4be67… Patch: https://github.com/kamailio/kamailio/commit/106b1afa6135e82c58aa942e8a4be67…

1 0

git:master:294427ca: mi_fifo: updated documentation for fifo_name parameter
by Daniel-Constantin Mierla 28 Apr '15

28 Apr '15

Module: kamailio Branch: master Commit: 294427ca8343391616b1db6be670a7acb66b069c URL: https://github.com/kamailio/kamailio/commit/294427ca8343391616b1db6be670a7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-28T15:21:58+02:00 mi_fifo: updated documentation for fifo_name parameter --- Modified: modules/mi_fifo/README Modified: modules/mi_fifo/doc/mi_fifo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/294427ca8343391616b1db6be670a7a… Patch: https://github.com/kamailio/kamailio/commit/294427ca8343391616b1db6be670a7a… --- diff --git a/modules/mi_fifo/README b/modules/mi_fifo/README index ed42377..a9a8303 100644 --- a/modules/mi_fifo/README +++ b/modules/mi_fifo/README @@ -111,9 +111,15 @@ Chapter 1. Admin Guide 4.1. fifo_name (string) The name of the FIFO file to be created for listening and reading - external commands. + external commands. If the value is a file name or does not start with + '/', the FIFO file is created in the 'run_dir'. The 'run_dir' is a core + parameter that can specify where to create runtime files, its default + value is '/var/run/kamailio/'. - Default value is NONE. + Default value is 'Kamailio_fifo'. + + The full path used by default for FIFO file is + '/var/run/kamailio/Kamailio_fifo' Example 1.1. Set fifo_name parameter ... diff --git a/modules/mi_fifo/doc/mi_fifo_admin.xml b/modules/mi_fifo/doc/mi_fifo_admin.xml index 714772d..4b25035 100644 --- a/modules/mi_fifo/doc/mi_fifo_admin.xml +++ b/modules/mi_fifo/doc/mi_fifo_admin.xml @@ -86,13 +86,20 @@ <title><varname>fifo_name</varname> (string)</title> <para> The name of the FIFO file to be created for listening and - reading external commands. + reading external commands. If the value is a file name or does + not start with '/', the FIFO file is created in the 'run_dir'. The + 'run_dir' is a core parameter that can specify where to create + runtime files, its default value is '/var/run/kamailio/'. </para> <para> <emphasis> - Default value is NONE. + Default value is '&kamailio;_fifo'. </emphasis> </para> + <para> + The full path used by default for FIFO file is + '/var/run/kamailio/&kamailio;_fifo' + </para> <example> <title>Set <varname>fifo_name</varname> parameter</title> <programlisting format="linespecific">

1 0

git:master:e5dc1506: mi_fifo: if fifo_name does not start with /, create it in run_dir
by Daniel-Constantin Mierla 28 Apr '15

28 Apr '15

Module: kamailio Branch: master Commit: e5dc15061be9d3866a8972af9732a3a7a753cc40 URL: https://github.com/kamailio/kamailio/commit/e5dc15061be9d3866a8972af9732a3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-28T15:15:32+02:00 mi_fifo: if fifo_name does not start with /, create it in run_dir - better security, /tmp exposes insecure operations, as reported by Debian project a while ago - run_dir is by default /var/run/kamailio - defualt value for fifo_name is now 'kamailio_fifo' - full default path for fifo is /var/run/kamailio/kamailio_fifo --- Modified: modules/mi_fifo/mi_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/e5dc15061be9d3866a8972af9732a3a… Patch: https://github.com/kamailio/kamailio/commit/e5dc15061be9d3866a8972af9732a3a… --- diff --git a/modules/mi_fifo/mi_fifo.c b/modules/mi_fifo/mi_fifo.c index 710eec1..b0046ef 100644 --- a/modules/mi_fifo/mi_fifo.c +++ b/modules/mi_fifo/mi_fifo.c @@ -60,7 +60,7 @@ static void fifo_process(int rank); static int mi_destroy(void); /* FIFO server vars */ -static char *mi_fifo = 0; /*!< FIFO name */ +static char *mi_fifo = NAME "_fifo"; /*!< FIFO name */ static char *mi_fifo_reply_dir = DEFAULT_MI_REPLY_DIR; /*!< dir where reply fifos are allowed */ static char *mi_reply_indent = DEFAULT_MI_REPLY_IDENT; static int mi_fifo_uid = -1; /*!< Fifo default UID */ @@ -114,12 +114,35 @@ static int mi_mod_init(void) { int n; struct stat filestat; + int len; + int sep; + char *p; /* checking the mi_fifo module param */ if (mi_fifo==NULL || *mi_fifo == 0) { LM_ERR("No MI fifo configured\n"); return -1; } + if(*mi_fifo != '/') { + if(runtime_dir!=NULL && *runtime_dir!=0) { + len = strlen(runtime_dir); + sep = 0; + if(runtime_dir[len-1]!='/') { + sep = 1; + } + len += sep + strlen(mi_fifo); + p = pkg_malloc(len + 1); + if(p==NULL) { + LM_ERR("no more pkg\n"); + return -1; + } + strcpy(p, runtime_dir); + if(sep) strcat(p, "/"); + strcat(p, mi_fifo); + mi_fifo = p; + LM_DBG("fifo path is [%s]\n", mi_fifo); + } + } LM_DBG("testing mi_fifo existance ...\n"); n=stat(mi_fifo, &filestat);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015