sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
237 discussions

git:master:ceaf687e: pkg/kamailio/deb: add virtual-mysql-client as an alternative of mysql-client at kamailio-mysql-modules package
by Victor Seva 27 Oct '15

27 Oct '15

Module: kamailio Branch: master Commit: ceaf687eddf64165f14032b10c3ee3dcec7a95dd URL: https://github.com/kamailio/kamailio/commit/ceaf687eddf64165f14032b10c3ee3d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-10-27T23:32:13+01:00 pkg/kamailio/deb: add virtual-mysql-client as an alternative of mysql-client at kamailio-mysql-modules package fixes #376 --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/squeeze/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control --- Diff: https://github.com/kamailio/kamailio/commit/ceaf687eddf64165f14032b10c3ee3d… Patch: https://github.com/kamailio/kamailio/commit/ceaf687eddf64165f14032b10c3ee3d… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index e891c18..6c4ec40 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -239,7 +239,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client, + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 89c1e26..756e84d 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -238,7 +238,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client, + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 6458ad9..5c5bb0f 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -236,7 +236,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client, + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index 7eb60db..51b5ae7 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -192,7 +192,7 @@ Package: kamailio-mysql-modules Architecture: linux-any Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client, + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 89c1e26..756e84d 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -238,7 +238,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client, + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 884f2af..bb10063 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -235,7 +235,7 @@ Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), - mysql-client, + mysql-client | virtual-mysql-client, ${misc:Depends}, ${shlibs:Depends} Description: MySQL database connectivity module for Kamailio

1 0

[kamailio] kamailio-mysql-modules on Ubuntu 14.04 not installable (#376)
by Benjamin Tietz 27 Oct '15

27 Oct '15

Hi, I try to install kamailio-mysql-modules on Ubuntu 14.04 Trusty via latest repo: deb http://deb.kamailio.org/kamailio trusty main I want to use sipcapture for homer5 and need mysql 5.6 for that. Now the problem: Dependencies say I need mysql-client, which can't be installed because I have mysql-client-5.6 already installed but mysql-client points to mysql-client-5.5 This is mentioned as bug in: https://bugs.launchpad.net/ubuntu/+source/mysql-5.6/+bug/1314555 https://wiki.debian.org/Teams/MySQL/virtual-mysql-server Any options to change to virtual-mysql-client package as dependance for kamailio-mysql-modules? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/376

3 3

git:4.3:801d9cc9: dmq_usrloc: fixed handling of dmq_ul.get_urecord_by_ruid() response
by Daniel-Constantin Mierla 27 Oct '15

27 Oct '15

Module: kamailio Branch: 4.3 Commit: 801d9cc900a7cdd954733012540299c7ca288007 URL: https://github.com/kamailio/kamailio/commit/801d9cc900a7cdd954733012540299c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-27T11:44:06+01:00 dmq_usrloc: fixed handling of dmq_ul.get_urecord_by_ruid() response - manual backport of master branch commits: 13cde2b and eeb3c16 (GH#373) --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/801d9cc900a7cdd954733012540299c… Patch: https://github.com/kamailio/kamailio/commit/801d9cc900a7cdd954733012540299c… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 40e89d3..c3c7e89 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -197,14 +197,14 @@ void usrloc_get_all_ucontact(dmq_node_t* node) memcpy( &aorhash, cp, sizeof(aorhash)); cp = (char*)cp + sizeof(aorhash); + r = 0; + ptr = 0; res = dmq_ul.get_urecord_by_ruid(_d, aorhash, &ruid, &r, &ptr); - aor = r->aor; - if (res > 0) { - LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); - dmq_ul.release_urecord(r); - dmq_ul.unlock_udomain(_d, &aor); + if (res < 0) { + LM_DBG("'%.*s' Not found in usrloc\n", ruid.len, ZSW(ruid.s)); continue; } + aor = r->aor; LM_DBG("- AoR: %.*s AoRhash=%d Flags=%d\n", aor.len, aor.s, aorhash, flags); while (ptr) {

1 0

[kamailio] kamailio 4.3.3 crash during usrloc save location and DMQ (#373)
by vinzens 27 Oct '15

27 Oct '15

We use the kamailio with dmq. One Kamailio gets an SIP Register and process it and forwards it though DMQ to another kamailio. here it should be saved in location as well. During saving this location the kamailio crashes. For me (not an dev) it seems to crash during getting the length of the AOR. This is not happening every time while kamailio gets an DMQ register but we can reproduce it very easy. (at least this is the line pointing to referred in the backtrace) the SIP DMQ Message looks like Oct 20 14:44:53 messi /usr/sbin/kamailio[15059]: NOTICE: <script>: Got KDMQ Message, handle it.. KDMQ sip:usrloc@217.116.120.39:5060 SIP/2.0 Via: SIP/2.0/UDP 172.20.21.3;branch=z9hG4bK7031.da526d01000000000000000000000000.0 To: <sip:usrloc@217.116.120.39:5060> From: <sip:usrloc@172.20.21.3:5060>;tag=c67e1a50505355c50500c05660eca619-6820 CSeq: 10 KDMQ Call-ID: 77bf92d7284e3548-25608(a)172.20.21.3 Content-Length: 430 Max-Forwards: 0 Content-Type: application/json {"action":2,"aor":"1016811e7(a)sipgate.de","ruid":"uloc-562103eb-6411-a4a1","c":"sip:1016811e7@XX.XXX.XXX.XX:3072;line=2u4rbxb1","received":"","path":"<sip:XXX.XXX.XXX.XXX;lr>","callid":"3134343130393735323137323138-pbswhv8xostq","user_agent":"snom870/8.7.5.13","instance":"<urn:uuid:f3495943-cd1f-4de0-8d9c-000413413E79>","expires":10,"cseq":28786,"flags":0,"cflags":0,"q":1000,"last_modified":1445345060,"methods":6111,"reg_id":1} we managed to get an core dump and it says: GNU gdb (GDB) 7.4.1-debian Copyright (C) 2012 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/.build-id/b9/e50c34b5b5de6da1e2473514911ce96a8a094d.debug...done. done. [New LWP 15069] warning: Can't read pathname for load map: Input/output error. [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -f /etc/kamailio/kamailio_sip_location_proxy.cfg -P /var/run'. Program terminated with signal 11, Segmentation fault. #0 0x00007f573d8c7770 in db_load_urecord_by_ruid (_c=0x7f573f616278, _d=_d@entry=0x7f5736ef5498, _ruid=_ruid@entry=0x7f573ae6d200) at udomain.c:822 822 udomain.c: No such file or directory. (gdb) bt #0 0x00007f573d8c7770 in db_load_urecord_by_ruid (_c=0x7f573f616278, _d=_d@entry=0x7f5736ef5498, _ruid=_ruid@entry=0x7f573ae6d200) at udomain.c:822 #1 0x00007f573d8cd0d5 in get_urecord_by_ruid (_d=0x7f5736ef5498, _aorhash=2416148423, _ruid=_ruid@entry=0x7f573ae6d200, _r=_r@entry=0x7ffc358958a0, _c=_c@entry=0x7ffc358958b0) at udomain.c:1177 #2 0x00007f573ac6720a in delete_contact (aor=..., ci=<optimized out>) at usrloc_sync.c:109 #3 usrloc_dmq_handle_msg (msg=<optimized out>, resp=0x7ffc35895a00, node=0x7f5736f9e6d8) at usrloc_sync.c:394 #4 0x00007f573ae8b10b in worker_loop (id=id@entry=1) at worker.c:105 #5 0x00007f573ae721e8 in child_init (rank=<optimized out>) at dmq.c:293 #6 child_init (rank=<optimized out>) at dmq.c:279 #7 0x000000000056d4f8 in init_mod_child (m=0x7f573f5fdf20, rank=rank@entry=0) at sr_module.c:915 #8 0x000000000056d442 in init_mod_child (m=0x7f573f5fe418, rank=rank@entry=0) at sr_module.c:912 #9 0x000000000056e91b in init_child (rank=rank@entry=0) at sr_module.c:941 #10 0x00000000004aa78c in main_loop () at main.c:1650 #11 0x0000000000427292 in main (argc=<optimized out>, argv=<optimized out>) at main.c:2547 (gdb) bt full #0 0x00007f573d8c7770 in db_load_urecord_by_ruid (_c=0x7f573f616278, _d=_d@entry=0x7f5736ef5498, _ruid=_ruid@entry=0x7f573ae6d200) at udomain.c:822 ci = 0x7f573daeaf00 columns = {0x7f573daeac30, 0x7f573daeac20, 0x7f573daeac10, 0x7f573daeac00, 0x7f573daeabf0, 0x7f573daeabe0, 0x7f573daeabd0, 0x7f573daeabc0, 0x7f573daeabb0, 0x7f573daeaba0, 0x7f573daeab90, 0x7f573daeab80, 0x7f573daeab50, 0x7f573daeac60, 0x7f573daeab70, 0x7f573daeab60, 0x7f573daeab40, 0x7f573daeab30, 0x7f573daeab20, 0x7f573daeac50, 0x7f573daeac40} keys = {0x7f573daeac60} order = <optimized out> vals = {{type = DB1_STR, nul = 0, free = 2, val = {int_val = 40974704, ll_val = 40974704, double_val = 2.0244193594913908e-316, time_val = 40974704, string_val = 0x2713970 "uloc-562103eb-6411-a4a1", str_val = {s = 0x2713970 "uloc-562103eb-6411-a4a1", len = 23}, blob_val = {s = 0x2713970 "uloc-562103eb-6411-a4a1", len = 23}, bitmap_val = 40974704}}} res = 0x7f573f6164e8 row = <optimized out> contact = {s = 0x272edd0 "sip:1016811e7@XX.XXX.XXX.XX:3072;line=e52c50xi", len = 46} aor = {s = 0x37fc50 <Address 0x37fc50 out of bounds>, len = 898193808} aorbuf = '\000' <repeats 511 times> domain = <optimized out> r = 0x0 c = <optimized out> __FUNCTION__ = "db_load_urecord_by_ruid" #1 0x00007f573d8cd0d5 in get_urecord_by_ruid (_d=0x7f5736ef5498, _aorhash=2416148423, _ruid=_ruid@entry=0x7f573ae6d200, _r=_r@entry=0x7ffc358958a0, _c=_c@entry=0x7ffc358958b0) at udomain.c:1177 sl = 16327 i = <optimized out> r = <optimized out> c = <optimized out> #2 0x00007f573ac6720a in delete_contact (aor=..., ci=<optimized out>) at usrloc_sync.c:109 c = <optimized out> ci = 0x7f573ae6d200 _d = 0x7f5736ef5498 r = <optimized out> #3 usrloc_dmq_handle_msg (msg=<optimized out>, resp=0x7ffc35895a00, node=0x7f5736f9e6d8) at usrloc_sync.c:394 content_length = <optimized out> body = <optimized out> jdoc = {root = 0x27137b0, flags = 0, buf = { s = 0x7f5736fd6662 "{\"action\":2,\"aor\":\"1016811e7(a)sipgate.de\",\"ruid\":\"uloc-562103eb-6411-a4a1\",\"c\":\"sip:1016811e7@XX.XXX.XXX.XX:3072;line=2u4rbxb1\",\"received\":\"\",\"path\":\"<sip:217.116.120.247;lr>\",\"callid\":\"313434313039373"..., len = 438}, malloc_fn = 0x7f573fa1ba00 <malloc>, free_fn = 0x7f573fa1b920 <free>} it = <optimized out> ci = {ruid = {s = 0x2713970 "uloc-562103eb-6411-a4a1", len = 23}, c = 0x7ffc358958d0, received = {s = 0x2719190 "", len = 0}, path = 0x7ffc358958e0, expires = 1445345660, q = 1000, callid = 0x7ffc358958f0, cseq = 28786, flags = 2, cflags = 0, user_agent = 0x7ffc35895900, sock = 0x0, methods = 6111, instance = { s = 0x27193d0 "<urn:uuid:f3495943-cd1f-4de0-8d9c-000413413E79>", len = 47}, reg_id = 1, server_id = 0, tcpconn_id = -1, keepalive = 0, xavp = 0x0, last_modified = 1445345060} action = <optimized out> expires = <optimized out> cseq = <optimized out> flags = <optimized out> cflags = <optimized out> q = <optimized out> last_modified = <optimized out> methods = <optimized out> reg_id = <optimized out> aor = {s = <optimized out>, len = 20} ruid = <optimized out> c = {s = 0x27190e0 "sip:1016811e7@IPADDRESS:3072;line=2u4rbxb1", len = 46} received = <optimized out> path = {s = 0x2713a00 "<sip:IPADDRESS;lr>", len = 24} callid = {s = 0x2719290 "3134343130393735323137323138-pbswhv8xostq", len = 41} user_agent = {s = 0x2719340 "snom870/8.7.5.13", len = 16} instance = <optimized out> __FUNCTION__ = "usrloc_dmq_handle_msg" #4 0x00007f573ae8b10b in worker_loop (id=id@entry=1) at worker.c:105 worker = 0x7f5736f957f0 current_job = 0x7f5736fa0a00 peer_response = {resp_code = 0, content_type = {s = 0x0, len = 0}, reason = {s = 0x0, len = 0}, body = {s = 0x0, len = 0}} ret_value = <optimized out> not_parsed = 0 dmq_node = 0x7f5736f9e6d8 __FUNCTION__ = "worker_loop" #5 0x00007f573ae721e8 in child_init (rank=<optimized out>) at dmq.c:293 ---Type <return> to continue, or q <return> to quit--- i = <optimized out> newpid = <optimized out> #6 child_init (rank=<optimized out>) at dmq.c:279 No locals. #7 0x000000000056d4f8 in init_mod_child (m=0x7f573f5fdf20, rank=rank@entry=0) at sr_module.c:915 __FUNCTION__ = "init_mod_child" #8 0x000000000056d442 in init_mod_child (m=0x7f573f5fe418, rank=rank@entry=0) at sr_module.c:912 __FUNCTION__ = "init_mod_child" #9 0x000000000056e91b in init_child (rank=rank@entry=0) at sr_module.c:941 No locals. #10 0x00000000004aa78c in main_loop () at main.c:1650 i = <optimized out> pid = <optimized out> si = <optimized out> si_desc = "udp receiver child=3 sock=217.116.120.39:5060\000\000\000\020\213k\000\000\000\000\000\252\311k\000\000\000\000\000\003\000\000\000\000\000\000\000(E\311\066W\177\000\000\001\000\000\000\000\000\000\000\000P:\251\313M\a\342\004\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\250\222\241\000\000\000\000\000\240\222\241\000\000\000\000" nrprocs = <optimized out> __FUNCTION__ = "main_loop" #11 0x0000000000427292 in main (argc=<optimized out>, argv=<optimized out>) at main.c:2547 cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0x7ffc35896efe "" tmp_len = 0 port = 1 proto = 1 options = 0x6baf50 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" ret = -1 seed = 1198920520 rfd = 4 debug_save = <optimized out> debug_flag = <optimized out> dont_fork_cnt = <optimized out> n_lst = 0x0 p = <optimized out> st = {st_dev = 14, st_ino = 30859, st_nlink = 2, st_mode = 16877, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = { tv_sec = 1444903317, tv_nsec = 438957686}, st_mtim = {tv_sec = 1445345013, tv_nsec = 829833044}, st_ctim = {tv_sec = 1445345020, tv_nsec = 417829857}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/373

3 16

git:master:fc0e6275: tm: added braces around initializer of cancel reason map
by Daniel-Constantin Mierla 27 Oct '15

27 Oct '15

Module: kamailio Branch: master Commit: fc0e6275fa61f72c1fed0f69393f609cc682888c URL: https://github.com/kamailio/kamailio/commit/fc0e6275fa61f72c1fed0f69393f609… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-27T11:26:23+01:00 tm: added braces around initializer of cancel reason map - reported by Yacin Caner --- Modified: modules/tm/t_cancel.c --- Diff: https://github.com/kamailio/kamailio/commit/fc0e6275fa61f72c1fed0f69393f609… Patch: https://github.com/kamailio/kamailio/commit/fc0e6275fa61f72c1fed0f69393f609… --- diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index ce18354..9db7abe 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -43,8 +43,8 @@ typedef struct cancel_reason_map { } cancel_reason_map_t; static cancel_reason_map_t _cancel_reason_map[] = { - 200, str_init("Answered elsewhere"), - 0, {0, 0} + { 200, str_init("Answered elsewhere") }, + { 0, {0, 0} } }; /**

1 0

git:master:eeb3c160: dmq_usrloc: access usrloc result record after handling return code
by Daniel-Constantin Mierla 26 Oct '15

26 Oct '15

Module: kamailio Branch: master Commit: eeb3c160ecddd65aa76997ed98e9b1be8e08ab20 URL: https://github.com/kamailio/kamailio/commit/eeb3c160ecddd65aa76997ed98e9b1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-26T21:47:46+01:00 dmq_usrloc: access usrloc result record after handling return code - reported in GH#373 --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/eeb3c160ecddd65aa76997ed98e9b1b… Patch: https://github.com/kamailio/kamailio/commit/eeb3c160ecddd65aa76997ed98e9b1b… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index 4d53d0c..2246c36 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -200,11 +200,11 @@ void usrloc_get_all_ucontact(dmq_node_t* node) r = 0; ptr = 0; res = dmq_ul.get_urecord_by_ruid(_d, aorhash, &ruid, &r, &ptr); - aor = r->aor; if (res < 0) { - LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s)); + LM_DBG("'%.*s' Not found in usrloc\n", ruid.len, ZSW(ruid.s)); continue; } + aor = r->aor; LM_DBG("- AoR: %.*s AoRhash=%d Flags=%d\n", aor.len, aor.s, aorhash, flags); while (ptr) {

1 0

git:master:4505878d: acc_radius : added doc for rad_time_mode
by Yasin CANER 26 Oct '15

26 Oct '15

Module: kamailio Branch: master Commit: 4505878d8be26e2e5497cbba581a2a912a824912 URL: https://github.com/kamailio/kamailio/commit/4505878d8be26e2e5497cbba581a2a9… Author: Yasin CANER <yasin.caner(a)netgsm.com.tr> Committer: Yasin CANER <yasin.caner(a)netgsm.com.tr> Date: 2015-10-26T16:16:12+02:00 acc_radius : added doc for rad_time_mode added information about new mod paramaeter rad_time_mode --- Modified: modules/acc_radius/doc/acc_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4505878d8be26e2e5497cbba581a2a9… Patch: https://github.com/kamailio/kamailio/commit/4505878d8be26e2e5497cbba581a2a9… --- diff --git a/modules/acc_radius/doc/acc_radius_admin.xml b/modules/acc_radius/doc/acc_radius_admin.xml index 17ebd2c..f439457 100644 --- a/modules/acc_radius/doc/acc_radius_admin.xml +++ b/modules/acc_radius/doc/acc_radius_admin.xml @@ -166,6 +166,39 @@ modparam("acc_radius", "radius_extra", "via=$hdr(Via[*]); email=$avp(s:email)") </programlisting> </example> </section> + <section> + <title><varname>rad_time_mode</varname>(integer)</title> + <para> + Radius Event-Timestamp for accounting. + </para> + <para> + Values can be: + </para> + <itemizedlist> + <listitem> + <para><emphasis>0</emphasis> - (default), format is only unix + timestamp for Event-Timestamp (For example: 1445590624)</para> + </listitem> + <listitem> + <para><emphasis>1</emphasis> - format is unix timestamp with microseconds + in Addition, it needs to change Event-Timestamp attribute type in dictionary to string + both radius server and client + (For example: 1445590624.377372) </para> + </listitem> + </itemizedlist> + + <para> + Default value is 0 (Unix timestamp). + </para> + <example> + <title>rad_time_mode example</title> + <programlisting format="linespecific"> +... +modparam("acc_radius", "rad_time_mode", 1) +... +</programlisting> + </example> +</section> </section> <section>

1 0

git:master:13999782: Merge pull request #378 from ycaner06/patch-7
by Daniel-Constantin Mierla 26 Oct '15

26 Oct '15

Module: kamailio Branch: master Commit: 139997826c8c3205504a0c799d7aa98b979e1185 URL: https://github.com/kamailio/kamailio/commit/139997826c8c3205504a0c799d7aa98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-26T21:38:52+01:00 Merge pull request #378 from ycaner06/patch-7 acc_radius : added radius time mode --- Modified: modules/acc_radius/acc_radius_mod.c Modified: modules/acc_radius/doc/acc_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/139997826c8c3205504a0c799d7aa98… Patch: https://github.com/kamailio/kamailio/commit/139997826c8c3205504a0c799d7aa98… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index 5a660d6..3820339 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -74,6 +74,7 @@ static char *radius_config = 0; int radius_flag = -1; int radius_missed_flag = -1; static int service_type = -1; +int rad_time_mode=0; void *rh; /* rad extra variables */ static char *rad_extra_str = 0; @@ -91,11 +92,12 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { - {"radius_config", PARAM_STRING, &radius_config }, + {"radius_config", PARAM_STRING, &radius_config }, {"radius_flag", INT_PARAM, &radius_flag }, {"radius_missed_flag", INT_PARAM, &radius_missed_flag }, {"service_type", INT_PARAM, &service_type }, - {"radius_extra", PARAM_STRING, &rad_extra_str }, + {"radius_extra", PARAM_STRING, &rad_extra_str }, + {"rad_time_mode", INT_PARAM, &rad_time_mode }, {0,0,0} }; @@ -328,6 +330,8 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) int m=0; int o=0; int rc_result=-1; + double tsecmicro; + char smicrosec[18]; send=NULL; @@ -347,9 +351,18 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) av_type = req->REQ_METHOD; /* method */ ADD_RAD_AVPAIR( RA_SIP_METHOD, &av_type, -1); - /* unix time */ - av_type = (uint32_t)inf->env->ts; - ADD_RAD_AVPAIR( RA_TIME_STAMP, &av_type, -1); + // Event Time Stamp with Microseconds + if(rad_time_mode==1){ + gettimeofday(&inf->env->tv, NULL); + tsecmicro=inf->env->tv.tv_sec+((double)inf->env->tv.tv_usec/1000000.0); + //radius client doesn t support double so convert it + sprintf(smicrosec,"%17.6f",tsecmicro); + ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); + }else{ + av_type = (uint32_t)inf->env->ts; + ADD_RAD_AVPAIR(RA_TIME_STAMP, &av_type, -1); + } + /* add extra also */ o = accb.get_extra_attrs(rad_extra, req, inf->varr+attr_cnt, diff --git a/modules/acc_radius/doc/acc_radius_admin.xml b/modules/acc_radius/doc/acc_radius_admin.xml index 17ebd2c..f439457 100644 --- a/modules/acc_radius/doc/acc_radius_admin.xml +++ b/modules/acc_radius/doc/acc_radius_admin.xml @@ -166,6 +166,39 @@ modparam("acc_radius", "radius_extra", "via=$hdr(Via[*]); email=$avp(s:email)") </programlisting> </example> </section> + <section> + <title><varname>rad_time_mode</varname>(integer)</title> + <para> + Radius Event-Timestamp for accounting. + </para> + <para> + Values can be: + </para> + <itemizedlist> + <listitem> + <para><emphasis>0</emphasis> - (default), format is only unix + timestamp for Event-Timestamp (For example: 1445590624)</para> + </listitem> + <listitem> + <para><emphasis>1</emphasis> - format is unix timestamp with microseconds + in Addition, it needs to change Event-Timestamp attribute type in dictionary to string + both radius server and client + (For example: 1445590624.377372) </para> + </listitem> + </itemizedlist> + + <para> + Default value is 0 (Unix timestamp). + </para> + <example> + <title>rad_time_mode example</title> + <programlisting format="linespecific"> +... +modparam("acc_radius", "rad_time_mode", 1) +... +</programlisting> + </example> +</section> </section> <section>

1 0

git:master:7d2e763b: acc_radius : fixed representation
by Yasin CANER 26 Oct '15

26 Oct '15

Module: kamailio Branch: master Commit: 7d2e763b2859ef614040c7b28c3aceb132eb95d3 URL: https://github.com/kamailio/kamailio/commit/7d2e763b2859ef614040c7b28c3aceb… Author: Yasin CANER <yasin.caner(a)netgsm.com.tr> Committer: Yasin CANER <yasin.caner(a)netgsm.com.tr> Date: 2015-10-26T15:49:24+02:00 acc_radius : fixed representation fixed exponential representation in converting --- Modified: modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7d2e763b2859ef614040c7b28c3aceb… Patch: https://github.com/kamailio/kamailio/commit/7d2e763b2859ef614040c7b28c3aceb… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index e3be7df..3820339 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -356,7 +356,7 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) gettimeofday(&inf->env->tv, NULL); tsecmicro=inf->env->tv.tv_sec+((double)inf->env->tv.tv_usec/1000000.0); //radius client doesn t support double so convert it - sprintf(smicrosec,"%f",tsecmicro); + sprintf(smicrosec,"%17.6f",tsecmicro); ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); }else{ av_type = (uint32_t)inf->env->ts;

1 0

git:master:750248ca: acc_radius : added radius time mode
by Yasin CANER 26 Oct '15

26 Oct '15

Module: kamailio Branch: master Commit: 750248ca22f0b8f03373cae2a56d56c3e0ae6d81 URL: https://github.com/kamailio/kamailio/commit/750248ca22f0b8f03373cae2a56d56c… Author: Yasin CANER <yasin.caner(a)netgsm.com.tr> Committer: Yasin CANER <yasin.caner(a)netgsm.com.tr> Date: 2015-10-23T11:12:43+03:00 acc_radius : added radius time mode added radius time mode for new event-timestamp . Format is seconds.microseconds --- Modified: modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/750248ca22f0b8f03373cae2a56d56c… Patch: https://github.com/kamailio/kamailio/commit/750248ca22f0b8f03373cae2a56d56c… --- diff --git a/modules/acc_radius/acc_radius_mod.c b/modules/acc_radius/acc_radius_mod.c index 5a660d6..e3be7df 100644 --- a/modules/acc_radius/acc_radius_mod.c +++ b/modules/acc_radius/acc_radius_mod.c @@ -74,6 +74,7 @@ static char *radius_config = 0; int radius_flag = -1; int radius_missed_flag = -1; static int service_type = -1; +int rad_time_mode=0; void *rh; /* rad extra variables */ static char *rad_extra_str = 0; @@ -91,11 +92,12 @@ static cmd_export_t cmds[] = { static param_export_t params[] = { - {"radius_config", PARAM_STRING, &radius_config }, + {"radius_config", PARAM_STRING, &radius_config }, {"radius_flag", INT_PARAM, &radius_flag }, {"radius_missed_flag", INT_PARAM, &radius_missed_flag }, {"service_type", INT_PARAM, &service_type }, - {"radius_extra", PARAM_STRING, &rad_extra_str }, + {"radius_extra", PARAM_STRING, &rad_extra_str }, + {"rad_time_mode", INT_PARAM, &rad_time_mode }, {0,0,0} }; @@ -328,6 +330,8 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) int m=0; int o=0; int rc_result=-1; + double tsecmicro; + char smicrosec[18]; send=NULL; @@ -347,9 +351,18 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) av_type = req->REQ_METHOD; /* method */ ADD_RAD_AVPAIR( RA_SIP_METHOD, &av_type, -1); - /* unix time */ - av_type = (uint32_t)inf->env->ts; - ADD_RAD_AVPAIR( RA_TIME_STAMP, &av_type, -1); + // Event Time Stamp with Microseconds + if(rad_time_mode==1){ + gettimeofday(&inf->env->tv, NULL); + tsecmicro=inf->env->tv.tv_sec+((double)inf->env->tv.tv_usec/1000000.0); + //radius client doesn t support double so convert it + sprintf(smicrosec,"%f",tsecmicro); + ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); + }else{ + av_type = (uint32_t)inf->env->ts; + ADD_RAD_AVPAIR(RA_TIME_STAMP, &av_type, -1); + } + /* add extra also */ o = accb.get_extra_attrs(rad_extra, req, inf->varr+attr_cnt,

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015