sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

git:master:666656c2: rtimer: doc - updated examples, enhancements for use with kemi
by Daniel-Constantin Mierla 29 Oct '17

29 Oct '17

Module: kamailio Branch: master Commit: 666656c27b8d01d490523f0a7e15de57ff42bad5 URL: https://github.com/kamailio/kamailio/commit/666656c27b8d01d490523f0a7e15de5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-29T09:13:31+01:00 rtimer: doc - updated examples, enhancements for use with kemi --- Modified: src/modules/rtimer/doc/rtimer_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/666656c27b8d01d490523f0a7e15de5… Patch: https://github.com/kamailio/kamailio/commit/666656c27b8d01d490523f0a7e15de5… --- diff --git a/src/modules/rtimer/doc/rtimer_admin.xml b/src/modules/rtimer/doc/rtimer_admin.xml index c70a4e5b23..92422c5f3e 100644 --- a/src/modules/rtimer/doc/rtimer_admin.xml +++ b/src/modules/rtimer/doc/rtimer_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -136,7 +136,10 @@ modparam("rtimer", "timer", "name=ta;interval=100000u;mode=1;") </listitem> <listitem> <para> - <emphasis>route</emphasis> - the index of the route to be executed. + <emphasis>route</emphasis> - the name of the route block to be executed, + or the name of the function from kemi script. The kemi function + receives a string parameter with the value being the name of the + module. </para> </listitem> </itemizedlist> @@ -150,9 +153,9 @@ modparam("rtimer", "timer", "name=ta;interval=100000u;mode=1;") <programlisting format="linespecific"> ... modparam("rtimer", "timer", "name=ta;interval=10;mode=1;") -modparam("rtimer", "exec", "timer=ta;route=8") +modparam("rtimer", "exec", "timer=ta;route=ONTIMER") -route[8] { +route[ONTIMER] { xlog("timer routine: time is $TF\n"); # delete from my sql cache table entries older than 2H sql_query("delete from kamailio_cache where last_updated<$TS-3600"); @@ -160,6 +163,22 @@ route[8] { ... </programlisting> </example> + <example> + <title>Use <varname>exec</varname> parameter with a Kemi engine</title> + <programlisting format="linespecific"> +... +modparam("rtimer", "timer", "name=ta;interval=10;mode=1;") +modparam("rtimer", "exec", "timer=ta;route=ksr_rtimer") +... +-- rtimer event callback function implemented in Lua +function ksr_rtimer(evname) + KSR.info("===== rtimer module triggered event\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section>

1 0

git:master:1b14fdee: rtimer: support for execution of kemi callback functions
by Daniel-Constantin Mierla 29 Oct '17

29 Oct '17

Module: kamailio Branch: master Commit: 1b14fdee7414d84b2c7181958bf29df3256299a7 URL: https://github.com/kamailio/kamailio/commit/1b14fdee7414d84b2c7181958bf29df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-29T09:06:52+01:00 rtimer: support for execution of kemi callback functions --- Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1b14fdee7414d84b2c7181958bf29df… Patch: https://github.com/kamailio/kamailio/commit/1b14fdee7414d84b2c7181958bf29df… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index 41bac5c281..24b32ec329 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -40,6 +40,7 @@ #include "../../core/script_cb.h" #include "../../core/parser/parse_param.h" #include "../../core/fmsg.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -183,6 +184,8 @@ void stm_timer_exec(unsigned int ticks, void *param) stm_timer_t *it; stm_route_t *rt; sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("rtimer"); if(param==NULL) return; @@ -196,7 +199,15 @@ void stm_timer_exec(unsigned int ticks, void *param) if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)==0 ) continue; /* drop the request */ set_route_type(REQUEST_ROUTE); - run_top_route(main_rt.rlist[rt->route], fmsg, 0); + keng = sr_kemi_eng_get(); + if(keng==NULL) { + run_top_route(main_rt.rlist[rt->route], fmsg, 0); + } else { + if(keng->froute(fmsg, EVENT_ROUTE, &rt->route_name, &evname)<0) { + LM_ERR("error running event route kemi callback [%.*s]\n", + rt->route_name.len, rt->route_name.s); + } + } exec_post_script_cb(fmsg, REQUEST_CB_TYPE); ksr_msg_env_reset(); }

1 0

git:master:8a0de1b9: rtimer: save the route name in the internal structure
by Daniel-Constantin Mierla 29 Oct '17

29 Oct '17

Module: kamailio Branch: master Commit: 8a0de1b9f29b0bcd3c13166911c24c01ef9c72ba URL: https://github.com/kamailio/kamailio/commit/8a0de1b9f29b0bcd3c13166911c24c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-29T09:02:46+01:00 rtimer: save the route name in the internal structure --- Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8a0de1b9f29b0bcd3c13166911c24c0… Patch: https://github.com/kamailio/kamailio/commit/8a0de1b9f29b0bcd3c13166911c24c0… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index aa509b6183..41bac5c281 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -44,9 +44,13 @@ MODULE_VERSION +#define RTIMER_ROUTE_NAME_SIZE 64 + typedef struct _stm_route { str timer; unsigned int route; + char route_name_buf[RTIMER_ROUTE_NAME_SIZE]; + str route_name; struct _stm_route *next; } stm_route_t; @@ -336,12 +340,20 @@ int stm_e_param(modparam_t type, void *val) } c = s.s[s.len]; s.s[s.len] = '\0'; + if(s.len>=RTIMER_ROUTE_NAME_SIZE-1) { + LM_ERR("route block name is too long [%.*s] (%d)\n", s.len, s.s, s.len); + free_params(params_list); + return -1; + } tmp.route = route_get(&main_rt, s.s); + memcpy(tmp.route_name_buf, s.s, s.len); + tmp.route_name_buf[s.len] = '\0'; + tmp.route_name.s = tmp.route_name_buf; + tmp.route_name.len = s.len; s.s[s.len] = c; if(tmp.route == -1) { - LM_ERR("invalid route: %.*s\n", - s.len, s.s); + LM_ERR("invalid route: %.*s\n", s.len, s.s); free_params(params_list); return -1; } @@ -354,6 +366,7 @@ int stm_e_param(modparam_t type, void *val) return -1; } memcpy(rt, &tmp, sizeof(stm_route_t)); + rt->route_name.s = rt->route_name_buf; rt->next = nt->rt; nt->rt = rt; free_params(params_list);

1 0

git:master:37cf1433: timer: revert to use of route_get()
by Daniel-Constantin Mierla 29 Oct '17

29 Oct '17

Module: kamailio Branch: master Commit: 37cf1433af55a8744dfccee873699e17b06b8ac4 URL: https://github.com/kamailio/kamailio/commit/37cf1433af55a8744dfccee873699e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-29T08:57:33+01:00 timer: revert to use of route_get() - route block is searched prior of being declared due to modparam callback --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/37cf1433af55a8744dfccee873699e1… Patch: https://github.com/kamailio/kamailio/commit/37cf1433af55a8744dfccee873699e1… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 4643db95fa..f6a739a2be 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -335,7 +335,6 @@ static int declare_timer(modparam_t type, char* param) char *p, *save_p, c, *timer_name; str s; str route_name = STR_NULL; - sr_kemi_eng_t *keng = NULL; timer_name = 0; save_p = p = param; @@ -359,16 +358,10 @@ static int declare_timer(modparam_t type, char* param) } c = s.s[s.len]; s.s[s.len] = '\0'; - keng = sr_kemi_eng_get(); - if(keng==NULL) { - n = route_lookup(&main_rt, s.s); - s.s[s.len] = c; - if (n == -1) goto err; - route_no = n; - } else { - s.s[s.len] = c; - route_no = -1; - } + n = route_get(&main_rt, s.s); + s.s[s.len] = c; + if (n == -1) goto err; + route_no = n; route_name = s; save_p = p;

1 0

[kamailio/kamailio] Kamailio 4.4.6 crashes with [pass_fd.c:277]: receive_fd(): EOF on 30 (#1208)
by Jonas Swiatek 28 Oct '17

28 Oct '17

### Description ``` Kamailio crashes out with message: CRITICAL: <core> [pass_fd.c:277]: receive_fd(): EOF on 30 ``` ### Troubleshooting #### Reproduction Happens sporadicly. Some times 6 times in a day. Some times it won't happen for a week. But on average it probably happens once per day. #### Debugging Data ``` Reading symbols from /usr/local/sbin/kamailio...done. [New LWP 29579] [New LWP 9469] [New LWP 29581] Missing separate debuginfo for /usr/lib64/libpq.so.5 Try: yum --enablerepo='*debug*' install /usr/lib/debug/.build-id/00/595f0be1374285c79ea1d4cdcee72682108fab.debug [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Missing separate debuginfo for /usr/lib64/libstdc++.so.6 Try: yum --enablerepo='*debug*' install /usr/lib/debug/.build-id/43/4c339faa62ca4e59eb71572a60967fe54a69ad.debug Missing separate debuginfo for /lib64/libgcc_s.so.1 Try: yum --enablerepo='*debug*' install /usr/lib/debug/.build-id/3f/d5f89de59e124ab1419a0bd16775b4096e84fd.debug Core was generated by `/usr/local/sbin/kamailio -P /var/run/kamailio.pid -m 256 -M 8 -u kamailio -g ka'. Program terminated with signal 11, Segmentation fault. #0 0x00007fc9a9350521 in _int_malloc () from /lib64/libc.so.6 Missing separate debuginfos, use: debuginfo-install cyrus-sasl-lib-2.1.23-13.16.amzn1.x86_64 glibc-2.17-106.168.amzn1.x86_64 keyutils-libs-1.5.8-3.12.amzn1.x86_64 krb5-libs-1.13.2-12.40.amzn1.x86_64 libcom_err-1.42.12-4.40.amzn1.x86_64 libcurl-7.47.1-9.68.amzn1.x86_64 libevent-2.0.21-4.19.amzn1.x86_64 libicu-50.1.2-11.12.amzn1.x86_64 libidn-1.18-2.8.amzn1.x86_64 libpsl-0.6.2-1.2.amzn1.x86_64 libselinux-2.1.10-3.22.amzn1.x86_64 libssh2-1.4.2-2.13.amzn1.x86_64 libxml2-2.9.1-6.3.49.amzn1.x86_64 nspr-4.11.0-1.37.amzn1.x86_64 nss-3.21.3-2.77.amzn1.x86_64 nss-softokn-freebl-3.16.2.3-14.4.39.amzn1.x86_64 nss-util-3.21.3-1.1.51.amzn1.x86_64 openldap-2.4.40-12.29.amzn1.x86_64 openssl-1.0.1k-15.96.amzn1.x86_64 xz-libs-5.1.2-12alpha.12.amzn1.x86_64 zlib-1.2.8-7.18.amzn1.x86_64 (gdb) bt full #0 0x00007fc9a9350521 in _int_malloc () from /lib64/libc.so.6 No symbol table info available. #1 0x00007fc9a935226c in malloc () from /lib64/libc.so.6 No symbol table info available. #2 0x00007fc9a9ac45d5 in _dl_scope_free () from /lib64/ld-linux-x86-64.so.2 No symbol table info available. #3 0x00007fc9a9abf691 in _dl_map_object_deps () from /lib64/ld-linux-x86-64.so.2 No symbol table info available. #4 0x00007fc9a9ac589b in dl_open_worker () from /lib64/ld-linux-x86-64.so.2 No symbol table info available. #5 0x00007fc9a9ac11b4 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2 No symbol table info available. #6 0x00007fc9a9ac51ab in _dl_open () from /lib64/ld-linux-x86-64.so.2 No symbol table info available. #7 0x00007fc9a94034d2 in do_dlopen () from /lib64/libc.so.6 No symbol table info available. #8 0x00007fc9a9ac11b4 in _dl_catch_error () from /lib64/ld-linux-x86-64.so.2 No symbol table info available. #9 0x00007fc9a9403592 in __libc_dlopen_mode () from /lib64/libc.so.6 No symbol table info available. #10 0x00007fc9a93dcac5 in init () from /lib64/libc.so.6 No symbol table info available. #11 0x00007fc9a6c1bbb0 in pthread_once () from /lib64/libpthread.so.0 No symbol table info available. #12 0x00007fc9a93dcbdc in backtrace () from /lib64/libc.so.6 No symbol table info available. #13 0x00007fc9a9347344 in __libc_message () from /lib64/libc.so.6 No symbol table info available. #14 0x00007fc9a934f053 in _int_free () from /lib64/libc.so.6 No symbol table info available. #15 0x00007fc9a933cff5 in fclose@@GLIBC_2.2.5 () from /lib64/libc.so.6 No symbol table info available. #16 0x00007fc9a88c29bf in _nss_files_gethostbyname4_r () from /lib64/libnss_files.so.2 No symbol table info available. #17 0x00007fc9a93aebb8 in gaih_inet () from /lib64/libc.so.6 No symbol table info available. #18 0x00007fc9a93b227d in getaddrinfo () from /lib64/libc.so.6 No symbol table info available. #19 0x00007fc99f7c86e4 in ?? () from /usr/lib64/libcurl.so.4 No symbol table info available. #20 0x00007fc99f7d2efa in ?? () from /usr/lib64/libcurl.so.4 No symbol table info available. #21 0x00007fc99f7d099b in ?? () from /usr/lib64/libcurl.so.4 No symbol table info available. #22 0x00007fc9a6c16dc5 in start_thread () from /lib64/libpthread.so.0 No symbol table info available. #23 0x00007fc9a93c8c9d in clone () from /lib64/libc.so.6 No symbol table info available. (gdb) info locals No symbol table info available. (gdb) list 1834 int proto; 1835 char *options; 1836 int ret; 1837 unsigned int seed; 1838 int rfd; 1839 int debug_save, debug_flag; 1840 int dont_fork_cnt; 1841 struct name_lst* n_lst; 1842 char *p; 1843 struct stat st = {0}; (gdb) ``` #### Log Messages ``` Aug 7 22:43:30 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: <core> [receive.c:173]: receive_msg(): core parsing of SIP message failed (67.191.157.42:5060/1) Aug 7 22:43:31 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event as-feature-event Aug 7 22:43:32 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:43:32 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:43:32 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event missed-call-summary Aug 7 22:43:36 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:43:36 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:43:37 ip-172-31-46-236 /usr/local/sbin/kamailio[9450]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event as-feature-event Aug 7 22:43:38 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event as-feature-event Aug 7 22:43:40 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:43:40 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:43:44 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:43:44 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:43:47 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: ERROR: <core> [receive.c:173]: receive_msg(): core parsing of SIP message failed (67.191.157.42:5060/1) Aug 7 22:43:48 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:43:48 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:43:50 ip-172-31-46-236 /usr/local/sbin/kamailio[9450]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event call-info Aug 7 22:43:52 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event as-feature-event Aug 7 22:43:52 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:43:52 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:43:52 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event as-feature-event Aug 7 22:43:52 ip-172-31-46-236 /usr/local/sbin/kamailio[9450]: NOTICE: presence [subscribe.c:1291]: handle_subscribe(): Unsupported presence event missed-call-summary Aug 7 22:43:56 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:43:56 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:43:57 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: <core> [receive.c:173]: receive_msg(): core parsing of SIP message failed (67.191.157.42:5060/1) Aug 7 22:44:00 ip-172-31-46-236 /usr/local/sbin/kamailio[9450]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:44:00 ip-172-31-46-236 /usr/local/sbin/kamailio[9450]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:44:00 ip-172-31-46-236 /usr/local/sbin/kamailio[9450]: ERROR: <core> [receive.c:173]: receive_msg(): core parsing of SIP message failed (67.191.157.42:5060/1) Aug 7 22:44:09 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:44:09 ip-172-31-46-236 /usr/local/sbin/kamailio[9449]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:44:10 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:44:10 ip-172-31-46-236 /usr/local/sbin/kamailio[9452]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:44:11 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: ERROR: maxfwd [mf_funcs.c:62]: is_maxfwd_present(): parsing MAX_FORWARD header failed! Aug 7 22:44:11 ip-172-31-46-236 /usr/local/sbin/kamailio[9451]: ERROR: <core> [msg_translator.c:2330]: build_res_buf_from_sip_req(): alas, parse_headers failed Aug 7 22:44:11 ip-172-31-46-236 /usr/local/sbin/kamailio[9477]: CRITICAL: <core> [pass_fd.c:277]: receive_fd(): EOF on 30 ``` #### SIP Traffic N/A ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.6 (x86_64/linux) 4d49b3 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 4d49b3 compiled on 11:39:53 Jul 29 2017 with gcc 4.8.3 ``` * **Operating System**:  ``` Linux ip-172-31-46-236 4.4.41-36.55.amzn1.x86_64 #1 SMP Wed Jan 18 01:03:26 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux It's Amazons Linux Distribution. I believe it's CentOS based. ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1208

5 30

git:master:62827f1d: modules: readme files regenerated - timer ... [skip ci]
by Kamailio Dev 28 Oct '17

28 Oct '17

Module: kamailio Branch: master Commit: 62827f1d883aa0cdd6ba6807958629b9a4f65d06 URL: https://github.com/kamailio/kamailio/commit/62827f1d883aa0cdd6ba6807958629b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-28T15:16:53+02:00 modules: readme files regenerated - timer ... [skip ci] --- Modified: src/modules/timer/README --- Diff: https://github.com/kamailio/kamailio/commit/62827f1d883aa0cdd6ba6807958629b… Patch: https://github.com/kamailio/kamailio/commit/62827f1d883aa0cdd6ba6807958629b… --- diff --git a/src/modules/timer/README b/src/modules/timer/README index bc20dd0953..85004102e5 100644 --- a/src/modules/timer/README +++ b/src/modules/timer/README @@ -40,8 +40,9 @@ Tomas Mandys 1.2. timer_enable usage 1.3. timer.timer.timer_id.enabled usage 1.4. timer.executed usage - 1.5. timer common example - 1.6. Using timer module for testing a functionality + 1.5. Common example using timer module + 1.6. Using timer module with kemi + 1.7. Using timer module for testing a functionality Chapter 1. Admin Guide @@ -112,8 +113,11 @@ Chapter 1. Admin Guide The format is: declare_timer = declare_timer_syntax - * timer_id is timer identifier, - * route is handler to be called when timer is triggered, + * timer_id is timer identifier. + * route is handler to be called when timer is triggered. It has to be + a route block name when native scripting is used, or Kemi function + name. The Kemi function name receives one string parameter (for now + it has a static value, respectively the module name). * interval is timer interval in milliseconds, * slow_fast determines if handler will be hooked in slow or fast timer queue, fast timer handler returns as quickly as possible, @@ -177,7 +181,7 @@ if (@timer.executed != "") { 7. Examples - Example 1.5. timer common example + Example 1.5. Common example using timer module ... loadmodule "modules/xprint/xprint.so" loadmodule "modules/timer/timer.so" @@ -201,7 +205,22 @@ route["ONTIMER2"] { } ... - Example 1.6. Using timer module for testing a functionality + Example 1.6. Using timer module with kemi +... +loadmodule "timer.so" + +modparam("timer", "declare_timer", "tmr1=ksr_timer,1000"); +... + +... +-- timer event callback function implemented in Lua +function ksr_timer(evname) + KSR.info("===== timer module triggered event\n"); + return 1; +end +... + + Example 1.7. Using timer module for testing a functionality The timer module may be used to test a functionality being developed and not requiring real request. A developer may put tested code in

1 0

git:master:7b8d3389: timer: doc - example using the module via kemi
by Daniel-Constantin Mierla 28 Oct '17

28 Oct '17

Module: kamailio Branch: master Commit: 7b8d3389338e7194201eeff18399822cc2188bc2 URL: https://github.com/kamailio/kamailio/commit/7b8d3389338e7194201eeff18399822… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-28T08:58:26+02:00 timer: doc - example using the module via kemi --- Modified: src/modules/timer/doc/timer.xml --- Diff: https://github.com/kamailio/kamailio/commit/7b8d3389338e7194201eeff18399822… Patch: https://github.com/kamailio/kamailio/commit/7b8d3389338e7194201eeff18399822… --- diff --git a/src/modules/timer/doc/timer.xml b/src/modules/timer/doc/timer.xml index 86ac522061..be86858455 100644 --- a/src/modules/timer/doc/timer.xml +++ b/src/modules/timer/doc/timer.xml @@ -100,11 +100,14 @@ <para> <itemizedlist> <listitem> - <emphasis>timer_id</emphasis> is timer identifier, + <emphasis>timer_id</emphasis> is timer identifier. </listitem> <listitem> <emphasis>route</emphasis> is handler to be called when - timer is triggered, + timer is triggered. It has to be a route block name when native + scripting is used, or Kemi function name. The Kemi function + name receives one string parameter (for now it has a static + value, respectively the module name). </listitem> <listitem> <emphasis>interval</emphasis> is timer interval in milliseconds, @@ -218,7 +221,7 @@ if (@timer.executed != "") { <section id="timer.examples"> <title>Examples</title> <example> - <title>timer common example</title> + <title>Common example using timer module</title> <programlisting> ... loadmodule "modules/xprint/xprint.so" @@ -243,7 +246,25 @@ route["ONTIMER2"] { } ... </programlisting> + </example> + + <example> + <title>Using timer module with kemi</title> + <programlisting> +... +loadmodule "timer.so" +modparam("timer", "declare_timer", "tmr1=ksr_timer,1000"); +... + +... +-- timer event callback function implemented in Lua +function ksr_timer(evname) + KSR.info("===== timer module triggered event\n"); + return 1; +end +... + </programlisting> </example> <example> <title>Using timer module for testing a functionality</title>

1 0

git:master:57011293: timer: allow execution of kemi callbacks on timer
by Daniel-Constantin Mierla 28 Oct '17

28 Oct '17

Module: kamailio Branch: master Commit: 570112934d693029229d9809cd2de98a1ce4cc7a URL: https://github.com/kamailio/kamailio/commit/570112934d693029229d9809cd2de98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-28T08:50:56+02:00 timer: allow execution of kemi callbacks on timer - route block name is used as kemi function name --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/570112934d693029229d9809cd2de98… Patch: https://github.com/kamailio/kamailio/commit/570112934d693029229d9809cd2de98… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index ae3381fb43..4643db95fa 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -48,6 +48,7 @@ #include "../../core/script_cb.h" #include "../../core/dset.h" #include "../../core/usr_avp.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -162,6 +163,8 @@ static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) sip_msg_t* msg; timer_action_t *a; run_act_ctx_t ra_ctx; + sr_kemi_eng_t *keng = NULL; + str evname = str_init("timer"); a = data; if (!a->disable_itself) { @@ -169,14 +172,17 @@ static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) LM_DBG("handler called at %d ticks, timer: '%s', pid:%d\n", ticks, a->timer_name, getpid()); - if (a->route_no >= main_rt.idx) { - LM_BUG("invalid routing table number #%d of %d\n", - a->route_no, main_rt.idx); - goto err2; - } - if (!main_rt.rlist[a->route_no]) { - LM_WARN("route not declared (hash:%d)\n", a->route_no); - goto err2; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + if (a->route_no >= main_rt.idx) { + LM_BUG("invalid routing table number #%d of %d\n", + a->route_no, main_rt.idx); + goto err2; + } + if (!main_rt.rlist[a->route_no]) { + LM_WARN("route not declared (hash:%d)\n", a->route_no); + goto err2; + } } msg=pkg_malloc(sizeof(sip_msg_t)); if (msg==0) { @@ -206,7 +212,13 @@ static ticks_t timer_handler(ticks_t ticks, struct timer_ln* tl, void* data) /* exec the routing script */ timer_executed = a; init_run_actions_ctx(&ra_ctx); - run_actions(&ra_ctx, main_rt.rlist[a->route_no], msg); + if(keng==NULL) { + run_actions(&ra_ctx, main_rt.rlist[a->route_no], msg); + } else { + if(keng->froute(msg, EVENT_ROUTE, &a->route_name, &evname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } timer_executed = 0; /* execute post request-script callbacks */ exec_post_script_cb(msg, REQUEST_CB_TYPE); @@ -323,6 +335,7 @@ static int declare_timer(modparam_t type, char* param) char *p, *save_p, c, *timer_name; str s; str route_name = STR_NULL; + sr_kemi_eng_t *keng = NULL; timer_name = 0; save_p = p = param; @@ -346,10 +359,16 @@ static int declare_timer(modparam_t type, char* param) } c = s.s[s.len]; s.s[s.len] = '\0'; - n = route_lookup(&main_rt, s.s); - s.s[s.len] = c; - if (n == -1) goto err; - route_no = n; + keng = sr_kemi_eng_get(); + if(keng==NULL) { + n = route_lookup(&main_rt, s.s); + s.s[s.len] = c; + if (n == -1) goto err; + route_no = n; + } else { + s.s[s.len] = c; + route_no = -1; + } route_name = s; save_p = p;

1 0

git:master:a69e47ce: timer: removed svn id
by Daniel-Constantin Mierla 28 Oct '17

28 Oct '17

Module: kamailio Branch: master Commit: a69e47ce762108e0399bdfb6784649ebf3a34394 URL: https://github.com/kamailio/kamailio/commit/a69e47ce762108e0399bdfb6784649e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-28T08:36:42+02:00 timer: removed svn id --- Modified: src/modules/rtimer/rtimer_mod.c Modified: src/modules/timer/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a69e47ce762108e0399bdfb6784649e… Patch: https://github.com/kamailio/kamailio/commit/a69e47ce762108e0399bdfb6784649e… --- diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index e067bd6918..aa509b6183 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. diff --git a/src/modules/timer/Makefile b/src/modules/timer/Makefile index f19f1eba85..4d5ee02832 100644 --- a/src/modules/timer/Makefile +++ b/src/modules/timer/Makefile @@ -1,7 +1,7 @@ # -# timer module makefile +# rtimer module makefile +# # -# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs

1 0

git:master:4ccfc2b6: timer: save route name inside timer action structure
by Daniel-Constantin Mierla 28 Oct '17

28 Oct '17

Module: kamailio Branch: master Commit: 4ccfc2b6845cccb04a2814c1d71c18de1e0efdff URL: https://github.com/kamailio/kamailio/commit/4ccfc2b6845cccb04a2814c1d71c18d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T19:19:09+02:00 timer: save route name inside timer action structure --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/4ccfc2b6845cccb04a2814c1d71c18d… Patch: https://github.com/kamailio/kamailio/commit/4ccfc2b6845cccb04a2814c1d71c18d… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 009bc6a95d..ae3381fb43 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -54,8 +54,12 @@ MODULE_VERSION #define MODULE_NAME "timer" +#define TIMER_ROUTE_NAME_SIZE 64 + typedef struct timer_action { char *timer_name; + char route_name_buf[TIMER_ROUTE_NAME_SIZE]; + str route_name; int route_no; int interval; int enable_on_start; @@ -67,10 +71,10 @@ typedef struct timer_action { } timer_action_t; /* list of all operations */ -static struct timer_action* timer_actions = 0; -static struct timer_action* pkg_timer_actions = 0; -static struct receive_info rcv_info; -static struct timer_action* timer_executed = 0; +static timer_action_t* timer_actions = 0; +static timer_action_t* pkg_timer_actions = 0; +static receive_info_t rcv_info; +static timer_action_t* timer_executed = 0; #define eat_spaces(_p) \ while( *(_p)==' ' || *(_p)=='\t' ){\ @@ -318,6 +322,7 @@ static int declare_timer(modparam_t type, char* param) timer_action_t *pa; char *p, *save_p, c, *timer_name; str s; + str route_name = STR_NULL; timer_name = 0; save_p = p = param; @@ -335,12 +340,17 @@ static int declare_timer(modparam_t type, char* param) save_p = p; if (!get_next_part(&p, &s, ',')) goto err; + if(s.len>=TIMER_ROUTE_NAME_SIZE-1) { + LM_ERR("route name is too long [%.*s] (%d)\n", s.len, s.s, s.len); + return E_CFG; + } c = s.s[s.len]; s.s[s.len] = '\0'; n = route_lookup(&main_rt, s.s); s.s[s.len] = c; if (n == -1) goto err; route_no = n; + route_name = s; save_p = p; if (!get_next_part(&p, &s, ',')) @@ -374,6 +384,10 @@ static int declare_timer(modparam_t type, char* param) } memset(pa, 0, sizeof(*pa)); pa->timer_name = timer_name; + memcpy(pa->route_name_buf, route_name.s, route_name.len); + pa->route_name_buf[route_name.len] = '\0'; + pa->route_name.s = pa->route_name_buf; + pa->route_name.len = route_name.len; pa->route_no = route_no; pa->interval = interval; pa->enable_on_start = enabled; @@ -402,6 +416,7 @@ static int mod_init() return E_OUT_OF_MEM; } memcpy(*pa, a, sizeof(**pa)); + (*pa)->route_name.s = (*pa)->route_name_buf; (*pa)->next = 0; pkg_timer_actions = a->next; pkg_free(a);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
31
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 2017