- sr-dev - kamailio.org

git:5.0:a6acbf20: registrar: do not return 0 in some cases of failure for save()
by Daniel-Constantin Mierla 30 Oct '17

30 Oct '17

Module: kamailio Branch: 5.0 Commit: a6acbf20d943bec39d4e09b5e0b3fd3ca9a72966 URL: https://github.com/kamailio/kamailio/commit/a6acbf20d943bec39d4e09b5e0b3fd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-30T10:39:06+01:00 registrar: do not return 0 in some cases of failure for save() (cherry picked from commit 9e5820f0c98b86824fcafe128fbfe0d37173479a) --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/a6acbf20d943bec39d4e09b5e0b3fd3… Patch: https://github.com/kamailio/kamailio/commit/a6acbf20d943bec39d4e09b5e0b3fd3… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 4ed6e7539e..1432efed64 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -1008,9 +1008,9 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) if (is_route_type(REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) ) reg_send_reply(_m); if (R_TOO_MANY == rerrno) - return -2; + return -2; /* for all other */ - return 0; + return -1; } /* Return values: @@ -1018,7 +1018,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) -2 Error in unregistering user -3 Contacts for AOR not found */ - + int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) { str aor = {0, 0};

1 0

git:master:9e5820f0: registrar: do not return 0 in some cases of failure for save()
by Daniel-Constantin Mierla 30 Oct '17

30 Oct '17

Module: kamailio Branch: master Commit: 9e5820f0c98b86824fcafe128fbfe0d37173479a URL: https://github.com/kamailio/kamailio/commit/9e5820f0c98b86824fcafe128fbfe0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-30T10:37:33+01:00 registrar: do not return 0 in some cases of failure for save() --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/9e5820f0c98b86824fcafe128fbfe0d… Patch: https://github.com/kamailio/kamailio/commit/9e5820f0c98b86824fcafe128fbfe0d… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 4ed6e7539e..1432efed64 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -1008,9 +1008,9 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) if (is_route_type(REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) ) reg_send_reply(_m); if (R_TOO_MANY == rerrno) - return -2; + return -2; /* for all other */ - return 0; + return -1; } /* Return values: @@ -1018,7 +1018,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri) -2 Error in unregistering user -3 Contacts for AOR not found */ - + int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) { str aor = {0, 0};

1 0

git:master:80a78412: modules: readme files regenerated - rtimer ... [skip ci]
by Kamailio Dev 29 Oct '17

29 Oct '17

Module: kamailio Branch: master Commit: 80a78412d6ad02251d1bd64dd9ce72acd1742fa6 URL: https://github.com/kamailio/kamailio/commit/80a78412d6ad02251d1bd64dd9ce72a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-29T09:17:01+01:00 modules: readme files regenerated - rtimer ... [skip ci] --- Modified: src/modules/rtimer/README --- Diff: https://github.com/kamailio/kamailio/commit/80a78412d6ad02251d1bd64dd9ce72a… Patch: https://github.com/kamailio/kamailio/commit/80a78412d6ad02251d1bd64dd9ce72a… --- diff --git a/src/modules/rtimer/README b/src/modules/rtimer/README index e5e8454ce9..aec594b58c 100644 --- a/src/modules/rtimer/README +++ b/src/modules/rtimer/README @@ -33,6 +33,7 @@ Daniel-Constantin Mierla 1.1. Set timer parameter 1.2. Set exec parameter + 1.3. Use exec parameter with a Kemi engine Chapter 1. Admin Guide @@ -113,18 +114,32 @@ modparam("rtimer", "timer", "name=ta;interval=100000u;mode=1;") The parameter can be set multiple times to get more routes executed on same timer. * timer - name of the timer. - * route - the index of the route to be executed. + * route - 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. Default value is NULL. Example 1.2. Set exec parameter ... 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"); } ... + + Example 1.3. Use exec parameter with a Kemi engine +... +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 +...

1 0

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: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

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

[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:e4800a83: timer: use route_lookup() instead of route_get() to find a route block
by Daniel-Constantin Mierla 28 Oct '17

28 Oct '17

Module: kamailio Branch: master Commit: e4800a83439cb04eb3a5d4e106ad767a3d6776a5 URL: https://github.com/kamailio/kamailio/commit/e4800a83439cb04eb3a5d4e106ad767… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T16:44:56+02:00 timer: use route_lookup() instead of route_get() to find a route block - avoids creating an empty route block structure - split code for dedicated cfg function wrapper --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/e4800a83439cb04eb3a5d4e106ad767… Patch: https://github.com/kamailio/kamailio/commit/e4800a83439cb04eb3a5d4e106ad767… --- diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c index 4a09a94c2b..009bc6a95d 100644 --- a/src/modules/timer/timer.c +++ b/src/modules/timer/timer.c @@ -252,12 +252,8 @@ static int timer_enable_fixup(void** param, int param_no) return 0; } -static int timer_enable_func(sip_msg_t* m, char* timer_act, char* enable) +static int timer_enable_helper(sip_msg_t* m, timer_action_t* a, int en) { - timer_action_t* a; - int en; - a = (void*) timer_act; - en = (int)(long) enable; /* timer is not deleted immediately but is removed from handler * by itself because timer_del may be slow blocking procedure * Disable and enable in sequence may be tricky @@ -282,6 +278,16 @@ static int timer_enable_func(sip_msg_t* m, char* timer_act, char* enable) return 1; } +static int timer_enable_func(sip_msg_t* m, char* timer_act, char* enable) +{ + timer_action_t* a; + int en; + a = (void*) timer_act; + en = (int)(long) enable; + + return timer_enable_helper(m, a, en); +} + static int get_next_part(char** s, str* part, char delim) { char *c, *c2; @@ -331,7 +337,7 @@ static int declare_timer(modparam_t type, char* param) c = s.s[s.len]; s.s[s.len] = '\0'; - n = route_get(&main_rt, s.s); + n = route_lookup(&main_rt, s.s); s.s[s.len] = c; if (n == -1) goto err; route_no = n;

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

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

27 Oct '17

Module: kamailio Branch: master Commit: 17f5db5b934a6ba35835aa99545d79deb99b35af URL: https://github.com/kamailio/kamailio/commit/17f5db5b934a6ba35835aa99545d79d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-27T15:31:22+02:00 modules: readme files regenerated - timer ... [skip ci] --- Modified: src/modules/timer/README --- Diff: https://github.com/kamailio/kamailio/commit/17f5db5b934a6ba35835aa99545d79d… Patch: https://github.com/kamailio/kamailio/commit/17f5db5b934a6ba35835aa99545d79d… --- diff --git a/src/modules/timer/README b/src/modules/timer/README index 23cd3e49b9..bc20dd0953 100644 --- a/src/modules/timer/README +++ b/src/modules/timer/README @@ -26,10 +26,13 @@ Tomas Mandys 5. Functions 5.1. timer_enable(timer_id, enable_disable) - 5.2. @timer.timer.timer_id.enabled - 5.3. @timer.executed - 6. Examples + 6. Selects + + 6.1. @timer.timer.timer_id.enabled + 6.2. @timer.executed + + 7. Examples List of Examples @@ -58,10 +61,13 @@ Chapter 1. Admin Guide 5. Functions 5.1. timer_enable(timer_id, enable_disable) - 5.2. @timer.timer.timer_id.enabled - 5.3. @timer.executed - 6. Examples + 6. Selects + + 6.1. @timer.timer.timer_id.enabled + 6.2. @timer.executed + + 7. Examples 1. Overview @@ -87,11 +93,13 @@ Chapter 1. Admin Guide 3. ABNF syntax +... timer_id = alphanum slow_fast = "slow" | "fast" declare_timer_syntax = timer_id "=" (route#|route_name) "," interval "," slow_fast "," ["enable"] enable_disable = "0" | "1" +... 4. Parameters @@ -115,16 +123,13 @@ Chapter 1. Admin Guide timer_enable to start it later. Example 1.1. Example declare_timer - ... - modparam("timer", "declare_timer", "MY_TIMER=MY_TIMER_ROUTE,10,slow,enab -le"); - ... +... +modparam("timer", "declare_timer", "MY_TIMER=MY_TIMER_ROUTE,10,slow,enable"); +... 5. Functions 5.1. timer_enable(timer_id, enable_disable) - 5.2. @timer.timer.timer_id.enabled - 5.3. @timer.executed 5.1. timer_enable(timer_id, enable_disable) @@ -136,34 +141,44 @@ le"); * enable_distable - set to 1 to enable timer, to 0 to disable. Example 1.2. timer_enable usage - ... - timer_enable("MY_TIMER", 1); - ... +... +timer_enable("MY_TIMER", 1); +... + +6. Selects -5.2. @timer.timer.timer_id.enabled + 6.1. @timer.timer.timer_id.enabled + 6.2. @timer.executed + +6.1. @timer.timer.timer_id.enabled Return true ("1") if timer specified by timer_id is enabled, otherwise returns false ("0"). Example 1.3. timer.timer.timer_id.enabled usage - if (@timer.timer.MY_TIMER.enabled == "1") { - .... - } +... +if (@timer.timer.MY_TIMER.enabled == "1") { + ... +} +... -5.3. @timer.executed +6.2. @timer.executed Returns name of timer which has been executed, i.e. non empty value is returned only when handler is being processed. Example 1.4. timer.executed usage - if (@timer.executed != "") { - # timer is being handled - .... - } +... +if (@timer.executed != "") { + # timer is being handled + ... +} +... -6. Examples +7. Examples Example 1.5. timer common example +... loadmodule "modules/xprint/xprint.so" loadmodule "modules/timer/timer.so" @@ -184,18 +199,20 @@ route["ONTIMER2"] { timer_enable("tmr1", 0); route("print"); } +... Example 1.6. 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 route section which is called once after Kamailio starts. +... loadmodule "timer"; loadmodule "xprint"; modparam("timer", "declare_timer", "TIMER_TEST=TEST,100,,enable"); -route { +request_route { xplog("L_E","main route"); } @@ -206,4 +223,5 @@ route[TEST] { # add here tested functionality xplog("L_E","test end\n"); -} + } +...

1 0

git:master:25a775cf: timer: docs - split selects from functions section
by Daniel-Constantin Mierla 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 25a775cf44bc9c88ce8b6afc906968e2677dbf37 URL: https://github.com/kamailio/kamailio/commit/25a775cf44bc9c88ce8b6afc906968e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T15:11:49+02:00 timer: docs - split selects from functions section --- Modified: src/modules/timer/doc/timer.xml --- Diff: https://github.com/kamailio/kamailio/commit/25a775cf44bc9c88ce8b6afc906968e… Patch: https://github.com/kamailio/kamailio/commit/25a775cf44bc9c88ce8b6afc906968e…

1 0

git:master:e9d0e799: timer: use typedefs, updated log macros
by Daniel-Constantin Mierla 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: e9d0e799309b807b2376fd3eb30bd74a36997168 URL: https://github.com/kamailio/kamailio/commit/e9d0e799309b807b2376fd3eb30bd74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T15:01:41+02:00 timer: use typedefs, updated log macros --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/e9d0e799309b807b2376fd3eb30bd74… Patch: https://github.com/kamailio/kamailio/commit/e9d0e799309b807b2376fd3eb30bd74…

1 0

git:master:3386e345: timer: code formatting
by Daniel-Constantin Mierla 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 3386e34593da78fcbf6f72f45ad2e6e8d3a72525 URL: https://github.com/kamailio/kamailio/commit/3386e34593da78fcbf6f72f45ad2e6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-27T14:52:22+02:00 timer: code formatting --- Modified: src/modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/3386e34593da78fcbf6f72f45ad2e6e… Patch: https://github.com/kamailio/kamailio/commit/3386e34593da78fcbf6f72f45ad2e6e…

1 0

[kamailio/kamailio] dialog: remove replicated dialog from profile as soon as gets to term… (#1284)
by Charles Chance 27 Oct '17

27 Oct '17

…inated state - matches local (non-replicated) behaviour introduced in edf61ac You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1284 -- Commit Summary -- * dialog: remove replicated dialog from profile as soon as gets to terminated state -- File Changes -- M src/modules/dialog/dlg_dmq.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1284.patch https://github.com/kamailio/kamailio/pull/1284.diff -- 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/pull/1284

2 2

git:master:0a3ba3ca: Merge pull request #1284 from kamailio/cchance/dialog
by GitHub 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 0a3ba3ca39d7215a9ac6b8906768e2835f6de353 URL: https://github.com/kamailio/kamailio/commit/0a3ba3ca39d7215a9ac6b8906768e28… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-27T11:34:32+01:00 Merge pull request #1284 from kamailio/cchance/dialog dialog: remove replicated dialog from profile as soon as gets to termâ¦ --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/0a3ba3ca39d7215a9ac6b8906768e28… Patch: https://github.com/kamailio/kamailio/commit/0a3ba3ca39d7215a9ac6b8906768e28… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 668bdbdef4..1a27842254 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -323,6 +323,13 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg, dlg->h_entry, dlg->h_id); } } + + /* remove dialog from profiles when no longer active */ + if (dlg->profile_links!=NULL) { + destroy_linkers(dlg->profile_links); + dlg->profile_links = NULL; + } + /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; /* keep dialog around for a bit, to prevent out-of-order

1 0

git:master:22e4031c: dialog: remove replicated dialog from profile as soon as gets to terminated state
by Charles Chance 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 22e4031cdcc7ba7c90553bd569e289043c0c64cf URL: https://github.com/kamailio/kamailio/commit/22e4031cdcc7ba7c90553bd569e2890… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-10-25T15:29:07+01:00 dialog: remove replicated dialog from profile as soon as gets to terminated state - matches local (non-replicated) behaviour introduced in edf61ac --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/22e4031cdcc7ba7c90553bd569e2890… Patch: https://github.com/kamailio/kamailio/commit/22e4031cdcc7ba7c90553bd569e2890… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 668bdbdef4..1a27842254 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -323,6 +323,13 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg, dlg->h_entry, dlg->h_id); } } + + /* remove dialog from profiles when no longer active */ + if (dlg->profile_links!=NULL) { + destroy_linkers(dlg->profile_links); + dlg->profile_links = NULL; + } + /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; /* keep dialog around for a bit, to prevent out-of-order

1 0

[kamailio/kamailio] pkg/kamailio/obs: git cherry-pick to 5.0 branch (#1285)
by sergey-safarov 27 Oct '17

27 Oct '17

pkg/kamailio/obs: git cherry-pick to 5.0 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1285 -- Commit Summary -- * pkg/kamailio/obs: Updated SPEC file * pkg/kamailio/obs Fixed build of perl module * pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed -- File Changes -- M pkg/kamailio/obs/kamailio.service (2) M pkg/kamailio/obs/kamailio.spec (193) M pkg/kamailio/obs/meta (9) A pkg/kamailio/obs/prjconf (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1285.patch https://github.com/kamailio/kamailio/pull/1285.diff -- 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/pull/1285

2 3

git:5.0:dd50f9a0: Merge pull request #1285 from sergey-safarov/5.0
by GitHub 27 Oct '17

27 Oct '17

Module: kamailio Branch: 5.0 Commit: dd50f9a07250b431402d3a7ee8ebe2e04be931b5 URL: https://github.com/kamailio/kamailio/commit/dd50f9a07250b431402d3a7ee8ebe2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-27T10:52:20+02:00 Merge pull request #1285 from sergey-safarov/5.0 pkg/kamailio/obs: git cherry-pick to 5.0 branch --- Added: pkg/kamailio/obs/prjconf Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/dd50f9a07250b431402d3a7ee8ebe2e… Patch: https://github.com/kamailio/kamailio/commit/dd50f9a07250b431402d3a7ee8ebe2e…

1 0

git:5.0:a25bc88b: pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed
by Sergey Safarov 27 Oct '17

27 Oct '17

Module: kamailio Branch: 5.0 Commit: a25bc88b844066e7454aa94f147056fc9288f658 URL: https://github.com/kamailio/kamailio/commit/a25bc88b844066e7454aa94f147056f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-10-27T04:05:26-04:00 pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/a25bc88b844066e7454aa94f147056f… Patch: https://github.com/kamailio/kamailio/commit/a25bc88b844066e7454aa94f147056f…

1 0

git:5.0:df28d3bc: pkg/kamailio/obs Fixed build of perl module
by Sergey Safarov 27 Oct '17

27 Oct '17

Module: kamailio Branch: 5.0 Commit: df28d3bc4933c148d8a1c2963326ad6119123dad URL: https://github.com/kamailio/kamailio/commit/df28d3bc4933c148d8a1c2963326ad6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-10-27T04:05:11-04:00 pkg/kamailio/obs Fixed build of perl module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/df28d3bc4933c148d8a1c2963326ad6… Patch: https://github.com/kamailio/kamailio/commit/df28d3bc4933c148d8a1c2963326ad6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ad68553086..20ddb3e047 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -13,6 +13,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -30,6 +31,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -47,6 +49,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -64,6 +67,7 @@ %bcond_with json %bcond_with kazoo %bcond_without memcached +%bcond_without perl %bcond_with redis %bcond_without sctp %bcond_without websocket @@ -82,6 +86,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -99,6 +104,7 @@ %bcond_without json %bcond_with kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -116,6 +122,7 @@ %bcond_with json %bcond_with kazoo %bcond_with memcached +%bcond_with perl %bcond_with redis %bcond_with sctp %bcond_with websocket @@ -133,6 +140,7 @@ %bcond_with json %bcond_with kazoo %bcond_with memcached +%bcond_without perl %bcond_without redis %bcond_with sctp %bcond_with websocket @@ -531,8 +539,14 @@ Protocol (SIP)" support for Kamailio. %package perl Summary: Perl extensions and database driver for Kamailio Group: System Environment/Daemons -Requires: mod_perl, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?leap_version} +Requires: perl +BuildRequires: perl +%else +Requires: mod_perl BuildRequires: mod_perl-devel +%endif %description perl Perl extensions and database driver for Kamailio.

1 0

git:5.0:a56ec0cb: pkg/kamailio/obs: Updated SPEC file
by Sergey Safarov 27 Oct '17

27 Oct '17

Module: kamailio Branch: 5.0 Commit: a56ec0cb0531587fb2da3196bc6b7202fb006879 URL: https://github.com/kamailio/kamailio/commit/a56ec0cb0531587fb2da3196bc6b720… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-10-27T04:04:54-04:00 pkg/kamailio/obs: Updated SPEC file --- Added: pkg/kamailio/obs/prjconf Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/a56ec0cb0531587fb2da3196bc6b720… Patch: https://github.com/kamailio/kamailio/commit/a56ec0cb0531587fb2da3196bc6b720…

1 0

git:master:0eaf73bd: Merge pull request #1260 from sergey-safarov/spec_update
by GitHub 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 0eaf73bd84589ede4b0f87a7a16820e5b2a4ff41 URL: https://github.com/kamailio/kamailio/commit/0eaf73bd84589ede4b0f87a7a16820e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-27T10:43:06+02:00 Merge pull request #1260 from sergey-safarov/spec_update pkg/kamailio: Created readme for centos, fedora, opensuse, oracle, rhel dists --- Added: pkg/kamailio/centos/README.md Added: pkg/kamailio/fedora/README.md Added: pkg/kamailio/opensuse/README.md Added: pkg/kamailio/oracle/README.md Added: pkg/kamailio/rhel/README.md --- Diff: https://github.com/kamailio/kamailio/commit/0eaf73bd84589ede4b0f87a7a16820e… Patch: https://github.com/kamailio/kamailio/commit/0eaf73bd84589ede4b0f87a7a16820e… --- diff --git a/pkg/kamailio/centos/README.md b/pkg/kamailio/centos/README.md new file mode 100644 index 0000000000..7ba215170e --- /dev/null +++ b/pkg/kamailio/centos/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. CentOS 6 +1. CentOS 7 + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/fedora/README.md b/pkg/kamailio/fedora/README.md new file mode 100644 index 0000000000..74e0298595 --- /dev/null +++ b/pkg/kamailio/fedora/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. Fedora 25 +1. Fedora 26 + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/opensuse/README.md b/pkg/kamailio/opensuse/README.md new file mode 100644 index 0000000000..b4a5e4510b --- /dev/null +++ b/pkg/kamailio/opensuse/README.md @@ -0,0 +1,7 @@ +Now supported dists: + +1. OpenSUSE Leap 42.2 +1. OpenSUSE Leap 42.3 +1. OpenSUSE Tumbleweed + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/oracle/README.md b/pkg/kamailio/oracle/README.md new file mode 100644 index 0000000000..42159ea26c --- /dev/null +++ b/pkg/kamailio/oracle/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. Oracle Linux 6 +1. Oracle Linux 7 + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/rhel/README.md b/pkg/kamailio/rhel/README.md new file mode 100644 index 0000000000..e1727f7320 --- /dev/null +++ b/pkg/kamailio/rhel/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. RHEL 6 +1. RHEL 7 + +SPEC file and other stuff located at `../obs` folder

1 0

git:master:7dad4f5a: pkg/kamailio: Created readme for centos, fedora, opensuse, oracle, rhel dists
by Sergey Safarov 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 7dad4f5a8c41923d4792baad42b93461e0dbb019 URL: https://github.com/kamailio/kamailio/commit/7dad4f5a8c41923d4792baad42b9346… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-10-02T04:50:48-04:00 pkg/kamailio: Created readme for centos, fedora, opensuse, oracle, rhel dists --- Added: pkg/kamailio/centos/README.md Added: pkg/kamailio/fedora/README.md Added: pkg/kamailio/opensuse/README.md Added: pkg/kamailio/oracle/README.md Added: pkg/kamailio/rhel/README.md --- Diff: https://github.com/kamailio/kamailio/commit/7dad4f5a8c41923d4792baad42b9346… Patch: https://github.com/kamailio/kamailio/commit/7dad4f5a8c41923d4792baad42b9346… --- diff --git a/pkg/kamailio/centos/README.md b/pkg/kamailio/centos/README.md new file mode 100644 index 0000000000..7ba215170e --- /dev/null +++ b/pkg/kamailio/centos/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. CentOS 6 +1. CentOS 7 + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/fedora/README.md b/pkg/kamailio/fedora/README.md new file mode 100644 index 0000000000..74e0298595 --- /dev/null +++ b/pkg/kamailio/fedora/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. Fedora 25 +1. Fedora 26 + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/opensuse/README.md b/pkg/kamailio/opensuse/README.md new file mode 100644 index 0000000000..b4a5e4510b --- /dev/null +++ b/pkg/kamailio/opensuse/README.md @@ -0,0 +1,7 @@ +Now supported dists: + +1. OpenSUSE Leap 42.2 +1. OpenSUSE Leap 42.3 +1. OpenSUSE Tumbleweed + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/oracle/README.md b/pkg/kamailio/oracle/README.md new file mode 100644 index 0000000000..42159ea26c --- /dev/null +++ b/pkg/kamailio/oracle/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. Oracle Linux 6 +1. Oracle Linux 7 + +SPEC file and other stuff located at `../obs` folder diff --git a/pkg/kamailio/rhel/README.md b/pkg/kamailio/rhel/README.md new file mode 100644 index 0000000000..e1727f7320 --- /dev/null +++ b/pkg/kamailio/rhel/README.md @@ -0,0 +1,6 @@ +Now supported dists: + +1. RHEL 6 +1. RHEL 7 + +SPEC file and other stuff located at `../obs` folder

1 0

[kamailio/kamailio] pkg/kamailio: Created readme for centos, fedora, opensuse, oracle, rhel dists (#1260)
by sergey-safarov 27 Oct '17

27 Oct '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1260 -- Commit Summary -- * pkg/kamailio: Created readme for centos, fedora, opensuse, oracle, rhel dists -- File Changes -- A pkg/kamailio/centos/README.md (6) A pkg/kamailio/fedora/README.md (6) A pkg/kamailio/opensuse/README.md (7) A pkg/kamailio/oracle/README.md (6) A pkg/kamailio/rhel/README.md (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1260.patch https://github.com/kamailio/kamailio/pull/1260.diff -- 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/pull/1260

2 1

git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio
by Juha Heinanen 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 02074c81158b0927778e5f2daaae8da953580f2f URL: https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-10-16T12:41:48+03:00 Merge branch 'master' of github.com:kamailio/kamailio --- Added: src/modules/phonenum/Makefile Added: src/modules/phonenum/README Added: src/modules/phonenum/cphonenumber.cpp Added: src/modules/phonenum/cphonenumber.h Added: src/modules/phonenum/doc/Makefile Added: src/modules/phonenum/doc/phonenum.xml Added: src/modules/phonenum/doc/phonenum_admin.xml Added: src/modules/phonenum/phonenum_mod.c Added: src/modules/phonenum/phonenum_pv.c Added: src/modules/phonenum/phonenum_pv.h Modified: src/Makefile.defs Modified: src/Makefile.groups Modified: src/modules/sipdump/sipdump_mod.c Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da… Patch: https://github.com/kamailio/kamailio/commit/02074c81158b0927778e5f2daaae8da…

4 8

git:master:a29312f6: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: a29312f650518fadff8122a8d2ece6c01594d0e1 URL: https://github.com/kamailio/kamailio/commit/a29312f650518fadff8122a8d2ece6c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-27T09:31:39+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/dialog/README Modified: src/modules/mtree/README Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/a29312f650518fadff8122a8d2ece6c… Patch: https://github.com/kamailio/kamailio/commit/a29312f650518fadff8122a8d2ece6c…

1 0

git:master:7ee62dfa: sl: use documentation entities
by Mikko Lehto 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 7ee62dfa4c2290e657a55b609053755f91faa4ee URL: https://github.com/kamailio/kamailio/commit/7ee62dfa4c2290e657a55b609053755… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-10-27T10:20:55+03:00 sl: use documentation entities --- Modified: src/modules/sl/doc/sl.xml --- Diff: https://github.com/kamailio/kamailio/commit/7ee62dfa4c2290e657a55b609053755… Patch: https://github.com/kamailio/kamailio/commit/7ee62dfa4c2290e657a55b609053755… --- diff --git a/src/modules/sl/doc/sl.xml b/src/modules/sl/doc/sl.xml index 1bd05b7c0b..01696c3ac3 100644 --- a/src/modules/sl/doc/sl.xml +++ b/src/modules/sl/doc/sl.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> +%docentities; +]> <book id="sl" xmlns:xi="http://www.w3.org/2001/XInclude"> <bookinfo> @@ -43,7 +47,7 @@ <para> The <acronym>SL</acronym> module needs to filter ACKs sent after a local stateless reply to an INVITE was generated. To recognize such - ACKs, ser adds a special "signature" in to-tags. This signature is + ACKs, &kamailio; adds a special "signature" in to-tags. This signature is sought for in incoming ACKs, and if included, the ACKs are absorbed. </para> @@ -61,7 +65,7 @@ module) for INVITE processing. Particularly, the problem happens when a UA sends an INVITE which already has a to-tag in it (e.g., a re-INVITE) and the server want to reply to it. Then, it will keep the - current to-tag, which will be mirrored in ACK. SER will not see + current to-tag, which will be mirrored in ACK. &kamailio; will not see its signature and forward the ACK downstream. Caused harm is not bad, just a useless ACK is forwarded. </para>

1 0

git:master:2a157d6f: sl: document event routes
by Mikko Lehto 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 2a157d6f0951124ca8a3aba7171dfb91c68625b7 URL: https://github.com/kamailio/kamailio/commit/2a157d6f0951124ca8a3aba7171dfb9… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-10-27T10:20:55+03:00 sl: document event routes --- Modified: src/modules/sl/doc/sl.xml --- Diff: https://github.com/kamailio/kamailio/commit/2a157d6f0951124ca8a3aba7171dfb9… Patch: https://github.com/kamailio/kamailio/commit/2a157d6f0951124ca8a3aba7171dfb9… --- diff --git a/src/modules/sl/doc/sl.xml b/src/modules/sl/doc/sl.xml index 01696c3ac3..e1535cb411 100644 --- a/src/modules/sl/doc/sl.xml +++ b/src/modules/sl/doc/sl.xml @@ -75,5 +75,36 @@ <xi:include href="sl_params.xml"/> <xi:include href="sl_functions.xml"/> <xi:include href="sl_stats.xml"/> + + <section> + <title>Event routes</title> + <section> + <title><function moreinfo="none">sl:filtered-ack</function></title> + <para> + Executed when ACK to locally generated reply is recognized and absorbed. + </para> + <programlisting format="linespecific"> +... +event_route[sl:filtered-ack] { + xlog("sl:filtered-ack ACK to local reply absorbed\n"); +} +... + </programlisting> + </section> + <section> + <title><function moreinfo="none">sl:local-response</function></title> + <para> + Executed after sl module reply function has sent local reply. + </para> + <programlisting format="linespecific"> +... +event_route[sl:local-response] { + xlog("sl:local-response replied locally\n"); +} +... + </programlisting> + </section> + </section> + </chapter> </book>

1 0

git:master:fab551a8: sl: fix typos and format in documentation and code
by Mikko Lehto 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: fab551a87b40b35ca99845df52071980458cdd51 URL: https://github.com/kamailio/kamailio/commit/fab551a87b40b35ca99845df5207198… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-10-27T10:20:25+03:00 sl: fix typos and format in documentation and code --- Modified: src/modules/sl/doc/sl.xml Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/fab551a87b40b35ca99845df5207198… Patch: https://github.com/kamailio/kamailio/commit/fab551a87b40b35ca99845df5207198… --- diff --git a/src/modules/sl/doc/sl.xml b/src/modules/sl/doc/sl.xml index c5f96e82be..1bd05b7c0b 100644 --- a/src/modules/sl/doc/sl.xml +++ b/src/modules/sl/doc/sl.xml @@ -49,7 +49,7 @@ </para> <para> To speed up the filtering process, the module uses a timeout - mechanism. When a reply is sent, a timer us set. As long as the + mechanism. When a reply is sent, a timer is set. As long as the timer is valid, the incoming ACK requests will be checked using TO tag value. Once the timer expires, all the ACK messages are let through - a long time passed till it sent a reply, so it does not @@ -63,7 +63,7 @@ re-INVITE) and the server want to reply to it. Then, it will keep the current to-tag, which will be mirrored in ACK. SER will not see its signature and forward the ACK downstream. Caused harm is not - bad--just a useless ACK is forwarded. + bad, just a useless ACK is forwarded. </para> </section> diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index ab50db3649..c523e8913b 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -194,7 +194,7 @@ static void mod_destroy() /** * @brief Small wrapper around sl_send_reply * - * Warapper around sl_send_rply() which accepts parameters that include + * Wrapper around sl_send_reply() which accepts parameters that include * config variables * */ diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index 6dbd754539..dbc5105d2c 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -384,7 +384,7 @@ int sl_filter_ACK(struct sip_msg *msg, unsigned int flags, void *bar ) /*check the timeout value*/ if ( *(sl_timeout)<= get_ticks_raw() ) { - LM_DBG("to late to be a local ACK!\n"); + LM_DBG("too late to be a local ACK!\n"); goto pass_it; }

1 0

git:master:e875863f: acc: documentation typo
by Mikko Lehto 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: e875863f1b23217454061f61b90e82ce4ff7be8b URL: https://github.com/kamailio/kamailio/commit/e875863f1b23217454061f61b90e82c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-10-27T10:19:25+03:00 acc: documentation typo --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e875863f1b23217454061f61b90e82c… Patch: https://github.com/kamailio/kamailio/commit/e875863f1b23217454061f61b90e82c… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 0bbda1a4a4..1e174705ec 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1541,7 +1541,7 @@ acc_db_request("$var(code) Error: $avp(reason)", "SomeTable"); <function moreinfo="none">acc_request(comment, table)</function> </title> <para> - Warapper around <function moreinfo="none">acc_log_request</function> + Wrapper around <function moreinfo="none">acc_log_request</function> and <function moreinfo="none">acc_db_request</function> functions, writing the accounting record to LOG and DATABASE backends. If <quote>db_url</quote> parameter is not set, the acc record is written

1 0

git:master:dee1dc34: mtree: doc typo
by Mikko Lehto 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: dee1dc349a5aad9c84a22701d88e2eafa6a22b5c URL: https://github.com/kamailio/kamailio/commit/dee1dc349a5aad9c84a22701d88e2ea… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-10-27T10:16:52+03:00 mtree: doc typo --- Modified: src/modules/mtree/doc/mtree_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dee1dc349a5aad9c84a22701d88e2ea… Patch: https://github.com/kamailio/kamailio/commit/dee1dc349a5aad9c84a22701d88e2ea… --- diff --git a/src/modules/mtree/doc/mtree_admin.xml b/src/modules/mtree/doc/mtree_admin.xml index 0162e32dfa..86effcd73f 100644 --- a/src/modules/mtree/doc/mtree_admin.xml +++ b/src/modules/mtree/doc/mtree_admin.xml @@ -141,7 +141,7 @@ modparam("mtree", "db_table", "mtrees") <para> type - the type of tree elements (0 = string, 2 = integer). It is valid only when the (tprefix, tvalue) pairs are loaded - (not for muti-column values). + (not for multi-column values). </para> </listitem> <listitem> @@ -149,7 +149,7 @@ modparam("mtree", "db_table", "mtrees") multi - tells if dbtable can contain more than one tree (0 = one tree, 1 = more than one tree identified by tname column). It is valid only when the (tprefix, tvalue) pairs - are loaded (not for muti-column values). + are loaded (not for multi-column values). </para> </listitem> </itemizedlist>

1 0

git:master:41aa50ae: dialog: documentation text format
by Mikko Lehto 27 Oct '17

27 Oct '17

Module: kamailio Branch: master Commit: 41aa50ae4ee31657f8eb61fcb949d188cda8cff4 URL: https://github.com/kamailio/kamailio/commit/41aa50ae4ee31657f8eb61fcb949d18… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-10-27T10:19:25+03:00 dialog: documentation text format --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/41aa50ae4ee31657f8eb61fcb949d18… Patch: https://github.com/kamailio/kamailio/commit/41aa50ae4ee31657f8eb61fcb949d18… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index d01ea69cff..e0041f75ed 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2550,7 +2550,7 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { <section> <title>event_route[dialog:start]</title> <para> - Executed when 200OK reply for INVITE is processed. + Executed when 200 OK reply for INVITE is processed. </para> </section> <section>

1 0

Kamailio v5.0.4 Released
by Daniel-Constantin Mierla 26 Oct '17

26 Oct '17

Hello, Kamailio SIP Server v5.0.4 stable release is out! This is a maintenance release of the latest stable branch, 5.0, that includes fixes since the release of v5.0.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.0.x. Deployments running previous 5.0.x versions are strongly recommended to be upgraded to v5.0.4. For more details about version 5.0.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2017/10/kamailio-v5-0-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 3

git:master:3f1f706b: kex: setdsturi() hanldes vars params
by Daniel-Constantin Mierla 26 Oct '17

26 Oct '17

Module: kamailio Branch: master Commit: 3f1f706b8b1fa5da9da56420d069fc231dd9d784 URL: https://github.com/kamailio/kamailio/commit/3f1f706b8b1fa5da9da56420d069fc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-26T21:16:36+02:00 kex: setdsturi() hanldes vars params --- Modified: src/modules/kex/kex_mod.c Modified: src/modules/kex/km_core.c --- Diff: https://github.com/kamailio/kamailio/commit/3f1f706b8b1fa5da9da56420d069fc2… Patch: https://github.com/kamailio/kamailio/commit/3f1f706b8b1fa5da9da56420d069fc2… --- diff --git a/src/modules/kex/kex_mod.c b/src/modules/kex/kex_mod.c index 46bc97a90e..f58cf189b6 100644 --- a/src/modules/kex/kex_mod.c +++ b/src/modules/kex/kex_mod.c @@ -88,8 +88,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"isbflagset", (cmd_function)w_isbflagset, 2,fixup_igp_igp, 0, ANY_ROUTE }, - {"setdsturi", (cmd_function)w_setdsturi, 1, 0, - 0, ANY_ROUTE }, + {"setdsturi", (cmd_function)w_setdsturi, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE }, {"resetdsturi", (cmd_function)w_resetdsturi, 0, 0, 0, ANY_ROUTE }, {"isdsturiset", (cmd_function)w_isdsturiset, 0, 0, @@ -279,4 +279,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_kex_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/kex/km_core.c b/src/modules/kex/km_core.c index 428e620d7b..f0d97f1af9 100644 --- a/src/modules/kex/km_core.c +++ b/src/modules/kex/km_core.c @@ -33,16 +33,17 @@ int w_setdsturi(struct sip_msg *msg, char *uri, str *s2) { - str s; + str suri; - /* todo: fixup */ - s.s = uri; - s.len = strlen(uri); + if(fixup_get_svalue(msg, (gparam_t*)uri, &suri)!=0) { + LM_ERR("cannot get the URI parameter\n"); + return -1; + } - if(set_dst_uri(msg, &s)!=0) + if(set_dst_uri(msg, &suri)!=0) return -1; - /* dst_uri changes, so it makes sense to re-use the current uri for - forking */ + /* dst_uri changed, so it makes sense to re-use the current uri + * for forking */ ruri_mark_new(); /* re-use uri for serial forking */ return 1;

1 0

git:master:a6efe6d7: app_python: safety checks for self var pointer
by Daniel-Constantin Mierla 26 Oct '17

26 Oct '17

Module: kamailio Branch: master Commit: a6efe6d7e1a205a9d0c2d5c6c165fe337c4de814 URL: https://github.com/kamailio/kamailio/commit/a6efe6d7e1a205a9d0c2d5c6c165fe3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T22:56:47+02:00 app_python: safety checks for self var pointer --- Modified: src/modules/app_python/python_msgobj.c --- Diff: https://github.com/kamailio/kamailio/commit/a6efe6d7e1a205a9d0c2d5c6c165fe3… Patch: https://github.com/kamailio/kamailio/commit/a6efe6d7e1a205a9d0c2d5c6c165fe3… --- diff --git a/src/modules/app_python/python_msgobj.c b/src/modules/app_python/python_msgobj.c index 33ddd8db3a..a9dd51d52f 100644 --- a/src/modules/app_python/python_msgobj.c +++ b/src/modules/app_python/python_msgobj.c @@ -70,6 +70,12 @@ static PyObject *msg_rewrite_ruri(msgobject *self, PyObject *args) { str nuri; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -99,6 +105,12 @@ static PyObject *msg_set_dst_uri(msgobject *self, PyObject *args) { str ruri; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -133,6 +145,12 @@ static PyObject *msg_getHeader(msgobject *self, PyObject *args) struct hdr_field *hf; str hname, *hbody; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -172,6 +190,12 @@ PyObject *msg_call_function(msgobject *self, PyObject *args) struct run_act_ctx ra_ctx; unsigned mod_ver; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -281,6 +305,12 @@ static PyObject *msg_getType(msgobject *self, PyObject *unused) { const char *rval; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -309,6 +339,12 @@ static PyObject *msg_getMethod(msgobject *self, PyObject *unused) { str *rval; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -328,6 +364,12 @@ static PyObject *msg_getStatus(msgobject *self, PyObject *unused) { str *rval; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -348,6 +390,12 @@ static PyObject *msg_getRURI(msgobject *self, PyObject *unused) { str *rval; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -368,6 +416,12 @@ static PyObject *msg_get_src_address(msgobject *self, PyObject *unused) { PyObject *src_ip, *src_port, *pyRval; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None); @@ -402,6 +456,12 @@ static PyObject *msg_get_dst_address(msgobject *self, PyObject *unused) { PyObject *dst_ip, *dst_port, *pyRval; + if (self == NULL) { + PyErr_SetString(PyExc_RuntimeError, "self is NULL"); + Py_INCREF(Py_None); + return Py_None; + } + if (self->msg == NULL) { PyErr_SetString(PyExc_RuntimeError, "self->msg is NULL"); Py_INCREF(Py_None);

1 0

MAX_FLAG
by Juha Heinanen 26 Oct '17

26 Oct '17

I'm running out of flags. Is there some good reason why flag_t is unsigned int instead of unsigned long? -- Juha

1 0

Planning Kamailio v5.0.4
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Hello, I am considering to release Kamailio v5.0.4 later this week, likely on Wednesday or Tuesday. If you are aware of any issue in branch 5.0 which is not yet reported on github.com/kamailio/kamailio issues tracker, then do it as soon as possible to have a chance to look at it. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training, Nov 13-15, 2017, in Berlin - www.asipto.com Kamailio World Conference - www.kamailioworld.com

3 5

Errored: kamailio/kamailio#4970 (master - 384a533)
by Travis CI 25 Oct '17

25 Oct '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4970 Status: Errored Duration: 21 minutes and 34 seconds Commit: 384a533 (master) Author: Daniel-Constantin Mierla Message: Merge pull request #1283 from dunst0/patch-1 dispatcher: undeclared UINT32_MAX on FreeBSD missing header View the changeset: https://github.com/kamailio/kamailio/compare/cafabcf658c2...384a5338762f View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/292597174?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:5.0:1b2c59f1: ChangeLog: new content updated for v5.0.4
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 1b2c59f15c9ce9d99eb7d2f2b4f2273d1b5314b8 URL: https://github.com/kamailio/kamailio/commit/1b2c59f15c9ce9d99eb7d2f2b4f2273… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T15:06:03+02:00 ChangeLog: new content updated for v5.0.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/1b2c59f15c9ce9d99eb7d2f2b4f2273… Patch: https://github.com/kamailio/kamailio/commit/1b2c59f15c9ce9d99eb7d2f2b4f2273…

1 0

git:5.0:6f6d0fb0: Makefile.defs: version set to 5.0.4
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 6f6d0fb03ea80bfad049e13743c95adccdca2235 URL: https://github.com/kamailio/kamailio/commit/6f6d0fb03ea80bfad049e13743c95ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T14:58:42+02:00 Makefile.defs: version set to 5.0.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6f6d0fb03ea80bfad049e13743c95ad… Patch: https://github.com/kamailio/kamailio/commit/6f6d0fb03ea80bfad049e13743c95ad… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 28c51588d2..0ae2c915f6 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

[kamailio/kamailio] Kamailio crashes on ws connection when both http_reply_parse and track_cseq_updates are enabled (#1277)
by Muhammad Shahzad Shafi 25 Oct '17

25 Oct '17

### Description  Kamailio gives segfault due to SIGCHLD when a websocket client tries to connect to it. The problem seems to happen due to following global parameter, >http_reply_parse=yes Along with following dialog module parameter, >modparam("dialog", "track_cseq_updates", 1) ### Troubleshooting Disabling dialog parameter track_cseq_updates fixes the problem but in my setup i need this to be set since i use uac_auth() method in failure routes. >modparam("dialog", "track_cseq_updates", 0) #### Reproduction  The issue is reproducible by setting following in kamailio.cfg >http_reply_parse=yes >modparam("dialog", "track_cseq_updates", 1) #### Debugging Data  ``` webrtc-as:/tmp# gdb /usr/local/adx-webrtc/sbin/kamailio core.kamailio.14045.webrtc-as.1508598510 ... Reading symbols from /usr/local/adx-webrtc/sbin/kamailio...done. [New LWP 14045] warning: Can't read pathname for load map: Input/output error. [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/i386-linux-gnu/i686/cmov/libthread_db.so.1". Core was generated by `/usr/local/adx-webrtc/sbin/kamailio -f /usr/local/adx-webrtc/etc/kamailio/kamai'. Program terminated with signal 11, Segmentation fault. #0 0xb58a41a6 in dlg_cseq_prepare_msg (msg=0xbfab2cc4) at dlg_cseq.c:81 81 if(get_cseq(msg)->method_id != METHOD_CANCEL) { (gdb) bt full #0 0xb58a41a6 in dlg_cseq_prepare_msg (msg=0xbfab2cc4) at dlg_cseq.c:81 __FUNCTION__ = "dlg_cseq_prepare_msg" #1 0xb58a53a0 in dlg_cseq_prepare_new_msg (msg=0xbfab2cc4) at dlg_cseq.c:116 __FUNCTION__ = "dlg_cseq_prepare_new_msg" #2 0xb58a99b6 in dlg_cseq_msg_sent (data=0xbfab333c) at dlg_cseq.c:369 msg = {id = 0, pid = 0, tval = {tv_sec = 0, tv_usec = 0}, fwd_send_flags = {f = 0 '\000', blst_imask = 0 '\000'}, rpl_send_flags = {f = 0 '\000', blst_imask = 0 '\000'}, first_line = {type = 2, flags = 2, len = 34, u = {request = {method = { s = 0xb6959fe8 "HTTP/1.1 101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConne"..., len = 8}, uri = { s = 0xb6959ff1 "101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConnection: up"..., len = 3}, version = { s = 0xb6959ff5 "Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConnection: upgrad"..., len = 19}, method_value = 101}, reply = {version = { s = 0xb6959fe8 "HTTP/1.1 101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConne"..., len = 8}, status = { s = 0xb6959ff1 "101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConnection: up"..., len = 3}, reason = { s = 0xb6959ff5 "Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConnection: upgrad"..., len = 19}, statuscode = 101}}}, via1 = 0x0, via2 = 0x0, headers = 0xb695c554, last_header = 0xb695a1a0, parsed_flag = 18446744073709551615, h_via1 = 0x0, h_via2 = 0x0, callid = 0x0, to = 0x0, cseq = 0x0, from = 0x0, contact = 0x0, maxforwards = 0x0, route = 0x0, record_route = 0x0, content_type = 0x0, content_length = 0xb695a1a0, authorization = 0x0, expires = 0x0, proxy_auth = 0x0, supported = 0x0, require = 0x0, proxy_require = 0x0, unsupported = 0x0, allow = 0x0, event = 0x0, accept = 0x0, accept_language = 0x0, organization = 0x0, priority = 0x0, subject = 0x0, user_agent = 0x0, server = 0xb695a15c, content_disposition = 0x0, diversion = 0x0, rpid = 0x0, refer_to = 0x0, session_expires = 0x0, min_se = 0x0, sipifmatch = 0x0, subscription_state = 0x0, date = 0x0, identity = 0x0, identity_info = 0x0, pai = 0x0, ppi = 0x0, path = 0x0, privacy = 0x0, body = 0x0, eoh = 0xb695a135 "\r\n", unparsed = 0xb695a135 "\r\n", rcv = { src_ip = {af = 0, len = 0, u = {addrl = {0, 0, 0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, dst_ip = {af = 0, len = 0, u = {addrl = {0, 0, 0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 0, dst_port = 0, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = { sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x0, proto = 0 '\000'}, buf = 0xb6959fe8 "HTTP/1.1 101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConne"..., len = 335, new_uri = {s = 0x0, len = 0}, dst_uri = {s = 0x0, len = 0}, parsed_uri_ok = 0, parsed_uri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x0, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = 0, transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}}, parsed_orig_ruri_ok = 0, parsed_orig_ruri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = { s = 0x0, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = 0, transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}}, add_rm = 0x0, body_lumps = 0x0, reply_lump = 0x0, add_to_branch_s = '\000' <repeats 57 times>, add_to_branch_len = 0, hash_index = 0, msg_flags = 0, flags = 0, set_global_address = {s = 0x0, len = 0}, set_global_port = {s = 0x0, len = 0}, force_send_socket = 0x0, path_vec = {s = 0x0, len = 0}, instance = {s = 0x0, len = 0}, reg_id = 0, ruid = {s = 0x0, len = 0}, location_ua = {s = 0x0, len = 0}, ldv = {flow = {decoded = 0, rcv = {src_ip = {af = 0, len = 0, u = {addrl = {0, 0, 0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, dst_ip = {af = 0, len = 0, u = {addrl = {0, 0, 0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 0, dst_port = 0, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x0, proto = 0 '\000'}}}} obuf = 0xbfab333c direction = 0 dlg = 0x0 nval = {s = 0x0, len = 0} tbuf = '\000' <repeats 19103 times>, "\027\003\003\002\070\000\000\000\000\000\000\000\001\213I\377\277\315\036\037\313\216\060OW\016\373\034\366\226\332\322\212}5\244a\311\277s\\\340\212B^\022\372\v\372\342L0d\257e6\341\236\343d\000\220\v\354\364\205\023G\245\333dN1\336\261r3\346\203\312,x\226>\310\263h\241\257\264\203<\301\244@R\326\370\063[^J \357\232\203\177\\\376\273\001{\311\004 \261\306G\371\bUe\027\065)\001\221)\364\316\037\r\326N\213\266d\252\214d\032\265\273\303\344\325\203\363\300\362\365\351_\221\273:r\223\251\277+\v\212~\234\301\345&\a\300F\207\236\274\035\366\f\001\217\033k\375%1b\237\001.\030\221\211X\244a<\252\276\223}\202\000\033\237\177\v\276>K5;\036\370&\330@\031\355\240-\376\026<s\211\246\235k\001\260`\211\333\270:mg\311\341`\037\065\313\244\"s\233\365?\233\331\035\242\262\217\061\240\004\370\001u\215\003\306\331>\255\025\324V\f\236\240\256\251o\343j\262\217\263qJ\367\333\314\004\263\023B\311W\240\034U|I\v\366\060\211\244$\277\177 \213\377\376\064#z\222y'5\236\365\355}\273\005\336/\254m\022\034\312\272\025\035\307d\223\361\214\004l\tq\f4\313\346\302:I\210\351\300W\024#\033}\022\343\322\362\214\226\n1\254\321\362\210Z%\352"... tbuf_len = 0 via = 0xa50c6b8c hfk = 0x0 cenv = 0x8430bc4 __FUNCTION__ = "dlg_cseq_msg_sent" #3 0x080c5ca9 in sr_event_exec (type=2, data=0xbfab333c) at events.c:231 ret = 0 i = 2 #4 0xb5e520cc in msg_send_buffer (dst=0xbfab3964, buf=0xb6959fe8 "HTTP/1.1 101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConne"..., len=335, flags=0) at ../../forward.h:138 new_dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = "\000\000\000\000\000\000\f\000\000\000\000\000\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\f\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\f\000\000\000\000\000\000\000\210\063\253\277K]\f\b", __u6_addr16 = {12, 0, 0, 0, 13192, 49067, 23883, 2060}, __u6_addr32 = {12, 0, 3215668104, 135028043}}}, sin6_scope_id = 0}}, id = 0, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} outb = { s = 0xb6959fe8 "HTTP/1.1 101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConne"..., len = 335} netinfo = {data = {s = 0xb5e58f55 "\213E\344\213@\f\211E\344\203}\344", len = -1079299188}, dst = 0x2, rcv = 0xb5e5f19c} port = -1079297644 ip = {af = 168079844, len = 3215668056, u = {addrl = {3051745692, 2769070720, 2769054604, 3215668168}, addr32 = {3051745692, 2769070720, 2769054604, 3215668168}, addr16 = {61852, 46565, 43648, 42252, 27532, 42252, 13256, 49067}, addr = "\234\361\345\265\200\252\f\245\214k\f\245\310\063\253\277"}} from = 0x0 local_addr = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = { sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 12 times>, "xq\253\277", __u6_addr16 = {0, 0, 0, 0, 0, 0, 29048, 49067}, __u6_addr32 = {0, 0, 0, 3215683960}}}, sin6_scope_id = 3078193140}} con = 0x0 wsev = {type = 0, buf = 0x0, len = 0, id = 0} ret = 0 __FUNCTION__ = "msg_send_buffer" #5 0xb5e55fb7 in sl_reply_helper (msg=0xbfab7178, code=101, reason=0xb695c598 "Switching Protocols", tag=0x0) at sl_funcs.c:202 buf = { s = 0xb6959fe8 "HTTP/1.1 101 Switching Protocols\r\nSia: SIP/2.0/TLS x.x.x.x:31366;rport=31366\r\nAccess-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConne"..., len = 335} dset = {s = 0x0, len = 0} dst = {send_sock = 0xb6653088, to = {s = {sa_family = 2, sa_data = "z\206\262\313\353\225\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 34426, sin_addr = {s_addr = 2515258290}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 34426, sin6_flowinfo = 2515258290, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = { 0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 1, proto = 3 '\003', send_flags = {f = 1 '\001', blst_imask = 0 '\000'}} dummy_bm = {to_tag_val = {s = 0x82646aa "\213\025\214XA\b\213R\b9\320\017\214\300\002", len = 138042733}} backup_mhomed = 0 ret = -1525898716 text = {s = 0xb695c598 "Switching Protocols", len = 19} backup_rt = 136692883 ctx = {rec_lev = 224423841, run_flags = 518, last_retcode = 32, jmp_env = {{__jmpbuf = {7, 0, -1525896576, 8, -1079297640, 136726975}, __mask_was_saved = 5, __saved_mask = {__val = {0, 20, 138035965, 138037119, 161, 138035960, 6846744, 7557840, 7558196, 4, 121, 2769068580, 2769070720, 3215669560, 135028043, 0, 2769054604, 3215669560, 136719511, 3059949576, 3063269120, 118, 0, 3063269120, 272, 3215669768, 136726975, 5, 0, 200, 137638064, 137638524}}}}} pmsg = {id = 2769057578, pid = 2, tval = {tv_sec = -1079298356, tv_usec = 2}, fwd_send_flags = {f = 2 '\002', blst_imask = 0 '\000'}, rpl_send_flags = {f = 0 '\000', blst_imask = 0 '\000'}, first_line = {type = -14952, flags = -18795, len = -1227359856, u = {request = {method = {s = 0xbfab72e0 "PV\226\266H\002", len = -1079298280}, uri = {s = 0x818b3a5 "\213E\344\351\211\002", len = -1079298364}, version = {s = 0x50 <Address 0x50 out of bounds>, len = -1079298372}, method_value = -1231752376}, reply = {version = {s = 0xbfab72e0 "PV\226\266H\002", len = -1079298280}, status = {s = 0x818b3a5 "\213E\344\351\211\002", len = -1079298364}, reason = {s = 0x50 <Address 0x50 out of bounds>, len = -1079298372}, statuscode = 3063214920}}}, via1 = 0x0, via2 = 0xbfab36c4, headers = 0xbfab35a8, last_header = 0x8188cb5, parsed_flag = 13163490031275437096, h_via1 = 0xbfab3518, h_via2 = 0xd606fa1, callid = 0x0, to = 0x0, cseq = 0x0, from = 0x0, contact = 0x0, maxforwards = 0xb691c4b0, route = 0x0, record_route = 0x0, content_type = 0xbfab3d20, content_length = 0x1c0, authorization = 0xbfab35f8, expires = 0x82649bf, proxy_auth = 0x5, supported = 0x0, require = 0x0, proxy_require = 0x0, unsupported = 0x0, allow = 0x0, event = 0xbfab3bac, accept = 0xffffffe4, accept_language = 0x0, organization = 0x1, priority = 0x5, subject = 0x8188c14, user_agent = 0x1c, server = 0xffffffff, content_disposition = 0x0, diversion = 0x73, rpid = 0x0, refer_to = 0x0, session_expires = 0xbfab3598, min_se = 0x8188bff, sipifmatch = 0xb6ae0ff0, subscription_state = 0x0, date = 0x2, identity = 0xbfab39a0, identity_info = 0x18, pai = 0xa50c7729, ppi = 0x0, path = 0xb7677d44, privacy = 0x0, body = 0xa50c7708, eoh = 0x0, unparsed = 0xbfab3ba8 "\200\252\f\245\002", rcv = {src_ip = {af = 93, len = 2769057544, u = {addrl = {3215670764, 224423841, 0, 3215689468}, addr32 = {3215670764, 224423841, 0, 3215689468}, addr16 = {15852, 49067, 28577, 3424, 0, 0, 34556, 49067}, addr = "\354=\253\277\241o`\r\000\000\000\000\374\206\253\277"}}, dst_ip = {af = 3215671656, len = 135931595, u = { addrl = {3063006384, 0, 3215670604, 3215670600}, addr32 = {3063006384, 0, 3215670604, 3215670600}, addr16 = {50352, 46737, 0, 0, 15692, 49067, 15688, 49067}, addr = "\260\304\221\266\000\000\000\000L=\253\277H=\253\277"}}, src_port = 15684, dst_port = 49067, proto_reserved1 = 262144, proto_reserved2 = -1079298552, src_su = {s = {sa_family = 35860, sa_data = "\030\bD\f\256\266\300\001\000\000\310\066\253\277"}, sin = {sin_family = 35860, sin_port = 2072, sin_addr = {s_addr = 3064859716}, sin_zero = "\300\001\000\000\310\066\253\277"}, sin6 = {sin6_family = 35860, sin6_port = 2072, sin6_flowinfo = 3064859716, sin6_addr = {__in6_u = {__u6_addr8 = "\300\001\000\000\310\066\253\277\277I&\b\002\000\000", __u6_addr16 = {448, 0, 14024, 49067, 18879, 2086, 2, 0}, __u6_addr32 = {448, 3215668936, 136726975, 2}}}, sin6_scope_id = 0}}, bind_address = 0xbfab3628, proto = -1 '\377'}, buf = 0xb6ae0ff0 "\033", len = 0, new_uri = {s = 0xbfab3648 "\330g\221\266(l\221\266\330g\221\266\020\322\254\266\330\066\253\277\241o`\r", len = 135028043}, dst_uri = {s = 0x0, len = 1}, parsed_uri_ok = -1079298488, parsed_uri = { user = {s = 0x8188c14 "\205\300t\a\270\001", len = 32}, passwd = {s = 0x0, len = -1231979188}, host = {s = 0x1 <Address 0x1 out of bounds>, len = 1}, port = {s = 0x0, len = -1231984680}, params = { s = 0xb6916c28 "\001", len = -1231984680}, sip_params = {s = 0xb6acd210 "\020", len = -1079298344}, headers = {s = 0xd606fa1 <Address 0xd606fa1 out of bounds>, len = 0}, port_no = 34556, proto = 49067, type = 3215671816, flags = 135931595, transport = {s = 0xb6916c28 "\001", len = 1}, ttl = {s = 0xbfab3dec "\277I&\b\260", len = -1079296536}, user_param = {s = 0xbfab3de4 "\314\001", len = 0}, maddr = {s = 0x0, len = -1241607909}, method = {s = 0x1 <Address 0x1 out of bounds>, len = 0}, lr = {s = 0xbfab36c8 "", len = 2}, r2 = {s = 0xb6632008 "\001", len = 226}, gr = { s = 0xb6acd210 "\020", len = -1230188016}, transport_val = {s = 0xb6ae0698 "\002", len = -1230109024}, ttl_val = {s = 0x0, len = -1231661426}, user_param_val = { s = 0xf <Address 0xf out of bounds>, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = -1241607909}, r2_val = { s = 0xe0 <Address 0xe0 out of bounds>, len = 262144}, gr_val = {s = 0xae <Address 0xae out of bounds>, len = -1}}, parsed_orig_ruri_ok = 0, parsed_orig_ruri = {user = { s = 0xf0 <Address 0xf0 out of bounds>, len = -1079298104}, passwd = {s = 0xb695c598 "Switching Protocols", len = 5}, host = {s = 0x0, len = 456}, port = {s = 0x1b4 <Address 0x1b4 out of bounds>, len = -1227359856}, params = {s = 0xbfab72e0 "PV\226\266H\002", len = -1079298136}, sip_params = { s = 0x818d27a "\213E\340\353\"\220\353\004\220\353\001\220\213E\320\211\004$\350\263\242\377\377\213E\344\211\004$\350\250\242\377\377\270", len = -1231698536}, headers = {s = 0xb694b754 "sip:", len = 4}, port_no = 62280, proto = 46740, type = ERROR_URI_T, flags = 0, transport = {s = 0x0, len = 224423841}, ttl = {s = 0x0, len = -1079277828}, user_param = { s = 0xbfab3828 "\270\321\376\265\255\216&\bt8\253\277", len = 136730906}, maddr = {s = 0xb6632008 "\001", len = -1231979088}, method = {s = 0x0, len = 0}, lr = { s = 0xd606fa1 <Address 0xd606fa1 out of bounds>, len = 0}, r2 = { s = 0xbfab3798 "h8\253\277\260\327\027\245\220\371\327\266\340r\253\277\350<\253\277/:\031\bH\363\224\266xq\253\277\234\357\224\266", len = 135028043}, gr = {s = 0x0, len = 20}, transport_val = { s = 0xb694ef9c "\002", len = 37147}, ttl_val = {s = 0xb695c5a0 "g Protocols", len = -1231753308}, user_param_val = {s = 0xb695c598 "Switching Protocols", len = -1231698536}, maddr_val = {s = 0x0, len = 428}, method_val = {s = 0xbfab3868 "89\253\277\277I&\b\005", len = -1525164112}, lr_val = {s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, r2_val = { s = 0xbfab3ce8 "\310F\253\277[k\006\b\b c\266T\305\225\266\204p3\b\334\215\063\bY\004", len = 135871023}, gr_val = {s = 0xb694f348 "\a", len = -1079283336}}, add_rm = 0xb694ef9c, body_lumps = 0x0, reply_lump = 0xb694f348, add_to_branch_s = "\273\003u\267X\305\225\266\205\266+\b\370;\253\277\000\000\000\000\304\000\000\000=\221\067\b\340\000\000\000\000\027\067\b\310\070\253\277\032Y&\b\b c\266`d\220\266\324}\221\266\033\221", add_to_branch_len = -1231979088, hash_index = 3077903151, msg_flags = 224423841, flags = 3059949576, set_global_address = {s = 0xb6917f8a "7\b\350\004", len = -1231959972}, set_global_port = { s = 0xe <Address 0xe out of bounds>, len = 224423841}, force_send_socket = 0x0, path_vec = {s = 0xb7750215 "\201\303\213\265\002", len = -1241591368}, instance = { s = 0x8268ead "\213E\364\213P\004\213E\f\211\020\213E\f\307@\024\004", len = -1079297932}, reg_id = 0, ruid = {s = 0x1c <Address 0x1c out of bounds>, len = 136049093}, location_ua = { s = 0xbfab38dc "\375B:\b\177G:\b\241", len = 0}, ldv = {flow = {decoded = 16, rcv = {src_ip = {af = 3059949576, len = 3064788156, u = {addrl = {262144, 3215669400, 3053359487, 3059949576}, addr32 = {262144, 3215669400, 3053359487, 3059949576}, addr16 = {0, 4, 14488, 49067, 37247, 46590, 8200, 46691}, addr = "\000\000\004\000\230\070\253\277\177\221\376\265\b c\266"}}, dst_ip = {af = 3215669364, len = 3215669560, u = {addrl = {136726975, 5, 16777216, 9219348}, addr32 = {136726975, 5, 16777216, 9219348}, addr16 = {18879, 2086, 5, 0, 0, 256, 44308, 140}, addr = "\277I&\b\005\000\000\000\000\000\000\001\024\255\214"}}, src_port = 31028, dst_port = 104, proto_reserved1 = 7557868, proto_reserved2 = 7558196, src_su = {s = {sa_family = 4, sa_data = "\000\000x\000\000\000\234\361\345\265\200\252\f\245"}, sin = {sin_family = 4, sin_port = 0, sin_addr = {s_addr = 120}, sin_zero = "\234\361\345\265\200\252\f\245"}, sin6 = { sin6_family = 4, sin6_port = 0, sin6_flowinfo = 120, sin6_addr = {__in6_u = {__u6_addr8 = "\234\361\345\265\200\252\f\245\310\070\253\277K]\f\b", __u6_addr16 = {61852, 46565, 43648, 42252, 14536, 49067, 23883, 2060}, __u6_addr32 = {3051745692, 2769070720, 3215669448, 135028043}}}, sin6_scope_id = 0}}, bind_address = 0x0, proto = 28 '\034'}}}} __FUNCTION__ = "sl_reply_helper" #6 0xb5e56dcc in sl_send_reply (msg=0xbfab7178, code=101, reason=0xb695c598 "Switching Protocols") at sl_funcs.c:303 No locals. #7 0xb5e4dde5 in send_reply (msg=0xbfab7178, code=101, reason=0xa50ca4ac) at sl.c:281 r = 0xb695c598 "Switching Protocols" t = 0xffffffff ret = 1 __FUNCTION__ = "send_reply" #8 0xa50b953f in ws_send_reply (msg=0xbfab7178, code=101, reason=0xa50ca4ac, hdrs=0xbfab4068) at ws_handshake.c:109 __FUNCTION__ = "ws_send_reply" #9 0xa50be321 in ws_handle_handshake (msg=0xbfab7178) at ws_handshake.c:424 key = {s = 0xb6965819 "GVs/6jVe4SSceoeJGmIG0g==\r\nSec-WebSocket-Extensions: permessage-deflate; client_max_window_bits\r\nSec-WebSocket-Protocol: sip\r\n\r\n", len = 24} headers = { s = 0xa50ca880 "Access-Control-Allow-Origin: https://web.service.dummy.ok\r\nSec-WebSocket-Protocol: sip\r\nUpgrade: websocket\r\nConnection: upgrade\r\nSec-WebSocket-Accept: y3st9Xv712JK2HJY6KDEx2nRd0w=\r\n", len = 182} reply_key = {s = 0xa50caa80 "y3st9Xv712JK2HJY6KDEx2nRd0w=[", len = 28} origin = { s = 0xb69656fb "https://web.service.dummy.ok\r\nSec-WebSocket-Version: 13\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36\r\nDNT: 1\r"..., len = 29} sha1 = "\313{-\365{\373\327bJ\330rX\350\240\304\307i\321wL" hdr_flags = 123 sub_protocol = 1 version = 13 hdr = 0x0 con = 0xa5aedc90 wsc = 0xb691c4b0 __FUNCTION__ = "ws_handle_handshake" #10 0x080655ce in do_action (h=0xbfab4be0, a=0xb6950d68, msg=0xbfab7178) at action.c:1054 ret = -5 v = 5 dst = {send_sock = 0xb692b968, to = {s = {sa_family = 37147, sa_data = "\376\265\200\000\000\000\000\200\000\000\216\000\000"}, sin = {sin_family = 37147, sin_port = 46590, sin_addr = {s_addr = 128}, sin_zero = "\000\200\000\000\216\000\000"}, sin6 = {sin6_family = 37147, sin6_port = 46590, sin6_flowinfo = 128, sin6_addr = {__in6_u = { __u6_addr8 = "\000\200\000\000\216\000\000\000\377\377\377\377\000\000\000", __u6_addr16 = {32768, 0, 142, 0, 65535, 65535, 0, 0}, __u6_addr32 = {32768, 142, 4294967295, 0}}}, sin6_scope_id = 124}}, id = -1079293400, proto = -65 '\277', send_flags = {f = 73 'I', blst_imask = 38 '&'}} tmp = 0xb5fe911b "\201\303\235@" new_uri = 0x0 end = 0x837178c "core: rvalue.c" crt = 0xb68ce36c " " cmd = 0xb66643f8 len = 161 user = 0 uri = {user = {s = 0x80000 <Address 0x80000 out of bounds>, len = 176}, passwd = {s = 0xffffffff <Address 0xffffffff out of bounds>, len = 0}, host = {s = 0xf4 <Address 0xf4 out of bounds>, len = 1}, port = {s = 0x0, len = 32}, params = {s = 0x0, len = -1079293560}, sip_params = { s = 0x81897cc "\205\300\017\237\300\017\266\320\213E\020\211\020\213E\b\213@\004\211\302\203\342\371\213E\b\211P\004\351\341\004", len = -1079283504}, headers = {s = 0xb694e8e4 "]\017", len = -1079283336}, port_no = 65535, proto = 65535, type = 3062691928, flags = 116, transport = {s = 0x0, len = -1241664416}, ttl = {s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, user_param = { s = 0xbfab48f8 "\030I\253\277\240\b\375\265\274\033\226\266$J\253\277\350I\253\277 \356\275\265\220\371\327\266\340r\253\277\210J\253\277\256\301\266\265xq\253\277\b\344\224\266\070J\253\277\064J\253\277", len = -1241708491}, maddr = { s = 0xb6965688 "Host: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-WebSocket-Version: 13\r\nUser-Agent: Mozilla/5.0 (Ma"..., len = -1231756347}, method = {s = 0x4 <Address 0x4 out of bounds>, len = -1079291832}, lr = {s = 0xbfab5044 "", len = -1231898264}, r2 = { s = 0x4 <Address 0x4 out of bounds>, len = 0}, gr = {s = 0x0, len = -1241664416}, transport_val = {s = 0xbfab4918 "\210J\253\277\256\301\266\265xq\253\277\b\344\224\266\070J\253\277\064J\253\277", len = -1241708384}, ttl_val = {s = 0xb6961bbc "\210V\226\266\004", len = -1079293404}, user_param_val = {s = 0xbfab49e8 "\241", len = -1245843936}, maddr_val = {s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, method_val = {s = 0xbfab4a88 "\370J\253\277\205\343\023\bxq\253\277\b\344\224\266\064K\253\277K]\f\b", len = -1246314066}, lr_val = {s = 0xbfab7178 "\001", len = -1231756280}, r2_val = {s = 0xbfab4a38 "", len = -1079293388}, gr_val = {s = 0x0, len = 176}} next_hop = {user = {s = 0x2 <Address 0x2 out of bounds>, len = 0}, passwd = {s = 0xbfab47e8 "\001", len = -1525164112}, host = {s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, port = { s = 0xbfab4898 "\210I\253\277\314\227\030\b\320p\253\277\344\350\224\266xq\253\277\377\377\377\377X\370\214\266t", len = 134681845}, params = {s = 0xbfab47e0 "", len = -1231755036}, sip_params = { s = 0xbfab7178 "\001", len = -1}, headers = {s = 0x0, len = 0}, port_no = 1, proto = 0, type = 2769803184, flags = 3067607440, transport = {s = 0xbfab72e0 "PV\226\266H\002", len = -1079294008}, ttl = {s = 0x9629dd1a <Address 0x9629dd1a out of bounds>, len = -827108235}, user_param = {s = 0x0, len = -1079293752}, maddr = {s = 0x818919c "\205\300\017\204S\005", len = -1079293788}, method = { s = 0xb68cfc04 "\001", len = -1079291828}, lr = {s = 0xbfab5048 "\354\253\214", len = -1079291836}, r2 = {s = 0xbfab86fc "\201T\232\236", len = -1079290936}, gr = { s = 0x81a44f4 "\205\300\017\204^\036", len = -1231869952}, transport_val = {s = 0x2 <Address 0x2 out of bounds>, len = -1079291988}, ttl_val = {s = 0xbfab4fa8 "xP\253\277\033\221\376\265\005", len = -1079291996}, user_param_val = {s = 0xb6906460 "\020", len = -1079293752}, maddr_val = {s = 0xb5fe911b "\201\303\235@", len = 224423841}, method_val = {s = 0x0, len = -1079293816}, lr_val = { s = 0x80c5d4b "\211E\364\213E\364\351\373\001", len = 0}, r2_val = {s = 0x8371700 "core", len = -1231326200}, gr_val = {s = 0xb5fe911b "\201\303\235@", len = -1232235660}} u = 0x80c5d4b port = 49067 dst_host = 0x83b0000 i = -1231756280 flags = 0 avp = 0xbfab7178 st = {flags = 3215675148, id = 20232, name = {n = 0, s = {s = 0x0, len = 262144}, re = 0x0}, avp = 0x1} sct = 0xbfab4d58 sjt = 0xbfab7178 rve = 0xbfab4af8 mct = 0xbfab70d0 rv = 0x2 rv1 = 0x813e385 c1 = {cache_type = 3215689468, val_type = 3215673384, c = {avp_val = {n = 135827584, s = {s = 0x8189080 "\205\300\017\204l\006", len = -1079293948}, re = 0x8189080}, pval = {rs = { s = 0x8189080 "\205\300\017\204l\006", len = -1079293948}, ri = -1231868804, flags = -1079291988}}, i2s = "\250O\253\277\244O\253\277\374\206\253\277(S\253\277\024\070\032\b\033"} s = {s = 0xd606fa1 <Address 0xd606fa1 out of bounds>, len = 0} srevp = {0xbfab86fc, 0xbfab52f8} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <Address 0x1 out of bounds>, str = {s = 0x1 <Address 0x1 out of bounds>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 19}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #11 0x08070ea0 in run_actions (h=0xbfab4be0, a=0xb6950d68, msg=0xbfab7178) at action.c:1549 t = 0xb6950d68 ret = -1 mod = 0x1000000 ms = 0 __FUNCTION__ = "run_actions" #12 0x080714f5 in run_actions_safe (h=0xbfab70d0, a=0xb6950d68, msg=0xbfab7178) at action.c:1614 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {-1525164112, -1227359856, -1079282976, -1079292984, -1775117030, -827108235}, __mask_was_saved = 0, __saved_mask = {__val = { 3215674584, 136726975, 5, 0, 32, 138085432, 138095523, 318, 138084352, 0, 3063092684, 3063090588, 3215676716, 2, 0, 3215689468, 3215674488, 135871193, 3063203816, 3063203824, 0, 135826431, 3062687824, 3215689468, 3063203816, 3063306390, 0, 3215689468, 3215676520, 135919377, 3062916228, 0}}}}} ret = -1231763484 ign_on_break = 0 #13 0x081897cc in rval_get_int (h=0xbfab70d0, msg=0xbfab7178, i=0xbfab5800, rv=0xb6951848, cache=0x0) at rvalue.c:912 r_avp = 0x2 avp_val = {n = 476, s = {s = 0x1dc <Address 0x1dc out of bounds>, len = 2}, re = 0x1dc} pval = {rs = {s = 0xbfab4e08 "\002", len = 136726975}, ri = 5, flags = 0} tmp = {s = 0x0, len = 428} s = 0x0 r = 0 ret = 0 destroy_pval = 0 __FUNCTION__ = "rval_get_int" #14 0x0818d6b6 in rval_expr_eval_int (h=0xbfab70d0, msg=0xbfab7178, res=0xbfab5800, rve=0xb6951844) at rvalue.c:1910 i1 = 0 i2 = 0 ret = -1 c1 = {cache_type = RV_CACHE_SELECT, val_type = 10, c = {avp_val = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, pval = {rs = {s = 0x0, len = 0}, ri = -1241664416, flags = -1079292072}}, i2s = "\240\b\375\265\000\034\226\266dP\253\277\030P\253\277 \356\275\265\220\371"} c2 = {cache_type = 110, val_type = RV_NONE, c = {avp_val = {n = -1241664416, s = {s = 0xb5fdb460 "4\303", len = -1227359856}, re = 0xb5fdb460}, pval = {rs = {s = 0xb5fdb460 "4\303", len = -1227359856}, ri = -1079282976, flags = -1079292104}}, i2s = "5\b\375\265\237V\226\266a\303\224\266\n\000\000\000K]\f\b\226X"} rv1 = 0xb699c7ac rv2 = 0xffffffff __FUNCTION__ = "rval_expr_eval_int" #15 0x080650b2 in do_action (h=0xbfab70d0, a=0xb6952088, msg=0xbfab7178) at action.c:1030 ret = -5 v = 0 dst = {send_sock = 0xb5f5895f, to = {s = {sa_family = 0, sa_data = "\000\000\000\000\000\000\374\206\253\277\030X\253\277"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\374\206\253\277\030X\253\277"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = { __u6_addr8 = "\374\206\253\277\030X\253\277\331:\031\b\004\261\231\266", __u6_addr16 = {34556, 49067, 22552, 49067, 15065, 2073, 45316, 46745}, __u6_addr32 = {3215689468, 3215677464, 135871193, 3063525636}}}, sin6_scope_id = 3063525644}}, id = 0, proto = -1 '\377', send_flags = {f = 139 '\213', blst_imask = 24 '\030'}} tmp = 0x0 new_uri = 0x952 <Address 0x952 out of bounds> end = 0x81a69ee "\270" crt = 0x0 cmd = 0xd len = 0 user = 0 uri = {user = {s = 0x0, len = -1079288484}, passwd = {s = 0x0, len = 0}, host = {s = 0x0, len = 3}, port = {s = 0x2 <Address 0x2 out of bounds>, len = -1}, params = { s = 0xffffffff <Address 0xffffffff out of bounds>, len = -1079289992}, sip_params = {s = 0x8188263 "\211\004$\350US\355\377\203\304\034[^_]\303U\211\345\203\354\070\213E\b\005\272\001", len = -1235017728}, headers = {s = 0x1bc <Address 0x1bc out of bounds>, len = 137828236}, port_no = 37181, proto = 2103, type = 224, flags = 137828096, transport = {s = 0x0, len = -1079288976}, ttl = {s = 0x0, len = -1241729631}, user_param = {s = 0x0, len = -1217954492}, maddr = {s = 0x0, len = -1241729638}, method = {s = 0xb76a2433 "\201\303\301[\017", len = -1079288488}, lr = { s = 0xe <Address 0xe out of bounds>, len = -1241729638}, r2 = {s = 0x1 <Address 0x1 out of bounds>, len = 13}, gr = {s = 0xbfab5e24 "T\346o\267a", len = 13}, transport_val = { s = 0xb7797ff4 "|=\026", len = -1079288432}, ttl_val = {s = 0xb5f5895f "", len = -1079288472}, user_param_val = { s = 0xb767525f "\213\225t\372\377\377\071\302\017\205\362\361\377\377\270\377\377\377\177+\205x\373\377\377\071\302\017\207\337\361\377\377\001\225x\373\377\377\200?", len = -1079288432}, maddr_val = {s = 0xb5f5895f "", len = 0}, method_val = {s = 0x0, len = 135821446}, lr_val = {s = 0xb6632008 "\001", len = 0}, r2_val = {s = 0x0, len = -1231759392}, gr_val = {s = 0xb694d390 "\a", len = 137828096}} next_hop = {user = {s = 0xbfab580c "", len = 0}, passwd = {s = 0xb695c598 "Switching Protocols", len = -1525164112}, host = {s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, port = { s = 0xbfab5868 "hZ\253\277P\334\030\b\320p\253\277xq\253\277\064Z\253\277\210\333\224\266", len = 135850740}, params = {s = 0xb694d7e0 "\002", len = -1079283336}, sip_params = { s = 0xbfab5a34 "\001", len = 32}, headers = {s = 0xb694d390 "\a", len = 0}, port_no = 55264, proto = 46740, type = ERROR_URI_T, flags = 0, transport = {s = 0x128 <Address 0x128 out of bounds>, len = -1079290008}, ttl = {s = 0x82649bf "\213E\340\203\300$\201\304\274", len = 184}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x2 <Address 0x2 out of bounds>, len = 0}, method = { s = 0xbfab86fc "\201T\232\236", len = -1079289960}, lr = {s = 0x826591a "\353\a\220\353\004\220\353\001\220\201\304\314", len = -1235017720}, r2 = {s = 0xb6994f3c "\020", len = -1079290104}, gr = { s = 0x81882be "\211E\360\203}\360", len = -1231677704}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x8371700 "core", len = 0}, maddr_val = {s = 0x0, len = 32}, method_val = {s = 0xbfab86fc "\201T\232\236", len = -1079289992}, lr_val = { s = 0x8187886 "\203\304l[^_]\303U\211\345\203\354\030\213E\b\213@\004\215P\377\213E\b\211P\004\213E\b\213@\004\205\300u\v\213E\b\211\004$\350\360\365\377\377\311\303U\211\345WVS\201\354\374", len = -1235017720}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}} u = 0x1 port = 49067 dst_host = 0xb699d424 i = -1231671128 flags = 0 avp = 0xb6966620 st = {flags = 3063268760, id = 55264, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, avp = 0x0} sct = 0x1 sjt = 0x1 rve = 0xb6951844 mct = 0x0 rv = 0xbfab5a34 rv1 = 0x0 c1 = {cache_type = RV_CACHE_EMPTY, val_type = 3063207912, c = {avp_val = {n = -1231698528, s = {s = 0xb695c5a0 "g Protocols", len = 0}, re = 0xb695c5a0}, pval = {rs = {s = 0xb695c5a0 "g Protocols", len = 0}, ri = -1217068523, flags = -1525164112}}, i2s = "\260\327\027\245\220\371\327\266\340r\253\277hV\253\277^\323\030\b\340\327"} s = {s = 0xb5fe911b "\201\303\235@", len = 213} srevp = {0x19c, 0xbfab56c8} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <Address 0x1 out of bounds>, str = {s = 0x1 <Address 0x1 out of bounds>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 19}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #16 0x08070ea0 in run_actions (h=0xbfab70d0, a=0xb6950c28, msg=0xbfab7178) at action.c:1549 t = 0xb6952088 ret = 1 mod = 0xb6920320 ms = 0 __FUNCTION__ = "run_actions" #17 0x08065552 in do_action (h=0xbfab70d0, a=0xb6952124, msg=0xbfab7178) at action.c:1045 ret = 1 v = 1 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = { sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\000\000\000\000\000\000\000\000\\c\253\277\005\000\000", __u6_addr16 = {0, 0, 0, 0, 25436, 49067, 5, 0}, __u6_addr32 = {0, 0, 3215680348, 5}}}, sin6_scope_id = 7}}, id = 0, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} tmp = 0xb578cee7 "\211n\370)~\374\306\004." new_uri = 0x128 <Address 0x128 out of bounds> end = 0xb7773d4c "malloc.c" crt = 0xb5792ff4 "\360\256" cmd = 0xb665c1e4 len = -1217064161 user = -1250349068 uri = {user = {s = 0xbfe2bb61 <Address 0xbfe2bb61 out of bounds>, len = 1084160162}, passwd = {s = 0x153911c2 <Address 0x153911c2 out of bounds>, len = 1892152629}, host = { s = 0x19945161 <Address 0x19945161 out of bounds>, len = 1918852815}, port = {s = 0xcb18b54e <Address 0xcb18b54e out of bounds>, len = -1526424657}, params = {s = 0xbfab6248 "", len = 0}, sip_params = {s = 0x1 <Address 0x1 out of bounds>, len = -1525164112}, headers = {s = 0xa04b0c0 "\350\267\004\n\032", len = -1231472044}, port_no = 25176, proto = 49067, type = 3077518168, flags = 0, transport = {s = 0x0, len = 1}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, method = { s = 0xbfab6308 "Hc\253\277^\323\030\b\004{\223\266\300m\253\277\270\033\226\266\004{\223\266", len = 135840547}, lr = {s = 0xb6961b94 " ", len = -1231676050}, r2 = {s = 0x0, len = -1235017720}, gr = {s = 0x0, len = -1079287036}, transport_val = {s = 0xbfab62a8 "ph\253\277TV\226\266\001", len = -1525164112}, ttl_val = {s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, user_param_val = { s = 0xbfab6308 "Hc\253\277^\323\030\b\004{\223\266\300m\253\277\270\033\226\266\004{\223\266", len = 135821446}, maddr_val = {s = 0xb6632008 "\001", len = -1231676488}, method_val = { s = 0x837178c "core: rvalue.c", len = 137859433}, lr_val = {s = 0x81 <Address 0x81 out of bounds>, len = 137828096}, r2_val = {s = 0xbfab6870 "", len = -1231661484}, gr_val = { s = 0x1 <Address 0x1 out of bounds>, len = 0}} next_hop = {user = {s = 0x0, len = 168079552}, passwd = {s = 0xbfab6178 "\250a\253\277K]\f\b", len = -1241607809}, host = {s = 0xb6632008 "\001", len = -1079287468}, port = { s = 0xffffffff <Address 0xffffffff out of bounds>, len = -1079287272}, params = {s = 0xbfab6164 "\254Ps", len = 16777216}, sip_params = {s = 0x8caf54 <Address 0x8caf54 out of bounds>, len = 6846808}, headers = {s = 0x7350ac <Address 0x7350ac out of bounds>, len = 7557292}, port_no = 4, proto = 0, type = 118, flags = 2769803184, transport = {s = 0xb6d7f990 "(J\005\n \002", len = -1079287384}, ttl = {s = 0x80c5d4b "\211E\364\213E\364\351\373\001", len = 0}, user_param = {s = 0x1 <Address 0x1 out of bounds>, len = 2}, maddr = {s = 0x1 <Address 0x1 out of bounds>, len = 188}, method = {s = 0x0, len = 0}, lr = {s = 0xa517d7b0 "\200\326", len = -1227359856}, r2 = {s = 0xbfab72e0 "PV\226\266H\002", len = -1079287160}, gr = { s = 0x826591a "\353\a\220\353\004\220\353\001\220\201\304\314", len = -1235017720}, transport_val = {s = 0xb6961b94 " ", len = 168079552}, ttl_val = {s = 0x0, len = -1}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x6af42c0 <Address 0x6af42c0 out of bounds>, len = -1500340898}} u = 0xb6b4aef8 port = 49067 dst_host = 0x20 i = 1893571582 flags = -1235017720 avp = 0xff565002 st = {flags = 28, id = 1, name = {n = 168077040, s = {s = 0xa04a6f0 "", len = 0}, re = 0xa04a6f0}, avp = 0xb6993a54} sct = 0xb6961bb8 sjt = 0xbfab6dc0 rve = 0xb694df34 mct = 0xb6937b04 rv = 0x0 rv1 = 0x0 c1 = {cache_type = 4436732, val_type = 3077202798, c = {avp_val = {n = -1217954492, s = {s = 0xb7677d44 "\200\275\064\373\377\377", len = -1079287276}, re = 0xb7677d44}, pval = {rs = { s = 0xb7677d44 "\200\275\064\373\377\377", len = -1079287276}, ri = -1241729638, flags = 8}}, i2s = "\330f\253\277\000\000\000\000\025\002u\267\270\321\376\265\255\216&\bTa"} s = {s = 0xbfab64f0 "", len = -1242200692} srevp = {0x0, 0xbfab61a8} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <Address 0x1 out of bounds>, str = {s = 0x1 <Address 0x1 out of bounds>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 19}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #18 0x08070ea0 in run_actions (h=0xbfab70d0, a=0xb694aee0, msg=0xbfab7178) at action.c:1549 t = 0xb6952124 ret = 1 mod = 0x1 ms = 0 __FUNCTION__ = "run_actions" #19 0x08065596 in do_action (h=0xbfab70d0, a=0xb69521c0, msg=0xbfab7178) at action.c:1049 ret = 1 v = 0 dst = {send_sock = 0xb77d07e5, to = {s = {sa_family = 29104, sa_data = "\253\277\030\000\000\000\030BD\265\000\000\000"}, sin = {sin_family = 29104, sin_port = 49067, sin_addr = {s_addr = 24}, sin_zero = "\030BD\265\000\000\000"}, sin6 = {sin6_family = 29104, sin6_port = 49067, sin6_flowinfo = 24, sin6_addr = {__in6_u = {__u6_addr8 = "\030BD\265\000\000\000\000D}g\267s\000\000", __u6_addr16 = {16920, 46404, 0, 0, 32068, 46951, 115, 0}, __u6_addr32 = {3041149464, 0, 3077012804, 115}}}, sin6_scope_id = 3041149457}}, id = -1218216444, proto = -72 '\270', send_flags = { f = 1 '\001', blst_imask = 126 '~'}} tmp = 0xbfab72e0 "PV\226\266H\002" new_uri = 0xb77e4910 "" end = 0xbfab6ec4 "\377\377\377\377\364?~\267\304T\005\b\005" crt = 0xb6d7f990 "(J\005\n \002" cmd = 0x0 len = -1525164112 user = -1218199836 uri = {user = {s = 0xb696560c "", len = 138085432}, passwd = {s = 0x83b2ba3 "parse_headers", len = 334}, host = {s = 0x83b0000 "core", len = 23}, port = {s = 0xb5792ff4 "\360\256", len = 0}, params = { s = 0xbfab86fc "\201T\232\236", len = 33}, sip_params = {s = 0xb578c8d8 "\205\300u\f\213D$\034\203\304([\303\215v", len = -1231660904}, headers = { s = 0xbfab6d28 "xn\253\277*F*\bWV\226\266=\201;\b\006", len = 137189177}, port_no = 22111, proto = 46742, type = 10, flags = 46, transport = {s = 0x0, len = 1}, ttl = { s = 0xb6d7f990 "(J\005\n \002", len = -1079282976}, user_param = {s = 0xbfab6e78 "", len = 136988202}, maddr = { s = 0xb6965657 "TTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-W"..., len = 138117437}, method = {s = 0x6 <Address 0x6 out of bounds>, len = -1079284392}, lr = {s = 0xb57b3148 "\f \001", len = 0}, r2 = {s = 0xbfab71af "", len = 10}, gr = { s = 0x0, len = -1218199836}, transport_val = {s = 0xd696910 <Address 0xd696910 out of bounds>, len = -1079284332}, ttl_val = { s = 0xb77d0166 "\213M\340\205\300u3\211\360\213]\364\213u\370\213}\374\211\354]\303\215t&", len = -1218155984}, user_param_val = {s = 0x805b926 "GLIBC_2.0", len = -1079277828}, maddr_val = { s = 0x805524e "libc.so.6", len = -1216756928}, method_val = {s = 0xbfab0002 "\237\266", len = -1216520544}, lr_val = {s = 0x805524e "libc.so.6", len = -1216594520}, r2_val = { s = 0xb77e3ff4 "\f\317\001", len = -1218221656}, gr_val = {s = 0x3 <Address 0x3 out of bounds>, len = -1079284204}} next_hop = {user = {s = 0x13e <Address 0x13e out of bounds>, len = 138084352}, passwd = {s = 0x83b0000 "core", len = -1216774156}, host = {s = 0xb77993c0 "", len = 0}, port = { s = 0xbfab6c48 "\334l\253\277m\314x\265\t", len = -1217754692}, params = {s = 0x2 <Address 0x2 out of bounds>, len = 0}, sip_params = {s = 0xb76a9a1d "\211\301e\203=\f", len = -1250349068}, headers = {s = 0xa0548a0 "", len = 0}, port_no = 27868, proto = 49067, type = 3044592749, flags = 9, transport = {s = 0xb7797ff4 "|=\026", len = -1217780685}, ttl = {s = 0xa054c46 "\r\n", len = -1079284616}, user_param = {s = 0xb76a88ed "e\203=\f", len = 0}, maddr = {s = 0x1 <Address 0x1 out of bounds>, len = -1079282940}, method = {s = 0x1 <Address 0x1 out of bounds>, len = -1216774156}, lr = {s = 0xbfab7270 "", len = -1253817830}, r2 = {s = 0xbfab7248 "", len = -1217965473}, gr = {s = 0xbfab7270 "", len = -1253817831}, transport_val = { s = 0x1 <Address 0x1 out of bounds>, len = 0}, ttl_val = {s = 0xb578c790 "\203\370\377t\016\061\300\213\\$\024\213t$\030\203\304\034\303\213\206\220", len = -1231661592}, user_param_val = { s = 0xc0 <Address 0xc0 out of bounds>, len = -1231661592}, maddr_val = {s = 0xb6632008 "\001", len = -1250349068}, method_val = {s = 0xb76a51d6 "\201\303\036.\017", len = -1253817831}, lr_val = { s = 0x8800001 <Address 0x8800001 out of bounds>, len = 0}, r2_val = {s = 0xbfab86fc "\201T\232\236", len = 2}, gr_val = {s = 0x0, len = -1235017720}} u = 0x0 port = 2113 dst_host = 0x5 i = 134566308 flags = 138095523 avp = 0x5 st = {flags = 3215683192, id = 24330, name = {n = 138084352, s = {s = 0x83b0000 "core", len = 4}, re = 0x83b0000}, avp = 0xb6974be0} sct = 0x80554c4 sjt = 0xb779c000 rve = 0xb6937ee0 mct = 0xb779c340 rv = 0xbfab72e0 rv1 = 0x0 c1 = {cache_type = RV_CACHE_EMPTY, val_type = 3215682552, c = {avp_val = {n = -1231676640, s = {s = 0xb6961b20 "\001", len = -1235017720}, re = 0xb6961b20}, pval = {rs = {s = 0xb6961b20 "\001", len = -1235017720}, ri = 23, flags = -1231598660}}, i2s = "\210V\226\266\000\000\000\000\374\206\253\277\310l\253\277\000\000\000\000\220\371"} s = {s = 0x80c5d4b "\211E\364\213E\364\351\373\001", len = 0} srevp = {0x0, 0xbfab6be8} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NUMBER_ST, u = {number = 1, string = 0x1 <Address 0x1 out of bounds>, str = {s = 0x1 <Address 0x1 out of bounds>, len = 0}, data = 0x1, attr = 0x1, select = 0x1}}, {type = RVE_FREE_FIXUP_ST, u = {number = 0, string = 0x0, str = {s = 0x0, len = 19}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #20 0x08070ea0 in run_actions (h=0xbfab70d0, a=0xb69521c0, msg=0xbfab7178) at action.c:1549 t = 0xb69521c0 ret = -1 mod = 0x40000001 ms = 0 __FUNCTION__ = "run_actions" #21 0xa5174a69 in xhttp_process_request (orig_msg=0xb6d7f828, new_buf=0xb6965650 "GET / HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok"..., new_len=584) at xhttp_mod.c:282 ret = 0 tmp_msg = {id = 1, pid = 0, tval = {tv_sec = 0, tv_usec = 0}, fwd_send_flags = {f = 0 '\000', blst_imask = 0 '\000'}, rpl_send_flags = {f = 1 '\001', blst_imask = 0 '\000'}, first_line = {type = 1, flags = 2, len = 16, u = {request = {method = { s = 0xb6965650 "GET / HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok"..., len = 3}, uri = { s = 0xb6965654 "/ HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSe"..., len = 1}, version = { s = 0xb6965656 "HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-"..., len = 8}, method_value = 16384}, reply = {version = { s = 0xb6965650 "GET / HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok"..., len = 3}, status = { s = 0xb6965654 "/ HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSe"..., len = 1}, reason = { s = 0xb6965656 "HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-"..., len = 8}, statuscode = 16384}}}, via1 = 0xb6961b20, via2 = 0x0, headers = 0xb6974be0, last_header = 0xb695c510, parsed_flag = 18446744073709551615, h_via1 = 0xb6974be0, h_via2 = 0x0, callid = 0x0, to = 0x0, cseq = 0x0, from = 0x0, contact = 0x0, maxforwards = 0x0, route = 0x0, record_route = 0x0, content_type = 0x0, content_length = 0x0, authorization = 0x0, expires = 0x0, proxy_auth = 0x0, supported = 0x0, require = 0x0, proxy_require = 0x0, unsupported = 0x0, allow = 0x0, event = 0x0, accept = 0x0, accept_language = 0xb6961e60, organization = 0x0, priority = 0x0, subject = 0x0, user_agent = 0xb6961d94, server = 0x0, content_disposition = 0x0, diversion = 0x0, rpid = 0x0, refer_to = 0x0, session_expires = 0x0, min_se = 0x0, sipifmatch = 0x0, subscription_state = 0x0, date = 0x0, identity = 0x0, identity_info = 0x0, pai = 0x0, ppi = 0x0, path = 0x0, privacy = 0x0, body = 0x0, eoh = 0xb6965896 "\r\n", unparsed = 0xb6965896 "\r\n", rcv = {src_ip = {af = 2, len = 4, u = {addrl = {2515258290, 0, 0, 0}, addr32 = {2515258290, 0, 0, 0}, addr16 = {52146, 38379, 0, 0, 0, 0, 0, 0}, addr = "\262\313\353\225", '\000' <repeats 11 times>}}, dst_ip = {af = 2, len = 4, u = {addrl = {1548587732, 0, 0, 0}, addr32 = {1548587732, 0, 0, 0}, addr16 = {37588, 23629, 0, 0, 0, 0, 0, 0}, addr = "\324\222M\\", '\000' <repeats 11 times>}}, src_port = 31366, dst_port = 8443, proto_reserved1 = 1, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "z\206\262\313\353\225\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 34426, sin_addr = {s_addr = 2515258290}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = { sin6_family = 2, sin6_port = 34426, sin6_flowinfo = 2515258290, sin6_addr = {__in6_u = {__u6_addr8 = "\000\000\000\000\000\000\000\000\001\000\000\000\310J~\267", __u6_addr16 = {0, 0, 0, 0, 1, 0, 19144, 46974}, __u6_addr32 = {0, 0, 1, 3078507208}}}, sin6_scope_id = 0}}, bind_address = 0xb6653088, proto = 3 '\003'}, buf = 0xb6965650 "GET / HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok"..., len = 584, new_uri = {s = 0x0, len = 0}, dst_uri = {s = 0x0, len = 0}, parsed_uri_ok = 0, parsed_uri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = { s = 0x0, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = 0, transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}}, parsed_orig_ruri_ok = 0, parsed_orig_ruri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = { s = 0x0, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = 0, transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}}, add_rm = 0x0, body_lumps = 0x0, reply_lump = 0xb695c638, add_to_branch_s = '\000' <repeats 57 times>, add_to_branch_len = 0, hash_index = 0, msg_flags = 0, flags = 0, set_global_address = {s = 0x0, len = 0}, set_global_port = {s = 0x0, len = 0}, force_send_socket = 0x0, path_vec = {s = 0x0, len = 0}, instance = {s = 0x0, len = 0}, reg_id = 0, ruid = {s = 0x0, len = 0}, location_ua = {s = 0x0, len = 0}, ldv = {flow = {decoded = 0, rcv = {src_ip = {af = 0, len = 0, u = {addrl = {0, 0, 0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, dst_ip = {af = 0, len = 0, u = {addrl = {0, 0, 0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 0, dst_port = 0, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x0, proto = 0 '\000'}}}} msg = 0xbfab7178 ra_ctx = {rec_lev = 3, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {-1525164112, -1227359856, -1079282976, -1079283672, -1770382054, -827108235}, __mask_was_saved = 0, __saved_mask = { __val = {3215683976, 3045741472, 3063305636, 544, 3215684288, 3059949576, 2779660224, 2779665395, 129, 3046232728, 0, 3215689468, 3215683944, 136838447, 3059949576, 3063305672, 138083373, 138084317, 213, 3077899005, 3046232728, 136883713, 3215685216, 0, 100, 0, 21, 129, 3215683976, 136875280, 3215684288, 3077898773}}}}} __FUNCTION__ = "xhttp_process_request" #22 0xa5175b68 in xhttp_handler (msg=0xb6d7f828) at xhttp_mod.c:357 ret = 0 fake_msg = 0xb6965650 "GET / HTTP/1.1\r\nVia: SIP/2.0/TLS x.x.x.x:31366\r\nHost: test.dummy.ok:8443\r\nConnection: upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok"... fake_msg_len = 584 pmatch = {rm_so = 0, rm_eo = 0} c = 32 ' ' __FUNCTION__ = "xhttp_handler" #23 0x081283de in nonsip_msg_run_hooks (msg=0xb6d7f828) at nonsip_hooks.c:111 r = 1 ret = 1 #24 0x08150a47 in receive_msg ( buf=0xa054a28 "GET / HTTP/1.1\r\nHost: test.dummy.ok:8443\r\nConnection: Upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-WebSocket-Version: 13\r\nUser-Agent:"..., len=544, rcv_info=0xa5aedca4) at receive.c:189 msg = 0xb6d7f828 ctx = {rec_lev = 5333888, run_flags = 4, last_retcode = 119, jmp_env = {{__jmpbuf = {-1238976092, 89, -1079281576, 135028043, 0, -1243844620}, __mask_was_saved = 0, __saved_mask = {__val = {0, 32, 3077898773, 3053375928, 136744621, 3215685780, 0, 28, 136726975, 5, 0, 92, 3059949576, 3059949576, 213, 3077202798, 3053359487, 3059949576, 3215685780, 3063306712, 3055991204, 3055962697, 16777216, 11526868, 4540512, 8193, 65560, 121, 65536, 3078045309, 3078198264, 3078045004}}}}} ret = -1216774156 inb = { s = 0xa054a28 "GET / HTTP/1.1\r\nHost: test.dummy.ok:8443\r\nConnection: Upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-WebSocket-Version: 13\r\nUser-Agent:"..., len = 544} netinfo = {data = {s = 0xb5dc6ff4 "\310Y\033", len = 10}, dst = 0x1000000, rcv = 0xafe31c} __FUNCTION__ = "receive_msg" #25 0x082395df in receive_tcp_msg ( tcpbuf=0xa5aede60 "GET / HTTP/1.1\r\nHost: test.dummy.ok:8443\r\nConnection: Upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-WebSocket-Version: 13\r\nUser-Agent:"..., len=544, rcv_info=0xa5aedca4, con=0xa5aedc90) at tcp_read.c:1279 buf = 0xa054a28 "GET / HTTP/1.1\r\nHost: test.dummy.ok:8443\r\nConnection: Upgrade\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\nOrigin: https://web.service.dummy.ok\r\nSec-WebSocket-Version: 13\r\nUser-Agent:"... bsize = 65535 blen = 65535 __FUNCTION__ = "receive_tcp_msg" #26 0x0823b42f in tcp_read_req (con=0xa5aedc90, bytes_read=0xbfab7f24, read_flags=0xbfab7f1c) at tcp_read.c:1447 bytes = 544 total_bytes = 544 resp = 1 size = 0 req = 0xa5aedd04 dst = {send_sock = 0x2001, to = {s = {sa_family = 54276, sa_data = "\264\266@74\245\001\000\000\000\020\000\000"}, sin = {sin_family = 54276, sin_port = 46772, sin_addr = {s_addr = 2771662656}, sin_zero = "\001\000\000\000\020\000\000"}, sin6 = {sin6_family = 54276, sin6_port = 46772, sin6_flowinfo = 2771662656, sin6_addr = {__in6_u = { __u6_addr8 = "\001\000\000\000\020\000\000\000\001\000\000\000\001\000\000", __u6_addr16 = {1, 0, 16, 0, 1, 0, 1, 0}, __u6_addr32 = {1, 16, 1, 1}}}, sin6_scope_id = 16}}, id = -1079279848, proto = 4 '\004', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} c = 0 '\000' ret = 0 __FUNCTION__ = "tcp_read_req" #27 0x0823ecf8 in handle_io (fm=0xb6b4d404, events=1, idx=-1) at tcp_read.c:1679 ret = 0 n = 0 read_flags = 1 con = 0xa5aedc90 s = 16 resp = 1 t = 1478278877 __FUNCTION__ = "handle_io" #28 0x08230b80 in io_wait_loop_epoll (h=0x8452f40, t=2, repeat=0) at io_wait.h:1065 n = 1 r = 0 fm = 0xb6b4d404 revents = 1 __FUNCTION__ = "io_wait_loop_epoll" #29 0x0823ffca in tcp_receive_loop (unix_sock=66) at tcp_read.c:1791 __FUNCTION__ = "tcp_receive_loop" #30 0x0822776c in tcp_init_children () at tcp_main.c:4796 r = 0 i = -1 reader_fd_1 = 66 pid = 0 si_desc = "tcp receiver (tls:y.y.y.y:8443)\000\000\000\001\000\000\000\000\000\000\000\252\066\000\000\000\000\000\000\000\000\000\000\340\062\064\245\241o`\r8\202\253\277\372\205$\b\377\377\377\377\263\362\071\b\001\000\000\000a\200$\b\000\000\000\000\001\000\000\000hu4\b\241o`\r\263\066\000\000(\000\000\000\070\202\253\277\004\000\000\000\304\323\000?" si = 0x0 __FUNCTION__ = "tcp_init_children" #31 0x080f00e7 in main_loop () at main.c:1704 i = 4 pid = 13993 si = 0x0 si_desc = "udp receiver child=3 sock=y.y.y.y:5080\000\062\064\245\001\000\000\000\001\000\000\000\364\237\342\265\000\260\063\245\016\020\000\000\250\370~\245\250\370~\245\000\000\000\000`\310\342\265\364o\334\265\001\000\000\000\000\000\000\000\374\206\253\277H\204\253\277\377\241&\b\324\253\231\266\367\001>\265\235\346\065\b\350\367\065\bn\000\000" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #32 0x080f679b in main (argc=13, argv=0xbfab8874) at main.c:2631 cfg_stream = 0x9ab5008 c = -1 r = 0 tmp = 0xbfab9908 "" tmp_len = 1 port = 0 proto = 0 options = 0x8354d18 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:" ret = -1 seed = 2660914305 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xbfab87a0 p = 0x805ce5c "[\201\303\264\202;" st = {st_dev = 15, __pad1 = 0, st_ino = 12628, st_mode = 16832, st_nlink = 2, st_uid = 0, st_gid = 0, st_rdev = 0, __pad2 = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = { n = 1 r = 0 fm = 0xb6b4d404 revents = 1 __FUNCTION__ = "io_wait_loop_epoll" #29 0x0823ffca in tcp_receive_loop (unix_sock=66) at tcp_read.c:1791 __FUNCTION__ = "tcp_receive_loop" #30 0x0822776c in tcp_init_children () at tcp_main.c:4796 r = 0 i = -1 reader_fd_1 = 66 pid = 0 si_desc = "tcp receiver (tls:y.y.y.y:8443)\000\000\000\001\000\000\000\000\000\000\000\252\066\000\000\000\000\000\000\000\000\000\000\340\062\064\245\241o`\r8\202\253\277\372\205$\b\377\377\377\377\263\362\071\b\001\000\000\000a\200$\b\000\000\000\000\001\000\000\000hu4\b\241o`\r\263\066\000\000(\000\000\000\070\202\253\277\004\000\000\000\304\323\000?" si = 0x0 __FUNCTION__ = "tcp_init_children" #31 0x080f00e7 in main_loop () at main.c:1704 i = 4 pid = 13993 si = 0x0 si_desc = "udp receiver child=3 sock=y.y.y.y:5080\000\062\064\245\001\000\000\000\001\000\000\000\364\237\342\265\000\260\063\245\016\020\000\000\250\370~\245\250\370~\245\000\000\000\000`\310\342\265\364o\334\265\001\000\000\000\000\000\000\000\374\206\253\277H\204\253\277\377\241&\b\324\253\231\266\367\001>\265\235\346\065\b\350\367\065\bn\000\000" nrprocs = 4 woneinit = 1 __FUNCTION__ = "main_loop" #32 0x080f679b in main (argc=13, argv=0xbfab8874) at main.c:2631 cfg_stream = 0x9ab5008 c = -1 r = 0 tmp = 0xbfab9908 "" tmp_len = 1 port = 0 proto = 0 options = 0x8354d18 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:" ret = -1 seed = 2660914305 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0xbfab87a0 p = 0x805ce5c "[\201\303\264\202;" st = {st_dev = 15, __pad1 = 0, st_ino = 12628, st_mode = 16832, st_nlink = 2, st_uid = 0, st_gid = 0, st_rdev = 0, __pad2 = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = { ---Type <return> to continue, or q <return> to quit--- tv_sec = 1506010457, tv_nsec = 983334802}, st_mtim = {tv_sec = 1508597914, tv_nsec = 354506842}, st_ctim = {tv_sec = 1508598507, tv_nsec = 860710419}, __unused4 = 0, __unused5 = 0} __FUNCTION__ = "main" (gdb) info locals __FUNCTION__ = "dlg_cseq_prepare_msg" (gdb) list 76 77 if(msg->first_line.type==SIP_REPLY) { 78 /* reply to local transaction -- nothing to do */ 79 if (parse_headers(msg, HDR_VIA2_F, 0)==-1 80 || (msg->via2==0) || (msg->via2->error!=PARSE_OK)) { 81 if(get_cseq(msg)->method_id != METHOD_CANCEL) { 82 LM_DBG("no second via in this message \n"); 83 return 3; 84 } 85 } ``` #### Log Messages  ``` Oct 21 15:08:30 webrtc-as webrtc[14045]: INFO: tls [tls_server.c:420]: tls_accept(): tls_accept: new connection from x.x.x.x:aaaaa using TLSv1/SSLv3 AES256-GCM-SHA384 256 Oct 21 15:08:30 webrtc-as webrtc[14045]: INFO: tls [tls_server.c:423]: tls_accept(): tls_accept: local socket: y.y.y.y:bbbb Oct 21 15:08:30 webrtc-as webrtc[14045]: INFO: tls [tls_server.c:434]: tls_accept(): tls_accept: client did not present a certificate Oct 21 15:08:30 webrtc-as kernel: [2587094.669038] kamailio[14045] segfault at 18 ip b58a41a6 sp bfaa2970 error 4 in dialog.so[b5885000+98000] Oct 21 15:08:31 webrtc-as webrtc[14077]: CRITICAL: <core> [pass_fd.c:277]: receive_fd(): EOF on 63 Oct 21 15:08:31 webrtc-as webrtc[13959]: ALERT: <core> [main.c:740]: handle_sigs(): child process 14045 exited by a signal 11 Oct 21 15:08:31 webrtc-as webrtc[13959]: ALERT: <core> [main.c:743]: handle_sigs(): core was generated Oct 21 15:08:31 webrtc-as webrtc[13959]: INFO: <core> [main.c:755]: handle_sigs(): terminating due to SIGCHLD Oct 21 15:08:31 webrtc-as webrtc[14076]: INFO: <core> [main.c:810]: sig_usr(): signal 15 received Oct 21 15:08:31 webrtc-as webrtc[14075]: INFO: <core> [main.c:810]: sig_usr(): signal 15 received Oct 21 15:08:31 webrtc-as webrtc[13961]: INFO: <core> [main.c:810]: sig_usr(): signal 15 received Oct 21 15:08:31 webrtc-as webrtc[14069]: INFO: <core> [main.c:810]: sig_usr(): signal 15 received Oct 21 15:08:31 webrtc-as webrtc[13962]: INFO: <core> [main.c:810]: sig_usr(): signal 15 received ... ``` #### SIP Traffic  ``` Not Available - Kamailio crash upon HTTP WS Upgrade. ``` ### Possible Solutions  In kamailio/modules/dialog/dlg_cseq.c commenting out IF condition at line 81, then rebuilding kamailio binary seems to fix the problem, i.e. ``` if(msg->first_line.type==SIP_REPLY) { /* reply to local transaction -- nothing to do */ if (parse_headers(msg, HDR_VIA2_F, 0)==-1 || (msg->via2==0) || (msg->via2->error!=PARSE_OK)) { ===> //if(get_cseq(msg)->method_id != METHOD_CANCEL) { LM_DBG("no second via in this message \n"); return 3; ===> //} } } ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.6 (i386/linux) becbde flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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: becbde -dirty compiled on 15:01:17 Oct 21 2017 with gcc 4.7.2 ``` * **Operating System**:  ``` Linux webrtc-as 3.16.0-0.bpo.4-686-pae #1 SMP Debian 3.16.36-1+deb8u2~bpo70+1 (2016-10-19) i686 GNU/Linux ``` -- 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/1277

2 2

git:master:384a5338: Merge pull request #1283 from dunst0/patch-1
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: 384a5338762fbc17bb63a24fcfc2dfe968626070 URL: https://github.com/kamailio/kamailio/commit/384a5338762fbc17bb63a24fcfc2dfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T14:43:01+02:00 Merge pull request #1283 from dunst0/patch-1 dispatcher: undeclared UINT32_MAX on FreeBSD missing header --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/384a5338762fbc17bb63a24fcfc2dfe… Patch: https://github.com/kamailio/kamailio/commit/384a5338762fbc17bb63a24fcfc2dfe… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index a8ec1fd15b..d2d9d1c806 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdint.h> #include <time.h> #include <math.h>

1 0

[kamailio/kamailio] dispatcher: undeclared UINT32_MAX on FreeBSD missing header (#1283)
by Rick 25 Oct '17

25 Oct '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fixes compiling error on FreeBSD because there is for UINT32_MAX the <stdint.h> header needed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1283 -- Commit Summary -- * dispatcher: undeclared UINT32_MAX on FreeBSD missing header -- File Changes -- M src/modules/dispatcher/dispatch.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1283.patch https://github.com/kamailio/kamailio/pull/1283.diff -- 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/pull/1283

2 2

git:master:ed4757c5: dispatcher: undeclared UINT32_MAX on FreeBSD missing header
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: ed4757c5886f0fc93d3eeec9f01885b63c6dc9c8 URL: https://github.com/kamailio/kamailio/commit/ed4757c5886f0fc93d3eeec9f01885b… Author: Rick <dunst0(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T14:37:42+02:00 dispatcher: undeclared UINT32_MAX on FreeBSD missing header - on FreeBSD is for UINT32_MAX the <stdint.h> header needed --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ed4757c5886f0fc93d3eeec9f01885b… Patch: https://github.com/kamailio/kamailio/commit/ed4757c5886f0fc93d3eeec9f01885b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index a8ec1fd15b..d2d9d1c806 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdint.h> #include <time.h> #include <math.h>

1 0

git:5.0:d191ff87: pkg: rpm - version set to 5.0.4 in specs
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: d191ff8712a775cf2f6c48b1134890fd636ae969 URL: https://github.com/kamailio/kamailio/commit/d191ff8712a775cf2f6c48b1134890f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T14:38:32+02:00 pkg: rpm - version set to 5.0.4 in specs --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/d191ff8712a775cf2f6c48b1134890f… Patch: https://github.com/kamailio/kamailio/commit/d191ff8712a775cf2f6c48b1134890f… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index b5f9f76b95..b345e4c789 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel dev0.0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index b5aae3791f..a34446f73b 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel dev0.0%{dist} %bcond_with dnssec %bcond_with kazoo diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 1c29158913..b8bcf62099 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel dev7.2%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 96c978bfa1..6e1995f0a6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel dev0.0%{dist} %if 0%{?fedora} == 24 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 2981d3b38f..342be9fcd3 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 17cbf264f7..08a5de31a7 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 7a5dc75158..bcd08a2a28 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 28160e197a..7910759012 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 8a253fe425..5a504eeb56 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.3 +%define ver 5.0.4 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

Errored: kamailio/kamailio#4967 (master - cafabcf)
by Travis CI 25 Oct '17

25 Oct '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4967 Status: Errored Duration: 25 minutes and 59 seconds Commit: cafabcf (master) Author: Daniel-Constantin Mierla Message: Merge pull request #1282 from oyvindkolbu/gcc-7 Support gcc 7+. View the changeset: https://github.com/kamailio/kamailio/compare/991d73c27c7b...cafabcf658c2 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/292537018?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: kamailio/kamailio#4965 (master - 991d73c)
by Travis CI 25 Oct '17

25 Oct '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4965 Status: Errored Duration: 32 minutes and 1 second Commit: 991d73c (master) Author: Daniel-Constantin Mierla Message: Merge pull request #1279 from vitalikvoip/usrloc_fix Usrloc fix View the changeset: https://github.com/kamailio/kamailio/compare/d581c007ac29...991d73c27c7b View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/292536218?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: kamailio/kamailio#4964 (master - d581c00)
by Travis CI 25 Oct '17

25 Oct '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4964 Status: Errored Duration: 21 minutes and 49 seconds Commit: d581c00 (master) Author: Daniel-Constantin Mierla Message: Merge pull request #1280 from sergey-safarov/alpine pkg/kamailio/alpine_docker: Added support ssh git repo url View the changeset: https://github.com/kamailio/kamailio/compare/ba7f663a0f1d...d581c007ac29 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/292535294?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:5.0:10a6dec6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 10a6dec6a0278bfc4161651f28edf9402cc6b1d4 URL: https://github.com/kamailio/kamailio/commit/10a6dec6a0278bfc4161651f28edf94… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-25T12:16:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/10a6dec6a0278bfc4161651f28edf94… Patch: https://github.com/kamailio/kamailio/commit/10a6dec6a0278bfc4161651f28edf94… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index 451628d8b3..bc3360580f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -49,6 +49,7 @@ Alexandr Dubovikov 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -84,8 +85,9 @@ Alexandr Dubovikov 1.18. Set insert_retry_timeout parameter 1.19. Set callid_aleg_header parameter 1.20. Set topoh_unmask parameter - 1.21. sip_capture() usage - 1.22. report_capture() usage + 1.21. Set nonsip_hook parameter + 1.22. sip_capture() usage + 1.23. report_capture() usage Chapter 1. Admin Guide @@ -119,6 +121,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -186,6 +189,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 3.1. db_url (str) @@ -257,7 +261,7 @@ modparam("sipcapture", "db_insert_mode", 1) 3.6. capture_on (integer) - Parameter to enable/disable capture globaly (on(1)/off(0)) + Parameter to enable/disable capture globally (on(1)/off(0)) Default value is "0". @@ -456,6 +460,18 @@ modparam("sipcapture", "callid_aleg_header", "X-CallIDALeg") modparam("sipcapture", "topoh_unmask", 1) ... +3.21. nonsip_hook (int) + + If set to 1, event route sipcapture:siprequest is run when HEP message + is received. + + Default value is 0. + + Example 1.21. Set nonsip_hook parameter +... +modparam("sipcapture", "nonsip_hook", 1) +... + 4. Functions 4.1. sip_capture([table]) @@ -477,7 +493,7 @@ modparam("sipcapture", "topoh_unmask", 1) ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.21. sip_capture() usage + Example 1.22. sip_capture() usage ... sip_capture(); ... @@ -496,7 +512,7 @@ sip_capture("sip_capture_call_20160124"); ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.22. report_capture() usage + Example 1.23. report_capture() usage ... report_capture(); ...

1 0

[kamailio/kamailio] Support gcc 7+. (#1282)
by oyvindkolbu 25 Oct '17

25 Oct '17

Don't let Makefile.defs complain about old compiler when using gcc 7. This also gives gcc 7 the same default values as the other recent gcc versions. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1282 -- Commit Summary -- * Support gcc 7+. -- File Changes -- M src/Makefile.defs (70) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1282.patch https://github.com/kamailio/kamailio/pull/1282.diff -- 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/pull/1282

2 2

git:master:cafabcf6: Merge pull request #1282 from oyvindkolbu/gcc-7
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: cafabcf658c203d07bd170b2ccbf8282600c19a0 URL: https://github.com/kamailio/kamailio/commit/cafabcf658c203d07bd170b2ccbf828… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:07:20+02:00 Merge pull request #1282 from oyvindkolbu/gcc-7 Support gcc 7+. --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/cafabcf658c203d07bd170b2ccbf828… Patch: https://github.com/kamailio/kamailio/commit/cafabcf658c203d07bd170b2ccbf828…

1 0

git:master:c110c6b2: Support gcc 7+.
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: c110c6b2741739ff5f45953bfd0d46b9f3b888dc URL: https://github.com/kamailio/kamailio/commit/c110c6b2741739ff5f45953bfd0d46b… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T11:25:40+02:00 Support gcc 7+. --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c110c6b2741739ff5f45953bfd0d46b… Patch: https://github.com/kamailio/kamailio/commit/c110c6b2741739ff5f45953bfd0d46b…

1 0

git:5.0:81c7a69b: Merge pull request #1281 from oyvindkolbu/sipcapture-backport
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 81c7a69b0be87c39365c405f0e3f945b9d99a199 URL: https://github.com/kamailio/kamailio/commit/81c7a69b0be87c39365c405f0e3f945… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:06:34+02:00 Merge pull request #1281 from oyvindkolbu/sipcapture-backport Sipcapture backport --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/examples/kamailio.cfg Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/81c7a69b0be87c39365c405f0e3f945… Patch: https://github.com/kamailio/kamailio/commit/81c7a69b0be87c39365c405f0e3f945…

1 0

git:5.0:055ad1cb: sipcapture: documentation typo
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 055ad1cb61f61d9996f0018727adfcb92fa98912 URL: https://github.com/kamailio/kamailio/commit/055ad1cb61f61d9996f0018727adfcb… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:51:22+02:00 sipcapture: documentation typo (cherry picked from commit 6452e86bcc3e4b927a2e511f3c7a9f464a69ac66) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/055ad1cb61f61d9996f0018727adfcb… Patch: https://github.com/kamailio/kamailio/commit/055ad1cb61f61d9996f0018727adfcb… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index d9d47cceda..c5590b3c1c 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -185,7 +185,7 @@ modparam("sipcapture", "db_insert_mode", 1) <section id="sipcapture.p.capture_on"> <title><varname>capture_on</varname> (integer)</title> <para> - Parameter to enable/disable capture globaly (on(1)/off(0)) + Parameter to enable/disable capture globally (on(1)/off(0)) </para> <para> <emphasis>

1 0

git:5.0:a3d53389: sipcapture: safety checks for values inside w_float2int()
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: a3d53389992f2ca7798a530d24677206b8be668b URL: https://github.com/kamailio/kamailio/commit/a3d53389992f2ca7798a530d2467720… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:51:16+02:00 sipcapture: safety checks for values inside w_float2int() (cherry picked from commit 97d8ebc966aba71efb3a964e71b00736db51401b) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/a3d53389992f2ca7798a530d2467720… Patch: https://github.com/kamailio/kamailio/commit/a3d53389992f2ca7798a530d2467720… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index a901236f46..99a1844c20 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1039,6 +1039,9 @@ static int w_float2int(struct sip_msg* _m, char* _val, char* _coof, char* s2) return -1; } + if(value.s==NULL || coof.s==NULL) + return -1; + ret = (int) (atof (value.s) * atoi(coof.s)); return ret ? ret : -1;

1 0

git:5.0:5274a0f9: sipcapture: keep hep buffer unmodified while getting PV $hep(NNN)
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 5274a0f9e5a5b74bbc37a6d74504b517d9dbfebe URL: https://github.com/kamailio/kamailio/commit/5274a0f9e5a5b74bbc37a6d74504b51… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:51:08+02:00 sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) - addition to GH PR #1191 (cherry picked from commit 2140d0141b5a7551ebbd072d801ce2339020dac0) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/5274a0f9e5a5b74bbc37a6d74504b51… Patch: https://github.com/kamailio/kamailio/commit/5274a0f9e5a5b74bbc37a6d74504b51… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index cd3338317c..6eaf13ab2b 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -973,8 +973,7 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch goto done; case 9: hg->time_sec = (hep_chunk_uint32_t *) (tmp); - hg->time_sec->data = ntohl(hg->time_sec->data); - ret = pv_get_uintval(msg, param, res, hg->time_sec->data); + ret = pv_get_uintval(msg, param, res, ntohl(hg->time_sec->data)); goto done; case 10:

1 0

git:5.0:1c944f3f: sipcapture: fix custom field variable naming
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 1c944f3fb1d67dbeb97879d3177171af8d8aecd7 URL: https://github.com/kamailio/kamailio/commit/1c944f3fb1d67dbeb97879d3177171a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:53+02:00 sipcapture: fix custom field variable naming (cherry picked from commit c8a804f5e3c3b12b64871d3989a87d79d8627afe) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/1c944f3fb1d67dbeb97879d3177171a… Patch: https://github.com/kamailio/kamailio/commit/1c944f3fb1d67dbeb97879d3177171a… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 1111b9da65..3e6d28793f 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1887,7 +1887,7 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else { EMPTY_STR(sco.custom1); } /* Custom - field2 */ - if(custom_field3_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { + if(custom_field2_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { sco.custom2 = tmphdr[5]->body; } else { EMPTY_STR(sco.custom2); }

1 0

git:5.0:f9092500: sipcapture: free allocated process memory before return
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: f909250081f06c5b9dfd96792cc7960ff00c9f32 URL: https://github.com/kamailio/kamailio/commit/f909250081f06c5b9dfd96792cc7960… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:58+02:00 sipcapture: free allocated process memory before return (cherry picked from commit ecf1ad77a2b9f69d5ae4f68fdc71cb1b10ebe729) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/f909250081f06c5b9dfd96792cc7960… Patch: https://github.com/kamailio/kamailio/commit/f909250081f06c5b9dfd96792cc7960… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 3e6d28793f..a901236f46 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -446,6 +446,7 @@ int parse_table_names (str table_name, str ** table_names){ names = (str*)pkg_malloc(sizeof(str) * no_tables); if(names == NULL) { LM_ERR("no more pkg memory left\n"); + pkg_free(table_name_cpy); return -1; } p = strtok (table_name_cpy,"| \t");

1 0

git:5.0:1ecac0c9: sipcapture: add missing or invalid byte order conversion
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 1ecac0c9eb4c328c9b69ae048817e1b13813b134 URL: https://github.com/kamailio/kamailio/commit/1ecac0c9eb4c328c9b69ae048817e1b… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:47+02:00 sipcapture: add missing or invalid byte order conversion (cherry picked from commit dac238ac3fdf2d0f47d6915508160b8160e9ab11) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/1ecac0c9eb4c328c9b69ae048817e1b… Patch: https://github.com/kamailio/kamailio/commit/1ecac0c9eb4c328c9b69ae048817e1b… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 5382e5817e..cd3338317c 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -989,13 +989,14 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch case 12: hg->capt_id = (hep_chunk_uint32_t *) (tmp); - ret = pv_get_uintval(msg, param, res, ntohs(hg->capt_id->data)); + ret = pv_get_uintval(msg, param, res, ntohl(hg->capt_id->data)); goto done; case 13: hg->keep_tm = (hep_chunk_uint16_t *) (tmp); - ret = pv_get_uintval(msg, param, res, hg->keep_tm->data); + ret = pv_get_uintval(msg, param, res, ntohs(hg->keep_tm->data)); goto done; + case 14: tmpstr.s = (char *) tmp + sizeof(hep_chunk_t); tmpstr.len = chunk_length - sizeof(hep_chunk_t);

1 0

git:5.0:97b5af5d: sipcapture: remove excess byte order conversion
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 97b5af5d5ac874c848f698136645dd1b92d0030a URL: https://github.com/kamailio/kamailio/commit/97b5af5d5ac874c848f698136645dd1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:33+02:00 sipcapture: remove excess byte order conversion - buffer pointer `tmp` in hepv3_get_chunk() was assigned to hg->time_(Âµ)sec - therefore everytime route script calls pseudovariables, part of original `buf` was byte converted (cherry picked from commit 6e43bf84a2afc4e83ce33b7a416d7b81f7dd5658) --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/97b5af5d5ac874c848f698136645dd1… Patch: https://github.com/kamailio/kamailio/commit/97b5af5d5ac874c848f698136645dd1…

1 0

[kamailio/kamailio] Sipcapture backport (#1281)
by oyvindkolbu 25 Oct '17

25 Oct '17

Backport fixes for sipcapture to 5.0. Important for $hep() to work properly. Mostly from GH #1191 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1281 -- Commit Summary -- * sipcapture: fix HEP3 capture-id >= 2^16 * modules/sipcapture: improve nonsip_hook documentation * sipcapture: remove excess byte order conversion * sipcapture: add missing or invalid byte order conversion * sipcapture: fix custom field variable naming * sipcapture: free allocated process memory before return * sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) * sipcapture: safety checks for values inside w_float2int() * sipcapture: documentation typo -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (22) M src/modules/sipcapture/examples/kamailio.cfg (20) M src/modules/sipcapture/hep.c (52) M src/modules/sipcapture/sipcapture.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1281.patch https://github.com/kamailio/kamailio/pull/1281.diff -- 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/pull/1281

2 2

git:5.0:1e5eb8bb: modules/sipcapture: improve nonsip_hook documentation
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 1e5eb8bb8ae5fe4f2a8e8940462bdd67ea760d43 URL: https://github.com/kamailio/kamailio/commit/1e5eb8bb8ae5fe4f2a8e8940462bdd6… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:50:22+02:00 modules/sipcapture: improve nonsip_hook documentation (cherry picked from commit 2f872dcc684a345cff09a437ae4a3767613b5529) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/examples/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/1e5eb8bb8ae5fe4f2a8e8940462bdd6… Patch: https://github.com/kamailio/kamailio/commit/1e5eb8bb8ae5fe4f2a8e8940462bdd6… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8916317cb0..d9d47cceda 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -493,6 +493,26 @@ modparam("sipcapture", "topoh_unmask", 1) </programlisting> </example> </section> + + <section id="sipcapture.p.nonsip_hook"> + <title><varname>nonsip_hook</varname> (int)</title> + <para> + If set to 1, event route <emphasis>sipcapture:siprequest</emphasis> is + run when HEP message is received. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>nonsip_hook</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sipcapture", "nonsip_hook", 1) +... + </programlisting> + </example> + </section> + </section> <section> <title>Functions</title> diff --git a/src/modules/sipcapture/examples/kamailio.cfg b/src/modules/sipcapture/examples/kamailio.cfg index 3d42a78f47..14a5641a1c 100644 --- a/src/modules/sipcapture/examples/kamailio.cfg +++ b/src/modules/sipcapture/examples/kamailio.cfg @@ -861,10 +861,6 @@ route[STORE] { sip_capture("$var(a)"); } -event_route[sipcapture:request] { - xlog("received sipcapture request from $si:$sp\r\n"); -} - #!ifdef WITH_HOMER_CUSTOM_STATS event_route[xhttp:request] { set_reply_close(); @@ -908,12 +904,14 @@ event_route[xhttp:request] { event_route[sipcapture:request] { - xlog("HEP Request!\n"); - xlog("received sipcapture request from $si:$sp\r\n"); - xlog("HEP VERSION $hep(version) request from $si:$sp\r\n"); - xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\r\n"); + xlog("HEP Request!\n"); + xlog("received sipcapture request from $si:$sp\n"); + xlog("HEP VERSION $hep(version) request from $si:$sp\n"); + xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\n"); + #Is it SIP ? - if($hep(0x00b) == 1){ + if($hep(0x00b) == 1) + { #Do parsing internal return 1; @@ -921,8 +919,8 @@ event_route[sipcapture:request] { else { #If report lets proceed here with payload - xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\r\n"); - return 0; + xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\n"); + return 0; } }

1 0

git:5.0:3ffbd379: sipcapture: fix HEP3 capture-id >= 2^16
by Ãyvind Kolbu 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 3ffbd3796cc8507480ccb666e724725c06b901ca URL: https://github.com/kamailio/kamailio/commit/3ffbd3796cc8507480ccb666e724725… Author: Bastian Triller <btriller(a)broadsoft.com> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2017-10-25T10:48:45+02:00 sipcapture: fix HEP3 capture-id >= 2^16 (cherry picked from commit dbd57c3eac30e1de54d98eb2ba8f608a17f7adbf) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/3ffbd3796cc8507480ccb666e724725… Patch: https://github.com/kamailio/kamailio/commit/3ffbd3796cc8507480ccb666e724725… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 7167cf3053..1111b9da65 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -271,7 +271,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1150,7 +1150,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

1 0

git:master:991d73c2: Merge pull request #1279 from vitalikvoip/usrloc_fix
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: 991d73c27c7b119c13c09f46ac8efc93460dc91f URL: https://github.com/kamailio/kamailio/commit/991d73c27c7b119c13c09f46ac8efc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:05:34+02:00 Merge pull request #1279 from vitalikvoip/usrloc_fix Usrloc fix --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/991d73c27c7b119c13c09f46ac8efc9… Patch: https://github.com/kamailio/kamailio/commit/991d73c27c7b119c13c09f46ac8efc9… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index c7d48cde8f..1231d4fc8a 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -217,6 +217,8 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) int summary = 0; ucontact_t* c; void* th; + void* dah; + void* dh; void* ah; void* bh; void* ih; @@ -228,14 +230,27 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(brief.len==5 && (strncmp(brief.s, "brief", 5)==0)) summary = 1; + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating top rpc"); + return; + } + if (rpc->struct_add(th, "[", "Domains", &dah) < 0) + { + rpc->fault(ctx, 500, "Internal error creating inner struct"); + return; + } + for( dl=root ; dl ; dl=dl->next ) { dom = dl->d; - if (rpc->add(ctx, "{", &th) < 0) + + if (rpc->struct_add(dah, "{", "Domain", &dh) < 0) { - rpc->fault(ctx, 500, "Internal error creating top rpc"); + rpc->fault(ctx, 500, "Internal error creating inner struct"); return; } - if(rpc->struct_add(th, "Sd[", + + if(rpc->struct_add(dh, "Sd[", "Domain", &dl->name, "Size", (int)dom->size, "AoRs", &ah)<0) @@ -254,6 +269,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(rpc->struct_add(ah, "S", "AoR", &r->aor)<0) { + unlock_ulslot( dom, i); rpc->fault(ctx, 500, "Internal error creating aor struct"); return; } @@ -288,7 +304,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) } /* extra attributes node */ - if(rpc->struct_add(th, "{", "Stats", &sh)<0) + if(rpc->struct_add(dh, "{", "Stats", &sh)<0) { rpc->fault(ctx, 500, "Internal error creating stats struct"); return;

1 0

git:master:247e9bf2: usrloc: fix format of the ul.dump json reply
by Vitaliy Aleksandrov 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: 247e9bf28ed900d980bf193708d2409cce3261d7 URL: https://github.com/kamailio/kamailio/commit/247e9bf28ed900d980bf193708d2409… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Date: 2017-10-23T19:15:44+03:00 usrloc: fix format of the ul.dump json reply - create "Domains" array instead of a single "Domain" object. --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/247e9bf28ed900d980bf193708d2409… Patch: https://github.com/kamailio/kamailio/commit/247e9bf28ed900d980bf193708d2409… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 36d2ed7d91..1231d4fc8a 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -217,6 +217,8 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) int summary = 0; ucontact_t* c; void* th; + void* dah; + void* dh; void* ah; void* bh; void* ih; @@ -228,14 +230,27 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(brief.len==5 && (strncmp(brief.s, "brief", 5)==0)) summary = 1; + if (rpc->add(ctx, "{", &th) < 0) + { + rpc->fault(ctx, 500, "Internal error creating top rpc"); + return; + } + if (rpc->struct_add(th, "[", "Domains", &dah) < 0) + { + rpc->fault(ctx, 500, "Internal error creating inner struct"); + return; + } + for( dl=root ; dl ; dl=dl->next ) { dom = dl->d; - if (rpc->add(ctx, "{", &th) < 0) + + if (rpc->struct_add(dah, "{", "Domain", &dh) < 0) { - rpc->fault(ctx, 500, "Internal error creating top rpc"); + rpc->fault(ctx, 500, "Internal error creating inner struct"); return; } - if(rpc->struct_add(th, "Sd[", + + if(rpc->struct_add(dh, "Sd[", "Domain", &dl->name, "Size", (int)dom->size, "AoRs", &ah)<0) @@ -289,7 +304,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) } /* extra attributes node */ - if(rpc->struct_add(th, "{", "Stats", &sh)<0) + if(rpc->struct_add(dh, "{", "Stats", &sh)<0) { rpc->fault(ctx, 500, "Internal error creating stats struct"); return;

1 0

[kamailio/kamailio] Usrloc fix (#1279)
by vitalikvoip 25 Oct '17

25 Oct '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description The first commit unlocks a usrloc slot when "ul.dump brief" fails. Otherwise, it stays locked forever. The second one changes "ul.dump" output format and adds "Domains" array that includes all location domains. Without this fix "kamctl ul show" shows only the first domain. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1279 -- Commit Summary -- * usrloc: fix format of the ul.dump json reply * usrloc: fix usrloc slot lock in ul.dump rpc procedure -- File Changes -- M src/modules/usrloc/ul_rpc.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1279.patch https://github.com/kamailio/kamailio/pull/1279.diff -- 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/pull/1279

2 2

git:master:dfcba5fb: usrloc: fix usrloc slot lock in ul.dump rpc procedure
by Vitaliy Aleksandrov 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: dfcba5fbcc5046a12babd3c6e93555f89ffa9cbe URL: https://github.com/kamailio/kamailio/commit/dfcba5fbcc5046a12babd3c6e93555f… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Date: 2017-10-23T19:15:44+03:00 usrloc: fix usrloc slot lock in ul.dump rpc procedure - unlock usrloc slot when "ul.dump brief" fails during aor struct creation --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/dfcba5fbcc5046a12babd3c6e93555f… Patch: https://github.com/kamailio/kamailio/commit/dfcba5fbcc5046a12babd3c6e93555f… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index c7d48cde8f..36d2ed7d91 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -254,6 +254,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) if(rpc->struct_add(ah, "S", "AoR", &r->aor)<0) { + unlock_ulslot( dom, i); rpc->fault(ctx, 500, "Internal error creating aor struct"); return; }

1 0

git:master:d581c007: Merge pull request #1280 from sergey-safarov/alpine
by GitHub 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: d581c007ac29aea2c70fbeecdcebda701c37aa37 URL: https://github.com/kamailio/kamailio/commit/d581c007ac29aea2c70fbeecdcebda7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-25T12:03:27+02:00 Merge pull request #1280 from sergey-safarov/alpine pkg/kamailio/alpine_docker: Added support ssh git repo url --- Modified: pkg/kamailio/alpine_docker/build.sh --- Diff: https://github.com/kamailio/kamailio/commit/d581c007ac29aea2c70fbeecdcebda7… Patch: https://github.com/kamailio/kamailio/commit/d581c007ac29aea2c70fbeecdcebda7… --- diff --git a/pkg/kamailio/alpine_docker/build.sh b/pkg/kamailio/alpine_docker/build.sh index dee81c7467..75516c2c9f 100755 --- a/pkg/kamailio/alpine_docker/build.sh +++ b/pkg/kamailio/alpine_docker/build.sh @@ -23,7 +23,7 @@ apk add --no-cache abuild git gcc build-base bison db-dev flex expat-dev perl-de build_and_install(){ cd /usr/src/kamailio - REPO_OWNER=$(git remote get-url origin 2> /dev/null | sed -e 's:^.*github.com/::' -e 's:/.*\.git::') + REPO_OWNER=$(git remote get-url origin 2> /dev/null | sed -e 's|^.*github.com/||' -e 's|^git@github.com:||' -e 's|/.*\.git||') if [ ! -z "$REPO_OWNER" ]; then sed -i -e "s:github.com/kamailio:github.com/$REPO_OWNER:" /usr/src/kamailio/pkg/kamailio/alpine/APKBUILD fi

1 0

git:master:d63d33bb: pkg/kamailio/alpine_docker: Added support ssh git repo url
by Sergey Safarov 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: d63d33bbd0883cffc5d6e34a336331697ce13005 URL: https://github.com/kamailio/kamailio/commit/d63d33bbd0883cffc5d6e34a3363316… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-10-24T14:32:17-04:00 pkg/kamailio/alpine_docker: Added support ssh git repo url --- Modified: pkg/kamailio/alpine_docker/build.sh --- Diff: https://github.com/kamailio/kamailio/commit/d63d33bbd0883cffc5d6e34a3363316… Patch: https://github.com/kamailio/kamailio/commit/d63d33bbd0883cffc5d6e34a3363316… --- diff --git a/pkg/kamailio/alpine_docker/build.sh b/pkg/kamailio/alpine_docker/build.sh index dee81c7467..75516c2c9f 100755 --- a/pkg/kamailio/alpine_docker/build.sh +++ b/pkg/kamailio/alpine_docker/build.sh @@ -23,7 +23,7 @@ apk add --no-cache abuild git gcc build-base bison db-dev flex expat-dev perl-de build_and_install(){ cd /usr/src/kamailio - REPO_OWNER=$(git remote get-url origin 2> /dev/null | sed -e 's:^.*github.com/::' -e 's:/.*\.git::') + REPO_OWNER=$(git remote get-url origin 2> /dev/null | sed -e 's|^.*github.com/||' -e 's|^git@github.com:||' -e 's|/.*\.git||') if [ ! -z "$REPO_OWNER" ]; then sed -i -e "s:github.com/kamailio:github.com/$REPO_OWNER:" /usr/src/kamailio/pkg/kamailio/alpine/APKBUILD fi

1 0

[kamailio/kamailio] pkg/kamailio/alpine_docker: Added support ssh git repo url (#1280)
by sergey-safarov 25 Oct '17

25 Oct '17

Fixed alpine docker build when git repo url use ssh You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1280 -- Commit Summary -- * pkg/kamailio/alpine_docker: Added support ssh git repo url -- File Changes -- M pkg/kamailio/alpine_docker/build.sh (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1280.patch https://github.com/kamailio/kamailio/pull/1280.diff -- 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/pull/1280

2 1

SIPS and Double Record-Route
by Carsten Bock 25 Oct '17

25 Oct '17

Hi, i am using Kamailio as an outbound proxy for Translating between TLS (public network) and UDP (internal network). When testing with a client, that uses a SIPS scheme, i've noticed the following behaviour, which broke my setup: Due to the sips:-URI in the Request URI and the two different interfaces (UDP and TLS), the RR module adds two new Record-Route headers like this: Record-Route: <sips:mt@46.101.100.26:5061;transport=tls;r2=on;lr=on;ftag=7BABD31B-59F04202000E785C-AD96E700;rm=1;did=f81.f88> Record-Route: <sips:mt@46.101.100.26;r2=on;lr=on;ftag=7BABD31B-59F04202000E785C-AD96E700;rm=1;did=f81.f88> This however breaks the internal routing, as the server is internally only reachable via UDP and not via TLS, as the internal network components only have UDP interfaces. Is this a bug? I've temporarily created a workaround, so RR will always use "sip" instead of "sips" (which solved my issue), but I wonder if this in general should be considered a bug??? Thanks, Carsten -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Millerntorplatz 1 20359 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-40 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

1 0

Errored: kamailio/kamailio#4961 (5.0 - 14560cb)
by Travis CI 25 Oct '17

25 Oct '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4961 Status: Errored Duration: 10 minutes and 34 seconds Commit: 14560cb (5.0) Author: Daniel-Constantin Mierla Message: dialog: safety check for handling http replies in cseq update code - reported by GH #1277 (cherry picked from commit ba7f663a0f1da799fc7a8be9b86039af2862f287) View the changeset: https://github.com/kamailio/kamailio/compare/bbe47d4a0c43...14560cbba998 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/292498362?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

2 1

Errored: kamailio/kamailio#4960 (master - ba7f663)
by Travis CI 25 Oct '17

25 Oct '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4960 Status: Errored Duration: 33 minutes and 56 seconds Commit: ba7f663 (master) Author: Daniel-Constantin Mierla Message: dialog: safety check for handling http replies in cseq update code - reported by GH #1277 View the changeset: https://github.com/kamailio/kamailio/compare/1bb3aeaaeb22...ba7f663a0f1d View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/292496838?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:5.0:49d4af49: pkg/kamailio/deb: set version to 5.0.4 [skip ci]
by Victor Seva 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 49d4af49682ea189321875c7132b3987d55a5519 URL: https://github.com/kamailio/kamailio/commit/49d4af49682ea189321875c7132b398… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-25T10:49:57+02:00 pkg/kamailio/deb: set version to 5.0.4 [skip ci] --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/49d4af49682ea189321875c7132b398… Patch: https://github.com/kamailio/kamailio/commit/49d4af49682ea189321875c7132b398… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 08f8f4a163..3d61d4dfae 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.4) unstable; urgency=medium + + * version set to 5.0.4 + + -- Victor Seva <vseva(a)debian.org> Wed, 25 Oct 2017 10:49:00 +0200 + kamailio (5.0.3) unstable; urgency=medium * version set to 5.0.3

1 0

git:5.0:14560cbb: dialog: safety check for handling http replies in cseq update code
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 14560cbba998cbb5904ce279119afe4590d9660d URL: https://github.com/kamailio/kamailio/commit/14560cbba998cbb5904ce279119afe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T10:20:43+02:00 dialog: safety check for handling http replies in cseq update code - reported by GH #1277 (cherry picked from commit ba7f663a0f1da799fc7a8be9b86039af2862f287) --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/14560cbba998cbb5904ce279119afe4… Patch: https://github.com/kamailio/kamailio/commit/14560cbba998cbb5904ce279119afe4… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 62e8ba3c79..716bde7cfb 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -59,12 +59,16 @@ static int dlg_cseq_prepare_msg(sip_msg_t *msg) LM_DBG("prepare msg for cseq update operations\n"); if(msg->first_line.type==SIP_REQUEST) { - if(!IS_SIP(msg)) - { + if(!IS_SIP(msg)) { LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { LM_DBG("non sip message\n"); return 1; }

1 0

git:5.0:5cb020ac: core: parser - typedef'ed msg_start struct to msg_start_t
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Module: kamailio Branch: 5.0 Commit: 5cb020ac9ed53f8520b9070a1945329abad08029 URL: https://github.com/kamailio/kamailio/commit/5cb020ac9ed53f8520b9070a1945329… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T10:20:34+02:00 core: parser - typedef'ed msg_start struct to msg_start_t (cherry picked from commit a21ea97800c7d7d3b082a9b1d57887e125d83d68) --- Modified: src/core/parser/parse_fline.h --- Diff: https://github.com/kamailio/kamailio/commit/5cb020ac9ed53f8520b9070a1945329… Patch: https://github.com/kamailio/kamailio/commit/5cb020ac9ed53f8520b9070a1945329… --- diff --git a/src/core/parser/parse_fline.h b/src/core/parser/parse_fline.h index 04f96b63f4..b10c02bc83 100644 --- a/src/core/parser/parse_fline.h +++ b/src/core/parser/parse_fline.h @@ -18,8 +18,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -68,31 +68,28 @@ #define REFER_LEN 5 #define PUBLISH_LEN 7 -struct msg_start { +typedef struct msg_start { short type; /*!< Type of the message - request/response */ short flags; /*!< First line flags */ int len; /*!< length including delimiter */ union { struct { - str method; /*!< Method string */ - str uri; /*!< Request URI */ - str version; /*!< SIP version */ + str method; /*!< Method string */ + str uri; /*!< Request URI */ + str version; /*!< SIP version */ int method_value; } request; struct { - str version; /*!< SIP version */ - str status; /*!< Reply status */ - str reason; /*!< Reply reason phrase */ - unsigned int /*!< statusclass,*/ statuscode; + str version; /*!< SIP version */ + str status; /*!< Reply status */ + str reason; /*!< Reply reason phrase */ + unsigned int statuscode; /*!< Reply status code */ } reply; }u; -}; - - +} msg_start_t; char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl); char* parse_fline(char* buffer, char* end, struct msg_start* fl); - #endif /* PARSE_FLINE_H */

1 0

git:master:ba7f663a: dialog: safety check for handling http replies in cseq update code
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: ba7f663a0f1da799fc7a8be9b86039af2862f287 URL: https://github.com/kamailio/kamailio/commit/ba7f663a0f1da799fc7a8be9b86039a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T10:17:12+02:00 dialog: safety check for handling http replies in cseq update code - reported by GH #1277 --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/ba7f663a0f1da799fc7a8be9b86039a… Patch: https://github.com/kamailio/kamailio/commit/ba7f663a0f1da799fc7a8be9b86039a… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index f1b047d210..1e343c9981 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -59,12 +59,16 @@ static int dlg_cseq_prepare_msg(sip_msg_t *msg) LM_DBG("prepare msg for cseq update operations\n"); if(msg->first_line.type==SIP_REQUEST) { - if(!IS_SIP(msg)) - { + if(!IS_SIP(msg)) { LM_DBG("non sip request message\n"); return 1; } - } else if(msg->first_line.type!=SIP_REPLY) { + } else if(msg->first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(msg)) { + LM_DBG("non sip reply message\n"); + return 1; + } + } else { LM_DBG("non sip message\n"); return 1; }

1 0

git:master:a21ea978: core: parser - typedef'ed msg_start struct to msg_start_t
by Daniel-Constantin Mierla 25 Oct '17

25 Oct '17

Module: kamailio Branch: master Commit: a21ea97800c7d7d3b082a9b1d57887e125d83d68 URL: https://github.com/kamailio/kamailio/commit/a21ea97800c7d7d3b082a9b1d57887e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-25T10:16:43+02:00 core: parser - typedef'ed msg_start struct to msg_start_t --- Modified: src/core/parser/parse_fline.h --- Diff: https://github.com/kamailio/kamailio/commit/a21ea97800c7d7d3b082a9b1d57887e… Patch: https://github.com/kamailio/kamailio/commit/a21ea97800c7d7d3b082a9b1d57887e… --- diff --git a/src/core/parser/parse_fline.h b/src/core/parser/parse_fline.h index 04f96b63f4..b10c02bc83 100644 --- a/src/core/parser/parse_fline.h +++ b/src/core/parser/parse_fline.h @@ -18,8 +18,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -68,31 +68,28 @@ #define REFER_LEN 5 #define PUBLISH_LEN 7 -struct msg_start { +typedef struct msg_start { short type; /*!< Type of the message - request/response */ short flags; /*!< First line flags */ int len; /*!< length including delimiter */ union { struct { - str method; /*!< Method string */ - str uri; /*!< Request URI */ - str version; /*!< SIP version */ + str method; /*!< Method string */ + str uri; /*!< Request URI */ + str version; /*!< SIP version */ int method_value; } request; struct { - str version; /*!< SIP version */ - str status; /*!< Reply status */ - str reason; /*!< Reply reason phrase */ - unsigned int /*!< statusclass,*/ statuscode; + str version; /*!< SIP version */ + str status; /*!< Reply status */ + str reason; /*!< Reply reason phrase */ + unsigned int statuscode; /*!< Reply status code */ } reply; }u; -}; - - +} msg_start_t; char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl); char* parse_fline(char* buffer, char* end, struct msg_start* fl); - #endif /* PARSE_FLINE_H */

1 0

git:master:1bb3aeaa: presence_dialoginfo: removed svn id, history, coherent indentation
by Daniel-Constantin Mierla 24 Oct '17

24 Oct '17

Module: kamailio Branch: master Commit: 1bb3aeaaeb220af6471a7a54dead308dc05380e5 URL: https://github.com/kamailio/kamailio/commit/1bb3aeaaeb220af6471a7a54dead308… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:38:12+02:00 presence_dialoginfo: removed svn id, history, coherent indentation --- Modified: src/modules/presence_dialoginfo/add_events.c Modified: src/modules/presence_dialoginfo/add_events.h Modified: src/modules/presence_dialoginfo/notify_body.c Modified: src/modules/presence_dialoginfo/notify_body.h Modified: src/modules/presence_dialoginfo/pidf.c Modified: src/modules/presence_dialoginfo/pidf.h Modified: src/modules/presence_dialoginfo/presence_dialoginfo.c Modified: src/modules/presence_dialoginfo/presence_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/1bb3aeaaeb220af6471a7a54dead308… Patch: https://github.com/kamailio/kamailio/commit/1bb3aeaaeb220af6471a7a54dead308…

1 0

git:5.0:bbe47d4a: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Oct '17

24 Oct '17

Module: kamailio Branch: 5.0 Commit: bbe47d4a0c43008dfa1c009e2061d90ea5556d26 URL: https://github.com/kamailio/kamailio/commit/bbe47d4a0c43008dfa1c009e2061d90… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-24T12:16:35+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth/README Modified: src/modules/cnxcc/README Modified: src/modules/db_postgres/README Modified: src/modules/dialog/README Modified: src/modules/domainpolicy/README Modified: src/modules/mediaproxy/README Modified: src/modules/misc_radius/README Modified: src/modules/nat_traversal/README Modified: src/modules/presence_xml/README --- Diff: https://github.com/kamailio/kamailio/commit/bbe47d4a0c43008dfa1c009e2061d90… Patch: https://github.com/kamailio/kamailio/commit/bbe47d4a0c43008dfa1c009e2061d90…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 24 Oct '17

24 Oct '17

- URL: https://github.com/kamailio/kamailio/commit/335eb8eed8009505fca8ee7859c1e45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:38:09+02:00 presence_xml: small adjustments, added section ids (cherry picked from commit 6fbaac0d9383da5fe30ea9d2e9671ab3dffd9694) - URL: https://github.com/kamailio/kamailio/commit/42d7fa47bdb9447d3522b3d233bc93b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:40:04+02:00 snmpstats: removed wrong function name from log message (cherry picked from commit e27ba180ab9801e6b32bfb31aad1c02d28f7e559) - URL: https://github.com/kamailio/kamailio/commit/270c8fce6414b8401a5d8181caa4fd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:40:52+02:00 uid_gflags: fixed rpc commands doc strings - converted log macros - coherent indentation and whitespacing (cherry picked from commit 0281dc351ca4cde8d3343164cc3091d02808f3cb) - URL: https://github.com/kamailio/kamailio/commit/6c2630274461d33ac41217239a7436a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:41:08+02:00 jsonrpcc: more debug messages if init fails - coherent indentation and whitespacing (cherry picked from commit f60a3cfa3070a4782038dcf9f2169562220cc396) - URL: https://github.com/kamailio/kamailio/commit/dc37a5e439a23132db79a46d70ba17c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:44:48+02:00 uid_uri_db: removed history, updated application name - adjustments to log messages and indentation (cherry picked from commit f5a329ff0ce0e433c5ff8a7bfdc815819dcf1022) - URL: https://github.com/kamailio/kamailio/commit/83d4e1826e8f3f0876ccc6be0df4abf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:45:12+02:00 uid_uri_db: fixed log message (cherry picked from commit 6fa1e72a8e8b74876432afe47830d2ee22b1caf6) - URL: https://github.com/kamailio/kamailio/commit/50579308d7830388e379ec039167f9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:45:25+02:00 uid_auth_db: removed history, updated log macros (cherry picked from commit 6eb9f46bc413b72f41423673f1ad1083775760c4) - URL: https://github.com/kamailio/kamailio/commit/9800aba65146b72623bb512049300d1… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2017-10-24T11:45:43+02:00 carrierroute: warning for the same carrier/domain having routes with only 0 probability - While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. (cherry picked from commit 9741bee7af8136b35af8e6279e530aa0ad54f574) - URL: https://github.com/kamailio/kamailio/commit/0dd00c1aedc14e2b5509b84468c277e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:45:57+02:00 seas: added guards to several include files - bits of formating and removal of inline history (cherry picked from commit e04716f4f9325fa5290555823132455ea599daac) - URL: https://github.com/kamailio/kamailio/commit/5eda789b9885ca27afb29ab6145dcc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:46:18+02:00 dialog: small updates to docs (cherry picked from commit e23c50aed89be717c0bc76e6fbfc902cf3deacb6) - URL: https://github.com/kamailio/kamailio/commit/c7350a733d0c000f67192943be3d925… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:48:12+02:00 rtpproxy: removed function name from log messages (cherry picked from commit 574f2d4d40fbdecf379292d65ad0218e8ecaab10) - URL: https://github.com/kamailio/kamailio/commit/0edd5072b35809a7529d413c45372f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:48:23+02:00 msrp: updates to log macros (cherry picked from commit 0e38dabe44e475e8054d3905e553637977dd26e1) - URL: https://github.com/kamailio/kamailio/commit/14bb444e8c106bf0d8ac6009ff6c47b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:50:34+02:00 core: tcp - increased the size for flags field in connection struct (cherry picked from commit 65ed9b065c497266a4ecd9760e7c168c69b4c6e8) - URL: https://github.com/kamailio/kamailio/commit/85ad34b0f5afd7fd4c560efafb940fb… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:52:16+02:00 cfgutils: Add fixup_free functions to (u)sleep functions (cherry picked from commit 194d1bd1d1b86a92ee51bb32d88c105eb6130910) - URL: https://github.com/kamailio/kamailio/commit/43efb087f618be3bba5fa4da15041fd… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:52:29+02:00 cfgutils: Allow pv in check_route_exists() and route_if_exists() These functions are somewhat useless if a dynamic parameter is not allowed. (cherry picked from commit 92e404b3676aa57bca531096cddc14d58e06c789) - URL: https://github.com/kamailio/kamailio/commit/635ff24db1e2f3439d15b9a0f3e3156… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:52:41+02:00 cfgutils: Properly handle 'exit' when from route_if_exists() exit is supposed to exit the routing script. route_if_exists() wasn't handling the exit, so script would continue to run after 'exit'. (cherry picked from commit d6a374d707f23afddfc007edfeae40b01836b3c0) - URL: https://github.com/kamailio/kamailio/commit/fe960c65c028bccd348140a4d02f23e… Author: Alex Hermann <alex(a)speakup.nl> Date: 2017-10-24T11:52:55+02:00 cfgutils: Remove debug statements in sleep functions Too much noise when debug logging is on (cherry picked from commit efe9d554a912edb0ffc5ae8e7176adc5bcc44a5e) - URL: https://github.com/kamailio/kamailio/commit/963594eaf13949a0c1e0c5e0221c8e0… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:53:07+02:00 json: Add fixup_free function for json_get_field (cherry picked from commit 305dbe7197f87d8e14bb75f14553852c8e3c9b8c) - URL: https://github.com/kamailio/kamailio/commit/2c509fdc77997c3a71add4d2b729e42… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:53:17+02:00 janssonrcp-c: Fix segfault in mod_destroy Check variable before dereferencing it. (cherry picked from commit 894e64ae69f485ee8b764092d255c65ab7740da7) - URL: https://github.com/kamailio/kamailio/commit/5ff6d3761a0722c5a8a18dfec3c856d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:53:35+02:00 jsonrpcc: do not declare variables in header files - avoid declaration in each .c that includes the .h (cherry picked from commit 291649821f4d19790072ffaf9aefc41891a3551d) - URL: https://github.com/kamailio/kamailio/commit/ececbd9c1753b101e12e66ed86496b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:53:45+02:00 janssonrpcc: do not lock in mod destroy - all children are killed already and if lock was already set results in a deadlock (cherry picked from commit 185db312ed91bba6c997a42a84c4da1e4ce2319f) - URL: https://github.com/kamailio/kamailio/commit/1a096c81bf36f5de3f5f6632dd041a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:54:57+02:00 dialog: adjusted debug messages when updating attributes (cherry picked from commit 47bfa060e6b182167c5d0b21cbaebf5b1c0bb8d2) - URL: https://github.com/kamailio/kamailio/commit/751aff9d26b910f0c9021d340831fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:55:16+02:00 auth: explicit listing of status codes for replies in docs of challenge functions (cherry picked from commit 4e2c3f2b41859767f13bef237b93ea7101f36d12) - URL: https://github.com/kamailio/kamailio/commit/f1921513187d432b67dd94df437f1ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:58:40+02:00 kamctl: added db subcommand to mange records in version table (cherry picked from commit d3b7f0d390dd430d40a1d47112f076f4b21e3afe) - URL: https://github.com/kamailio/kamailio/commit/24048d5cc742f9421a1ea8962190e76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:58:53+02:00 sqlops: keep string values zero-terminated inside db result structure (cherry picked from commit f90e785114c7dd738ca7ce7e70d72dd92cbd7136) - URL: https://github.com/kamailio/kamailio/commit/a91e787ebbe39e6f608e77da929c9f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:59:54+02:00 auth_radius: added section ids in docs (cherry picked from commit 563004ca54cb31d19e3bd9e30633c9f860070883) - URL: https://github.com/kamailio/kamailio/commit/8c9d1d8cb198dc377029db76b16be13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:00:13+02:00 app_mono: added section ids (cherry picked from commit 9229cb397e3afebd5e25e67713e4df9b6d622192) - URL: https://github.com/kamailio/kamailio/commit/078a253702e7ab320d346f2ed5cad58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:00:27+02:00 app_python: added section ids in docs (cherry picked from commit b24c3093feeb49bd6e9e508a6947fb3926c4ea8f) - URL: https://github.com/kamailio/kamailio/commit/26fa101b3019d113ef4eea870921d22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:00:52+02:00 cnxcc: added section ids in the docs (cherry picked from commit f5430eb0ad6134539d5eb4369e4c60bdb5fa4a63) - URL: https://github.com/kamailio/kamailio/commit/81712b43b3f1863f1a4d0fefada7cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:01:04+02:00 cplc: added section ids in docs (cherry picked from commit f460607b5b0903c0937e5272c18d1c4fed38d42d) - URL: https://github.com/kamailio/kamailio/commit/010e0fcce60adbf15f91e8049e0257c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:01:18+02:00 domainpolicy: removed empty rpc section - added several section ids (cherry picked from commit d94a65cbd0a86e1869037bbcfa261bc4219be908) - URL: https://github.com/kamailio/kamailio/commit/66cdd82fa174eb89cced4bb90c011dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:01:37+02:00 presence_conference: removed history and svn ids (cherry picked from commit e4cb62486644cdca753fe6c7768bd738ee19c8a5) - URL: https://github.com/kamailio/kamailio/commit/d5580542873e2a71101e625a96e855b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:02:08+02:00 maxfwd: fixed location for section id of maxfwd_process (cherry picked from commit 1f54f3d21a81badb4ba43c6adb88195bdd2c42f1) - URL: https://github.com/kamailio/kamailio/commit/7cdfc2083292e4ee75845aabc033797… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:02:24+02:00 mediaproxy: added section ids in docs (cherry picked from commit 5535a612445ea71a938e427e0ed7e3f7ea5d88cf) - URL: https://github.com/kamailio/kamailio/commit/813f0d868a076dae51a6018917dfc66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:02:36+02:00 misc_radius: end separator for examples in docs - added section ids (cherry picked from commit e49512ce80693aa2638d9fca940ded5a889cd2f9) - URL: https://github.com/kamailio/kamailio/commit/bdfbaaebdd4b4abd1f48d52e7179706… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:03:38+02:00 tm: updated some structs to typedefs (cherry picked from commit 4267e1ef7c9ffaac606964fb1b2d64334754b5d9) - URL: https://github.com/kamailio/kamailio/commit/e9106f999c9a5ec0d82bbf061ccb8ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:03:59+02:00 dialog: documented optional sdp body for rpc bridge command (cherry picked from commit 59b58035bfe8e722a696db889d5295254092ae90) - URL: https://github.com/kamailio/kamailio/commit/f39462818a109481281ad06303d9c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:04:19+02:00 db_postgres: documentation for lockset parameter (cherry picked from commit 7d27b682cc6259b1f6bcd21584b9f1d5bbfc9a36) - URL: https://github.com/kamailio/kamailio/commit/09a0a36e8ce21ed0422fe8649c9cfa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:04:32+02:00 nat_traversal: added section ids in docs (cherry picked from commit 642dcef14271bc1376a54f8afe3a159d4e831ba6) - URL: https://github.com/kamailio/kamailio/commit/b0b77e07e10e8bbf65c991c7dae8f33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:04:59+02:00 core: fix for bitwise test in core rpc command (cherry picked from commit f662a62519f99e046caf03063147104af22ec3c3) - URL: https://github.com/kamailio/kamailio/commit/e23e875be66d4f42d18f495b5fc86e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:05:10+02:00 core: fix bitwise test for priting socket details (cherry picked from commit 18b996262fb1c7bde94b494ce837754dc82c9e7e) - URL: https://github.com/kamailio/kamailio/commit/5d41da20a121370ec33155fe92ac94a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:08:34+02:00 pua_dialoginfo: removed svn ids, history, done indentation (cherry picked from commit 904e7435cc4206a9058602b12ba23a1d733674db)

1 0

[kamailio/kamailio] usrloc: ul.dump fixes (#1275)
by vitalikvoip 23 Oct '17

23 Oct '17

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description ul.dump rpc procedure has two problems: - it doesn't call unlock_ulslot() for "ul.dump brief" when aor creation fails - json format of its reply is incorrect for multiple domains. They are not represented as an array of domains and this breaks "kamctl ul show" while "kamcmd ul.dump" still works. Table unlocking is safe and needs to be backported to the stable branch. New output format of "ul.dump" can be considered as a breaking change since somebody can use this command to get registered users information and parse it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1275 -- Commit Summary -- * Fix memory leak in ldap module that happens after calling ldap_result_next() * Merge branch 'master' of https://github.com/kamailio/kamailio * tsilo: fix deadlock in ts_append() * Merge branch 'master' of https://github.com/kamailio/kamailio * ipops: new naptr_query function * Merge branch 'master' of https://github.com/kamailio/kamailio * Merge remote-tracking branch 'upstream/master' * Merge remote-tracking branch 'upstream/master' * usrloc: fix format of the ul.dump json reply * usrloc: fix usrloc slot lock in ul.dump rpc procedure * Merge branch 'master' of https://github.com/kamailio/kamailio -- File Changes -- M src/modules/usrloc/ul_rpc.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1275.patch https://github.com/kamailio/kamailio/pull/1275.diff -- 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/pull/1275

3 7

git:5.0:92a0bccd: jsonrpcs: use select on udp socket to work on non-blocking mode
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 92a0bccdc1ed5c1e00bced6a7cc996b21a9e3e60 URL: https://github.com/kamailio/kamailio/commit/92a0bccdc1ed5c1e00bced6a7cc996b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T14:37:44+02:00 jsonrpcs: use select on udp socket to work on non-blocking mode (cherry picked from commit b57c83c936bf729bda3174803cacbf006552f2dc) --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/92a0bccdc1ed5c1e00bced6a7cc996b… Patch: https://github.com/kamailio/kamailio/commit/92a0bccdc1ed5c1e00bced6a7cc996b… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4dc4740e90..3529941f1d 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -30,6 +30,7 @@ #include <fcntl.h> #include <sys/socket.h> #include <sys/un.h> +#include <sys/select.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -560,16 +561,29 @@ void jsonrpc_dgram_server(int rx_sock) int ret; str scmd; jsonrpc_plain_reply_t* jr = NULL; + fd_set readfds; + int n; ret = 0; while(1) { /*read the datagram*/ /* update the local config framework structures */ cfg_update(); - memset(jsonrpc_dgram_buf, 0, JSONRPC_DGRAM_BUF_SIZE); jsonrpc_dgram_reply_addr_len = sizeof(jsonrpc_dgram_reply_addr); + FD_ZERO(&readfds); + FD_SET(rx_sock, &readfds); + n = select(rx_sock+1, &readfds, 0, 0, 0); + if(n < 0) { + LM_ERR("failure in select: (%d) %s\n", errno, strerror(errno)); + continue; + } + if(!FD_ISSET(rx_sock, &readfds)) { + /* no data on udp socket */ + continue; + } + /* get the client's address */ ret = recvfrom(rx_sock, jsonrpc_dgram_buf, JSONRPC_DGRAM_BUF_SIZE, 0, (struct sockaddr*)&jsonrpc_dgram_reply_addr,

1 0

git:master:b57c83c9: jsonrpcs: use select on udp socket to work on non-blocking mode
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: master Commit: b57c83c936bf729bda3174803cacbf006552f2dc URL: https://github.com/kamailio/kamailio/commit/b57c83c936bf729bda3174803cacbf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T14:35:43+02:00 jsonrpcs: use select on udp socket to work on non-blocking mode --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/b57c83c936bf729bda3174803cacbf0… Patch: https://github.com/kamailio/kamailio/commit/b57c83c936bf729bda3174803cacbf0… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4dc4740e90..3529941f1d 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -30,6 +30,7 @@ #include <fcntl.h> #include <sys/socket.h> #include <sys/un.h> +#include <sys/select.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -560,16 +561,29 @@ void jsonrpc_dgram_server(int rx_sock) int ret; str scmd; jsonrpc_plain_reply_t* jr = NULL; + fd_set readfds; + int n; ret = 0; while(1) { /*read the datagram*/ /* update the local config framework structures */ cfg_update(); - memset(jsonrpc_dgram_buf, 0, JSONRPC_DGRAM_BUF_SIZE); jsonrpc_dgram_reply_addr_len = sizeof(jsonrpc_dgram_reply_addr); + FD_ZERO(&readfds); + FD_SET(rx_sock, &readfds); + n = select(rx_sock+1, &readfds, 0, 0, 0); + if(n < 0) { + LM_ERR("failure in select: (%d) %s\n", errno, strerror(errno)); + continue; + } + if(!FD_ISSET(rx_sock, &readfds)) { + /* no data on udp socket */ + continue; + } + /* get the client's address */ ret = recvfrom(rx_sock, jsonrpc_dgram_buf, JSONRPC_DGRAM_BUF_SIZE, 0, (struct sockaddr*)&jsonrpc_dgram_reply_addr,

1 0

[kamailio/kamailio] pua_dialoginfo: segfault after setting pubruri_caller_dlg_var/pubruri_callee_dlg_var (#1271)
by Sebastian Denz 23 Oct '17

23 Oct '17

### Description Kamailio is segfaulting after activating pubruri_caller_dlg_var and pubruri_callee_dlg_var from pua_dialoginfo. modparam("pua_dialoginfo", "use_pubruri_avps", 1) //modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:pubruris_caller)") //modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:pubruris_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") modparam("pua_dialoginfo", "pubruri_callee_dlg_var", "pubruri_callee") When i comment the corresponding lines and switch back to the regular avps Kamailio runs without problems. ### Troubleshooting #### Reproduction In my setup it seems to be sufficient to just set the module parameters to provoke the segfault. I dont have to wait for any SIP-Traffic or accessing the dlg_vars. Kamailio segfaults while starting. #### Debugging Data  ``` [root@kamroute ~]# gdb /usr/sbin/kamailio /core.6547 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-100.el7 Copyright (C) 2013 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-redhat-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/usr/sbin/kamailio.debug...done. done. [New LWP 6547] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio_'. Program terminated with signal 11, Segmentation fault. #0 __strlen_sse2 () at ../sysdeps/x86_64/strlen.S:31 31 movdqu (%rdi), %xmm1 (gdb) bt full #0 __strlen_sse2 () at ../sysdeps/x86_64/strlen.S:31 No locals. #1 0x00007fc7c61786c4 in mod_init () at pua_dialoginfo.c:692 bind_pua = 0x7fc7c6396b88 <bind_pua> s = {s = 0x0, len = -969002120} avp_spec = {type = 397561584, getf = 0x7fc7ce3b8827 <__fprintf+135>, setf = 0x3, pvp = {pvn = {type = 48, nfree = 0x7ffd17b24e80, u = {isname = {type = 397561264, name = {n = 7976200, s = {s = 0x79b508 "DEBUG", len = 397562576}, re = 0x79b508}}, dname = 0x7ffd17b24db0}}, pvi = {type = 0, u = {ival = 6547, dval = 0x1993}}}, trans = 0x79b508} __FUNCTION__ = "mod_init" #2 0x00000000005661e2 in init_mod (m=0x7fc7cdbd3ac0) at core/sr_module.c:966 __FUNCTION__ = "init_mod" #3 0x0000000000565f1e in init_mod (m=0x7fc7cdbd3e50) at core/sr_module.c:963 __FUNCTION__ = "init_mod" #4 0x0000000000566519 in init_modules () at core/sr_module.c:995 t = 0x20000003e4 i = 994 __FUNCTION__ = "init_modules" #5 0x00000000004293e1 in main (argc=13, argv=0x7ffd17b252d8) at main.c:2584 cfg_stream = 0x254c010 c = -1 r = 397562176 tmp = 0x7ffd17b256e0 "" tmp_len = 0 port = 0 proto = 0 options = 0x737a20 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 286186509 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 18, st_ino = 37027, st_nlink = 2, st_mode = 16832, st_uid = 996, st_gid = 2, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1507876455, tv_nsec = 469604021}, st_mtim = {tv_sec = 1507878072, tv_nsec = 553083864}, st_ctim = {tv_sec = 1507878072, tv_nsec = 553083864}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) info locals cfg_stream = 0x254c010 c = -1 r = 397562176 tmp = 0x7ffd17b256e0 "" tmp_len = 0 port = 0 proto = 0 options = 0x737a20 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 286186509 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 18, st_ino = 37027, st_nlink = 2, st_mode = 16832, st_uid = 996, st_gid = 2, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1507876455, tv_nsec = 469604021}, st_mtim = { tv_sec = 1507878072, tv_nsec = 553083864}, st_ctim = {tv_sec = 1507878072, tv_nsec = 553083864}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) list 26 mov %edi, %ecx 27 and $0x3f, %ecx 28 pxor %xmm0, %xmm0 29 cmp $0x30, %ecx 30 ja L(next) 31 movdqu (%rdi), %xmm1 32 pcmpeqb %xmm1, %xmm0 33 pmovmskb %xmm0, %edx 34 test %edx, %edx 35 jnz L(exit_less16) (gdb) ``` #### Log Messages  Nothing which seems to be interesting. Kamailios last words are: ``` 0(7450) DEBUG: <core> [core/sr_module.c:965]: init_mod(): pua_dialoginfo 0(7450) DEBUG: <core> [core/sr_module.c:694]: find_mod_export_record(): find_export_record: found <bind_pua> in module pua [/usr/lib64/kamailio/modules/pua.so] 0(7450) DEBUG: <core> [core/sr_module.c:694]: find_mod_export_record(): find_export_record: found <load_dlg> in module dialog [/usr/lib64/kamailio/modules/dialog.so] 0(7448) ERROR: <core> [core/daemonize.c:303]: daemonize(): Main process exited before writing to pipe ``` #### SIP Traffic  ``` no SIP Traffic needed ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@kamroute ~]# kamailio -v version: kamailio 5.0.3 (x86_64/linux) 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: unknown compiled on 12:31:32 Sep 20 2017 with gcc 4.8.2 [root@kamroute ~]# rpm -qa|grep kamail kamailio-presence-5.0.3-10.el7.x86_64 kamailio-outbound-5.0.3-10.el7.x86_64 kamailio-debuginfo-5.0.3-10.el7.x86_64 kamailio-5.0.3-10.el7.x86_64 kamailio-ims-5.0.3-10.el7.x86_64 kamailio-xmpp-5.0.3-10.el7.x86_64 kamailio-mysql-5.0.3-10.el7.x86_64 [root@kamroute ~]# ``` * **Operating System**:  Up2date RHEL7. ``` [root@kamroute ~]# cat /etc/redhat-release Red Hat Enterprise Linux Server release 7.4 (Maipo) [root@kamroute ~]# uname -a Linux kamroute.intranet.mydomain.de 3.10.0-514.26.1.el7.x86_64 #1 SMP Tue Jun 20 01:16:02 EDT 2017 x86_64 x86_64 x86_64 GNU/Linux [root@kamroute ~]# ``` If you need any further information just let me know! -- 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/1271

2 2

git:5.0:114acb1d: pua_dialoginfo: fixed condition in mod init checking avp names
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 114acb1d4c94846e1371e476237fc62e57f90bb0 URL: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:42:47+02:00 pua_dialoginfo: fixed condition in mod init checking avp names (cherry picked from commit 666c9d1fcdde00dbdd2e87ff797e554af6d72b5c) --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62… Patch: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index c6251840e0..a544f1fd4c 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -584,7 +584,7 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) struct sip_msg *request = _params->req; struct dlginfo_cell *dlginfo; - if (request->REQ_METHOD != METHOD_INVITE) + if (request==NULL || request->REQ_METHOD != METHOD_INVITE) return; if(send_publish_flag > -1 && !(request->flags & (1<<send_publish_flag))) @@ -682,8 +682,8 @@ static int mod_init(void) if(use_pubruri_avps) { - if(!(pubruri_caller_avp && *pubruri_caller_avp) - && (pubruri_callee_avp && *pubruri_callee_avp)) { + if((pubruri_caller_avp==NULL || *pubruri_caller_avp==0) + || (pubruri_callee_avp==NULL || *pubruri_callee_avp==0)) { LM_ERR("pubruri_caller_avp and pubruri_callee_avp must be set," " if use_pubruri_avps is enabled\n"); return -1;

1 0

git:master:f9a59248: pua_dialoginfo: debug message to show whether avps are used or not
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: master Commit: f9a59248dccfb95453a48d63ac5ad90bc6c745e5 URL: https://github.com/kamailio/kamailio/commit/f9a59248dccfb95453a48d63ac5ad90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:46:01+02:00 pua_dialoginfo: debug message to show whether avps are used or not - adjusted code format to avoid very long line --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/f9a59248dccfb95453a48d63ac5ad90… Patch: https://github.com/kamailio/kamailio/commit/f9a59248dccfb95453a48d63ac5ad90…

1 0

git:master:904e7435: pua_dialoginfo: removed svn ids, history, done indentation
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: master Commit: 904e7435cc4206a9058602b12ba23a1d733674db URL: https://github.com/kamailio/kamailio/commit/904e7435cc4206a9058602b12ba23a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:33:28+02:00 pua_dialoginfo: removed svn ids, history, done indentation --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/904e7435cc4206a9058602b12ba23a1… Patch: https://github.com/kamailio/kamailio/commit/904e7435cc4206a9058602b12ba23a1…

1 0

[kamailio/kamailio] Add comments to db schema and set default last_modified (#1276)
by Isaac McDonald 23 Oct '17

23 Oct '17

Added comments explaining table functionality to MySQL schema. These comments can be viewed in MySQL when browsing the schema which helps admins understand what each table is used for. Changed default value for "last_modified" in grp table from "1970-01-01 00:00:00" to CURRENT_TIMESTAMP and set to automatically update "last_modified" if the record is ever updated. This means that if a record is inserted without a "last_modified", MySQL will insert an accurate time-stamp instead of 0000-00-00 00:00:00 which breaks the SQLOPS module.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1276 -- Commit Summary -- * Add comments to db schema and default timestamp -- File Changes -- M misc/scripts/mysql/my_create.sql (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1276.patch https://github.com/kamailio/kamailio/pull/1276.diff -- 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/pull/1276

2 4

git:5.0:8a01ab81: jsonrpcs: init fifo stream via mod init callback
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 8a01ab81074313efa5daa4cc87d571f67f43178a URL: https://github.com/kamailio/kamailio/commit/8a01ab81074313efa5daa4cc87d571f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:18:03+02:00 jsonrpcs: init fifo stream via mod init callback (cherry picked from commit 17697e4bcabcec62d4393c6ae60fabec7d1c8e98) --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/8a01ab81074313efa5daa4cc87d571f… Patch: https://github.com/kamailio/kamailio/commit/8a01ab81074313efa5daa4cc87d571f…

1 0

git:5.0:64a2bec2: jsonrpcs: use same socket for dgram transport
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 64a2bec28f1182b30bd3404f6bba9b2f4e868258 URL: https://github.com/kamailio/kamailio/commit/64a2bec28f1182b30bd3404f6bba9b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:18:15+02:00 jsonrpcs: use same socket for dgram transport (cherry picked from commit 9c3883a7856d6fb12d103baf3f784107a7c3914c) --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/64a2bec28f1182b30bd3404f6bba9b2… Patch: https://github.com/kamailio/kamailio/commit/64a2bec28f1182b30bd3404f6bba9b2… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index b17feb2b86..4dc4740e90 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -63,7 +63,7 @@ typedef struct{ } jsonrpc_dgram_address_t; typedef struct jsonrpc_dgram_rx_tx { - int rx_sock, tx_sock; + int rx_sock; } jsonrpc_dgram_rx_tx_t; /* dgram variables */ @@ -71,7 +71,7 @@ static int jsonrpc_dgram_socket_domain = AF_LOCAL; static jsonrpc_dgram_sockaddr_t jsonrpc_dgram_addr; /* dgram socket definition parameter */ -static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets; +static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets = { -1 }; /* dgram unixsock specific parameters */ char *jsonrpc_dgram_socket = NAME "_rpc.sock"; @@ -89,7 +89,7 @@ int jsonrpc_dgram_child_init(int rank); int jsonrpc_dgram_destroy(void); -void jsonrpc_dgram_server(int rx_sock, int tx_sock); +void jsonrpc_dgram_server(int rx_sock); static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); @@ -363,7 +363,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, case AF_INET: if (bind(socks->rx_sock, &addr->udp_addr.s, - sockaddru_len(addr->udp_addr))< 0) { + sockaddru_len(addr->udp_addr))< 0) { LM_ERR("bind: %s\n", strerror(errno)); goto err_rx; } @@ -377,13 +377,12 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, break; default: LM_ERR("domain not supported\n"); - goto err_both; + goto err_rx; } - jsonrpc_dgram_create_reply_socket(socks->tx_sock, socket_domain, err_both); optval = 64 * 1024; - if (setsockopt(socks->tx_sock, SOL_SOCKET, SO_SNDBUF, + if (setsockopt(socks->rx_sock, SOL_SOCKET, SO_SNDBUF, (void*)&optval, sizeof(optval)) ==-1){ LM_ERR("failed to increse send buffer size via setsockopt " " SO_SNDBUF (%d) - %d: %s\n", optval, @@ -391,9 +390,18 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, /* continue, non-critical */ } + /* Turn non-blocking mode on for tx*/ + flags = fcntl(socks->rx_sock, F_GETFL); + if (flags == -1){ + LM_ERR("fcntl failed: %s\n", strerror(errno)); + goto err_rx; + } + if (fcntl(socks->rx_sock, F_SETFL, flags | O_NONBLOCK) == -1) { + LM_ERR("fcntl: set non-blocking failed: %s\n", strerror(errno)); + goto err_rx; + } return 0; -err_both: - if(socks->tx_sock>=0) close(socks->tx_sock); + err_rx: if(socks->rx_sock>=0) close(socks->rx_sock); return -1; @@ -440,8 +448,7 @@ static void jsonrpc_dgram_process(int rank) jsonrpc_dgram_write_buffer_len = JSONRPC_DGRAM_BUF_SIZE ; - jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock, - jsonrpc_dgram_sockets.tx_sock); + jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock); exit(-1); } @@ -480,8 +487,7 @@ int jsonrpc_dgram_child_init(int rank) static int jsonrpc_dgram_post_process(void) { /* close the sockets */ - close(jsonrpc_dgram_sockets.rx_sock); - close(jsonrpc_dgram_sockets.tx_sock); + if(jsonrpc_dgram_sockets.rx_sock>=0) close(jsonrpc_dgram_sockets.rx_sock); return 0; } @@ -549,7 +555,7 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, return n; } -void jsonrpc_dgram_server(int rx_sock, int tx_sock) +void jsonrpc_dgram_server(int rx_sock) { int ret; str scmd; @@ -608,7 +614,7 @@ void jsonrpc_dgram_server(int rx_sock, int tx_sock) jr->rcode, jr->rbody.s, jr->rbody.len, jr->rbody.s); - jsonrpc_dgram_send_data(tx_sock, jr->rbody.s, jr->rbody.len, + jsonrpc_dgram_send_data(rx_sock, jr->rbody.s, jr->rbody.len, (struct sockaddr*)&jsonrpc_dgram_reply_addr, jsonrpc_dgram_reply_addr_len, jsonrpc_dgram_timeout);

1 0

git:5.0:04c774d8: jsonrpcs: init dgram sockets via mod init callback
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 04c774d86a62387a6f297b29040220e7dcf597f1 URL: https://github.com/kamailio/kamailio/commit/04c774d86a62387a6f297b29040220e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:17:54+02:00 jsonrpcs: init dgram sockets via mod init callback (cherry picked from commit 70fa5b79e413e162427f5a8ffad3357252c517e2) --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/04c774d86a62387a6f297b29040220e… Patch: https://github.com/kamailio/kamailio/commit/04c774d86a62387a6f297b29040220e… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 94a068b3f5..b17feb2b86 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -90,7 +90,7 @@ int jsonrpc_dgram_destroy(void); void jsonrpc_dgram_server(int rx_sock, int tx_sock); -static int jsonrpc_dgram_pre_process(void); +static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); int jsonrpc_dgram_mod_init(void) @@ -241,6 +241,11 @@ int jsonrpc_dgram_mod_init(void) jsonrpc_dgram_socket, strlen(jsonrpc_dgram_socket)); done: + if(jsonrpc_dgram_init_socks()!=0) { + LM_ERR("init datagram sockets function failed\n"); + return -1; + } + /* add space for extra processes */ register_procs(jsonrpc_dgram_workers); /* add child to update local config framework structures */ @@ -395,7 +400,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, } -static int jsonrpc_dgram_pre_process(void) +static int jsonrpc_dgram_init_socks(void) { int res; @@ -448,10 +453,6 @@ int jsonrpc_dgram_child_init(int rank) int pid; if (rank==PROC_MAIN) { - if(jsonrpc_dgram_pre_process()!=0) { - LM_ERR("pre-fork function failed\n"); - return -1; - } for(i=0; i<jsonrpc_dgram_workers; i++) { pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0)

1 0

git:5.0:6702903e: jsonrpcs: set rank PROC_RPC for fifo and dgram processes
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 6702903ee846590fd0759f71fa741af95150677d URL: https://github.com/kamailio/kamailio/commit/6702903ee846590fd0759f71fa741af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:17:43+02:00 jsonrpcs: set rank PROC_RPC for fifo and dgram processes (cherry picked from commit a2b862a74c77bc71238d9b8c9ef19ddb629c75ce) --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/6702903ee846590fd0759f71fa741af… Patch: https://github.com/kamailio/kamailio/commit/6702903ee846590fd0759f71fa741af… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index 53d62662b0..85b65c43bc 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -550,7 +550,7 @@ int jsonrpc_fifo_child_init(int rank) LM_ERR("invalid fifo file path\n"); } - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS FIFO", 1); + pid=fork_process(PROC_RPC, "JSONRPCS FIFO", 1); if (pid<0) { return -1; /* error */ } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 3347959448..94a068b3f5 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -453,7 +453,7 @@ int jsonrpc_dgram_child_init(int rank) return -1; } for(i=0; i<jsonrpc_dgram_workers; i++) { - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS DATAGRAM", 1); + pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

1 0

git:5.0:0b02a2f0: jsonrpcs: updated the name of module in description of extra procs
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 0b02a2f0cfecdb72e020d3d6bdab4ac6e97ecd27 URL: https://github.com/kamailio/kamailio/commit/0b02a2f0cfecdb72e020d3d6bdab4ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:17:34+02:00 jsonrpcs: updated the name of module in description of extra procs (cherry picked from commit d4f11b6ffc459faf5c6577cc3374420c1469baeb) --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/0b02a2f0cfecdb72e020d3d6bdab4ac… Patch: https://github.com/kamailio/kamailio/commit/0b02a2f0cfecdb72e020d3d6bdab4ac… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index c44a55c236..53d62662b0 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -550,7 +550,7 @@ int jsonrpc_fifo_child_init(int rank) LM_ERR("invalid fifo file path\n"); } - pid=fork_process(PROC_NOCHLDINIT, "JSONRPC-S FIFO", 1); + pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS FIFO", 1); if (pid<0) { return -1; /* error */ } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index c61fa6da28..3347959448 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -453,7 +453,7 @@ int jsonrpc_dgram_child_init(int rank) return -1; } for(i=0; i<jsonrpc_dgram_workers; i++) { - pid=fork_process(PROC_NOCHLDINIT, "JSONRPC-S DATAGRAM", 1); + pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

1 0

git:master:9c3883a7: jsonrpcs: use same socket for dgram transport
by Daniel-Constantin Mierla 22 Oct '17

22 Oct '17

Module: kamailio Branch: master Commit: 9c3883a7856d6fb12d103baf3f784107a7c3914c URL: https://github.com/kamailio/kamailio/commit/9c3883a7856d6fb12d103baf3f78410… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-22T09:49:22+02:00 jsonrpcs: use same socket for dgram transport --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/9c3883a7856d6fb12d103baf3f78410… Patch: https://github.com/kamailio/kamailio/commit/9c3883a7856d6fb12d103baf3f78410… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index b17feb2b86..4dc4740e90 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -63,7 +63,7 @@ typedef struct{ } jsonrpc_dgram_address_t; typedef struct jsonrpc_dgram_rx_tx { - int rx_sock, tx_sock; + int rx_sock; } jsonrpc_dgram_rx_tx_t; /* dgram variables */ @@ -71,7 +71,7 @@ static int jsonrpc_dgram_socket_domain = AF_LOCAL; static jsonrpc_dgram_sockaddr_t jsonrpc_dgram_addr; /* dgram socket definition parameter */ -static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets; +static jsonrpc_dgram_rx_tx_t jsonrpc_dgram_sockets = { -1 }; /* dgram unixsock specific parameters */ char *jsonrpc_dgram_socket = NAME "_rpc.sock"; @@ -89,7 +89,7 @@ int jsonrpc_dgram_child_init(int rank); int jsonrpc_dgram_destroy(void); -void jsonrpc_dgram_server(int rx_sock, int tx_sock); +void jsonrpc_dgram_server(int rx_sock); static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); @@ -363,7 +363,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, case AF_INET: if (bind(socks->rx_sock, &addr->udp_addr.s, - sockaddru_len(addr->udp_addr))< 0) { + sockaddru_len(addr->udp_addr))< 0) { LM_ERR("bind: %s\n", strerror(errno)); goto err_rx; } @@ -377,13 +377,12 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, break; default: LM_ERR("domain not supported\n"); - goto err_both; + goto err_rx; } - jsonrpc_dgram_create_reply_socket(socks->tx_sock, socket_domain, err_both); optval = 64 * 1024; - if (setsockopt(socks->tx_sock, SOL_SOCKET, SO_SNDBUF, + if (setsockopt(socks->rx_sock, SOL_SOCKET, SO_SNDBUF, (void*)&optval, sizeof(optval)) ==-1){ LM_ERR("failed to increse send buffer size via setsockopt " " SO_SNDBUF (%d) - %d: %s\n", optval, @@ -391,9 +390,18 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, /* continue, non-critical */ } + /* Turn non-blocking mode on for tx*/ + flags = fcntl(socks->rx_sock, F_GETFL); + if (flags == -1){ + LM_ERR("fcntl failed: %s\n", strerror(errno)); + goto err_rx; + } + if (fcntl(socks->rx_sock, F_SETFL, flags | O_NONBLOCK) == -1) { + LM_ERR("fcntl: set non-blocking failed: %s\n", strerror(errno)); + goto err_rx; + } return 0; -err_both: - if(socks->tx_sock>=0) close(socks->tx_sock); + err_rx: if(socks->rx_sock>=0) close(socks->rx_sock); return -1; @@ -440,8 +448,7 @@ static void jsonrpc_dgram_process(int rank) jsonrpc_dgram_write_buffer_len = JSONRPC_DGRAM_BUF_SIZE ; - jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock, - jsonrpc_dgram_sockets.tx_sock); + jsonrpc_dgram_server(jsonrpc_dgram_sockets.rx_sock); exit(-1); } @@ -480,8 +487,7 @@ int jsonrpc_dgram_child_init(int rank) static int jsonrpc_dgram_post_process(void) { /* close the sockets */ - close(jsonrpc_dgram_sockets.rx_sock); - close(jsonrpc_dgram_sockets.tx_sock); + if(jsonrpc_dgram_sockets.rx_sock>=0) close(jsonrpc_dgram_sockets.rx_sock); return 0; } @@ -549,7 +555,7 @@ static int jsonrpc_dgram_send_data(int fd, char* buf, unsigned int len, return n; } -void jsonrpc_dgram_server(int rx_sock, int tx_sock) +void jsonrpc_dgram_server(int rx_sock) { int ret; str scmd; @@ -608,7 +614,7 @@ void jsonrpc_dgram_server(int rx_sock, int tx_sock) jr->rcode, jr->rbody.s, jr->rbody.len, jr->rbody.s); - jsonrpc_dgram_send_data(tx_sock, jr->rbody.s, jr->rbody.len, + jsonrpc_dgram_send_data(rx_sock, jr->rbody.s, jr->rbody.len, (struct sockaddr*)&jsonrpc_dgram_reply_addr, jsonrpc_dgram_reply_addr_len, jsonrpc_dgram_timeout);

1 0

git:master:17697e4b: jsonrpcs: init fifo stream via mod init callback
by Daniel-Constantin Mierla 21 Oct '17

21 Oct '17

Module: kamailio Branch: master Commit: 17697e4bcabcec62d4393c6ae60fabec7d1c8e98 URL: https://github.com/kamailio/kamailio/commit/17697e4bcabcec62d4393c6ae60fabe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-21T12:19:41+02:00 jsonrpcs: init fifo stream via mod init callback --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/17697e4bcabcec62d4393c6ae60fabe… Patch: https://github.com/kamailio/kamailio/commit/17697e4bcabcec62d4393c6ae60fabe…

1 0

git:master:70fa5b79: jsonrpcs: init dgram sockets via mod init callback
by Daniel-Constantin Mierla 21 Oct '17

21 Oct '17

Module: kamailio Branch: master Commit: 70fa5b79e413e162427f5a8ffad3357252c517e2 URL: https://github.com/kamailio/kamailio/commit/70fa5b79e413e162427f5a8ffad3357… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-21T12:10:29+02:00 jsonrpcs: init dgram sockets via mod init callback --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/70fa5b79e413e162427f5a8ffad3357… Patch: https://github.com/kamailio/kamailio/commit/70fa5b79e413e162427f5a8ffad3357… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 94a068b3f5..b17feb2b86 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -90,7 +90,7 @@ int jsonrpc_dgram_destroy(void); void jsonrpc_dgram_server(int rx_sock, int tx_sock); -static int jsonrpc_dgram_pre_process(void); +static int jsonrpc_dgram_init_socks(void); static int jsonrpc_dgram_post_process(void); int jsonrpc_dgram_mod_init(void) @@ -241,6 +241,11 @@ int jsonrpc_dgram_mod_init(void) jsonrpc_dgram_socket, strlen(jsonrpc_dgram_socket)); done: + if(jsonrpc_dgram_init_socks()!=0) { + LM_ERR("init datagram sockets function failed\n"); + return -1; + } + /* add space for extra processes */ register_procs(jsonrpc_dgram_workers); /* add child to update local config framework structures */ @@ -395,7 +400,7 @@ int jsonrpc_dgram_init_server(jsonrpc_dgram_sockaddr_t *addr, } -static int jsonrpc_dgram_pre_process(void) +static int jsonrpc_dgram_init_socks(void) { int res; @@ -448,10 +453,6 @@ int jsonrpc_dgram_child_init(int rank) int pid; if (rank==PROC_MAIN) { - if(jsonrpc_dgram_pre_process()!=0) { - LM_ERR("pre-fork function failed\n"); - return -1; - } for(i=0; i<jsonrpc_dgram_workers; i++) { pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0)

1 0

git:master:a2b862a7: jsonrpcs: set rank PROC_RPC for fifo and dgram processes
by Daniel-Constantin Mierla 21 Oct '17

21 Oct '17

Module: kamailio Branch: master Commit: a2b862a74c77bc71238d9b8c9ef19ddb629c75ce URL: https://github.com/kamailio/kamailio/commit/a2b862a74c77bc71238d9b8c9ef19dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-21T11:47:35+02:00 jsonrpcs: set rank PROC_RPC for fifo and dgram processes --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/a2b862a74c77bc71238d9b8c9ef19dd… Patch: https://github.com/kamailio/kamailio/commit/a2b862a74c77bc71238d9b8c9ef19dd… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index 53d62662b0..85b65c43bc 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -550,7 +550,7 @@ int jsonrpc_fifo_child_init(int rank) LM_ERR("invalid fifo file path\n"); } - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS FIFO", 1); + pid=fork_process(PROC_RPC, "JSONRPCS FIFO", 1); if (pid<0) { return -1; /* error */ } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 3347959448..94a068b3f5 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -453,7 +453,7 @@ int jsonrpc_dgram_child_init(int rank) return -1; } for(i=0; i<jsonrpc_dgram_workers; i++) { - pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS DATAGRAM", 1); + pid=fork_process(PROC_RPC, "JSONRPCS DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

1 0

git:master:d4f11b6f: jsonrpcs: updated the name of module in description of extra procs
by Daniel-Constantin Mierla 20 Oct '17

20 Oct '17

Module: kamailio Branch: master Commit: d4f11b6ffc459faf5c6577cc3374420c1469baeb URL: https://github.com/kamailio/kamailio/commit/d4f11b6ffc459faf5c6577cc3374420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-20T11:23:06+02:00 jsonrpcs: updated the name of module in description of extra procs --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/d4f11b6ffc459faf5c6577cc3374420… Patch: https://github.com/kamailio/kamailio/commit/d4f11b6ffc459faf5c6577cc3374420… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index c44a55c236..53d62662b0 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -550,7 +550,7 @@ int jsonrpc_fifo_child_init(int rank) LM_ERR("invalid fifo file path\n"); } - pid=fork_process(PROC_NOCHLDINIT, "JSONRPC-S FIFO", 1); + pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS FIFO", 1); if (pid<0) { return -1; /* error */ } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index c61fa6da28..3347959448 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -453,7 +453,7 @@ int jsonrpc_dgram_child_init(int rank) return -1; } for(i=0; i<jsonrpc_dgram_workers; i++) { - pid=fork_process(PROC_NOCHLDINIT, "JSONRPC-S DATAGRAM", 1); + pid=fork_process(PROC_NOCHLDINIT, "JSONRPCS DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

1 0

[kamailio/kamailio] No music on hold (#1273)
by Fyodor 19 Oct '17

19 Oct '17

os: ubuntu 16.04 installation: apt install kamailio rttproxy configured and works(SRTP works fine) Databases for mohqueue exist My kamailio.cfg: ``` loadmodule "mohqueue.so" # --- music on hold moh ---- modparam ("mohqueue", "db_url", "mysql://kamailio:MYPASSWORDHERE@localhost/kamailio") modparam ("mohqueue", "mohdir", "/etc/kamailio/moh") modparam ("mohqueue", "moh_maxcalls", 3000) ``` ``` fed@vps1:/etc/kamailio# ls -al /etc/kamailio/moh/ total 185424 drwxr-xr-x 2 kamailio kamailio 4096 Oct 8 09:32 ./ drwxr-xr-x 3 root root 4096 Oct 8 10:04 ../ -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.0 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.1 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.10 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.11 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.12 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.13 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.14 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.15 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.16 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.17 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.18 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.19 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.2 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.20 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.3 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.4 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.5 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.6 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.7 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.8 -rw-r--r-- 1 kamailio kamailio 8627660 Oct 8 09:32 hold.9 -rw-r--r-- 1 kamailio kamailio 8627660 Jan 2 2017 hold.wav ``` No errors or warnings in log file. Calls work fine, but no music on hold. Can anybody help me, please? -- 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/1273

3 4

git:4.4:471f8843: pkg/kamailio/deb: fix kamailio-berkeley-modules dependence
by Victor Seva 19 Oct '17

19 Oct '17

Module: kamailio Branch: 4.4 Commit: 471f8843cf3fa65e5215c284337e1206e1e96c9e URL: https://github.com/kamailio/kamailio/commit/471f8843cf3fa65e5215c284337e120… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-19T10:40:45+02:00 pkg/kamailio/deb: fix kamailio-berkeley-modules dependence --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/squeeze/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/471f8843cf3fa65e5215c284337e120… Patch: https://github.com/kamailio/kamailio/commit/471f8843cf3fa65e5215c284337e120…

1 0

git:5.0:60dc10a3: pkg/kamailio/deb: fix kamailio-berkeley-modules dependence
by Victor Seva 19 Oct '17

19 Oct '17

Module: kamailio Branch: 5.0 Commit: 60dc10a3948bdc51d1c9298e8a174a0af066557a URL: https://github.com/kamailio/kamailio/commit/60dc10a3948bdc51d1c9298e8a174a0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-19T10:36:27+02:00 pkg/kamailio/deb: fix kamailio-berkeley-modules dependence --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/60dc10a3948bdc51d1c9298e8a174a0… Patch: https://github.com/kamailio/kamailio/commit/60dc10a3948bdc51d1c9298e8a174a0… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 488c082045..eb22c68222 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -422,7 +422,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index eb2e603f3c..5c71aa4150 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -420,7 +420,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 070856edcc..afb94c80f3 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -416,7 +416,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index e9e8231d62..2747c390d5 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -420,7 +420,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index e9e8231d62..2747c390d5 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -420,7 +420,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index d63ab59d31..4e375f6700 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -418,7 +418,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 070856edcc..afb94c80f3 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -416,7 +416,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index 0a03ef75fc..2e931f4cd9 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -421,7 +421,7 @@ Package: kamailio-berkeley-modules Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: db5.1-util, +Depends: db-util (>= 4.6.19), kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}

1 0

git:master:3a1e8807: pkg/kamailio/deb: fix kamailio-berkeley-modules dependence
by Victor Seva 19 Oct '17

19 Oct '17

Module: kamailio Branch: master Commit: 3a1e8807d340dd7907b310006a18a7e82e795d2b URL: https://github.com/kamailio/kamailio/commit/3a1e8807d340dd7907b310006a18a7e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-19T10:31:51+02:00 pkg/kamailio/deb: fix kamailio-berkeley-modules dependence --- Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/3a1e8807d340dd7907b310006a18a7e… Patch: https://github.com/kamailio/kamailio/commit/3a1e8807d340dd7907b310006a18a7e…

1 0

git:5.0:71876926: xmlrpc: fix handling the optional param spec on no more params
by Daniel-Constantin Mierla 19 Oct '17

19 Oct '17

Module: kamailio Branch: 5.0 Commit: 71876926dd7add9f7423bda1aa4489933d8174ac URL: https://github.com/kamailio/kamailio/commit/71876926dd7add9f7423bda1aa44899… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-19T09:00:21+02:00 xmlrpc: fix handling the optional param spec on no more params (cherry picked from commit 9483efe6af26a2a8b08ee132e8ed2afe25e71cbc) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/71876926dd7add9f7423bda1aa44899… Patch: https://github.com/kamailio/kamailio/commit/71876926dd7add9f7423bda1aa44899… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index e40f32b485..7cce80090d 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1525,7 +1525,13 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) f=(autoconvert?GET_X_AUTOCONV:0) | (lflf2crlf?GET_X_LFLF2CRLF:0); while(*fmt) { - if (!ctx->act_param) goto error; + if (!ctx->act_param) { + if(*fmt=='*') { + break; + } else { + goto error; + } + } value = ctx->act_param->xmlChildrenNode; switch(*fmt) {

1 0

git:5.0:1b86bf2f: jsonrpcs: proper propagation of rpc fault code and message
by Daniel-Constantin Mierla 19 Oct '17

19 Oct '17

Module: kamailio Branch: 5.0 Commit: 1b86bf2faa09d3a9ef3684f42582a83267635668 URL: https://github.com/kamailio/kamailio/commit/1b86bf2faa09d3a9ef3684f42582a83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-19T09:00:34+02:00 jsonrpcs: proper propagation of rpc fault code and message (cherry picked from commit 9364b1691412ec1d3d59ca8a801613470e079c1d) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/1b86bf2faa09d3a9ef3684f42582a83… Patch: https://github.com/kamailio/kamailio/commit/1b86bf2faa09d3a9ef3684f42582a83… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 2103f75dfc..adf423d4ef 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -298,13 +298,23 @@ static void jsonrpc_fault(jsonrpc_ctx_t* ctx, int code, char* fmt, ...) jsonrpc_delayed_reply_ctx_init(ctx); - ctx->http_code = code; + if(code <= 100) { + ctx->http_code = 500; + } else { + ctx->http_code = code; + } va_start(ap, fmt); vsnprintf(jsonrpc_error_buf, JSONRPC_ERROR_REASON_BUF_LEN, fmt, ap); va_end(ap); - ctx->http_text.len = strlen(jsonrpc_error_buf); + ctx->error_text.len = strlen(jsonrpc_error_buf); + ctx->error_text.s = jsonrpc_error_buf; + ctx->http_text.len = ctx->error_text.len; ctx->http_text.s = jsonrpc_error_buf; - if(ctx->error_code == 0) ctx->error_code = -32000; + if(code == 0) { + ctx->error_code = -32000; + } else { + ctx->error_code = code; + } return; } @@ -347,8 +357,14 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx) _jsonrpc_error_table[i].text.s, _jsonrpc_error_table[i].text.len); } else { - srjson_AddStrStrToObject(ctx->jrpl, nj, - "message", 7, "Unexpected Error", 16); + if(ctx->error_text.len>0) { + srjson_AddStrStrToObject(ctx->jrpl, nj, + "message", 7, + ctx->error_text.s, ctx->error_text.len); + } else { + srjson_AddStrStrToObject(ctx->jrpl, nj, + "message", 7, "Unexpected Error", 16); + } } srjson_AddItemToObject(ctx->jrpl, ctx->jrpl->root, "error", nj); } diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.h b/src/modules/jsonrpcs/jsonrpcs_mod.h index eec2a743b0..ef15c3ec93 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.h +++ b/src/modules/jsonrpcs/jsonrpcs_mod.h @@ -50,6 +50,7 @@ typedef struct jsonrpc_ctx { srjson_t *rpl_node; /**< Pointer to crt node in json reply doc */ int reply_sent; /**< Flag set if the json reply was sent */ int error_code; /**< Json error code */ + str error_text; /**< Json error text */ int http_code; /**< http reply code */ str http_text; /**< http reply reason text */ int transport; /**< RPC transport */

1 0

git:5.0:dc9efda1: jsonrpcs: fix handling the optional param spec on no more params
by Daniel-Constantin Mierla 19 Oct '17

19 Oct '17

Module: kamailio Branch: 5.0 Commit: dc9efda1bb416874fd3fe4320326d067fa9fb0c0 URL: https://github.com/kamailio/kamailio/commit/dc9efda1bb416874fd3fe4320326d06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-19T09:00:10+02:00 jsonrpcs: fix handling the optional param spec on no more params (cherry picked from commit 87d71619e7896d3d333bb6c15d4c00616add71a6) --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dc9efda1bb416874fd3fe4320326d06… Patch: https://github.com/kamailio/kamailio/commit/dc9efda1bb416874fd3fe4320326d06… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index b30beafd55..2103f75dfc 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -648,7 +648,7 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) ctx->req_node = ctx->req_node->next; } /* error if there is still a scan char type and it is not optional */ - if(*fmt && mandatory_param==1) + if(*fmt && *fmt!='*' && mandatory_param==1) goto error; va_end(ap);

1 0

git:master:9364b169: jsonrpcs: proper propagation of rpc fault code and message
by Daniel-Constantin Mierla 19 Oct '17

19 Oct '17

Module: kamailio Branch: master Commit: 9364b1691412ec1d3d59ca8a801613470e079c1d URL: https://github.com/kamailio/kamailio/commit/9364b1691412ec1d3d59ca8a8016134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-19T08:58:59+02:00 jsonrpcs: proper propagation of rpc fault code and message --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c Modified: src/modules/jsonrpcs/jsonrpcs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/9364b1691412ec1d3d59ca8a8016134… Patch: https://github.com/kamailio/kamailio/commit/9364b1691412ec1d3d59ca8a8016134… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index e2b4b80cb6..633847fc9d 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -299,13 +299,23 @@ static void jsonrpc_fault(jsonrpc_ctx_t* ctx, int code, char* fmt, ...) jsonrpc_delayed_reply_ctx_init(ctx); - ctx->http_code = code; + if(code <= 100) { + ctx->http_code = 500; + } else { + ctx->http_code = code; + } va_start(ap, fmt); vsnprintf(jsonrpc_error_buf, JSONRPC_ERROR_REASON_BUF_LEN, fmt, ap); va_end(ap); - ctx->http_text.len = strlen(jsonrpc_error_buf); + ctx->error_text.len = strlen(jsonrpc_error_buf); + ctx->error_text.s = jsonrpc_error_buf; + ctx->http_text.len = ctx->error_text.len; ctx->http_text.s = jsonrpc_error_buf; - if(ctx->error_code == 0) ctx->error_code = -32000; + if(code == 0) { + ctx->error_code = -32000; + } else { + ctx->error_code = code; + } return; } @@ -348,8 +358,14 @@ static int jsonrpc_send(jsonrpc_ctx_t* ctx) _jsonrpc_error_table[i].text.s, _jsonrpc_error_table[i].text.len); } else { - srjson_AddStrStrToObject(ctx->jrpl, nj, - "message", 7, "Unexpected Error", 16); + if(ctx->error_text.len>0) { + srjson_AddStrStrToObject(ctx->jrpl, nj, + "message", 7, + ctx->error_text.s, ctx->error_text.len); + } else { + srjson_AddStrStrToObject(ctx->jrpl, nj, + "message", 7, "Unexpected Error", 16); + } } srjson_AddItemToObject(ctx->jrpl, ctx->jrpl->root, "error", nj); } diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.h b/src/modules/jsonrpcs/jsonrpcs_mod.h index eec2a743b0..ef15c3ec93 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.h +++ b/src/modules/jsonrpcs/jsonrpcs_mod.h @@ -50,6 +50,7 @@ typedef struct jsonrpc_ctx { srjson_t *rpl_node; /**< Pointer to crt node in json reply doc */ int reply_sent; /**< Flag set if the json reply was sent */ int error_code; /**< Json error code */ + str error_text; /**< Json error text */ int http_code; /**< http reply code */ str http_text; /**< http reply reason text */ int transport; /**< RPC transport */

1 0

Re: [sr-dev] [SR-Users] Development for Kamailio v5.1 series is frozen
by Daniel-Constantin Mierla 19 Oct '17

19 Oct '17

Hello, all existing PRs are going to be merged if the are already open and nothing gets broken. I will look at them in the near future. Cheers, Daniel On 18.10.17 16:10, Sergey Safarov wrote: > Hello Daniel > Could you make review of PR #1106 > <https://github.com/kamailio/kamailio/pull/1106> and #1260 > <https://github.com/kamailio/kamailio/pull/1260> > > Sergey > > вт, 17 окт. 2017 г. в 7:25, Daniel-Constantin Mierla > <miconda(a)gmail.com <mailto:miconda@gmail.com>>: > > Hello, > > short note to mark the freezing of development for Kamailio v5.1 > series. > For few weeks, please do not push new features in the master branch. > Once the branch 5.1 is created (expected to happen in 3-4 weeks from > now), the master branch becomes again open for new feature. Meanwhile > the focus has to be on testing current code. > > Work on related tools (e.g., kamctl) or documentation can still be > done > as well as getting the new modules in 5.1 in good shape, plus adding > exports to kemi interface (which should not interfere with old code). > > The entire testing phase is expected to be 4 to 6 weeks, then the > release of v5.1.0 -- likely by end of November should be out. > > Cheers, > Daniel > > -- > Daniel-Constantin Mierla > www.twitter.com/miconda <http://www.twitter.com/miconda> -- > www.linkedin.com/in/miconda <http://www.linkedin.com/in/miconda> > Kamailio Advanced Training, Nov 13-15, 2017, in Berlin - > www.asipto.com <http://www.asipto.com> > Kamailio World Conference - www.kamailioworld.com > <http://www.kamailioworld.com> > > > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org <mailto:sr-users@lists.kamailio.org> > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users > -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training, Nov 13-15, 2017, in Berlin - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

ul.add params
by Juha Heinanen 18 Oct '17

18 Oct '17

I noticed that my ul.add command that works OK in 5.0 doesn't anymore work in 5.1. I get back to the xmlrpc query: <name>faultString</name> <value><string>Not enough parameters or wrong format</string></value> I then went and compared ul.add in 5.0 and 5.1 and noticed that in 5.1 it has added two optional params: received (optional) value with the received-from address (source address) (use '0' or '.' if it should not be set). Format: sip:srcip:srcport;transport=abc socket (optional) value with the local socket address (use '0' or '.' if it should not be set). Format: proto:localip:localport Note: the position of parameters is relevant, in the case of optional parameters, use '0' or '.' for parameters that should not be set which are positioned before any parameter that has to be set. What does that mean? Isn't optional really optional, but 0 or . is needed? -- Juha

2 8

git:master:cae9b565: sipdump: details of running processes written in meta file
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: cae9b5655b1779e4f968f9ab16a5bae41151e4a4 URL: https://github.com/kamailio/kamailio/commit/cae9b5655b1779e4f968f9ab16a5bae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:41:20+02:00 sipdump: details of running processes written in meta file --- Modified: src/modules/sipdump/sipdump_mod.c Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/cae9b5655b1779e4f968f9ab16a5bae… Patch: https://github.com/kamailio/kamailio/commit/cae9b5655b1779e4f968f9ab16a5bae… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 4a7dfd4c16..c95e0b091a 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -169,7 +169,6 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) ti = localtime(&tv.tv_sec); obuf->len = snprintf(_sipdump_wbuf, SIPDUMP_WBUF_SIZE, "====================\n" - "v: 1.0\n" "tag: %.*s\n" "pid: %d\n" "process: %d\n" diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index d3b2a8a7fe..03ed711d81 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -28,6 +28,8 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/globals.h" +#include "../../core/ver.h" +#include "../../core/pt.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -133,6 +135,7 @@ static int sipdump_write_meta(char *fpath) { char mpath[SIPDUMP_FPATH_SIZE]; int len; + int i; FILE *mfile = NULL; struct tm *ti; @@ -156,9 +159,19 @@ static int sipdump_write_meta(char *fpath) ti = localtime(&up_since); fprintf(mfile, "v: 1.0\n" - "start: %s", - asctime(ti) + "version: %s %s\n" + "start: %s" + "nrprocs: %d\n", + ver_name, ver_version, + asctime(ti), + *process_count ); + for (i=0; i<*process_count; i++) { + fprintf(mfile, + "process: %d %d %s\n", + i, pt[i].pid, pt[i].desc); + } + fclose(mfile); return 0; }

1 0

git:master:87d71619: jsonrpcs: fix handling the optional param spec on no more params
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 87d71619e7896d3d333bb6c15d4c00616add71a6 URL: https://github.com/kamailio/kamailio/commit/87d71619e7896d3d333bb6c15d4c006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:36:26+02:00 jsonrpcs: fix handling the optional param spec on no more params --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/87d71619e7896d3d333bb6c15d4c006… Patch: https://github.com/kamailio/kamailio/commit/87d71619e7896d3d333bb6c15d4c006… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index cd99ad8a01..e2b4b80cb6 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -649,7 +649,7 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) ctx->req_node = ctx->req_node->next; } /* error if there is still a scan char type and it is not optional */ - if(*fmt && mandatory_param==1) + if(*fmt && *fmt!='*' && mandatory_param==1) goto error; va_end(ap);

1 0

git:master:9483efe6: xmlrpc: fix handling the optional param spec on no more params
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 9483efe6af26a2a8b08ee132e8ed2afe25e71cbc URL: https://github.com/kamailio/kamailio/commit/9483efe6af26a2a8b08ee132e8ed2af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:41:01+02:00 xmlrpc: fix handling the optional param spec on no more params --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9483efe6af26a2a8b08ee132e8ed2af… Patch: https://github.com/kamailio/kamailio/commit/9483efe6af26a2a8b08ee132e8ed2af… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index d3689d3af1..2e7c644279 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1533,7 +1533,13 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) f=(autoconvert?GET_X_AUTOCONV:0) | (lflf2crlf?GET_X_LFLF2CRLF:0); while(*fmt) { - if (!ctx->act_param) goto error; + if (!ctx->act_param) { + if(*fmt=='*') { + break; + } else { + goto error; + } + } value = ctx->act_param->xmlChildrenNode; switch(*fmt) {

1 0

git:master:7ffa6a4f: usrloc: log message when rpc ul.add does not get proper params
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 7ffa6a4fd2b4daf9edf0f46d5be0bb9cc06e00d7 URL: https://github.com/kamailio/kamailio/commit/7ffa6a4fd2b4daf9edf0f46d5be0bb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:35:31+02:00 usrloc: log message when rpc ul.add does not get proper params --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7ffa6a4fd2b4daf9edf0f46d5be0bb9… Patch: https://github.com/kamailio/kamailio/commit/7ffa6a4fd2b4daf9edf0f46d5be0bb9… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index d9533af262..c7d48cde8f 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -599,6 +599,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &ci.received, &socket); if (ret < 9) { + LM_ERR("not enough parameters - read so far: %d\n", ret); rpc->fault(ctx, 500, "Not enough parameters or wrong format"); return; }

1 0

git:master:6bfdbbcd: sipdump: write a meta file along the data file
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 6bfdbbcda638265409be1f22bd19eda8beed24ff URL: https://github.com/kamailio/kamailio/commit/6bfdbbcda638265409be1f22bd19eda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T09:11:58+02:00 sipdump: write a meta file along the data file - store there the common details (runtime environment attributes) --- Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/6bfdbbcda638265409be1f22bd19eda… Patch: https://github.com/kamailio/kamailio/commit/6bfdbbcda638265409be1f22bd19eda… --- diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 4a566e9ff5..d3b2a8a7fe 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -27,6 +27,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/globals.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -67,7 +68,7 @@ int sipdump_list_init(int en) } /** - * + * */ int sipdump_enabled(void) { @@ -86,7 +87,7 @@ int sipdump_list_destroy(void) sipdump_data_t *sdd0 = NULL; if(_sipdump_list==NULL) return 0; - + sdd=_sipdump_list->first; while(sdd!=NULL) { sdd0 = sdd; @@ -126,7 +127,44 @@ int sipdump_list_add(str *data) } /** - * + * + */ +static int sipdump_write_meta(char *fpath) +{ + char mpath[SIPDUMP_FPATH_SIZE]; + int len; + FILE *mfile = NULL; + struct tm *ti; + + len = strlen(fpath); + if(len>=SIPDUMP_FPATH_SIZE-1) { + LM_ERR("file path too long\n"); + return -1; + } + strcpy(mpath, fpath); + mpath[len-4] = 'm'; + mpath[len-3] = 'e'; + mpath[len-2] = 't'; + mpath[len-1] = 'a'; + + LM_DBG("writing meta to file: %s\n", mpath); + mfile = fopen( mpath , "w" ); + if(mfile==NULL) { + LM_ERR("failed to open meta file %s\n", mpath); + return -1; + } + ti = localtime(&up_since); + fprintf(mfile, + "v: 1.0\n" + "start: %s", + asctime(ti) + ); + fclose(mfile); + return 0; +} + +/** + * */ static int sipdump_rotate_file(void) { @@ -153,18 +191,19 @@ static int sipdump_rotate_file(void) 1900+ti->tm_year, ti->tm_mon, ti->tm_mday, ti->tm_hour, ti->tm_min, ti->tm_sec); LM_DBG("writing to file: %s (%d)\n", _sipdump_fpath, n); - _sipdump_file = fopen( _sipdump_fpath , "w" ); + _sipdump_file = fopen( _sipdump_fpath, "w" ); if(_sipdump_file==NULL) { LM_ERR("failed to open file %s\n", _sipdump_fpath); return -1; } + sipdump_write_meta(_sipdump_fpath); sipdump_last_rotate = tv; - + return 0; } /** - * + * */ int sipdump_file_init(str *folder, str *fprefix) { @@ -288,4 +327,4 @@ int sipdump_rpc_init(void) return -1; } return 0; -} \ No newline at end of file +}

1 0

git:master:4de01bbf: geoip: fixed typo in definition of gip variable
by Daniel-Constantin Mierla 17 Oct '17

17 Oct '17

Module: kamailio Branch: master Commit: 4de01bbf3c0a80e67554285988a92fcf18ff9f2b URL: https://github.com/kamailio/kamailio/commit/4de01bbf3c0a80e67554285988a92fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-17T09:15:03+02:00 geoip: fixed typo in definition of gip variable --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4de01bbf3c0a80e67554285988a92fc… Patch: https://github.com/kamailio/kamailio/commit/4de01bbf3c0a80e67554285988a92fc… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index ab827a17a5..556806ea80 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -46,7 +46,7 @@ static int w_geoip_match(struct sip_msg* msg, char* str1, char* str2); static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass); static pv_export_t mod_pvs[] = { - { {"gip", sizeof("git")-1}, PVT_OTHER, pv_get_geoip, 0, + { {"gip", sizeof("gip")-1}, PVT_OTHER, pv_get_geoip, 0, pv_parse_geoip_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -153,4 +153,4 @@ static sr_kemi_t sr_kemi_geoip_exports[] = { int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_geoip_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:ad84dd05: pkg/kamailio/deb: buster files
by Victor Seva 17 Oct '17

17 Oct '17

Module: kamailio Branch: master Commit: ad84dd05e678a180663c857637154bac1b159c27 URL: https://github.com/kamailio/kamailio/commit/ad84dd05e678a180663c857637154ba… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-17T09:03:07+02:00 pkg/kamailio/deb: buster files --- Added: pkg/kamailio/deb/buster/changelog Added: pkg/kamailio/deb/buster/compat Added: pkg/kamailio/deb/buster/control Added: pkg/kamailio/deb/buster/copyright Added: pkg/kamailio/deb/buster/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/buster/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio.README.Debian Added: pkg/kamailio/deb/buster/kamailio.default Added: pkg/kamailio/deb/buster/kamailio.examples Added: pkg/kamailio/deb/buster/kamailio.init Added: pkg/kamailio/deb/buster/kamailio.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio.postinst Added: pkg/kamailio/deb/buster/kamailio.service Added: pkg/kamailio/deb/buster/rules Added: pkg/kamailio/deb/buster/source.lintian-overrides Added: pkg/kamailio/deb/buster/source/format Added: pkg/kamailio/deb/buster/watch --- Diff: https://github.com/kamailio/kamailio/commit/ad84dd05e678a180663c857637154ba… Patch: https://github.com/kamailio/kamailio/commit/ad84dd05e678a180663c857637154ba…

1 0

git:master:6b021e19: pkg/kamailio/deb: add buster support
by Victor Seva 17 Oct '17

17 Oct '17

Module: kamailio Branch: master Commit: 6b021e199cfdfaac3e4723320742377e9da1e1d0 URL: https://github.com/kamailio/kamailio/commit/6b021e199cfdfaac3e4723320742377… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-17T09:02:16+02:00 pkg/kamailio/deb: add buster support * remove buildserver.net reference from backports --- Added: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial --- Diff: https://github.com/kamailio/kamailio/commit/6b021e199cfdfaac3e4723320742377… Patch: https://github.com/kamailio/kamailio/commit/6b021e199cfdfaac3e4723320742377… --- diff --git a/pkg/kamailio/deb/debian/backports/buster b/pkg/kamailio/deb/debian/backports/buster new file mode 100755 index 0000000000..9fc54a9e40 --- /dev/null +++ b/pkg/kamailio/deb/debian/backports/buster @@ -0,0 +1,23 @@ +#!/bin/bash +# +# Target dist: Debian buster +DIST=buster + +rm -rf ${DIST} +cp -r debian ${DIST} + +# No mi_xmlrpc module +sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \ + ${DIST}/control +sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules +sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules + +# No dnssec module: +sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ + ${DIST}/control +sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules +sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules + +# clean backports scripts +rm -rf ${DIST}/backports +exit 0 diff --git a/pkg/kamailio/deb/debian/backports/jessie b/pkg/kamailio/deb/debian/backports/jessie index ec8187fb17..48fc3d3798 100755 --- a/pkg/kamailio/deb/debian/backports/jessie +++ b/pkg/kamailio/deb/debian/backports/jessie @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Jessie DIST=jessie diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 3fbca2811f..80a2beff03 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Squeeze DIST=precise diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index df1a365da9..e642c049e0 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Sid DIST=sid diff --git a/pkg/kamailio/deb/debian/backports/stretch b/pkg/kamailio/deb/debian/backports/stretch index f75b2a3f16..285eb85633 100755 --- a/pkg/kamailio/deb/debian/backports/stretch +++ b/pkg/kamailio/deb/debian/backports/stretch @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Stretch DIST=stretch diff --git a/pkg/kamailio/deb/debian/backports/trusty b/pkg/kamailio/deb/debian/backports/trusty index 6aa1c2f76f..2e3665ba4a 100755 --- a/pkg/kamailio/deb/debian/backports/trusty +++ b/pkg/kamailio/deb/debian/backports/trusty @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Ubuntu trusty DIST=trusty diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 1b4fa2e021..c526f2fd42 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Wheezy DIST=wheezy diff --git a/pkg/kamailio/deb/debian/backports/xenial b/pkg/kamailio/deb/debian/backports/xenial index 174fbc9fdd..721ca849a0 100755 --- a/pkg/kamailio/deb/debian/backports/xenial +++ b/pkg/kamailio/deb/debian/backports/xenial @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Ubuntu xenial DIST=xenial

1 0

Development for Kamailio v5.1 series is frozen
by Daniel-Constantin Mierla 17 Oct '17

17 Oct '17

Hello, short note to mark the freezing of development for Kamailio v5.1 series. For few weeks, please do not push new features in the master branch. Once the branch 5.1 is created (expected to happen in 3-4 weeks from now), the master branch becomes again open for new feature. Meanwhile the focus has to be on testing current code. Work on related tools (e.g., kamctl) or documentation can still be done as well as getting the new modules in 5.1 in good shape, plus adding exports to kemi interface (which should not interfere with old code). The entire testing phase is expected to be 4 to 6 weeks, then the release of v5.1.0 -- likely by end of November should be out. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training, Nov 13-15, 2017, in Berlin - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

git:master:9c064ff6: pkg/kamailio/deb: set version 5.1.0~dev8
by Victor Seva 16 Oct '17

16 Oct '17

Module: kamailio Branch: master Commit: 9c064ff672df7c3e65b4b2891899bfaa460469dd URL: https://github.com/kamailio/kamailio/commit/9c064ff672df7c3e65b4b2891899bfa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-16T12:11:13+02:00 pkg/kamailio/deb: set version 5.1.0~dev8 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/9c064ff672df7c3e65b4b2891899bfa… Patch: https://github.com/kamailio/kamailio/commit/9c064ff672df7c3e65b4b2891899bfa… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 358ae895cc..c141ede2f5 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev8) unstable; urgency=medium + + * version set to 5.1.0~dev8 + + -- Victor Seva <vseva(a)debian.org> Mon, 16 Oct 2017 12:09:55 +0200 + kamailio (5.1.0~dev7) unstable; urgency=medium * version set to 5.1.0-dev7

1 0

git:master:f8198900: modules: readme files regenerated - sipdump ... [skip ci]
by Kamailio Dev 16 Oct '17

16 Oct '17

Module: kamailio Branch: master Commit: f819890018e339ce416b9da51fb44bd719449228 URL: https://github.com/kamailio/kamailio/commit/f819890018e339ce416b9da51fb44bd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-16T11:46:21+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/f819890018e339ce416b9da51fb44bd… Patch: https://github.com/kamailio/kamailio/commit/f819890018e339ce416b9da51fb44bd… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index 2ec9d58953..e1408cec6f 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2017 asipto.com + Copyright Â© 2017 asipto.com __________________________________________________________________ Table of Contents @@ -124,11 +124,11 @@ Chapter 1. Admin Guide Enable storage. - Default value is 1 (0 - off; 1 - on). + Default value is 0 (0 - off; 1 - on). Example 1.1. Set enable parameter ... -modparam("sipdump", "enable", 0) +modparam("sipdump", "enable", 1) ... 3.2. wait (int) @@ -180,7 +180,7 @@ modparam("sipdump", "fprefix", "ksipdump-") 4.1. sipdump_send(tag) -4.1. sipdump_send(tag) +4.1. sipdump_send(tag) Send the details of the current SIP message to the writter process and get it stored in the file. @@ -199,7 +199,7 @@ sipdump_send("cfg"); 5.1. sipdump.enable -5.1. sipdump.enable +5.1. sipdump.enable Control the value for "enable" parameter.

1 0

git:master:8596e84b: sipdump: enable param now defaults to 0
by Juha Heinanen 16 Oct '17

16 Oct '17

Module: kamailio Branch: master Commit: 8596e84b20f93cf73963b0c61e15dbb049b2276a URL: https://github.com/kamailio/kamailio/commit/8596e84b20f93cf73963b0c61e15dbb… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-10-16T12:40:43+03:00 sipdump: enable param now defaults to 0 --- Modified: src/modules/sipdump/doc/sipdump_admin.xml Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8596e84b20f93cf73963b0c61e15dbb… Patch: https://github.com/kamailio/kamailio/commit/8596e84b20f93cf73963b0c61e15dbb… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 8cffb7284a..b490c57b88 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -80,14 +80,14 @@ </para> <para> <emphasis> - Default value is 1 (0 - off; 1 - on). + Default value is 0 (0 - off; 1 - on). </emphasis> </para> <example> <title>Set <varname>enable</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sipdump", "enable", 0) +modparam("sipdump", "enable", 1) ... </programlisting> </example> diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index cb8651e0b0..a7f1c3bea5 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -41,7 +41,7 @@ MODULE_VERSION -static int sipdump_enable = 1; +static int sipdump_enable = 0; int sipdump_rotate = 7200; static int sipdump_wait = 100; static str sipdump_folder = str_init("/tmp");

1 0

git:master:12b2a249: phonenum: new module to do lookup on phone numbers
by Daniel-Constantin Mierla 16 Oct '17

16 Oct '17

Module: kamailio Branch: master Commit: 12b2a249577ad175692c49d040891fa1ffae7244 URL: https://github.com/kamailio/kamailio/commit/12b2a249577ad175692c49d040891fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-16T10:54:44+02:00 phonenum: new module to do lookup on phone numbers - relies on libphonenumber to get the attributes associated with the phone number --- Added: src/modules/phonenum/Makefile Added: src/modules/phonenum/README Added: src/modules/phonenum/cphonenumber.cpp Added: src/modules/phonenum/cphonenumber.h Added: src/modules/phonenum/doc/Makefile Added: src/modules/phonenum/doc/phonenum.xml Added: src/modules/phonenum/doc/phonenum_admin.xml Added: src/modules/phonenum/phonenum_mod.c Added: src/modules/phonenum/phonenum_pv.c Added: src/modules/phonenum/phonenum_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/12b2a249577ad175692c49d040891fa… Patch: https://github.com/kamailio/kamailio/commit/12b2a249577ad175692c49d040891fa…

1 1

sipdump comment/question
by Juha Heinanen 16 Oct '17

16 Oct '17

Perhaps 0 would be better choice as "enable" param default value, since dumping is likely to be done only if some need arises. What is meaning of wait param, i.e., what is it that is waited for? 3.2. wait (int) Wait time (microseconds) when no SIP traffic is received. -- Juha

2 1

sipdump compile trouble
by Juha Heinanen 16 Oct '17

16 Oct '17

CC (gcc) [M sipdump.so] sipdump_mod.o In file included from ../../core/parser/../ut.h:42:0, from ../../core/parser/../ip_addr.h:39, from ../../core/parser/msg_parser.h:37, from ../../core/sr_module.h:34, from sipdump_mod.c:30: sipdump_mod.c: In function 'child_init': ../../core/parser/../dprint.h:302:8: warning: 'i' may be used uninitialized in this function [-Wmaybe-uninitialized] fprintf(stderr, "%.*s%2d(%d) %s: %s" fmt, \ ^~~~~~~ sipdump_mod.c:124:6: note: 'i' was declared here int i; ^ CC (gcc) [M sipdump.so] sipdump_write.o sipdump_write.c: In function 'sipdump_rotate_file': sipdump_write.c:135:6: warning: variable 'n' set but not used [-Wunused-but-set-variable] int n; ^

2 1

git:master:cf0814d0: Makefile.defs: version set to 5.1.0-dev8
by Daniel-Constantin Mierla 16 Oct '17

16 Oct '17

Module: kamailio Branch: master Commit: cf0814d06bbb1fcd88020d2bce27482142ed7b7e URL: https://github.com/kamailio/kamailio/commit/cf0814d06bbb1fcd88020d2bce27482… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-16T11:04:17+02:00 Makefile.defs: version set to 5.1.0-dev8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/cf0814d06bbb1fcd88020d2bce27482… Patch: https://github.com/kamailio/kamailio/commit/cf0814d06bbb1fcd88020d2bce27482… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a7a66c4ed9..a2027a3a92 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev7 +EXTRAVERSION = -dev8 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:cb4f97b4: sipdump: fixed compile warnings on unused variables
by Daniel-Constantin Mierla 16 Oct '17

16 Oct '17

Module: kamailio Branch: master Commit: cb4f97b4eb985727182c0ce8f595d3affe663cff URL: https://github.com/kamailio/kamailio/commit/cb4f97b4eb985727182c0ce8f595d3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-16T11:03:14+02:00 sipdump: fixed compile warnings on unused variables - reported by Juha Heinanen --- Modified: src/modules/sipdump/sipdump_mod.c Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/cb4f97b4eb985727182c0ce8f595d3a… Patch: https://github.com/kamailio/kamailio/commit/cb4f97b4eb985727182c0ce8f595d3a… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index cb8651e0b0..4f1e83b5f8 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -121,7 +121,6 @@ static int mod_init(void) */ static int child_init(int rank) { - int i; if(rank != PROC_MAIN) return 0; @@ -129,7 +128,7 @@ static int child_init(int rank) if(fork_basic_utimer(PROC_TIMER, "SIPDUMP WRITE TIMER", 1 /*socks flag*/, sipdump_timer_exec, NULL, sipdump_wait /*usec*/) < 0) { - LM_ERR("failed to register timer routine as process (%d)\n", i); + LM_ERR("failed to register timer routine as process\n"); return -1; /* error */ } diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 8d8c890721..4a566e9ff5 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -152,6 +152,7 @@ static int sipdump_rotate_file(void) "%d-%02d-%02d--%02d-%02d-%02d.data", 1900+ti->tm_year, ti->tm_mon, ti->tm_mday, ti->tm_hour, ti->tm_min, ti->tm_sec); + LM_DBG("writing to file: %s (%d)\n", _sipdump_fpath, n); _sipdump_file = fopen( _sipdump_fpath , "w" ); if(_sipdump_file==NULL) { LM_ERR("failed to open file %s\n", _sipdump_fpath);

1 0

git:master:599f3659: Makefile.groups: added sipdump and phonenum modules
by Daniel-Constantin Mierla 16 Oct '17

16 Oct '17

Module: kamailio Branch: master Commit: 599f3659a5e4463104f73251c2215723a61cda4b URL: https://github.com/kamailio/kamailio/commit/599f3659a5e4463104f73251c221572… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-16T10:58:21+02:00 Makefile.groups: added sipdump and phonenum modules --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/599f3659a5e4463104f73251c221572… Patch: https://github.com/kamailio/kamailio/commit/599f3659a5e4463104f73251c221572… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index ab82466413..e9b670537a 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -15,7 +15,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ nat_traversal nathelper path pike pv ratelimit rr rtimer \ rtpproxy sanity sdpops siputils sl statistics textops \ textopsx tm tmx topoh xlog rtpengine stun sipt tcpops \ - auth_xkeys smsops tsilo cfgt statsc topos + auth_xkeys smsops tsilo cfgt statsc topos sipdump # - extra used modules, with no extra dependency mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ @@ -199,6 +199,9 @@ mod_list_nsq=nsq # - modules depending on librabbitmq library mod_list_rabbitmq=rabbitmq +# - modules depending on libphonenumber library +mod_list_phonenum=phonenum + # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ @@ -229,7 +232,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_geoip2) \ $(mod_list_erlang) $(mod_list_systemd) \ $(mod_list_http_async) $(mod_list_nsq) \ - $(mod_list_rabbitmq) $(mod_list_jsdt)) + $(mod_list_rabbitmq) $(mod_list_jsdt)) \ + $(mod_list_phonenum) @@ -437,6 +441,9 @@ module_group_knsq=$(mod_list_nsq) # K rabbitmq modules module_group_krabbitmq=$(mod_list_rabbitmq) +# K phonenumber modules +module_group_kphonenum=$(mod_list_phonenum) + # list of static modules # static_modules:=

1 0

Roadmap to Kamailio v5.1
by Daniel-Constantin Mierla 16 Oct '17

16 Oct '17

Hello, being discussed at the previous IRC devel meeting before the summer, it's time to plan the preparation for next major release, respectively Kamailio 5.1 series. As an initial proposal, a timeline can be: - Mon, Oct 16, 2017 - freeze the development - in 3-4 weeks after that, create the branch 5.1 - 2-3 weeks after, do the release of v5.1.0 That means more or less by end of November we will have first version of 5.1 series. There are still 4 weeks of development, hopefully enough to get ongoing work finished. I know from github tracker that there are people working on redis support for usrloc. I will focus on exporting more functions to kemi, right now should be around 60%, by freeze should be more than 80% (likely that means all of what most of people use these days, because there are some modules that I guess are not much used). Maybe one or two modules will be pushed as well from my side. I think we should also do an IRC devel meeting to try to sync better on this. Maybe by mid of next week, I will send another email shortly. Should anyone have more details to add or adjust the proposal, do not hesitate to reply to mailing list! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 2

git:master:14a3bd9e: sipdump: write proto and af for each sip message
by Daniel-Constantin Mierla 15 Oct '17

15 Oct '17

Module: kamailio Branch: master Commit: 14a3bd9eae7f3cb6af9d4b6e4250ab6c468c8b9f URL: https://github.com/kamailio/kamailio/commit/14a3bd9eae7f3cb6af9d4b6e4250ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-15T10:01:25+02:00 sipdump: write proto and af for each sip message --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/14a3bd9eae7f3cb6af9d4b6e4250ab6… Patch: https://github.com/kamailio/kamailio/commit/14a3bd9eae7f3cb6af9d4b6e4250ab6… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 5971322971..cb8651e0b0 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -152,7 +152,6 @@ typedef struct sipdump_info { str buf; str af; str proto; - str subproto; str src_ip; int src_port; str dst_ip; @@ -177,6 +176,7 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) "process: %d\n" "time: %lu.%06lu\n" "date: %s" + "proto: %.*s %.*s\n" "srcip: %.*s\n" "srcport: %d\n" "dstip: %.*s\n" @@ -189,6 +189,7 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) process_no, (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec, asctime(ti), + sdi->proto.len, sdi->proto.s, sdi->af.len, sdi->af.s, sdi->src_ip.len, sdi->src_ip.s, sdi->src_port, sdi->dst_ip.len, sdi->dst_ip.s, sdi->dst_port, sdi->buf.len, sdi->buf.s @@ -229,6 +230,16 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) sdi.dst_port = (int)msg->rcv.bind_address->port_no; } + sdi.af.len = 4; + if(msg->rcv.bind_address->address.af==AF_INET6) { + sdi.af.s = "ipv6"; + } else { + sdi.af.s = "ipv4"; + } + sdi.proto.s = "none"; + sdi.proto.len = 4; + get_valid_proto_string(msg->rcv.proto, 0, 0, &sdi.proto); + if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1; @@ -288,6 +299,15 @@ int sipdump_msg_received(sr_event_param_t *evp) sdi.dst_ip = evp->rcv->bind_address->address_str; sdi.dst_port = (int)evp->rcv->bind_address->port_no; } + sdi.af.len = 4; + if(evp->rcv->bind_address->address.af==AF_INET6) { + sdi.af.s = "ipv6"; + } else { + sdi.af.s = "ipv4"; + } + sdi.proto.s = "none"; + sdi.proto.len = 4; + get_valid_proto_string(evp->rcv->proto, 0, 0, &sdi.proto); if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1; @@ -326,6 +346,16 @@ int sipdump_msg_sent(sr_event_param_t *evp) sdi.dst_ip.s = dstip_buf; sdi.dst_port = (int)su_getport(&evp->dst->to); + sdi.af.len = 4; + if(evp->dst->send_sock->address.af==AF_INET6) { + sdi.af.s = "ipv6"; + } else { + sdi.af.s = "ipv4"; + } + sdi.proto.s = "none"; + sdi.proto.len = 4; + get_valid_proto_string(evp->dst->proto, 0, 0, &sdi.proto); + if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1;

1 0

git:master:3565caf3: core: set receive infor for sr event SREV_NET_DATA_IN
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 3565caf3b0f2ac28f7d2993213e4d3ef6a21a2fb URL: https://github.com/kamailio/kamailio/commit/3565caf3b0f2ac28f7d2993213e4d3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T10:43:45+02:00 core: set receive infor for sr event SREV_NET_DATA_IN --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/3565caf3b0f2ac28f7d2993213e4d3e… Patch: https://github.com/kamailio/kamailio/commit/3565caf3b0f2ac28f7d2993213e4d3e… --- diff --git a/src/core/receive.c b/src/core/receive.c index 28c2c7971a..bb9342a414 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -149,6 +149,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) inb.s = buf; inb.len = len; evp.data = (void*)&inb; + evp.rcv = rcv_info; sr_event_exec(SREV_NET_DATA_IN, &evp); len = inb.len;

1 0

git:master:868208c0: sipdump: log src and dst ip and port
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 868208c0bd26bd9d8f72e548075606c4f3c82f33 URL: https://github.com/kamailio/kamailio/commit/868208c0bd26bd9d8f72e548075606c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T11:16:00+02:00 sipdump: log src and dst ip and port --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/868208c0bd26bd9d8f72e548075606c… Patch: https://github.com/kamailio/kamailio/commit/868208c0bd26bd9d8f72e548075606c… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index e7ba0a69a5..5971322971 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -150,8 +150,9 @@ static char _sipdump_wbuf[SIPDUMP_WBUF_SIZE]; typedef struct sipdump_info { str tag; str buf; - int af; - int proto; + str af; + str proto; + str subproto; str src_ip; int src_port; str dst_ip; @@ -176,6 +177,10 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) "process: %d\n" "time: %lu.%06lu\n" "date: %s" + "srcip: %.*s\n" + "srcport: %d\n" + "dstip: %.*s\n" + "dstport: %d\n" "~~~~~~~~~~~~~~~~~~~~\n" "%.*s" "||||||||||||||||||||\n", @@ -184,6 +189,8 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) process_no, (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec, asctime(ti), + sdi->src_ip.len, sdi->src_ip.s, sdi->src_port, + sdi->dst_ip.len, sdi->dst_ip.s, sdi->dst_port, sdi->buf.len, sdi->buf.s ); obuf->s = _sipdump_wbuf; @@ -198,6 +205,7 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) { str wdata; sipdump_info_t sdi; + char srcip_buf[IP_ADDR_MAX_STRZ_SIZE]; if(!sipdump_enabled()) return 1; @@ -207,6 +215,19 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) sdi.buf.s = msg->buf; sdi.buf.len = msg->len; sdi.tag = *stag; + sdi.src_ip.len = ip_addr2sbufz(&msg->rcv.src_ip, srcip_buf, + IP_ADDR_MAX_STRZ_SIZE); + sdi.src_ip.s = srcip_buf; + sdi.src_port = msg->rcv.src_port; + if(msg->rcv.bind_address==NULL + || msg->rcv.bind_address->address_str.s==NULL) { + sdi.dst_ip.len = 7; + sdi.dst_ip.s = "0.0.0.0"; + sdi.dst_port = 0; + } else { + sdi.dst_ip = msg->rcv.bind_address->address_str; + sdi.dst_port = (int)msg->rcv.bind_address->port_no; + } if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); @@ -244,7 +265,8 @@ int sipdump_msg_received(sr_event_param_t *evp) { str wdata; sipdump_info_t sdi; - + char srcip_buf[IP_ADDR_MAX_STRZ_SIZE]; + if(!sipdump_enabled()) return 0; @@ -253,7 +275,19 @@ int sipdump_msg_received(sr_event_param_t *evp) sdi.buf = *((str*)evp->data); sdi.tag.s = "rcv"; sdi.tag.len = 3; - + sdi.src_ip.len = ip_addr2sbufz(&evp->rcv->src_ip, srcip_buf, + IP_ADDR_MAX_STRZ_SIZE); + sdi.src_ip.s = srcip_buf; + sdi.src_port = evp->rcv->src_port; + if(evp->rcv->bind_address==NULL + || evp->rcv->bind_address->address_str.s==NULL) { + sdi.dst_ip.len = 7; + sdi.dst_ip.s = "0.0.0.0"; + sdi.dst_port = 0; + } else { + sdi.dst_ip = evp->rcv->bind_address->address_str; + sdi.dst_port = (int)evp->rcv->bind_address->port_no; + } if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1; @@ -273,7 +307,9 @@ int sipdump_msg_sent(sr_event_param_t *evp) { str wdata; sipdump_info_t sdi; - + ip_addr_t ip; + char dstip_buf[IP_ADDR_MAX_STRZ_SIZE]; + if(!sipdump_enabled()) return 0; @@ -283,6 +319,13 @@ int sipdump_msg_sent(sr_event_param_t *evp) sdi.tag.s = "snd"; sdi.tag.len = 3; + sdi.src_ip = evp->dst->send_sock->address_str; + sdi.src_port = (int)evp->dst->send_sock->port_no; + su2ip_addr(&ip, &evp->dst->to); + sdi.dst_ip.len = ip_addr2sbufz(&ip, dstip_buf, IP_ADDR_MAX_STRZ_SIZE); + sdi.dst_ip.s = dstip_buf; + sdi.dst_port = (int)su_getport(&evp->dst->to); + if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1;

1 0

git:master:344df709: core: added field for receive info inside sr_event_param_t
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 344df7099435dcc76bf052cf2a020b3512ad153b URL: https://github.com/kamailio/kamailio/commit/344df7099435dcc76bf052cf2a020b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T10:42:52+02:00 core: added field for receive info inside sr_event_param_t --- Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/344df7099435dcc76bf052cf2a020b3… Patch: https://github.com/kamailio/kamailio/commit/344df7099435dcc76bf052cf2a020b3… --- diff --git a/src/core/events.h b/src/core/events.h index f2f63bc016..191fe85cc8 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -42,6 +42,7 @@ typedef struct sr_event_param { void *data; + receive_info_t* rcv; dest_info_t *dst; } sr_event_param_t;

1 0

git:master:62d9eb79: core: compacted typedefs for ip addr structs
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 62d9eb79b9c461df8a21eba928a31f8bd4d85c48 URL: https://github.com/kamailio/kamailio/commit/62d9eb79b9c461df8a21eba928a31f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T10:41:32+02:00 core: compacted typedefs for ip addr structs --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/62d9eb79b9c461df8a21eba928a31f8… Patch: https://github.com/kamailio/kamailio/commit/62d9eb79b9c461df8a21eba928a31f8…

1 0

[kamailio/kamailio] sipcapture: fix HEP3 capture-id >= 2^16 (#1272)
by Bastian Triller 13 Oct '17

13 Oct '17

(cherry picked from commit dbd57c3eac30e1de54d98eb2ba8f608a17f7adbf)   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1272 -- Commit Summary -- * sipcapture: fix HEP3 capture-id >= 2^16 -- File Changes -- M modules/sipcapture/sipcapture.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1272.patch https://github.com/kamailio/kamailio/pull/1272.diff -- 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/pull/1272

2 2

git:4.4:3794ecf8: Merge pull request #1272 from btriller/fix-hep3-capture-id-backport-4.4
by GitHub 13 Oct '17

13 Oct '17

Module: kamailio Branch: 4.4 Commit: 3794ecf832925e71dd6834c711388801aa60c274 URL: https://github.com/kamailio/kamailio/commit/3794ecf832925e71dd6834c71138880… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-13T20:10:17+02:00 Merge pull request #1272 from btriller/fix-hep3-capture-id-backport-4.4 sipcapture: fix HEP3 capture-id >= 2^16 --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/3794ecf832925e71dd6834c71138880… Patch: https://github.com/kamailio/kamailio/commit/3794ecf832925e71dd6834c71138880… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index fb999360a5..e80158b82e 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -257,7 +257,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1112,7 +1112,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

1 0

git:4.4:0367cdcd: sipcapture: fix HEP3 capture-id >= 2^16
by Bastian Triller 13 Oct '17

13 Oct '17

Module: kamailio Branch: 4.4 Commit: 0367cdcd094566657cc8ec1b22790d1f927993cd URL: https://github.com/kamailio/kamailio/commit/0367cdcd094566657cc8ec1b22790d1… Author: Bastian Triller <btriller(a)broadsoft.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2017-10-13T16:53:08+02:00 sipcapture: fix HEP3 capture-id >= 2^16 (cherry picked from commit dbd57c3eac30e1de54d98eb2ba8f608a17f7adbf) --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/0367cdcd094566657cc8ec1b22790d1… Patch: https://github.com/kamailio/kamailio/commit/0367cdcd094566657cc8ec1b22790d1… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index fb999360a5..e80158b82e 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -257,7 +257,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1112,7 +1112,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

1 0

git:master:98609436: sipdump: implemented sipdump.enable rpc command
by Daniel-Constantin Mierla 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: 986094362b8ff384cc0378a7028425ea092609aa URL: https://github.com/kamailio/kamailio/commit/986094362b8ff384cc0378a7028425e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-13T12:33:30+02:00 sipdump: implemented sipdump.enable rpc command --- Modified: src/modules/sipdump/sipdump_mod.c Modified: src/modules/sipdump/sipdump_write.c Modified: src/modules/sipdump/sipdump_write.h --- Diff: https://github.com/kamailio/kamailio/commit/986094362b8ff384cc0378a7028425e… Patch: https://github.com/kamailio/kamailio/commit/986094362b8ff384cc0378a7028425e… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 48a77ada76..e7ba0a69a5 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -94,6 +94,11 @@ struct module_exports exports = { */ static int mod_init(void) { + if(sipdump_rpc_init()<0) { + LM_ERR("failed to register rpc commands\n"); + return -1; + } + if(sipdump_file_init(&sipdump_folder, &sipdump_fprefix) < 0) { LM_ERR("cannot initialize storage file\n"); return -1; diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 7d76715c7d..8d8c890721 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -27,6 +27,8 @@ #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/rpc.h" +#include "../../core/rpc_lookup.h" #include "sipdump_write.h" @@ -226,3 +228,63 @@ void sipdump_timer_exec(unsigned int ticks, void *param) shm_free(sdd); } } + +static const char *sipdump_rpc_enable_doc[2] = { + "Command to control sipdump enable value", 0}; + + +/* +* RPC command to control sipdump enable +*/ +static void sipdump_rpc_enable(rpc_t *rpc, void *ctx) +{ + int enval = -1; + int oval = 0; + int nval = 0; + + void *th; + + if(rpc->scan(ctx, "*d", &enval) != 1) { + enval = -1; + } + + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + + if(_sipdump_list) { + oval = _sipdump_list->enable; + if(enval==0 || enval==1) { + _sipdump_list->enable = enval; + nval = enval; + } else { + nval = oval; + } + } + + if(rpc->struct_add(th, "dd", "oldval", oval, "newval", nval) < 0) { + rpc->fault(ctx, 500, "Internal error reply structure"); + return; + } +} + +/* clang-format off */ +rpc_export_t sipdump_rpc_cmds[] = { + {"sipdump.enable", sipdump_rpc_enable, + sipdump_rpc_enable_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ + +/** + * register RPC commands + */ +int sipdump_rpc_init(void) +{ + if(rpc_register_array(sipdump_rpc_cmds) != 0) { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +} \ No newline at end of file diff --git a/src/modules/sipdump/sipdump_write.h b/src/modules/sipdump/sipdump_write.h index e9d5de4131..611fd10fd9 100644 --- a/src/modules/sipdump/sipdump_write.h +++ b/src/modules/sipdump/sipdump_write.h @@ -51,4 +51,6 @@ int sipdump_file_init(str *folder, str *fprefix); int sipdump_enabled(void); +int sipdump_rpc_init(void); + #endif

2 3

git:master:cdafc5a6: core: helper function to print ip address in a buffer with square brackets
by Daniel-Constantin Mierla 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: cdafc5a6a0a3487101820d608ffa5973d7464d00 URL: https://github.com/kamailio/kamailio/commit/cdafc5a6a0a3487101820d608ffa597… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-13T12:33:30+02:00 core: helper function to print ip address in a buffer with square brackets --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/cdafc5a6a0a3487101820d608ffa597… Patch: https://github.com/kamailio/kamailio/commit/cdafc5a6a0a3487101820d608ffa597… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 7edb44e679..df23e64c6d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -660,15 +660,39 @@ static inline int ip_addr2sbuf(struct ip_addr* ip, char* buff, int len) } } +/* same as ip_addr2sbuf, but with [ ] around IPv6 addresses */ +static inline int ip_addr2sbufz(struct ip_addr* ip, char* buff, int len) +{ + char *p; + int sz; + + p = buff; + switch(ip->af){ + case AF_INET6: + *p++ = '['; + sz = ip6tosbuf(ip->u.addr, p, len-2); + p += sz; + *p++ = ']'; + *p=0; + return sz + 2; + break; + case AF_INET: + return ip4tosbuf(ip->u.addr, buff, len); + break; + default: + LM_CRIT("unknown address family %d\n", ip->af); + return 0; + } +} /* maximum size of a str returned by ip_addr2a (including \0) */ #define IP_ADDR_MAX_STR_SIZE (IP6_MAX_STR_SIZE+1) /* ip62ascii + \0*/ +#define IP_ADDR_MAX_STRZ_SIZE (IP6_MAX_STR_SIZE+3) /* ip62ascii + [ + ] + \0*/ /* fast ip_addr -> string converter; * it uses an internal buffer */ static inline char* ip_addr2a(struct ip_addr* ip) { - static char buff[IP_ADDR_MAX_STR_SIZE]; int len; @@ -683,7 +707,7 @@ static inline char* ip_addr2a(struct ip_addr* ip) static inline char* ip_addr2strz(struct ip_addr* ip) { - static char buff[IP_ADDR_MAX_STR_SIZE+2]; + static char buff[IP_ADDR_MAX_STRZ_SIZE]; char *p; int len;

1 0

git:master:18b99626: core: fix bitwise test for priting socket details
by Daniel-Constantin Mierla 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: 18b996262fb1c7bde94b494ce837754dc82c9e7e URL: https://github.com/kamailio/kamailio/commit/18b996262fb1c7bde94b494ce837754… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-13T12:33:30+02:00 core: fix bitwise test for priting socket details --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/18b996262fb1c7bde94b494ce837754… Patch: https://github.com/kamailio/kamailio/commit/18b996262fb1c7bde94b494ce837754… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a50cfe3e59..424c5d83e8 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1913,7 +1913,7 @@ void print_all_socket_lists() printf(" %s: %s", get_valid_proto_name(proto), si->name.s); - if (!si->flags & SI_IS_IP) + if (!(si->flags & SI_IS_IP)) printf(" [%s]", si->address_str.s); printf( ":%s%s%s", si->port_no_str.s,

1 0

git:master:f662a625: core: fix for bitwise test in core rpc command
by Daniel-Constantin Mierla 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: f662a62519f99e046caf03063147104af22ec3c3 URL: https://github.com/kamailio/kamailio/commit/f662a62519f99e046caf03063147104… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-13T12:33:30+02:00 core: fix for bitwise test in core rpc command --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/f662a62519f99e046caf03063147104… Patch: https://github.com/kamailio/kamailio/commit/f662a62519f99e046caf03063147104… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index a489a8975d..16b36e5a2b 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -944,7 +944,7 @@ static void core_sockets_list(rpc_t* rpc, void* c) rpc->struct_add(ha, "ss", "proto", get_proto_name(proto), "address", si->name.s); - if (!si->flags & SI_IS_IP) + if (!(si->flags & SI_IS_IP)) rpc->struct_add(ha, "s", "ipaddress", si->address_str.s); rpc->struct_add(ha, "sss",

1 0

git:master:9c3958e7: modules: readme files regenerated - nat_traversal ... [skip ci]
by Kamailio Dev 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: 9c3958e77c2f6bfcf7a66e36b05a163447f33c5b URL: https://github.com/kamailio/kamailio/commit/9c3958e77c2f6bfcf7a66e36b05a163… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-13T11:01:45+02:00 modules: readme files regenerated - nat_traversal ... [skip ci] --- Modified: src/modules/nat_traversal/README --- Diff: https://github.com/kamailio/kamailio/commit/9c3958e77c2f6bfcf7a66e36b05a163… Patch: https://github.com/kamailio/kamailio/commit/9c3958e77c2f6bfcf7a66e36b05a163… --- diff --git a/src/modules/nat_traversal/README b/src/modules/nat_traversal/README index 9b37228d60..c3054862e4 100644 --- a/src/modules/nat_traversal/README +++ b/src/modules/nat_traversal/README @@ -50,7 +50,7 @@ Dan Pascu 6.3. subscribed_endpoints 6.4. dialog_endpoints - 7. Exported pseudo-variables + 7. Pseudo Variables 7.1. $keepalive.socket(nat_endpoint) 7.2. $source_uri @@ -113,7 +113,7 @@ Chapter 1. Admin Guide 6.3. subscribed_endpoints 6.4. dialog_endpoints - 7. Exported pseudo-variables + 7. Pseudo Variables 7.1. $keepalive.socket(nat_endpoint) 7.2. $source_uri @@ -605,7 +605,7 @@ if ((method=="REGISTER" || method=="SUBSCRIBE" || Indicates how many of the NAT endpoints are kept alive for taking part in an INVITE dialog. -7. Exported pseudo-variables +7. Pseudo Variables 7.1. $keepalive.socket(nat_endpoint) 7.2. $source_uri

1 0

git:master:c7f40f8a: sipdump: new module saving sip traffic and additional details into local files
by Daniel-Constantin Mierla 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: c7f40f8a2acbfad5c755aa32bdbb39a491899e2b URL: https://github.com/kamailio/kamailio/commit/c7f40f8a2acbfad5c755aa32bdbb39a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-13T10:57:19+02:00 sipdump: new module saving sip traffic and additional details into local files - aiming to help troubleshooting during development or testing, especially when dealing with SIP over TLS with forward privacy --- Added: src/modules/sipdump/Makefile Added: src/modules/sipdump/README Added: src/modules/sipdump/doc/Makefile Added: src/modules/sipdump/doc/sipdump.xml Added: src/modules/sipdump/doc/sipdump_admin.xml Added: src/modules/sipdump/sipdump_mod.c Added: src/modules/sipdump/sipdump_write.c Added: src/modules/sipdump/sipdump_write.h --- Diff: https://github.com/kamailio/kamailio/commit/c7f40f8a2acbfad5c755aa32bdbb39a… Patch: https://github.com/kamailio/kamailio/commit/c7f40f8a2acbfad5c755aa32bdbb39a…

1 0

git:master:642dcef1: nat_traversal: added section ids in docs
by Daniel-Constantin Mierla 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: 642dcef14271bc1376a54f8afe3a159d4e831ba6 URL: https://github.com/kamailio/kamailio/commit/642dcef14271bc1376a54f8afe3a159… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-13T09:34:59+02:00 nat_traversal: added section ids in docs --- Modified: src/modules/nat_traversal/doc/nat_traversal_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/642dcef14271bc1376a54f8afe3a159… Patch: https://github.com/kamailio/kamailio/commit/642dcef14271bc1376a54f8afe3a159…

1 0

[kamailio/kamailio] crash on infinite loop processing a call (#1263)
by Victor Seva 11 Oct '17

11 Oct '17

### Description config was wrongly sending the call to a not properly constructed destination and the loop end was not properly detected so a infinite loop was created. Anyhow, kamailio process should not crash. ### Troubleshooting #### Debugging Data  ``` (gdb) bt #0 0x0000000000568783 in rval_get_tmp_str (h=0x0, msg=0x0, tmpv=0x0, rv=0x0, cache=0x0, tmp_cache=0x0) at core/rvalue.c:1098 #1 0x0000000000569889 in rval_convert (h=0x7fff558296a0, msg=0x7efefebd5fb8, type=RV_STR, v=0x7eff0f922c70, c=0x0) at core/rvalue.c:1308 #2 0x000000000056b3a0 in rval_str_add2 (h=0x7fff558296a0, msg=0x7efefebd5fb8, l=0x7eff0f922540, c1=0x0, r=0x7eff0f922c70, c2=0x0) at core/rvalue.c:1634 #3 0x000000000057211e in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f923398) at core/rvalue.c:2462 #4 0x00000000005717ad in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f9241f8) at core/rvalue.c:2446 #5 0x00000000005717ad in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f925058) at core/rvalue.c:2446 #6 0x00000000005717ad in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f925f28) at core/rvalue.c:2446 #7 0x00000000004cb551 in lval_assign (h=0x7fff558296a0, msg=0x7efefebd5fb8, lv=0x7eff0f9223d8, rve=0x7eff0f925f28) at core/lvalue.c:384 #8 0x000000000043e38a in do_action (h=0x7fff558296a0, a=0x7eff0f926658, msg=0x7efefebd5fb8) at core/action.c:1430 #9 0x000000000043fe83 in run_actions (h=0x7fff558296a0, a=0x7eff0f917968, msg=0x7efefebd5fb8) at core/action.c:1552 #10 0x000000000042f7a1 in do_action (h=0x7fff558296a0, a=0x7eff0f8f9b18, msg=0x7efefebd5fb8) at core/action.c:678 #11 0x000000000043fe83 in run_actions (h=0x7fff558296a0, a=0x7eff0f8f9b18, msg=0x7efefebd5fb8) at core/action.c:1552 #12 0x0000000000440563 in run_actions_safe (h=0x7fff5582aee0, a=0x7eff0f8f9b18, msg=0x7efefebd5fb8) at core/action.c:1620 #13 0x000000000056794f in rval_get_int (h=0x7fff5582aee0, msg=0x7efefebd5fb8, i=0x7fff55829a84, rv=0x7eff0f8f9c70, cache=0x0) at core/rvalue.c:912 #14 0x000000000056bfc9 in rval_expr_eval_int (h=0x7fff5582aee0, msg=0x7efefebd5fb8, res=0x7fff55829a84, rve=0x7eff0f8f9c68) at core/rvalue.c:1906 #15 0x000000000042b45a in do_action (h=0x7fff5582aee0, a=0x7eff0f8fa398, msg=0x7efefebd5fb8) at core/action.c:345 #16 0x000000000043fe83 in run_actions (h=0x7fff5582aee0, a=0x7eff0f8fa398, msg=0x7efefebd5fb8) at core/action.c:1552 #17 0x0000000000432f47 in do_action (h=0x7fff5582aee0, a=0x7eff0f8fa4e8, msg=0x7efefebd5fb8) at core/action.c:1045 #18 0x000000000043fe83 in run_actions (h=0x7fff5582aee0, a=0x7eff0f8f15c0, msg=0x7efefebd5fb8) at core/action.c:1552 #19 0x000000000042f7a1 in do_action (h=0x7fff5582aee0, a=0x7eff0f926bb0, msg=0x7efefebd5fb8) at core/action.c:678 #20 0x000000000043fe83 in run_actions (h=0x7fff5582aee0, a=0x7eff0f926bb0, msg=0x7efefebd5fb8) at core/action.c:1552 #21 0x0000000000440563 in run_actions_safe (h=0x7fff5582c040, a=0x7eff0f926bb0, msg=0x7efefebd5fb8) at core/action.c:1620 [...] (gdb) f 8 #8 0x000000000043e38a in do_action (h=0x7fff558296a0, a=0x7eff0f926658, msg=0x7efefebd5fb8) at core/action.c:1430 1430 v=lval_assign(h, msg, (struct lvalue*)a->val[0].u.data, (gdb) p (struct lvalue*)a->val[0].u.data $1 = (struct lvalue *) 0x7eff0f9223d8 (gdb) p *(struct lvalue*)a->val[0].u.data $2 = {type = LV_PVAR, lv = {pvs = 0x7eff0f7dcf38, avps = {type = 259903288, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}}} (gdb) f 7 #7 0x00000000004cb551 in lval_assign (h=0x7fff558296a0, msg=0x7efefebd5fb8, lv=0x7eff0f9223d8, rve=0x7eff0f925f28) at core/lvalue.c:384 384 rv=rval_expr_eval(h, msg, rve); (gdb) p *rve $3 = {op = RVE_CONCAT_OP, left = {rve = 0x7eff0f925058, rval = {type = 261247064, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, right = {rve = 0x7eff0f925788, rval = {type = 261248904, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, fpos = {s_line = 1144, e_line = 1144, s_col = 11, e_col = 62, fname = 0x7fff56026e01 "/etc/kamailio/kamailio.cfg", rname = 0x7eff0f915db0 "SEND_TO_NEXT_DISPATCH"}} (gdb) f 6 #6 0x00000000005717ad in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f925f28) at core/rvalue.c:2446 2446 rv1=rval_expr_eval(h, msg, rve->left.rve); (gdb) p rve->left.rve $4 = (struct rval_expr *) 0x7eff0f925058 (gdb) p *rve->left.rve $5 = {op = RVE_CONCAT_OP, left = {rve = 0x7eff0f9241f8, rval = {type = 261243384, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, right = {rve = 0x7eff0f924928, rval = {type = 261245224, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, fpos = {s_line = 1144, e_line = 1144, s_col = 11, e_col = 52, fname = 0x7fff56026e01 "/etc/kamailio/kamailio.cfg", rname = 0x7eff0f915db0 "SEND_TO_NEXT_DISPATCH"}} (gdb) f 5 #5 0x00000000005717ad in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f925058) at core/rvalue.c:2446 2446 rv1=rval_expr_eval(h, msg, rve->left.rve); (gdb) p rve->left.rve $6 = (struct rval_expr *) 0x7eff0f9241f8 (gdb) p *rve->left.rve $7 = {op = RVE_CONCAT_OP, left = {rve = 0x7eff0f923398, rval = {type = 261239704, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, right = {rve = 0x7eff0f923ac8, rval = {type = 261241544, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, fpos = {s_line = 1144, e_line = 1144, s_col = 11, e_col = 28, fname = 0x7fff56026e01 "/etc/kamailio/kamailio.cfg", rname = 0x7eff0f915db0 "SEND_TO_NEXT_DISPATCH"}} (gdb) f 4 #4 0x00000000005717ad in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f9241f8) at core/rvalue.c:2446 2446 rv1=rval_expr_eval(h, msg, rve->left.rve); (gdb) p rve->left.rve $8 = (struct rval_expr *) 0x7eff0f923398 (gdb) p *rve->left.rve $9 = {op = RVE_CONCAT_OP, left = {rve = 0x7eff0f922538, rval = {type = 261236024, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, right = {rve = 0x7eff0f922c68, rval = {type = 261237864, refcnt = 32511, v = {p = 0x0, l = 0, s = {s = 0x0, len = 0}, avps = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}, index = 0}, sel = {f = {0x0, 0x0, 0x0, 0x0}, param_offset = {0, 0, 0, 0, 0}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}} <repeats 32 times>}, n = 0}, pvs = {type = PVT_NONE, getf = 0x0, setf = 0x0, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 0, s = {s = 0x0, len = 0}, re = 0x0}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x0, bexpr = 0x0, re = {s = {s = 0x0, len = 0}, regex = 0x0}}, bsize = 0, flags = 0, buf = ""}}, fpos = {s_line = 1144, e_line = 1144, s_col = 11, e_col = 22, fname = 0x7fff56026e01 "/etc/kamailio/kamailio.cfg", rname = 0x7eff0f915db0 "SEND_TO_NEXT_DISPATCH"}} (gdb) f 3 #3 0x000000000057211e in rval_expr_eval (h=0x7fff558296a0, msg=0x7efefebd5fb8, rve=0x7eff0f923398) at core/rvalue.c:2462 2462 ret=rval_str_add2(h, msg, rv1, 0, rv2, 0); (gdb) p r1 r2 No symbol "r1" in current context. (gdb) p rv1 $10 = (struct rvalue *) 0x7eff0f922540 (gdb) p rv2 $11 = (struct rvalue *) 0x7eff0f922c70 (gdb) p *rv1 $12 = {type = RV_STR, refcnt = 3, v = {p = 0x7eff0f921e78, l = 139633942994552, s = {s = 0x7eff0f921e78 "sip:", len = 4}, avps = {type = 261234296, name = {n = 4, s = {s = 0x7eff00000004 "", len = 147196536}, re = 0x7eff00000004}, index = 1}, sel = {f = {0x7eff0f921e78, 0x7eff00000004, 0x7eff08c60a78 <pv_set_scriptvar>, 0x1}, param_offset = {0, 90, 7861601, 0, 261235616}, params = {{type = 258031632, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}}, {type = 261235616, v = {i = 258031632, s = {s = 0x7eff0f614010 "\001", len = 0}, p = 0x7eff0f614010}}, {type = 8108800, v = {i = 258032704, s = {s = 0x7eff0f614440 "", len = 258032704}, p = 0x7eff0f614440}}, {type = 1442987344, v = {i = 6691748, s = {s = 0x661ba4 <qm_free+6132> "H\201\304", <incomplete sequence \330>, len = 0}, p = 0x661ba4 <qm_free+6132>}}, {type = 261233544, v = {i = 258031632, s = {s = 0x160f614010 <error: Cannot access memory at address 0x160f614010>, len = 1442987176}, p = 0x160f614010}}, {type = 6676612, v = {i = 261234240, s = {s = 0x7eff0f921e40 "\b", len = 258031632}, p = 0x7eff0f921e40}}, {type = 1442987248, v = {i = 6682339, s = {s = 0x9f0065f6e3 <error: Cannot access memory at address 0x9f0065f6e3>, len = 258049504}, p = 0x9f0065f6e3}}, {type = 258049504, v = {i = 1442987280, s = { s = 0x7fff56023d10 "\260's\001", len = 6682339}, p = 0x7fff56023d10}}, {type = 8389724, v = {i = 8112983, s = {s = 0x7bcb57 "fragm. from qm_malloc", len = 8389724}, p = 0x7bcb57}}, {type = 128, v = {i = 261234008, s = {s = 0x7eff0f921d58 "\200", len = 258031632}, p = 0x7eff0f921d58}}, {type = 23734457, v = {i = 0, s = {s = 0x0, len = 8108800}, p = 0x0}}, {type = 261234240, v = {i = 23734457, s = {s = 0x16a28b9 "ip:", len = 1442987536}, p = 0x16a28b9}}, {type = 6684728, v = {i = 8388886, s = {s = 0x800116 "core", len = 23734452}, p = 0x800116}}, {type = 1442987568, v = {i = 6684728, s = {s = 0x660038 <qm_malloc+2370> "H\213E\310H\203\300\070\351Y\003", len = 8388886}, p = 0x660038 <qm_malloc+2370>}}, {type = 258056000, v = {i = 1442987616, s = {s = 0x7fff56023e60 "\t", len = 6691748}, p = 0x7fff56023e60}}, {type = 7844384, v = {i = 5664136, s = {s = 0x7600566d88 <error: Cannot access memory at address 0x7600566d88>, len = 7860583}, p = 0x7600566d88}}, {type = 7844389, v = {i = 8388886, s = {s = 0x800116 "core", len = 258031632}, p = 0x800116}}, {type = 8402319, v = {i = 8389724, s = {s = 0x80045c "core: core/cfg.lex", len = 128}, p = 0x80045c}}, {type = 258031632, v = {i = 8402319, s = {s = 0x80358f <__FUNCTION__.7705> "addstr", len = 8389724}, p = 0x80358f <__FUNCTION__.7705>}}, { type = SEL_PARAM_STR, v = {i = 258031632, s = {s = 0x7eff0f614010 "\001", len = 258031632}, p = 0x7eff0f614010}}, {type = 261234008, v = {i = 1, s = {s = 0x7eff00000001 "", len = 23734457}, p = 0x7eff00000001}}, {type = 374, v = {i = 23734456, s = {s = 0x16a28b8 "sip:", len = 8}, p = 0x16a28b8}}, {type = SEL_PARAM_INT, v = {i = 1442987680, s = {s = 0x7fff56023ea0 "\210\037", len = 7461677}, p = 0x7fff56023ea0}}, {type = 1442987824, v = {i = 8463786, s = {s = 0xa45008125aa <error: Cannot access memory at address 0xa45008125aa>, len = 8112983}, p = 0xa45008125aa}}, {type = 7461677, v = {i = 1442987700, s = {s = 0x7fff56023eb4 "\376~", len = 11420944}, p = 0x7fff56023eb4}}, {type = 261235672, v = {i = 0, s = {s = 0x0, len = 23734460}, p = 0x0}}, {type = 11420944, v = {i = 258032704, s = { s = 0x7eff0f614440 "", len = 23734460}, p = 0x7eff0f614440}}, {type = 374, v = {i = 23734459, s = {s = 0x16a28bb ":", len = 11420972}, p = 0x16a28bb}}, {type = 23734462, v = {i = 377, s = {s = 0x179 <error: Cannot access memory at address 0x179>, len = 23734462}, p = 0x179}}, {type = SEL_PARAM_STR, v = {i = 0, s = {s = 0x0, len = 1442987904}, p = 0x0}}, {type = 7446070, v = {i = 261227880, s = {s = 0x7eff0f920568 "\"", len = 261235672}, p = 0x7eff0f920568}}, {type = SEL_PARAM_INT, v = {i = 258384760, s = { s = 0x7eff0f66a378 "blue.foeedc.proxy.staging.voxivo.com", len = 0}, p = 0x7eff0f66a378}}}, n = 0}, pvs = {type = 261234296, getf = 0x7eff00000004, setf = 0x7eff08c60a78 <pv_set_scriptvar>, pvp = {pvn = {type = 1, nfree = 0x5a00000000, u = {isname = {type = 7861601, name = {n = 261235616, s = {s = 0x7eff0f9223a0 "H", len = 258031632}, re = 0x7eff0f9223a0}}, dname = 0x77f561}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x7eff0f9223a0}, action = 0x7eff0f921e78, bexpr = 0x7eff0f921e78, re = {s = { s = 0x7eff0f921e78 "sip:", len = 4}, regex = 0x7eff08c60a78 <pv_set_scriptvar>}}, bsize = 0, flags = 1, buf = ""} (gdb) p *rv2 $13 = {type = RV_PVAR, refcnt = 2, v = {p = 0x7, l = 7, s = {s = 0x7 <error: Cannot access memory at address 0x7>, len = 147123646}, avps = {type = 7, name = {n = 147123646, s = { s = 0x7eff08c4edbe <pv_get_ruri_attr> "UH\211\345AWAVAUATSH\203\354HH\211}\270H\211u\260H\211U\250H\203}\270", len = 147203592}, re = 0x7eff08c4edbe <pv_get_ruri_attr>}, index = 0}, sel = {f = {0x7, 0x7eff08c4edbe <pv_get_ruri_attr>, 0x7eff08c62608 <pv_set_ruri_user>, 0x0}, param_offset = {0, 0, 0, 0, 1}, params = {{type = SEL_PARAM_INT, v = {i = 0, s = {s = 0x0, len = 0}, p = 0x0}}, {type = SEL_PARAM_INT, v = {i = 258031632, s = {s = 0x7eff0f614010 "\001", len = 0}, p = 0x7eff0f614010}}, {type = 8108800, v = {i = 258032704, s = { s = 0x7eff0f614440 "", len = 258032704}, p = 0x7eff0f614440}}, {type = 1442987344, v = {i = 6691748, s = {s = 0x661ba4 <qm_free+6132> "H\201\304", <incomplete sequence \330>, len = 0}, p = 0x661ba4 <qm_free+6132>}}, {type = 261233544, v = {i = 258031632, s = { s = 0x160f614010 <error: Cannot access memory at address 0x160f614010>, len = 1442987176}, p = 0x160f614010}}, {type = 6676612, v = {i = 261234240, s = {s = 0x7eff0f921e40 "\b", len = 258031632}, p = 0x7eff0f921e40}}, {type = 1442987248, v = {i = 6682339, s = { s = 0x9f0065f6e3 <error: Cannot access memory at address 0x9f0065f6e3>, len = 261234584}, p = 0x9f0065f6e3}}, {type = 258031632, v = {i = 1442987280, s = {s = 0x7fff56023d10 "\260's\001", len = 6682339}, p = 0x7fff56023d10}}, {type = 258044688, v = {i = 258044688, s = {s = 0x7eff0f617310 "", len = 1442987312}, p = 0x7eff0f617310}}, {type = 6682339, v = {i = 8389724, s = {s = 0x5670080045c <error: Cannot access memory at address 0x5670080045c>, len = 8112983}, p = 0x5670080045c}}, {type = 8389724, v = {i = 128, s = { s = 0x80 <error: Cannot access memory at address 0x80>, len = 261234352}, p = 0x80}}, {type = 258031632, v = {i = 23734467, s = {s = 0x16a28c3 " + \"@", len = 0}, p = 0x16a28c3}}, {type = 8108800, v = {i = 261234584, s = {s = 0x7eff0f921f98 "(", len = 23734467}, p = 0x7eff0f921f98}}, {type = 1442987568, v = {i = 6684728, s = {s = 0x660038 <qm_malloc+2370> "H\213E\310H\203\300\070\351Y\003", len = 8388886}, p = 0x660038 <qm_malloc+2370>}}, {type = 258056000, v = {i = 1442987616, s = {s = 0x7fff56023e60 "\t", len = 6691748}, p = 0x7fff56023e60}}, {type = 7844384, v = {i = 5664136, s = {s = 0x7600566d88 <error: Cannot access memory at address 0x7600566d88>, len = 7860583}, p = 0x7600566d88}}, {type = 7844389, v = {i = 8388886, s = {s = 0x800116 "core", len = 258031632}, p = 0x800116}}, { type = 8402319, v = {i = 8389724, s = {s = 0x80045c "core: core/cfg.lex", len = 8388886}, p = 0x80045c}}, {type = 258031632, v = {i = 8402319, s = {s = 0x80358f <__FUNCTION__.7705> "addstr", len = 8389724}, p = 0x80358f <__FUNCTION__.7705>}}, {type = 128, v = { i = 258031632, s = {s = 0x7eff0f614010 "\001", len = 258031632}, p = 0x7eff0f614010}}, {type = 261234008, v = {i = 1, s = {s = 0x7eff00000001 "", len = 261234728}, p = 0x7eff00000001}}, {type = 258031632, v = {i = 261234352, s = {s = 0x7eff0f921eb0 "\200", len = 8}, p = 0x7eff0f921eb0}}, {type = 258042672, v = {i = 258042672, s = {s = 0x7eff0f616b30 "", len = 1442987648}, p = 0x7eff0f616b30}}, {type = 6682339, v = {i = 8463786, s = {s = 0xa45008125aa <error: Cannot access memory at address 0xa45008125aa>, len = 8112983}, p = 0xa45008125aa}}, {type = 261234408, v = {i = 40, s = {s = 0x400000028 <error: Cannot access memory at address 0x400000028>, len = 7783792}, p = 0x400000028}}, {type = 261234640, v = {i = 0, s = {s = 0x0, len = 1442987776}, p = 0x0}}, {type = 5313571, v = { i = 261234728, s = {s = 0x7eff0f922028 "\200", len = 261235672}, p = 0x7eff0f922028}}, {type = 1442987904, v = {i = 6684728, s = {s = 0x660038 <qm_malloc+2370> "H\213E\310H\203\300\070\351Y\003", len = 8402432}, p = 0x660038 <qm_malloc+2370>}}, {type = 23734467, v = { i = 326, s = {s = 0x146 <error: Cannot access memory at address 0x146>, len = 1442987840}, p = 0x146}}, {type = SEL_PARAM_DIV, v = {i = 3, s = {s = 0x21014500000003 <error: Cannot access memory at address 0x21014500000003>, len = 0}, p = 0x21014500000003}}, { type = 259906520, v = {i = 261227880, s = {s = 0x7eff0f920568 "\"", len = 261234640}, p = 0x7eff0f920568}}, {type = SEL_PARAM_INT, v = {i = 258384760, s = {s = 0x7eff0f66a378 "blue.foeedc.proxy.staging.voxivo.com", len = 0}, p = 0x7eff0f66a378}}}, n = 0}, pvs = { type = PVT_RURI_USERNAME, getf = 0x7eff08c4edbe <pv_get_ruri_attr>, setf = 0x7eff08c62608 <pv_set_ruri_user>, pvp = {pvn = {type = 0, nfree = 0x0, u = {isname = {type = 0, name = {n = 1, s = {s = 0x1 <error: Cannot access memory at address 0x1>, len = 0}, re = 0x1}}, dname = 0x0}}, pvi = {type = 0, u = {ival = 0, dval = 0x0}}}, trans = 0x0}, action = 0x7, bexpr = 0x7, re = {s = {s = 0x7 <error: Cannot access memory at address 0x7>, len = 147123646}, regex = 0x7eff08c62608 <pv_set_ruri_user>}}, bsize = 0, flags = 0, buf = ""} (gdb) (gdb) f 2 #2 0x000000000056b3a0 in rval_str_add2 (h=0x7fff558296a0, msg=0x7efefebd5fb8, l=0x7eff0f922540, c1=0x0, r=0x7eff0f922c70, c2=0x0) at core/rvalue.c:1634 1634 if ((rv2=rval_convert(h, msg, RV_STR, r, c2))==0) (gdb) f 1 #1 0x0000000000569889 in rval_convert (h=0x7fff558296a0, msg=0x7efefebd5fb8, type=RV_STR, v=0x7eff0f922c70, c=0x0) at core/rvalue.c:1308 1308 if (unlikely(rval_get_tmp_str(h, msg, &tmp, v, c, &tmp_cache) < 0)) (gdb) f 0 #0 0x0000000000568783 in rval_get_tmp_str (h=0x0, msg=0x0, tmpv=0x0, rv=0x0, cache=0x0, tmp_cache=0x0) at core/rvalue.c:1098 1098 { ``` -- 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/1263

2 4

git:4.4:551a0d0f: core: add safety check to rval_get_tmp_str()
by Victor Seva 11 Oct '17

11 Oct '17

Module: kamailio Branch: 4.4 Commit: 551a0d0f301bfc9e9ae92614511d073b13954701 URL: https://github.com/kamailio/kamailio/commit/551a0d0f301bfc9e9ae92614511d073… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-11T18:35:06+02:00 core: add safety check to rval_get_tmp_str() See #1263 (cherry picked from commit c6e921e45f1257913848110189eab82a34aa2f8b) --- Modified: rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/551a0d0f301bfc9e9ae92614511d073… Patch: https://github.com/kamailio/kamailio/commit/551a0d0f301bfc9e9ae92614511d073… --- diff --git a/rvalue.c b/rvalue.c index a38a5246ea..921b4a0516 100644 --- a/rvalue.c +++ b/rvalue.c @@ -1102,7 +1102,11 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, { avp_t* r_avp; int i; - + + if(rv==NULL) { + return -1; + } + switch(rv->type){ case RV_INT: tmpv->s=sint2strbuf(rv->v.l, tmp_cache->i2s,

1 0

git:5.0:9e3096e1: core: add safety check to rval_get_tmp_str()
by Victor Seva 11 Oct '17

11 Oct '17

Module: kamailio Branch: 5.0 Commit: 9e3096e16ac233e1667110904e1d944753d53c7a URL: https://github.com/kamailio/kamailio/commit/9e3096e16ac233e1667110904e1d944… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-11T18:31:37+02:00 core: add safety check to rval_get_tmp_str() See #1263 (cherry picked from commit c6e921e45f1257913848110189eab82a34aa2f8b) --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/9e3096e16ac233e1667110904e1d944… Patch: https://github.com/kamailio/kamailio/commit/9e3096e16ac233e1667110904e1d944… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 540f26620a..fcb238d111 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -1099,6 +1099,10 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, avp_t* r_avp; int i; + if(rv==NULL) { + return -1; + } + switch(rv->type){ case RV_INT: tmpv->s=sint2strbuf(rv->v.l, tmp_cache->i2s,

1 0

git:master:bbb9c335: modules: readme files regenerated - db_postgres ... [skip ci]
by Kamailio Dev 11 Oct '17

11 Oct '17

Module: kamailio Branch: master Commit: bbb9c3353324f41e94e5b5fd9dc8020c0edfcf3d URL: https://github.com/kamailio/kamailio/commit/bbb9c3353324f41e94e5b5fd9dc8020… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-11T18:31:26+02:00 modules: readme files regenerated - db_postgres ... [skip ci] --- Modified: src/modules/db_postgres/README --- Diff: https://github.com/kamailio/kamailio/commit/bbb9c3353324f41e94e5b5fd9dc8020… Patch: https://github.com/kamailio/kamailio/commit/bbb9c3353324f41e94e5b5fd9dc8020… --- diff --git a/src/modules/db_postgres/README b/src/modules/db_postgres/README index 7bfd597402..7640f36c18 100644 --- a/src/modules/db_postgres/README +++ b/src/modules/db_postgres/README @@ -26,6 +26,7 @@ Greg Fausak 3.1. retries (integer) 3.2. timeout (integer) 3.3. tcp_keepalive (integer) + 3.4. lockset (integer) 4. Functions @@ -34,6 +35,7 @@ Greg Fausak 1.1. Set retries parameter 1.2. Set timeout parameter 1.3. Set tcp_keepalive parameter + 1.4. Set lockset parameter Chapter 1. Admin Guide @@ -50,6 +52,7 @@ Chapter 1. Admin Guide 3.1. retries (integer) 3.2. timeout (integer) 3.3. tcp_keepalive (integer) + 3.4. lockset (integer) 4. Functions @@ -81,6 +84,7 @@ Chapter 1. Admin Guide 3.1. retries (integer) 3.2. timeout (integer) 3.3. tcp_keepalive (integer) + 3.4. lockset (integer) 3.1. retries (integer) @@ -127,6 +131,18 @@ modparam("db_postgres", "timeout", 10) modparam("db_postgres", "tcp_keepalive", 600) ... +3.4. lockset (integer) + + The value is used as power of two to compute the size of the lock set + needed to implement the equivalent of REPLACE SQL statement. + + Default value is 4 (lock set size is 16). + + Example 1.4. Set lockset parameter +... +modparam("db_postgres", "lockset", 6) +... + 4. Functions NONE

1 0

git:master:7d27b682: db_postgres: documentation for lockset parameter
by Daniel-Constantin Mierla 11 Oct '17

11 Oct '17

Module: kamailio Branch: master Commit: 7d27b682cc6259b1f6bcd21584b9f1d5bbfc9a36 URL: https://github.com/kamailio/kamailio/commit/7d27b682cc6259b1f6bcd21584b9f1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-11T18:27:50+02:00 db_postgres: documentation for lockset parameter --- Modified: src/modules/db_postgres/doc/db_postgres_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d27b682cc6259b1f6bcd21584b9f1d… Patch: https://github.com/kamailio/kamailio/commit/7d27b682cc6259b1f6bcd21584b9f1d… --- diff --git a/src/modules/db_postgres/doc/db_postgres_admin.xml b/src/modules/db_postgres/doc/db_postgres_admin.xml index 49bd88286f..e218294736 100644 --- a/src/modules/db_postgres/doc/db_postgres_admin.xml +++ b/src/modules/db_postgres/doc/db_postgres_admin.xml @@ -11,9 +11,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para>The module is an implementation of the internal DB API v1 and v2 @@ -130,6 +130,27 @@ modparam("db_postgres", "tcp_keepalive", 600) </programlisting> </example> </section> + + <section> + <title><varname>lockset</varname> (integer)</title> + <para> + The value is used as power of two to compute the size of the + lock set needed to implement the equivalent of REPLACE SQL + statement. + </para> + <para> + Default value is 4 (lock set size is 16). + </para> + <example> + <title>Set <varname>lockset</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_postgres", "lockset", 6) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:60f177bf: db_postgres: clang format of the code
by Daniel-Constantin Mierla 11 Oct '17

11 Oct '17

Module: kamailio Branch: master Commit: 60f177bf04cd116b1e34f5563f594da327af8c09 URL: https://github.com/kamailio/kamailio/commit/60f177bf04cd116b1e34f5563f594da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-11T18:23:19+02:00 db_postgres: clang format of the code --- Modified: src/modules/db_postgres/db_postgres.c Modified: src/modules/db_postgres/km_dbase.c Modified: src/modules/db_postgres/km_dbase.h Modified: src/modules/db_postgres/km_pg_con.c Modified: src/modules/db_postgres/km_pg_con.h Modified: src/modules/db_postgres/km_pg_type.h Modified: src/modules/db_postgres/km_res.c Modified: src/modules/db_postgres/km_res.h Modified: src/modules/db_postgres/km_val.c Modified: src/modules/db_postgres/km_val.h Modified: src/modules/db_postgres/pg_cmd.c Modified: src/modules/db_postgres/pg_cmd.h Modified: src/modules/db_postgres/pg_con.c Modified: src/modules/db_postgres/pg_con.h Modified: src/modules/db_postgres/pg_fld.c Modified: src/modules/db_postgres/pg_fld.h Modified: src/modules/db_postgres/pg_mod.c Modified: src/modules/db_postgres/pg_oid.c Modified: src/modules/db_postgres/pg_oid.h Modified: src/modules/db_postgres/pg_res.c Modified: src/modules/db_postgres/pg_res.h Modified: src/modules/db_postgres/pg_sql.c Modified: src/modules/db_postgres/pg_sql.h Modified: src/modules/db_postgres/pg_uri.c Modified: src/modules/db_postgres/pg_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/60f177bf04cd116b1e34f5563f594da… Patch: https://github.com/kamailio/kamailio/commit/60f177bf04cd116b1e34f5563f594da…

1 0

[kamailio/kamailio] kazoo: amqp_connection parameter maximum length is too short (#1269)
by Mark Lipscombe 11 Oct '17

11 Oct '17

The 100 character hard-coded maximum length of the kazoo module's amqp_connection parameter is too short. The limit was previously bumped from 50 to 100 following on from #529 but this is still too short. Example use case, using Hashicorp's vault to dish out AMQP credentials yields a connection URL like this: amqp://aws-ec2-13e1e70e-d4d3-abbe-5f3b-7b631f83def7:63b8d362-72d1-878e-81ca-d62667503495@rabbitmq.service.consul:5672 https://github.com/kamailio/kamailio/blob/48791fae1ba8508b18856d90e85a93df0… -- 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/1269

2 2

git:master:33ecbbba: kazoo : increase max url size to 512
by lazedo 11 Oct '17

11 Oct '17

Module: kamailio Branch: master Commit: 33ecbbbaf8054220372637ac89ac4e4a7c7748d0 URL: https://github.com/kamailio/kamailio/commit/33ecbbbaf8054220372637ac89ac4e4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-10-11T06:22:42+01:00 kazoo : increase max url size to 512 --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/33ecbbbaf8054220372637ac89ac4e4… Patch: https://github.com/kamailio/kamailio/commit/33ecbbbaf8054220372637ac89ac4e4… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index fbf2e9a8a9..bcea2e6ee0 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -679,7 +679,7 @@ void kz_amqp_destroy() { kz_hash_destroy(); } -#define KZ_URL_MAX_SIZE 100 +#define KZ_URL_MAX_SIZE 512 static char* KZ_URL_ROOT = "/"; int kz_amqp_add_connection(modparam_t type, void* val)

1 0

git:master:b87ac344: kazoo : add consumer key if appropriate
by lazedo 11 Oct '17

11 Oct '17

Module: kamailio Branch: master Commit: b87ac3440ae38526cca15dd26625e481e331d51e URL: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-10-11T06:21:23+01:00 kazoo : add consumer key if appropriate --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… Patch: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index af6223d693..fbf2e9a8a9 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2848,9 +2848,13 @@ char* maybe_add_consumer_key(int server_id, amqp_bytes_t body) } char buffer[100]; const char* server_id_str = json_object_get_string(server_id_obj); - sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(server_id_str && strlen(server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } shm_free(payload); payload = kz_amqp_bytes_dup(amqp_cstring_bytes((char*)json_object_to_json_string(json_obj))); json_object_put(json_obj); @@ -2894,9 +2898,13 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); if(JObj != NULL) { server_id_str = (char*) json_object_get_string(JObj); - sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(server_id_str && strlen(server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } } cmd->return_payload = kz_amqp_string_dup((char*)json_object_to_json_string(json_obj)); @@ -2957,9 +2965,13 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); if(JObj != NULL) { const char* _kz_server_id_str = json_object_get_string(JObj); - sprintf(buffer, "consumer://%d/%s", _kz_server_id, _kz_server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(_kz_server_id_str && strlen(_kz_server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", _kz_server_id, _kz_server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } } json_object_object_add(json_obj, BLF_JSON_BROKER_ZONE, json_object_new_string(server_ptr->zone->zone));

1 0

git:master:48791fae: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 10 Oct '17

10 Oct '17

Module: kamailio Branch: master Commit: 48791fae1ba8508b18856d90e85a93df003b1e3b URL: https://github.com/kamailio/kamailio/commit/48791fae1ba8508b18856d90e85a93d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-10T11:46:38+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/48791fae1ba8508b18856d90e85a93d… Patch: https://github.com/kamailio/kamailio/commit/48791fae1ba8508b18856d90e85a93d… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index f56c64cad8..29c7f28ebd 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1914,10 +1914,11 @@ kamcmd dlg.profile_list inbound_calls * from - SIP address to initiate the call * to - SIP address to refer 'from' to * op (optional) - outbound proxy SIP address + * body (optional) - SDP body for initial INVITE RPC Command Format: ... -kamcmd dlg.list _from_ _to_ _op_ +kamcmd dlg.bridge_dlg _from_ _to_ _op_ ... 10. Exported Variables

1 0

git:master:59b58035: dialog: documented optional sdp body for rpc bridge command
by Daniel-Constantin Mierla 10 Oct '17

10 Oct '17

Module: kamailio Branch: master Commit: 59b58035bfe8e722a696db889d5295254092ae90 URL: https://github.com/kamailio/kamailio/commit/59b58035bfe8e722a696db889d52952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-10T11:33:22+02:00 dialog: documented optional sdp body for rpc bridge command --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59b58035bfe8e722a696db889d52952… Patch: https://github.com/kamailio/kamailio/commit/59b58035bfe8e722a696db889d52952… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 4823de489d..d01ea69cff 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2453,11 +2453,15 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { <listitem><para> <emphasis>op</emphasis> (optional) - outbound proxy SIP address </para></listitem> + <listitem><para> + <emphasis>body</emphasis> (optional) - SDP body for initial + INVITE + </para></listitem> </itemizedlist> <para>RPC Command Format:</para> <programlisting format="linespecific"> ... -&kamcmd; dlg.list _from_ _to_ _op_ +&kamcmd; dlg.bridge_dlg _from_ _to_ _op_ ... </programlisting> </section>

1 0

[kamailio/kamailio] Use NAT IP to keep DNS-loadbalance (#1268)
by abell-star 10 Oct '17

10 Oct '17

I let two kamailio server processes run in two Nat IP , and DNS to keep loadbalance. but DNS can return two Nat IP,when the IP it returns is not the same as the account register,the server cann't deal with request,i wonder if i can use Nat IP to keep DNS loadbalance? -- 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/1268

2 2

git:master:4267e1ef: tm: updated some structs to typedefs
by Daniel-Constantin Mierla 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 4267e1ef7c9ffaac606964fb1b2d64334754b5d9 URL: https://github.com/kamailio/kamailio/commit/4267e1ef7c9ffaac606964fb1b2d643… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-09T18:27:28+02:00 tm: updated some structs to typedefs --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4267e1ef7c9ffaac606964fb1b2d643… Patch: https://github.com/kamailio/kamailio/commit/4267e1ef7c9ffaac606964fb1b2d643…

1 0

[kamailio/kamailio] p_usrloc: Fix #1265: missing columns in location.sql file. (#1266)
by Andrew Siplas 09 Oct '17

09 Oct '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1265 #### Description Add columns referenced by [p_usrloc_mod.c](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dd… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1266 -- Commit Summary -- * p_usrloc: Fix #1265: missing columns in location.sql file. -- File Changes -- M src/modules/p_usrloc/location.sql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1266.patch https://github.com/kamailio/kamailio/pull/1266.diff -- 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/pull/1266

3 5

git:master:9c936647: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 9c9366473280c52d7f79348637a56264420d48fc URL: https://github.com/kamailio/kamailio/commit/9c9366473280c52d7f79348637a5626… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-09T16:46:17+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README --- Diff: https://github.com/kamailio/kamailio/commit/9c9366473280c52d7f79348637a5626… Patch: https://github.com/kamailio/kamailio/commit/9c9366473280c52d7f79348637a5626… --- diff --git a/src/modules/path/README b/src/modules/path/README index d2e3d69398..4d6e7cba5c 100644 --- a/src/modules/path/README +++ b/src/modules/path/README @@ -292,6 +292,13 @@ if (!add_path("loadbalancer", "ob")) { address as domain-part, and the address the request has been received from as received-parameter. + If the “outbound” module was loaded before this module, and outbound is + required for this request, the header will be in the form “Path: + <sip:flowtoken@1.2.3.4;lr;received=sip:2.3.4.5:1234;ob>”, where + “flowtoken” is the RFC 5626 flow-token that can be used to identify the + source and local address and transport the request was received on, and + where “1.2.3.4” is the address of the outgoing interface. + This function can be used from REQUEST_ROUTE. Example 1.8. add_path_received() usage

1 0

[kamailio/kamailio] path: insert flow token in path header with received (#1261)
by Rick 09 Oct '17

09 Oct '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - added the possiblity to have the received parameter and flow toke in the add_path_received function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1261 -- Commit Summary -- * path: insert flow token in path header with received -- File Changes -- M src/modules/path/doc/path_admin.xml (9) M src/modules/path/path.c (78) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1261.patch https://github.com/kamailio/kamailio/pull/1261.diff -- 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/pull/1261

2 1

git:master:fa8441fb: Merge pull request #1261 from dunst0/feature/flowTokenAndReceived
by GitHub 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: fa8441fb92460d235d8aa7cbf2611b07dfa6230b URL: https://github.com/kamailio/kamailio/commit/fa8441fb92460d235d8aa7cbf2611b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-09T16:32:20+02:00 Merge pull request #1261 from dunst0/feature/flowTokenAndReceived path: insert flow token in path header with received --- Modified: src/modules/path/doc/path_admin.xml Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/fa8441fb92460d235d8aa7cbf2611b0… Patch: https://github.com/kamailio/kamailio/commit/fa8441fb92460d235d8aa7cbf2611b0…

1 0

git:master:3c04bda0: path: insert flow token in path header with received
by Rick Barenthin 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 3c04bda005430206dd1b9da4f11b474ab8fea363 URL: https://github.com/kamailio/kamailio/commit/3c04bda005430206dd1b9da4f11b474… Author: Rick Barenthin <dunst0(a)gmail.com> Committer: Rick Barenthin <dunst0(a)gmail.com> Date: 2017-10-04T17:41:39+02:00 path: insert flow token in path header with received - added the possiblity to have the received parameter and flow toke in the add_path_received function --- Modified: src/modules/path/doc/path_admin.xml Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/3c04bda005430206dd1b9da4f11b474… Patch: https://github.com/kamailio/kamailio/commit/3c04bda005430206dd1b9da4f11b474…

1 0

git:master:08f81795: modules: readme files regenerated - db_flatstore ... [skip ci]
by Kamailio Dev 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 08f817957d1f262aaf5ef4b927c1e9c64a70ec9c URL: https://github.com/kamailio/kamailio/commit/08f817957d1f262aaf5ef4b927c1e9c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-09T16:31:28+02:00 modules: readme files regenerated - db_flatstore ... [skip ci] --- Modified: src/modules/db_flatstore/README --- Diff: https://github.com/kamailio/kamailio/commit/08f817957d1f262aaf5ef4b927c1e9c… Patch: https://github.com/kamailio/kamailio/commit/08f817957d1f262aaf5ef4b927c1e9c… --- diff --git a/src/modules/db_flatstore/README b/src/modules/db_flatstore/README index a8d45e8d9e..16164ce65d 100644 --- a/src/modules/db_flatstore/README +++ b/src/modules/db_flatstore/README @@ -5,7 +5,14 @@ Jan Janak FhG FOKUS <jan(a)iptel.org> +Julien Chavanton + + Flowroute + <jchavanton(a)gmail.com> + Copyright © 2004, 2005 FhG FOKUS + + Copyright © 2017 Flowroute __________________________________________________________________ Table of Contents @@ -19,6 +26,7 @@ Jan Janak 2. Parameters 2.1. flush (integer) + 2.2. encode_delimiter (integer) Chapter 1. Admin Guide @@ -31,6 +39,7 @@ Chapter 1. Admin Guide 2. Parameters 2.1. flush (integer) + 2.2. encode_delimiter (integer) 1. Overview @@ -81,10 +90,11 @@ modparam("acc", "db_url", "flatstore:/var/log/acc") 1.1. Rotating Log Files The module implements a Kamailio management interface command called - flatstore.rotate. When Kamailio receives the command it will close and - reopen all files used by the db_flatstore module. The rotation itself - has to be done by another application (such as logrotate). Follow these - steps to rotate files generated by the db_flatstore module: + flatstore.k_rotate. When Kamailio receives the command it will close + and reopen all files used by the db_flatstore module. The rotation + itself has to be done by another application (such as logrotate). + Follow these steps to rotate files generated by the db_flatstore + module: * Rename the files that you want to rotate: cd /var/log/acc mv acc_1.log acc_1.log.20050605 @@ -95,7 +105,7 @@ mv acc_4.log acc_3.log.20050605 into the renamed files. * Send Kamailio the management command to close and reopen the renamed files: -kamcmd flatstore.rotate +kamcmd flatstore.k_rotate This will force Kamailio to close the renamed files and open new ones with original names, such as acc_1.log. New files will be open at the point when Kamailio has some data to write. It is normal @@ -106,9 +116,18 @@ kamcmd flatstore.rotate 2. Parameters 2.1. flush (integer) + 2.2. encode_delimiter (integer) 2.1. flush (integer) Enable or disable flushing after each write. Default value is 1. + +2.2. encode_delimiter (integer) + + Enable or disable encoding tof the escaped character using ""%" HEX + HEX" mechanism for escaping from RFC 2396 + + Default value is 1. Default delimiter '|' is replaced with %7C if found + in any string

1 0

[kamailio/kamailio] db_flatstore: encode delimiter param (#1262)
by Julien Chavanton 09 Oct '17

09 Oct '17

using ""%" HEX HEX" mechanism for escaping from RFC 2396 #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I consider it non breaking because with the existing a field containing an ASCII vertical bar '|' would break the separator count and result in broken CDRs, etc. in this case changing the default behavior is probably recommended, someone could abuse this flaw. Test: consider the following message, the '|' character in the call-id will break the accounting event. ``` INVITE sip:+11231234567@127.0.0.101 SIP/2.0 Via: SIP/2.0/UDP 1.1.69.51:5070;rport;branch=z9hG4bKPjpM.BvWCQzoS0BJ7TgnuLF9YtmHQTlDgd Max-Forwards: 70 Call-ID: fG8qa5Xc-iNDLhIAnuLZP|njL1sojRRD ``` With the encoding it is replaced with '%7C', no modifications should be required to systems processing the ACC events since different behavior will only take place when there is an invalid ACC event: ``` cat /var/log/acc/acc_129.log INVITE|upDPn89PCIq7SLTssEGoLoSbC-jDRnfj||fG8qa5Xc-iNDLhIAnuLZP%7CnjL1sojRRD.|403|Forbidden ``` Extra comments: I corrected the documentation on the command 'flatstore.rotate', since it was not working, but this one is 'flatstore.k_rotate' If I understand correctly this module was never migrated from SER to Kamailio completely ... This change may be the only important one for operation, so I am not proposing any extra refactoring. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1262 -- Commit Summary -- * db_flatstore: encode delimiter param -- File Changes -- M src/modules/db_flatstore/db_flatstore.c (5) M src/modules/db_flatstore/doc/db_flatstore.xml (14) M src/modules/db_flatstore/doc/db_flatstore_params.xml (11) M src/modules/db_flatstore/km_flatstore.c (15) M src/modules/db_flatstore/km_flatstore.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1262.patch https://github.com/kamailio/kamailio/pull/1262.diff -- 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/pull/1262

2 1

git:master:c203af8d: Merge pull request #1262 from jchavanton/db_flatstore_delimiter
by GitHub 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: c203af8d977cd977f2614d22fab84fead07dc25a URL: https://github.com/kamailio/kamailio/commit/c203af8d977cd977f2614d22fab84fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-09T16:29:17+02:00 Merge pull request #1262 from jchavanton/db_flatstore_delimiter db_flatstore: encode delimiter param --- Modified: src/modules/db_flatstore/db_flatstore.c Modified: src/modules/db_flatstore/doc/db_flatstore.xml Modified: src/modules/db_flatstore/doc/db_flatstore_params.xml Modified: src/modules/db_flatstore/km_flatstore.c Modified: src/modules/db_flatstore/km_flatstore.h --- Diff: https://github.com/kamailio/kamailio/commit/c203af8d977cd977f2614d22fab84fe… Patch: https://github.com/kamailio/kamailio/commit/c203af8d977cd977f2614d22fab84fe…

1 0

git:master:4571f168: db_flatstore: encode delimiter param
by Julien Chavanton 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 4571f168ea1d8d51ed31a5dd7e581ecc84b53d00 URL: https://github.com/kamailio/kamailio/commit/4571f168ea1d8d51ed31a5dd7e581ec… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-10-04T08:36:12-07:00 db_flatstore: encode delimiter param using ""%" HEX HEX" mechanism for escaping from RFC 2396 --- Modified: src/modules/db_flatstore/db_flatstore.c Modified: src/modules/db_flatstore/doc/db_flatstore.xml Modified: src/modules/db_flatstore/doc/db_flatstore_params.xml Modified: src/modules/db_flatstore/km_flatstore.c Modified: src/modules/db_flatstore/km_flatstore.h --- Diff: https://github.com/kamailio/kamailio/commit/4571f168ea1d8d51ed31a5dd7e581ec… Patch: https://github.com/kamailio/kamailio/commit/4571f168ea1d8d51ed31a5dd7e581ec…

1 0

git:master:b8d5c7fb: p_usrloc: location.sql missing INSTANCE_COL
by Lucian Balaceanu 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: b8d5c7fbe994bb581c1e78285f08ec1980f6b89f URL: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-10-09T16:05:01+03:00 p_usrloc: location.sql missing INSTANCE_COL --- Modified: src/modules/p_usrloc/location.sql --- Diff: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1… Patch: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1… --- diff --git a/src/modules/p_usrloc/location.sql b/src/modules/p_usrloc/location.sql index e729c0f94e..9f39dd4218 100644 --- a/src/modules/p_usrloc/location.sql +++ b/src/modules/p_usrloc/location.sql @@ -17,6 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, + instance VARCHAR(255) DEFAULT NULL, reg_id INTEGER DEFAULT 0 NOT NULL ) ENGINE=MyISAM;

1 0

[kamailio/kamailio] p_usrloc: location.sql missing RUID_COL and REG_ID_COL (#1265)
by Andrew Siplas 09 Oct '17

09 Oct '17

## p_usrloc: location.sql missing columns [location.sql](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dda5… should include columns corresponding to `RUID_COL` and `REG_ID_COL`) from [p_usrloc_mod.c](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dd… ### Log Messages ``` kamailio: ERROR: db_mysql [km_dbase.c:127]: db_mysql_submit_query(): driver error on query: Unknown column 'reg_id' in 'field list' (1054) kamailio: ERROR: <core> [db_query.c:132]: db_do_query_internal(): error while submitting query kamailio: ERROR: p_usrloc [ul_db_query.c:110]: db_exec_query(): could not query table location. ``` ``` kamailio: ERROR: db_mysql [km_dbase.c:127]: db_mysql_submit_query(): driver error on query: Unknown column 'ruid' in 'field list' (1054) kamailio: ERROR: <core> [db_query.c:132]: db_do_query_internal(): error while submitting query kamailio: ERROR: p_usrloc [ul_db_query.c:110]: db_exec_query(): could not query table location. ``` ### Solutions Adding columns referenced by [p_usrloc_mod.c](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dd… to match `kamdbctl`'s [usrloc-create.sql](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff5… -- 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/1265

2 3

git:master:f9115fc5: Merge pull request #1266 from asiplas/master
by GitHub 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: f9115fc5fcdc0f4348e3c38b72117e09ce670226 URL: https://github.com/kamailio/kamailio/commit/f9115fc5fcdc0f4348e3c38b72117e0… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2017-10-09T15:36:23+03:00 Merge pull request #1266 from asiplas/master p_usrloc: Fix #1265: missing columns in location.sql file. --- Modified: src/modules/p_usrloc/location.sql --- Diff: https://github.com/kamailio/kamailio/commit/f9115fc5fcdc0f4348e3c38b72117e0… Patch: https://github.com/kamailio/kamailio/commit/f9115fc5fcdc0f4348e3c38b72117e0… --- diff --git a/src/modules/p_usrloc/location.sql b/src/modules/p_usrloc/location.sql index a80902abbe..e729c0f94e 100644 --- a/src/modules/p_usrloc/location.sql +++ b/src/modules/p_usrloc/location.sql @@ -1,6 +1,7 @@ drop table if exists location; CREATE TABLE location ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + ruid VARCHAR(64) DEFAULT '' NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, domain VARCHAR(64) DEFAULT NULL, contact VARCHAR(255) DEFAULT '' NOT NULL, @@ -15,7 +16,8 @@ CREATE TABLE location ( cflags INT(11) DEFAULT 0 NOT NULL, user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, - methods INT(11) DEFAULT NULL + methods INT(11) DEFAULT NULL, + reg_id INTEGER DEFAULT 0 NOT NULL ) ENGINE=MyISAM; CREATE INDEX account_contact_idx ON location (username, domain, contact);

1 0

git:master:9be2a966: p_usrloc: Fix #1265: missing columns in location.sql file.
by Andrew Siplas 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 9be2a96651f743af0a22d0534ee9fc90e857d484 URL: https://github.com/kamailio/kamailio/commit/9be2a96651f743af0a22d0534ee9fc9… Author: Andrew Siplas <andrew(a)asiplas.net> Committer: Andrew Siplas <andrew(a)asiplas.net> Date: 2017-10-08T05:41:00-04:00 p_usrloc: Fix #1265: missing columns in location.sql file. Add columns referenced by [p_usrloc_mod.c](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dd… --- Modified: src/modules/p_usrloc/location.sql --- Diff: https://github.com/kamailio/kamailio/commit/9be2a96651f743af0a22d0534ee9fc9… Patch: https://github.com/kamailio/kamailio/commit/9be2a96651f743af0a22d0534ee9fc9… --- diff --git a/src/modules/p_usrloc/location.sql b/src/modules/p_usrloc/location.sql index a80902abbe..e729c0f94e 100644 --- a/src/modules/p_usrloc/location.sql +++ b/src/modules/p_usrloc/location.sql @@ -1,6 +1,7 @@ drop table if exists location; CREATE TABLE location ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + ruid VARCHAR(64) DEFAULT '' NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, domain VARCHAR(64) DEFAULT NULL, contact VARCHAR(255) DEFAULT '' NOT NULL, @@ -15,7 +16,8 @@ CREATE TABLE location ( cflags INT(11) DEFAULT 0 NOT NULL, user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, - methods INT(11) DEFAULT NULL + methods INT(11) DEFAULT NULL, + reg_id INTEGER DEFAULT 0 NOT NULL ) ENGINE=MyISAM; CREATE INDEX account_contact_idx ON location (username, domain, contact);

1 0

git:master:fa948316: modules: readme files regenerated - mediaproxy ... [skip ci]
by Kamailio Dev 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: fa948316059a140ee906d386c5a2a3123e9c370c URL: https://github.com/kamailio/kamailio/commit/fa948316059a140ee906d386c5a2a31… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-09T12:47:04+02:00 modules: readme files regenerated - mediaproxy ... [skip ci] --- Modified: src/modules/mediaproxy/README Modified: src/modules/misc_radius/README --- Diff: https://github.com/kamailio/kamailio/commit/fa948316059a140ee906d386c5a2a31… Patch: https://github.com/kamailio/kamailio/commit/fa948316059a140ee906d386c5a2a31… --- diff --git a/src/modules/mediaproxy/README b/src/modules/mediaproxy/README index 122de0878d..7be9930e9c 100644 --- a/src/modules/mediaproxy/README +++ b/src/modules/mediaproxy/README @@ -25,7 +25,7 @@ Dan Pascu 4.1. SIP Router Modules 4.2. External Libraries or Applications - 5. Exported parameters + 5. Parameters 5.1. disable (int) 5.2. mediaproxy_socket (string) @@ -66,7 +66,7 @@ Chapter 1. Admin Guide 4.1. SIP Router Modules 4.2. External Libraries or Applications - 5. Exported parameters + 5. Parameters 5.1. disable (int) 5.2. mediaproxy_socket (string) @@ -160,7 +160,7 @@ Chapter 1. Admin Guide * Mediaproxy version 2.4.2 or higher (but not necessarily on the same host as SIP Router). -5. Exported parameters +5. Parameters 5.1. disable (int) 5.2. mediaproxy_socket (string) diff --git a/src/modules/misc_radius/README b/src/modules/misc_radius/README index 62685c59ac..c5d41f59cd 100644 --- a/src/modules/misc_radius/README +++ b/src/modules/misc_radius/README @@ -182,6 +182,7 @@ Chapter 1. Admin Guide Example 1.2. radius_config parameter usage ... modparam("misc_radius", "radius_config", "/etc/radiusclient.conf") +... 3.2. caller_service_type (integer) @@ -193,6 +194,7 @@ modparam("misc_radius", "radius_config", "/etc/radiusclient.conf") Example 1.3. caller_service_type parameter usage ... modparam("misc_radius", "caller_service_type", 18) +... 3.3. callee_service_type (integer) @@ -204,6 +206,7 @@ modparam("misc_radius", "caller_service_type", 18) Example 1.4. callee_service_type parameter usage ... modparam("misc_radius", "callee_service_type", 19) +... 3.4. group_service_type (integer) @@ -215,6 +218,7 @@ modparam("misc_radius", "callee_service_type", 19) Example 1.5. group_service_type parameter usage ... modparam("misc_radius", "group_service_type", 20) +... 3.5. uri_service_type (integer) @@ -226,6 +230,7 @@ modparam("misc_radius", "group_service_type", 20) Example 1.6. uri_service_type parameter usage ... modparam("misc_radius", "uri_service_type", 21) +... 3.6. caller_extra (string) @@ -240,6 +245,7 @@ modparam("misc_radius", "uri_service_type", 21) Example 1.7. caller_extra parameter usage ... modparam("misc_radius", "caller_extra", "Calling-Station-Id=$fu") +... 3.7. callee_extra (string) @@ -254,6 +260,7 @@ modparam("misc_radius", "caller_extra", "Calling-Station-Id=$fu") Example 1.8. callee_extra parameter usage ... modparam("misc_radius", "callee_extra", "SIP-URI-User=$rU;SIP-URI-Host=$rd") +... 3.8. group_extra (string) @@ -268,6 +275,7 @@ modparam("misc_radius", "callee_extra", "SIP-URI-User=$rU;SIP-URI-Host=$rd") Example 1.9. group_extra parameter usage ... modparam("misc_radius", "group_extra", "My-Special=$avp(i:100)") +... 3.9. uri_extra (string) @@ -282,6 +290,7 @@ modparam("misc_radius", "group_extra", "My-Special=$avp(i:100)") Example 1.10. uri_extra parameter usage ... modparam("misc_radius", "uri_extra", "Called-Station-Id=$tu") +... 3.10. use_sip_uri_host (integer) @@ -295,6 +304,7 @@ modparam("misc_radius", "uri_extra", "Called-Station-Id=$tu") Example 1.11. use_sip_uri_host parameter usage ... modparam("misc_radius", "use_sip_uri_host", 1) +... 3.11. common_response (integer)

1 0

git:master:9cc48208: mediaproxy: code formatting using clang
by Daniel-Constantin Mierla 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 9cc48208ec92f3e12be53e8054603e0ee248675f URL: https://github.com/kamailio/kamailio/commit/9cc48208ec92f3e12be53e8054603e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-07T23:17:39+02:00 mediaproxy: code formatting using clang --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/9cc48208ec92f3e12be53e8054603e0… Patch: https://github.com/kamailio/kamailio/commit/9cc48208ec92f3e12be53e8054603e0…

1 0

git:master:e49512ce: misc_radius: end separator for examples in docs
by Daniel-Constantin Mierla 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: e49512ce80693aa2638d9fca940ded5a889cd2f9 URL: https://github.com/kamailio/kamailio/commit/e49512ce80693aa2638d9fca940ded5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-08T22:54:00+02:00 misc_radius: end separator for examples in docs - added section ids --- Modified: src/modules/misc_radius/doc/misc_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e49512ce80693aa2638d9fca940ded5… Patch: https://github.com/kamailio/kamailio/commit/e49512ce80693aa2638d9fca940ded5…

1 0

git:master:5535a612: mediaproxy: added section ids in docs
by Daniel-Constantin Mierla 09 Oct '17

09 Oct '17

Module: kamailio Branch: master Commit: 5535a612445ea71a938e427e0ed7e3f7ea5d88cf URL: https://github.com/kamailio/kamailio/commit/5535a612445ea71a938e427e0ed7e3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-07T23:11:01+02:00 mediaproxy: added section ids in docs --- Modified: src/modules/mediaproxy/doc/mediaproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5535a612445ea71a938e427e0ed7e3f… Patch: https://github.com/kamailio/kamailio/commit/5535a612445ea71a938e427e0ed7e3f…

1 0

INFO: qq.com domain was blocked due to very high volume of spam
by Daniel-Constantin Mierla 09 Oct '17

09 Oct '17

Hello, writing to inform everyone that currently the qq.com domain is blacklisted by the kamailio.org email server due to high volume of spam sent to many admin addresses and mailing lists. Spamassassin had very hard time digesting and filtering, as content kept changing and addresses were random. I didn't get the chance yet to check if we have subscribers with this domain, so, as a fast lane, if you use it and don't have the possibility to quickly switch to another email server domain, write me to try to whitelist the address. Hopefully, if anyone is affected, there is not much inconvenience, but it was the only quick solution that could be applied for the moment. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

SIP -
by Subba Krishna MG 06 Oct '17

06 Oct '17

Hello, How do i include Expires header for 200 OK message? One of the manual says this.. how do i modify my existing config file to include this? I am using : /usr/local/etc/kamailio/kamailio.cfg for configuration. Rgds, MGSK 1.4.9. expires_offset (int) The value that should be subtracted from the expires value when sending a 200OK for a publish. It is used for forcing the client cu send an update before the old publish expires. *Default value is "0".* *Example 1-9. Set expires_offset parameter* ... modparam("presence", "expires_offset", 10)

2 1

[kamailio/kamailio] kamailio inserts buggy sip header (#1257)
by defeden 05 Oct '17

05 Oct '17

when kamailio try to dispatch the requests to Asterisk, it inserts a sip header without newline, so the sip header will be concatenated with the next header herein an example: sip:edi-2001@217.108.243.20:12983;transport=TCP;obContact: <sip:edi-2001@10.42.0.11:5060;transport=UDP> -- 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/1257

2 12

git:master:6c01e269: maxfwd: applied clang format
by Daniel-Constantin Mierla 05 Oct '17

05 Oct '17

Module: kamailio Branch: master Commit: 6c01e2692d5ff56dda54d21469d32c4d3dcbfbff URL: https://github.com/kamailio/kamailio/commit/6c01e2692d5ff56dda54d21469d32c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-06T01:20:25+02:00 maxfwd: applied clang format --- Modified: src/modules/maxfwd/api.h Modified: src/modules/maxfwd/maxfwd.c Modified: src/modules/maxfwd/mf_funcs.c Modified: src/modules/maxfwd/mf_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/6c01e2692d5ff56dda54d21469d32c4… Patch: https://github.com/kamailio/kamailio/commit/6c01e2692d5ff56dda54d21469d32c4…

1 0

git:master:1f54f3d2: maxfwd: fixed location for section id of maxfwd_process
by Daniel-Constantin Mierla 05 Oct '17

05 Oct '17

Module: kamailio Branch: master Commit: 1f54f3d21a81badb4ba43c6adb88195bdd2c42f1 URL: https://github.com/kamailio/kamailio/commit/1f54f3d21a81badb4ba43c6adb88195… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-06T01:16:10+02:00 maxfwd: fixed location for section id of maxfwd_process --- Modified: src/modules/maxfwd/doc/maxfwd_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1f54f3d21a81badb4ba43c6adb88195… Patch: https://github.com/kamailio/kamailio/commit/1f54f3d21a81badb4ba43c6adb88195…

1 0

Problem with 1st run of Kamailio
by Дмитрий Муров 05 Oct '17

05 Oct '17

Hello. Have installed Kamailio 5.0.3 on CentOS 7 x64 and made all setup according the documentation. But when I try to run Kamailio for the 1st time it returns an error. Here’s the log: [root@localhost ~]# systemctl start kamailio Job for kamailio.service failed because the control process exited with error code. See "systemctl status kamailio.service" and "journalctl -xe" for details. [root@localhost ~]# systemctl status kamailio.service -l ● kamailio.service - SYSV: Kamailio is a fast, reliable and flexible SIP Server. Loaded: loaded (/etc/rc.d/init.d/kamailio; bad; vendor preset: disabled) Active: failed (Result: exit-code) since Wed 2017-10-04 12:09:58 MSK; 5s ago Docs: man:systemd-sysv-generator(8) Process: 14091 ExecStart=/etc/rc.d/init.d/kamailio start (code=exited, status=1/FAILURE) Oct 04 12:09:58 localhost.localdomain kamailio[14091]: 0(14101) : <core> [cfg.y:3426]: yyerror_at(): parse error in config file //etc/kamailio/kamailio.cfg, line 412, column 43: Can't set module parameter Oct 04 12:09:58 localhost.localdomain kamailio[14091]: 0(14101) ERROR: <core> [cfg.y:3286]: yyparse(): cfg. parser: failed to find command handle_publish (params 0) Oct 04 12:09:58 localhost.localdomain kamailio[14091]: 0(14101) : <core> [cfg.y:3426]: yyerror_at(): parse error in config file //etc/kamailio/kamailio.cfg, line 719, column 18: unknown command, missing loadmodule? Oct 04 12:09:58 localhost.localdomain kamailio[14091]: 0(14101) ERROR: <core> [cfg.y:3286]: yyparse(): cfg. parser: failed to find command handle_subscribe (params 0) Oct 04 12:09:58 localhost.localdomain kamailio[14091]: 0(14101) : <core> [cfg.y:3426]: yyerror_at(): parse error in config file //etc/kamailio/kamailio.cfg, line 722, column 20: unknown command, missing loadmodule? Oct 04 12:09:58 localhost.localdomain kamailio[14091]: ERROR: bad config file (7 errors) Oct 04 12:09:58 localhost.localdomain systemd[1]: kamailio.service: control process exited, code=exited status=1 Oct 04 12:09:58 localhost.localdomain systemd[1]: Failed to start SYSV: Kamailio is a fast, reliable and flexible SIP Server.. Oct 04 12:09:58 localhost.localdomain systemd[1]: Unit kamailio.service entered failed state. Oct 04 12:09:58 localhost.localdomain systemd[1]: kamailio.service failed. Looks like it’s missing the next modules: presence.so and presence_xml.so Looked for them in modules directory – nope. Searched for them in the internet – nope. Guys, could you help me to fix this error? BR, Dmitry

3 2

git:master:e4cb6248: presence_conference: removed history and svn ids
by Daniel-Constantin Mierla 05 Oct '17

05 Oct '17

Module: kamailio Branch: master Commit: e4cb62486644cdca753fe6c7768bd738ee19c8a5 URL: https://github.com/kamailio/kamailio/commit/e4cb62486644cdca753fe6c7768bd73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-05T17:34:13+02:00 presence_conference: removed history and svn ids --- Modified: src/modules/presence_conference/add_events.c Modified: src/modules/presence_conference/add_events.h Modified: src/modules/presence_conference/notify_body.c Modified: src/modules/presence_conference/notify_body.h Modified: src/modules/presence_conference/pidf.c Modified: src/modules/presence_conference/pidf.h Modified: src/modules/presence_conference/presence_conference.c Modified: src/modules/presence_conference/presence_conference.h --- Diff: https://github.com/kamailio/kamailio/commit/e4cb62486644cdca753fe6c7768bd73… Patch: https://github.com/kamailio/kamailio/commit/e4cb62486644cdca753fe6c7768bd73…

1 0

git:master:c6e921e4: core: add safety check to rval_get_tmp_str()
by Victor Seva 05 Oct '17

05 Oct '17

Module: kamailio Branch: master Commit: c6e921e45f1257913848110189eab82a34aa2f8b URL: https://github.com/kamailio/kamailio/commit/c6e921e45f1257913848110189eab82… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-05T13:28:38+02:00 core: add safety check to rval_get_tmp_str() See #1263 --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/c6e921e45f1257913848110189eab82… Patch: https://github.com/kamailio/kamailio/commit/c6e921e45f1257913848110189eab82… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 540f26620a..fcb238d111 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -1099,6 +1099,10 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, avp_t* r_avp; int i; + if(rv==NULL) { + return -1; + } + switch(rv->type){ case RV_INT: tmpv->s=sint2strbuf(rv->v.l, tmp_cache->i2s,

1 0

out of memory crash 5.0.2
by David Escartín 04 Oct '17

04 Oct '17

hello all today we experience an issue in a kamailio when we saw some issue trying to free a sip transaction it seems Oct 4 09:28:35 tyo-proxy2 /usr/local/kamailio/sbin/kamailio[174859]: : <core> [core/mem/q_malloc.c:469]: qm_free(): BUG: qm_free: bad pointer 0x3463636562393730 (out of memory block!) called from tm: h_table.c: free_cell_helper(187) - aborting Oct 4 09:28:36 tyo-proxy2 /usr/local/kamailio/sbin/kamailio[174879]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 37 Oct 4 09:28:36 tyo-proxy2 /usr/local/kamailio/sbin/kamailio[174832]: ALERT: <core> [main.c:743]: handle_sigs(): child process 174859 exited by a signal 6 Oct 4 09:28:36 tyo-proxy2 /usr/local/kamailio/sbin/kamailio[174832]: ALERT: <core> [main.c:746]: handle_sigs(): core was generated Oct 4 09:28:36 tyo-proxy2 /usr/local/kamailio/sbin/kamailio[174832]: INFO: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD here you have the backtrace of the core (gdb) #0 0x00007fb7cfe461d7 in raise () from /lib64/libc.so.6 #1 0x00007fb7cfe478c8 in abort () from /lib64/libc.so.6 #2 0x0000000000660056 in qm_free (qmp=0x7fb709b42000, p=0x3863316638663636, file=0x7fb7ce044dd6 "tm: h_table.c", func=0x7fb7ce045080 <__FUNCTION__.10977> "free_cell_helper", line=187, mname=0x7fb7ce0447d0 "tm") at core/mem/q_malloc.c:471 #3 0x00007fb7cdf74529 in free_cell_helper (dead_cell=0x7fb7abe40eb0, silent=0, fname=0x7fb7ce0627e0 "timer.c", fline=651) at h_table.c:187 #4 0x00007fb7cdfff369 in wait_handler (ti=995094357, wait_tl=0x7fb7abe40f30, data=0x7fb7abe40eb0) at timer.c:651 #5 0x00000000004b0b15 in timer_list_expire (t=995094357, h=0x7fb709bc0c58, slow_l=0x7fb709bc3ae0, slow_mark=26309) at core/timer.c:874 #6 0x00000000004b0f79 in timer_handler () at core/timer.c:939 #7 0x00000000004b1419 in timer_main () at core/timer.c:978 #8 0x0000000000423234 in main_loop () at main.c:1697 #9 0x0000000000429dcd in main (argc=13, argv=0x7ffed3d33788) at main.c:2646 (gdb) bt ful #0 0x00007fb7cfe461d7 in raise () from /lib64/libc.so.6 No symbol table info available. #1 0x00007fb7cfe478c8 in abort () from /lib64/libc.so.6 No symbol table info available. #2 0x0000000000660056 in qm_free (qmp=0x7fb709b42000, p=0x3863316638663636, file=0x7fb7ce044dd6 "tm: h_table.c", func=0x7fb7ce045080 <__FUNCTION__.10977> "free_cell_helper", line=187, mname=0x7fb7ce0447d0 "tm") at core/mem/q_malloc.c:471 qm = 0x7fb709b42000 f = 0x7fb71f11eba8 size = 552 next = 0x7ffed3d330f0 prev = 0x7fb7ce024c51 <run_trans_callbacks+124> __FUNCTION__ = "qm_free" #3 0x00007fb7cdf74529 in free_cell_helper (dead_cell=0x7fb7abe40eb0, silent=0, fname=0x7fb7ce0627e0 "timer.c", fline=651) at h_table.c:187 b = 0x0 i = 1 rpl = 0x7fb7cf193ef0 tt = 0x7ffed3d331f0 foo = 0x100000000 cbs = 0x0 cbs_tmp = 0x7fb70a4f62f0 __FUNCTION__ = "free_cell_helper" #4 0x00007fb7cdfff369 in wait_handler (ti=995094357, wait_tl=0x7fb7abe40f30, data=0x7fb7abe40eb0) at timer.c:651 p_cell = 0x7fb7abe40eb0 ret = 0 #5 0x00000000004b0b15 in timer_list_expire (t=995094357, h=0x7fb709bc0c58, slow_l=0x7fb709bc3ae0, slow_mark=26309) at core/timer.c:874 tl = 0x7fb7abe40f30 ret = 0 #6 0x00000000004b0f79 in timer_handler () at core/timer.c:939 saved_ticks = 995094357 run_slow_timer = 0 i = 709 __FUNCTION__ = "timer_handler" #7 0x00000000004b1419 in timer_main () at core/timer.c:978 No locals. #8 0x0000000000423234 in main_loop () at main.c:1697 i = 8 pid = 0 si = 0x0 si_desc = "udp receiver child=7 sock=87.237.82.76:5060\000\267\177\000\000\360\063\323\323\376\177\000\000\341\304e\000\000\000\000\000@yA\000\000\000\000\000ȶ\267\t\267\177\000\000\000\000\000\000\000\000\000\000\340\020\025Ϸ\177\000\000@4\323\323\376\177\000\000\017\213f\000\000\000\000\000\260Ju\000\000\000\000\000UF\356_o\000\000" nrprocs = 8 woneinit = 1 __FUNCTION__ = "main_loop" #9 0x0000000000429dcd in main (argc=13, argv=0x7ffed3d33788) at main.c:2646 cfg_stream = 0xdae010 c = -1 r = 0 tmp = 0x7ffed3d34f25 "" tmp_len = 0 port = 0 proto = 0 options = 0x734958 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 3992879128 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffed3d33640 ---Type <return> to continue, or q <return> to quit--- p = 0x7fb7cfeb18bd <intel_check_word+173> "H\205\300t\025\017\266P\003\017\266\312D9\371\017\204", <incomplete sequence \316> st = {st_dev = 19, st_ino = 33728, st_nlink = 2, st_mode = 16832, st_uid = 1001, st_gid = 1001, __pad0 = 0, st_rdev = 0, st_size = 300, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1502352827, tv_nsec = 921620311}, st_mtim = {tv_sec = 1505400353, tv_nsec = 950483654}, st_ctim = {tv_sec = 1505400396, tv_nsec = 678439390}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) frame 4 #4 0x00007fb7cdfff369 in wait_handler (ti=995094357, wait_tl=0x7fb7abe40f30, data=0x7fb7abe40eb0) at timer.c:651 651 UNREF_FREE(p_cell); (gdb) p *p_cell $25 = {next_c = 0x0, prev_c = 0x0, hash_index = 2893, label = 1369668607, flags = 4132, nr_of_outgoings = 2, ref_count = {val = 0}, from = { s = 0x7fb71863203b "From: <sip:+8801884038854@125.22.112.12;user=phone>;tag=59D4A891-3602563D-AC1C5C0E\r\nTo: \"+971569252742\" <sip:+971569252742@87.237.82.72;user=phone>;tag=caK9N5Na0HNXH\r\nCall-ID: aef5eaee-a8e5-11e7-9764-"..., len = 84}, callid = { s = 0x7fb7186320e2 "Call-ID: aef5eaee-a8e5-11e7-9764-b96367f6cc42\r\nCSeq: 1 BYE\r\nSupported: timer\r\nMax-Forwards: 68\r\nReason: Q.850 ;cause=16 ;text=\"Normal call clearing\"\r\nContent-Length: 0\r\nRoute: <sip:87.237.82.72;lr=on;"..., len = 47}, cseq_n = { s = 0x7fb718632111 "CSeq: 1 BYE\r\nSupported: timer\r\nMax-Forwards: 68\r\nReason: Q.850 ;cause=16 ;text=\"Normal call clearing\"\r\nContent-Length: 0\r\nRoute: <sip:87.237.82.72;lr=on;ftag=caK9N5Na0HNXH;did=61b.969a>\r\n\r\n", len = 7}, to = { s = 0x7fb71863208f "To: \"+971569252742\" <sip:+971569252742@87.237.82.72;user=phone>;tag=caK9N5Na0HNXH\r\nCall-ID: aef5eaee-a8e5-11e7-9764-b96367f6cc42\r\nCSeq: 1 BYE\r\nSupported: timer\r\nMax-Forwards: 68\r\nReason: Q.850 ;cause="..., len = 83}, method = { s = 0x7fb718631fb8 "BYE sip:971569252742@87.237.83.72:5080 SIP/2.0\r\nVia: SIP/2.0/UDP 125.22.112.12:5060;branch=z9hG4bKhvkkq0202gqhhk4sl041sd0000g00.1\r\nFrom: <sip:+8801884038854@125.22.112.12;user=phone>;tag=59D4A891-3602"..., len = 3}, tmcb_hl = {first = 0x7fb734f46910, reg_types = 131714}, wait_timer = {next = 0x0, prev = 0x0, expire = 995094345, initial_timeout = 80, data = 0x7fb7abe40eb0, f = 0x7fb7cdfff2b6 <wait_handler>, flags = 513, slow_idx = 0}, uas = {request = 0x7fb7186318c8, end_request = 0x7fb7186329b8 "\300\300\300\300", response = {activ_type = 481, flags = 128, t_active = 0 '\000', branch = 0, buffer_len = 517, buffer = 0x7fb7647fab88 "SIP/2.0 481 Call Does Not Exist\r\nVia: SIP/2.0/UDP 125.22.112.12:5060;branch=z9hG4bKhvkkq0202gqhhk4sl041sd0000g00.1\r\nFrom: <sip:+8801884038854@125.22.112.12;user=phone>;tag=59D4A891-3602563D-AC1C5C0E\r\n"..., my_T = 0x7fb7abe40eb0, timer = {next = 0x0, prev = 0x0, expire = 0, initial_timeout = 0, data = 0x0, f = 0x7fb7cdffed8a <retr_buf_handler>, flags = 0, slow_idx = 0}, dst = {send_sock = 0x7fb7cee66788, to = {s = { sa_family = 2, sa_data = "\023\304}\026p\f\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 208672381}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 208672381, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 0, proto = 1 '\001', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}}, retr_expire = 0, fr_expire = 0}, local_totag = {s = 0x0, len = 0}, cancel_reas = 0x0, status = 481}, uac = 0x7fb7abe410b8, async_backup = { backup_route = 1, backup_branch = 4294967295, blind_uac = 0, ruri_new = 1}, fwded_totags = 0x0, uri_avps_from = 0x0, uri_avps_to = 0x0, user_avps_from = 0x0, user_avps_to = 0x0, domain_avps_from = 0x0, domain_avps_to = 0x0, xavps_list = 0x0, reply_mutex = {val = 0}, reply_locker_pid = {val = 0}, reply_rec_lock_level = 0, fr_timeout = 480, fr_inv_timeout = 1920, rt_t1_timeout_ms = 650, rt_t2_timeout_ms = 4000, end_of_life = 995094709, relayed_reply_branch = 1, on_failure = 0, on_branch_failure = 0, on_reply = 0, on_branch = 0, on_branch_delayed = 0, md5 = 0x7fb7abe41098 "adfe93b19dfeb65381f6a9144bf1b0e9"} (gdb) frame 3 #3 0x00007fb7cdf74529 in free_cell_helper (dead_cell=0x7fb7abe40eb0, silent=0, fname=0x7fb7ce0627e0 "timer.c", fline=651) at h_table.c:187 187 sip_msg_free_unsafe(rpl); (gdb) p *rpl $26 = {id = 793790803, pid = 540028466, tval = {tv_sec = 8462656578208149556, tv_usec = 7308613580334855013}, fwd_send_flags = {f = 111 'o', blst_imask = 117 'u'}, rpl_send_flags = {f = 116 't', blst_imask = 13 '\r'}, first_line = {type = 8250, flags = 18771, len = 775040848, u = {request = {method = {s = 0x3738205044552f30 <Address 0x3738205044552f30 out of bounds>, len = 926102062}, uri = { s = 0x636e6172623b3237 <Address 0x636e6172623b3237 out of bounds>, len = 964312424}, version = {s = 0x39332e636338654b <Address 0x39332e636338654b out of bounds>, len = 1664496945}, method_value = 878863157}, reply = { version = {s = 0x3738205044552f30 <Address 0x3738205044552f30 out of bounds>, len = 926102062}, status = {s = 0x636e6172623b3237 <Address 0x636e6172623b3237 out of bounds>, len = 964312424}, reason = { s = 0x39332e636338654b <Address 0x39332e636338654b out of bounds>, len = 1664496945}, statuscode = 878863157}}}, via1 = 0x3364636462323865, via2 = 0x302e353838623234, headers = 0x53203a6169560a0d, last_header = 0x552f302e322f5049, parsed_flag = 3689061859469578308, h_via1 = 0x3b32372e32382e37, h_via2 = 0x7a3d68636e617262, callid = 0x38654b6234476839, to = 0x37393663352e6363, cseq = 0x6535613738373339, from = 0x6336666237316130, contact = 0x3231353933353432, maxforwards = 0x560a0d302e366232, route = 0x2f504953203a6169, record_route = 0x205044552f302e32, content_type = 0x382e3733322e3738, content_length = 0x6172623b32372e32, authorization = 0x4768397a3d68636e, expires = 0x2e636338654b6234, proxy_auth = 0x3465633231636336, supported = 0x3230623761643335, require = 0x3566356130333333, proxy_require = 0x3864303335346234, unsupported = 0x3a6169560a0d302e, allow = 0x302e322f50495320, event = 0x2e3738205044552f, accept = 0x372e32382e373332, accept_language = 0x68636e6172623b32, organization = 0x4b62344768397a3d, priority = 0x3565612e63633865, subject = 0x6461316136346538, user_agent = 0x3239643035353036, server = 0x6562653237353264, content_disposition = 0xd302e3866616138, diversion = 0x4953203a6169560a, rpid = 0x44552f302e322f50, refer_to = 0x3733322e37382050, session_expires = 0x623b32372e32382e, min_se = 0x397a3d68636e6172, sipifmatch = 0x6338654b62344768, subscription_state = 0x6332626363392e63, date = 0x6339613134333566, identity = 0x3936353363343934, identity_info = 0x6338383864636536, pai = 0x69560a0d302e3639, ppi = 0x322f504953203a61, path = 0x38205044552f302e, privacy = 0x32382e3733322e37, min_expires = 0x6e6172623b32372e, body = 0x344768397a3d6863, eoh = 0x632e636338654b62 <Address 0x632e636338654b62 out of bounds>, unparsed = 0x3339316133646337 <Address 0x3339316133646337 out of bounds>, rcv = {src_ip = {af = 1630613603, len = 959854384, u = {addrl = { 3977350488200209462, 3329677872489128505}, addr32 = {879125558, 926049074, 909206073, 775251042}, addr16 = {25654, 13414, 25394, 14130, 25145, 13873, 25698, 11829}, addr = "6df42c279b16bd5."}}, dst_ip = { af = 1443499312, len = 540696937, u = {addrl = {3400268511741757779, 3615888265024914517}, addr32 = {793790803, 791686706, 542131285, 841889592}, addr16 = {18771, 12112, 11826, 12080, 17493, 8272, 14136, 12846}, addr = "SIP/2.0/UDP 87.2"}}, src_port = 14131, dst_port = 14382, proto_reserved1 = 842477106, proto_reserved2 = 1634886203, src_su = {s = {sa_family = 25454, sa_data = "h=z9hG4bKe8cc."}, sin = {sin_family = 25454, sin_port = 15720, sin_addr = {s_addr = 1198012794}, sin_zero = "4bKe8cc."}, sin6 = {sin6_family = 25454, sin6_port = 15720, sin6_flowinfo = 1198012794, sin6_addr = {__in6_u = {__u6_addr8 = "4bKe8cc.13d79438", __u6_addr16 = {25140, 25931, 25400, 11875, 13105, 14180, 13369, 14387}, __u6_addr32 = {1699439156, 778265400, 929313585, 942879801}}}, sin6_scope_id = 1680879928}}, bind_address = 0x3239306139373563, proto = 102 'f'}, buf = 0xa0d302e64376563 <Address 0xa0d302e64376563 out of bounds>, len = 979462486, new_uri = {s = 0x5044552f302e322f <Address 0x5044552f302e322f out of bounds>, len = 775370784}, dst_uri = { s = 0x72623b32372e3238 <Address 0x72623b32372e3238 out of bounds>, len = 1751346785}, parsed_uri_ok = 1264727111, parsed_uri = {user = {s = 0x613161333937642e <Address 0x613161333937642e out of bounds>, len = 943219557}, passwd = {s = 0x6164643739663937 <Address 0x6164643739663937 out of bounds>, len = 828455217}, host = {s = 0x6169560a0d302e66 <Address 0x6169560a0d302e66 out of bounds>, len = 1230184506}, port = { s = 0x3738205044552f30 <Address 0x3738205044552f30 out of bounds>, len = 926102062}, params = {s = 0x636e6172623b3237 <Address 0x636e6172623b3237 out of bounds>, len = 964312424}, sip_params = { s = 0x63622e636338654b <Address 0x63622e636338654b out of bounds>, len = 808609078}, headers = {s = 0x6432346339396636 <Address 0x6432346339396636 out of bounds>, len = 845296434}, port_no = 12643, proto = 12646, type = 808346165, flags = (URI_USER_NORMALIZE | unknown: 1767246348), transport = {s = 0x552f302e322f5049 <Address 0x552f302e322f5049 out of bounds>, len = 941641796}, ttl = { s = 0x3b32372e32382e37 <Address 0x3b32372e32382e37 out of bounds>, len = 1851880034}, user_param = {s = 0x38654b6234476839 <Address 0x38654b6234476839 out of bounds>, len = 959341411}, maddr = { s = 0x6432663738626633 <Address 0x6432663738626633 out of bounds>, len = 845296945}, method = {s = 0x6530396537303332 <Address 0x6530396537303332 out of bounds>, len = 775239991}, lr = { s = 0x2f504953203a6169 <Address 0x2f504953203a6169 out of bounds>, len = 791686706}, r2 = {s = 0x382e3733322e3738 <Address 0x382e3733322e3738 out of bounds>, len = 842477106}, gr = { s = 0x4768397a3d68636e <Address 0x4768397a3d68636e out of bounds>, len = 1699439156}, transport_val = {s = 0x3037313336323438 <Address 0x3037313336323438 out of bounds>, len = 912406072}, ttl_val = { s = 0x6466616633366533 <Address 0x6466616633366533 out of bounds>, len = 942695731}, user_param_val = {s = 0x3a6169560a0d302e <Address 0x3a6169560a0d302e out of bounds>, len = 1346982688}, maddr_val = { s = 0x2e3738205044552f <Address 0x2e3738205044552f out of bounds>, len = 775369522}, method_val = {s = 0x68636e6172623b32 <Address 0x68636e6172623b32 out of bounds>, len = 1748597309}, lr_val = { s = 0x6532622e63633865 <Address 0x6532622e63633865 out of bounds>, len = 892560439}, r2_val = {s = 0x3462613963313564 <Address 0x3462613963313564 out of bounds>, len = 842491188}, gr_val = { s = 0xd302e3332393430 <Address 0xd302e3332393430 out of bounds>, len = 1634293258}}, parsed_orig_ruri_ok = 775040848, parsed_orig_ruri = {user = {s = 0x3733322e37382050 <Address 0x3733322e37382050 out of bounds>, len = 775043118}, passwd = {s = 0x397a3d68636e6172 <Address 0x397a3d68636e6172 out of bounds>, len = 1647593320}, host = {s = 0x3036306533392e63 <Address 0x3036306533392e63 out of bounds>, len = 808739637}, port = { s = 0x6430303434316430 <Address 0x6430303434316430 out of bounds>, len = 962998329}, params = {s = 0x69560a0d302e3732 <Address 0x69560a0d302e3732 out of bounds>, len = 1394621025}, sip_params = { s = 0x38205044552f302e <Address 0x38205044552f302e out of bounds>, len = 858926647}, headers = {s = 0x6e6172623b32372e <Address 0x6e6172623b32372e out of bounds>, len = 2050844771}, port_no = 19298, proto = 14437, type = 909009763, flags = (unknown: 878850356), transport = {s = 0x3737663362366332 <Address 0x3737663362366332 out of bounds>, len = 811689014}, ttl = {s = 0x2e32646465633366 <Address 0x2e32646465633366 out of bounds>, len = 1443499312}, user_param = {s = 0x2f302e322f504953 <Address 0x2f302e322f504953 out of bounds>, len = 542131285}, maddr = {s = 0x32372e32382e3733 <Address 0x32372e32382e3733 out of bounds>, len = 1634886203}, method = { s = 0x654b62344768397a <Address 0x654b62344768397a out of bounds>, len = 778265400}, lr = {s = 0x3463643430313264 <Address 0x3463643430313264 out of bounds>, len = 1684156466}, r2 = { s = 0x6139313961373064 <Address 0x6139313961373064 out of bounds>, len = 809002294}, gr = {s = 0x504953203a616956 <Address 0x504953203a616956 out of bounds>, len = 808333871}, transport_val = { s = 0x2e3733322e373820 <Address 0x2e3733322e373820 out of bounds>, len = 925774392}, ttl_val = {s = 0x68397a3d68636e61 <Address 0x68397a3d68636e61 out of bounds>, len = 1264727111}, user_param_val = { s = 0x336239313030662e <Address 0x336239313030662e out of bounds>, len = 1714436451}, maddr_val = {s = 0x3639343462666465 <Address 0x3639343462666465 out of bounds>, len = 1647731768}, method_val = { s = 0x6169560a0d302e65 <Address 0x6169560a0d302e65 out of bounds>, len = 1230184506}, lr_val = {s = 0x3738205044552f30 <Address 0x3738205044552f30 out of bounds>, len = 926102062}, r2_val = { s = 0x636e6172623b3237 <Address 0x636e6172623b3237 out of bounds>, len = 964312424}, gr_val = {s = 0x32342e636338654b <Address 0x32342e636338654b out of bounds>, len = 1681404473}}, add_rm = 0x3863316638663636, body_lumps = 0x3633623765633361, reply_lump = 0x302e326136636130, add_to_branch_s = "\r\nVia: SIP/2.0/UDP 87.237.82.72;branch=z9hG4bKe8cc.f34debd", add_to_branch_len = 909522273, hash_index = 1664628533, msg_flags = 959656752, flags = 1680947555, set_global_address = {s = 0x560a0d302e646164 <Address 0x560a0d302e646164 out of bounds>, len = 540696937}, set_global_port = {s = 0x205044552f302e32 <Address 0x205044552f302e32 out of bounds>, len = 841889592}, force_send_socket = 0x6172623b32372e32, path_vec = {s = 0x4768397a3d68636e <Address 0x4768397a3d68636e out of bounds>, len = 1699439156}, instance = { s = 0x3061653066303834 <Address 0x3061653066303834 out of bounds>, len = 962738483}, reg_id = 1714840422, ruid = {s = 0x3762376465303565 <Address 0x3762376465303565 out of bounds>, len = 168636462}, location_ua = { s = 0x302e322f50495320 <Address 0x302e322f50495320 out of bounds>, len = 1346655535}, ldv = {flow = {decoded = 775369522, rcv = {src_ip = {af = 1919040306, len = 1751346785, u = {addrl = {5431961581858159165, 7233118750862686309}, addr32 = {1748597309, 1264727111, 1667446885, 1684091694}, addr16 = {31293, 26681, 13383, 19298, 14437, 25443, 13102, 25697}, addr = "=z9hG4bKe8cc.3ad"}}, dst_ip = {af = 1681024055, len = 1714447409, u = {addrl = {4049126615781303909, 3544439805141410918}, addr32 = {809068133, 942760756, 959800422, 825254201}, addr16 = {26213, 12345, 25396, 14385, 25702, 14645, 24889, 12592}, addr = "ef904c18fd599a01"}}, src_port = 12855, dst_port = 14640, proto_reserved1 = 221261363, proto_reserved2 = 1634293258, src_su = {s = {sa_family = 8250, sa_data = "SIP/2.0/UDP 87"}, sin = {sin_family = 8250, sin_port = 18771, sin_addr = {s_addr = 775040848}, sin_zero = "0/UDP 87"}, sin6 = {sin6_family = 8250, sin6_port = 18771, sin6_flowinfo = 775040848, sin6_addr = {__in6_u = {__u6_addr8 = "0/UDP 87.237.82.", __u6_addr16 = {12080, 17493, 8272, 14136, 12846, 14131, 14382, 11826}, __u6_addr32 = {1146433328, 926425168, 926102062, 775043118}}}, sin6_scope_id = 1648046647}}, bind_address = 0x397a3d68636e6172, proto = 104 'h'}}}} (gdb) frame 2 #2 0x0000000000660056 in qm_free (qmp=0x7fb709b42000, p=0x3863316638663636, file=0x7fb7ce044dd6 "tm: h_table.c", func=0x7fb7ce045080 <__FUNCTION__.10977> "free_cell_helper", line=187, mname=0x7fb7ce0447d0 "tm") at core/mem/q_malloc.c:471 471 abort(); (gdb) frame 1 #1 0x00007fb7cfe478c8 in abort () from /lib64/libc.so.6 (gdb) could you please check if you find any clue? just some secs before we started to receive some requests which caused a loop in our proxy (SIP requests to the proxy without To tag and no Route headers) maybe that could be related consuming the memory ¿? we are running kamailio 5.0.2 best regards david

1 0

git:master:376731b0: modules: readme files regenerated - domainpolicy ... [skip ci]
by Kamailio Dev 04 Oct '17

04 Oct '17

Module: kamailio Branch: master Commit: 376731b0fdcebb68c721ee4e4bcdd3f6dc3fcd7d URL: https://github.com/kamailio/kamailio/commit/376731b0fdcebb68c721ee4e4bcdd3f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-04T13:46:38+02:00 modules: readme files regenerated - domainpolicy ... [skip ci] --- Modified: src/modules/domainpolicy/README --- Diff: https://github.com/kamailio/kamailio/commit/376731b0fdcebb68c721ee4e4bcdd3f… Patch: https://github.com/kamailio/kamailio/commit/376731b0fdcebb68c721ee4e4bcdd3f… --- diff --git a/src/modules/domainpolicy/README b/src/modules/domainpolicy/README index 4e0870e22c..29ad907372 100644 --- a/src/modules/domainpolicy/README +++ b/src/modules/domainpolicy/README @@ -49,14 +49,13 @@ Klaus Darilion 4.1. dp_can_connect() 4.2. dp_apply_policy() - 5. RPC Commands - 6. Usage Scenarios + 5. Usage Scenarios - 6.1. TLS Based Federation - 6.2. SIP Hub based Federation - 6.3. Walled Garden Federation + 5.1. TLS Based Federation + 5.2. SIP Hub based Federation + 5.3. Walled Garden Federation - 7. Known Limitations + 6. Known Limitations List of Examples @@ -101,14 +100,13 @@ Chapter 1. Admin Guide 4.1. dp_can_connect() 4.2. dp_apply_policy() - 5. RPC Commands - 6. Usage Scenarios + 5. Usage Scenarios - 6.1. TLS Based Federation - 6.2. SIP Hub based Federation - 6.3. Walled Garden Federation + 5.1. TLS Based Federation + 5.2. SIP Hub based Federation + 5.3. Walled Garden Federation - 7. Known Limitations + 6. Known Limitations 1. Overview @@ -407,18 +405,16 @@ if (dp_apply_policy()) { } ... -5. RPC Commands +5. Usage Scenarios -6. Usage Scenarios - - 6.1. TLS Based Federation - 6.2. SIP Hub based Federation - 6.3. Walled Garden Federation + 5.1. TLS Based Federation + 5.2. SIP Hub based Federation + 5.3. Walled Garden Federation This section describes how this module can be use to implement selective VoIP peerings. -6.1. TLS Based Federation +5.1. TLS Based Federation This example shows how a secure peering fabric can be configured based on TLS and Domain Policies. @@ -460,7 +456,7 @@ tls_client_domain["tlsfed"] { tls_verify_server = 1 } -6.2. SIP Hub based Federation +5.2. SIP Hub based Federation This example shows how a peering fabric based on a central SIP hub can be configured. @@ -490,7 +486,7 @@ mysql> select * from domainpolicy; | 1 | http://HUBFED.org/ | fed | domainreplacement | sip.HUBFED.org | +----+--------------------+------+-------------------+----------------+ -6.3. Walled Garden Federation +5.3. Walled Garden Federation This example assumes that a set of SIP providers have established a secure Layer 3 network between their proxies. It does not matter @@ -529,4 +525,4 @@ mysql> select * from domainpolicy; | 1 | http://l3fed.org/ | fed | domainprefix | l3fed | +----+-------------------+------+--------------+-------+ -7. Known Limitations +6. Known Limitations

1 0

git:master:d94a65cb: domainpolicy: removed empty rpc section
by Daniel-Constantin Mierla 04 Oct '17

04 Oct '17

Module: kamailio Branch: master Commit: d94a65cbd0a86e1869037bbcfa261bc4219be908 URL: https://github.com/kamailio/kamailio/commit/d94a65cbd0a86e1869037bbcfa261bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-04T13:42:30+02:00 domainpolicy: removed empty rpc section - added several section ids --- Modified: src/modules/domainpolicy/doc/domainpolicy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d94a65cbd0a86e1869037bbcfa261bc… Patch: https://github.com/kamailio/kamailio/commit/d94a65cbd0a86e1869037bbcfa261bc…

1 0

git:master:465c9355: modules: readme files regenerated - xhttp_pi ... [skip ci]
by Kamailio Dev 03 Oct '17

03 Oct '17

Module: kamailio Branch: master Commit: 465c9355a7d16c2c11c0f12b7346f8d42d693212 URL: https://github.com/kamailio/kamailio/commit/465c9355a7d16c2c11c0f12b7346f8d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-03T17:16:26+02:00 modules: readme files regenerated - xhttp_pi ... [skip ci] --- Modified: src/modules/xhttp_pi/README --- Diff: https://github.com/kamailio/kamailio/commit/465c9355a7d16c2c11c0f12b7346f8d… Patch: https://github.com/kamailio/kamailio/commit/465c9355a7d16c2c11c0f12b7346f8d… --- diff --git a/src/modules/xhttp_pi/README b/src/modules/xhttp_pi/README index dfbf45ceaa..967acef66b 100644 --- a/src/modules/xhttp_pi/README +++ b/src/modules/xhttp_pi/README @@ -268,7 +268,7 @@ modparam("xhttp_pi", "xhttp_pi_root", "pi") Example 1.2. Set xhttp_pi_buf_size parameter ... -modparam("xhttp", "xhttp_pi_buf_size", 1024) +modparam("xhttp_pi", "xhttp_pi_buf_size", 1024) ... 6.3. framework (string) @@ -279,7 +279,7 @@ modparam("xhttp", "xhttp_pi_buf_size", 1024) Example 1.3. Set framework parameter ... -modparam("xhttp", "framework", "/usr/local/etc/kamailio/pi_framework.xml") +modparam("xhttp_pi", "framework", "/usr/local/etc/kamailio/pi_framework.xml") ... 7. Functions @@ -298,7 +298,7 @@ loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "xhttp_pi.so" ... -modparam("xhttp", "framework", "/usr/local/etc/kamailio/pi_framework.xml") +modparam("xhttp_pi", "framework", "/usr/local/etc/kamailio/pi_framework.xml") ... event_route[xhttp:request] { $var(xhttp_root) = $(hu{s.substr,0,3});

1 0

git:master:f6f8b802: xhttp_pi: fix documentation examples
by Ovidiu Sas 03 Oct '17

03 Oct '17

Module: kamailio Branch: master Commit: f6f8b802749b2234e700fbd9cde8b847a54cab83 URL: https://github.com/kamailio/kamailio/commit/f6f8b802749b2234e700fbd9cde8b84… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-10-03T11:02:27-04:00 xhttp_pi: fix documentation examples --- Modified: src/modules/xhttp_pi/doc/xhttp_pi_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6f8b802749b2234e700fbd9cde8b84… Patch: https://github.com/kamailio/kamailio/commit/f6f8b802749b2234e700fbd9cde8b84… --- diff --git a/src/modules/xhttp_pi/doc/xhttp_pi_admin.xml b/src/modules/xhttp_pi/doc/xhttp_pi_admin.xml index 523fd2bc66..4fbe320003 100644 --- a/src/modules/xhttp_pi/doc/xhttp_pi_admin.xml +++ b/src/modules/xhttp_pi/doc/xhttp_pi_admin.xml @@ -314,7 +314,7 @@ modparam("xhttp_pi", "xhttp_pi_root", "pi") <title>Set <varname>xhttp_pi_buf_size</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("xhttp", "xhttp_pi_buf_size", 1024) +modparam("xhttp_pi", "xhttp_pi_buf_size", 1024) ... </programlisting> </example> @@ -333,7 +333,7 @@ modparam("xhttp", "xhttp_pi_buf_size", 1024) <title>Set <varname>framework</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("xhttp", "framework", "/usr/local/etc/kamailio/pi_framework.xml") +modparam("xhttp_pi", "framework", "/usr/local/etc/kamailio/pi_framework.xml") ... </programlisting> </example> @@ -359,7 +359,7 @@ loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "xhttp_pi.so" ... -modparam("xhttp", "framework", "/usr/local/etc/kamailio/pi_framework.xml") +modparam("xhttp_pi", "framework", "/usr/local/etc/kamailio/pi_framework.xml") ... event_route[xhttp:request] { $var(xhttp_root) = $(hu{s.substr,0,3});

1 0

git:master:f460607b: cplc: added section ids in docs
by Daniel-Constantin Mierla 03 Oct '17

03 Oct '17

Module: kamailio Branch: master Commit: f460607b5b0903c0937e5272c18d1c4fed38d42d URL: https://github.com/kamailio/kamailio/commit/f460607b5b0903c0937e5272c18d1c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-03T15:38:29+02:00 cplc: added section ids in docs --- Modified: src/modules/cplc/doc/cplc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f460607b5b0903c0937e5272c18d1c4… Patch: https://github.com/kamailio/kamailio/commit/f460607b5b0903c0937e5272c18d1c4…

1 0

odd parse error
by James Cloos 02 Oct '17

02 Oct '17

I'm seeing this parse error on a machine running kamailio 5.0.1: 0(5586) CRITICAL: <core> [core/cfg.y:3396]: yyerror_at(): parse error in config file //etc/kamailio/kamailio.cfg, from line 725, column 1 to line 726, column 0: syntax error 0(5586) CRITICAL: <core> [core/cfg.y:3396]: yyerror_at(): parse error in config file //etc/kamailio/kamailio.cfg, from line 725, column 1 to line 726, column 0: invalid route statement I'm posting here because the file only has 725 lines, so "from line 725 to line 726" makes no sense. Are there ony know bugs relevant to parse error reporting? Also: Besides lots of -d flags, how can I find which route statement is invalid? -JimC -- James Cloos <cloos(a)jhcloos.com> OpenPGP: 0x997A9F17ED7DAEA6

2 2

git:master:ae7e19fa: modules: readme files regenerated - cnxcc ... [skip ci]
by Kamailio Dev 02 Oct '17

02 Oct '17

Module: kamailio Branch: master Commit: ae7e19fa77693f7c574a66ee6c773e781cea6a86 URL: https://github.com/kamailio/kamailio/commit/ae7e19fa77693f7c574a66ee6c773e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-02T19:31:18+02:00 modules: readme files regenerated - cnxcc ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/ae7e19fa77693f7c574a66ee6c773e7… Patch: https://github.com/kamailio/kamailio/commit/ae7e19fa77693f7c574a66ee6c773e7… --- diff --git a/src/modules/cnxcc/README b/src/modules/cnxcc/README index 5ec0fa9cff..f2bd975e55 100644 --- a/src/modules/cnxcc/README +++ b/src/modules/cnxcc/README @@ -41,11 +41,11 @@ Carlos Ruiz Díaz 6. Events 7. Web Interface - 8. Sample + 8. Sample Config List of Examples - 1.1. dlg_flag + 1.1. 1.2. credit_check_period 1.3. cnxcc_set_max_credit() 1.4. cnxcc_set_max_time() @@ -86,7 +86,7 @@ Chapter 1. Admin Guide 6. Events 7. Web Interface - 8. Sample + 8. Sample Config 1. Overview @@ -138,11 +138,11 @@ Chapter 1. Admin Guide 3.1. redis (integer) 3.2. credit_check_period (integer) -3.1. redis (integer) +3.1. redis (integer) Redis datasource connection information - Example 1.1. dlg_flag + Example 1.1. ... modparam("cnxcc", "redis", "addr=127.0.0.1;port=6379;db=1") ... @@ -354,7 +354,7 @@ event_route[cnxcc:call-shutdown] Link: https://github.com/caruizdiaz/cnxcc-web -8. Sample +8. Sample Config Example 1.8. kamailio-cnxcc.cfg ...

1 0

git:master:f5430eb0: cnxcc: added section ids in the docs
by Daniel-Constantin Mierla 02 Oct '17

02 Oct '17

Module: kamailio Branch: master Commit: f5430eb0ad6134539d5eb4369e4c60bdb5fa4a63 URL: https://github.com/kamailio/kamailio/commit/f5430eb0ad6134539d5eb4369e4c60b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-02T19:12:21+02:00 cnxcc: added section ids in the docs --- Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f5430eb0ad6134539d5eb4369e4c60b… Patch: https://github.com/kamailio/kamailio/commit/f5430eb0ad6134539d5eb4369e4c60b…

1 0

git:master:d84451d9: siptrace: fix memory leak in hlog
by Federico Cabiddu 02 Oct '17

02 Oct '17

Module: kamailio Branch: master Commit: d84451d9a1b144b5aee4678df051cb65e8db2595 URL: https://github.com/kamailio/kamailio/commit/d84451d9a1b144b5aee4678df051cb6… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-10-02T11:03:59+02:00 siptrace: fix memory leak in hlog --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/d84451d9a1b144b5aee4678df051cb6… Patch: https://github.com/kamailio/kamailio/commit/d84451d9a1b144b5aee4678df051cb6… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1969384d41..81f924efd5 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2349,6 +2349,9 @@ static int hlog(struct sip_msg *msg, str *correlationid, str *message) { hostent2su(&dst.to, &p->host, p->addr_idx, (p->port)?p->port:SIP_PORT); LM_DBG("setting up the socket_info\n"); + free_proxy(p); /* frees only p content, not p itself */ + pkg_free(p); + if (force_send_sock_str.s) { LM_DBG("force_send_sock activated, grep for the sock_info\n"); si = grep_sock_info(&force_send_sock_uri->host,

1 0

git:master:b24c3093: app_python: added section ids in docs
by Daniel-Constantin Mierla 02 Oct '17

02 Oct '17

Module: kamailio Branch: master Commit: b24c3093feeb49bd6e9e508a6947fb3926c4ea8f URL: https://github.com/kamailio/kamailio/commit/b24c3093feeb49bd6e9e508a6947fb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-02T09:50:56+02:00 app_python: added section ids in docs --- Modified: src/modules/app_python/doc/app_python_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b24c3093feeb49bd6e9e508a6947fb3… Patch: https://github.com/kamailio/kamailio/commit/b24c3093feeb49bd6e9e508a6947fb3… --- diff --git a/src/modules/app_python/doc/app_python_admin.xml b/src/modules/app_python/doc/app_python_admin.xml index dc06758ffe..9eab795662 100644 --- a/src/modules/app_python/doc/app_python_admin.xml +++ b/src/modules/app_python/doc/app_python_admin.xml @@ -58,7 +58,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="app_python.p.script_name"> <title><varname>script_name</varname> (string)</title> <para> The path to the fiel with Python code to be executed @@ -79,7 +79,7 @@ modparam("app_python", "script_name", "/usr/local/etc/kamailio/myscript.py") </example> </section> - <section> + <section id="app_python.p.mod_init_function"> <title><varname>mod_init_function</varname> (string)</title> <para> The Python function to be executed by this module when @@ -100,7 +100,7 @@ modparam("app_python", "mod_init_function", "my_mod_init") </example> </section> - <section> + <section id="app_python.p.child_init_method"> <title><varname>child_init_method</varname> (string)</title> <para> The Python function to be executed by this module when @@ -125,7 +125,7 @@ modparam("app_python", "child_init_method", "my_child_init") <section> <title>Functions</title> - <section> + <section id="app_python.f.python_exec"> <title> <function moreinfo="none">python_exec(method [, args])</function> </title>

1 0

[kamailio/kamailio] pkg/kamailio/obs: Created links for dists: (#1244)
by sergey-safarov 02 Oct '17

02 Oct '17

- Fedora 25, 26 - RHEL 6, 7 - OpenSUSE Leap, Tumbleweed #### Pre-Submission Checklist - [ ] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ x No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Purpose of PR - trac packaging in one SPEC file for all RPM based dists. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1244 -- Commit Summary -- * pkg/kamailio/obs: Created links for dists: -- File Changes -- A pkg/kamailio/fedora/25 (1) A pkg/kamailio/fedora/26 (1) M pkg/kamailio/obs/kamailio.spec (9) A pkg/kamailio/opensuse/1315 (1) A pkg/kamailio/opensuse/1330 (1) A pkg/kamailio/rhel/6 (1) A pkg/kamailio/rhel/7 (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1244.patch https://github.com/kamailio/kamailio/pull/1244.diff -- 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/pull/1244

1 2

git:master:9229cb39: app_mono: added section ids
by Daniel-Constantin Mierla 01 Oct '17

01 Oct '17

Module: kamailio Branch: master Commit: 9229cb397e3afebd5e25e67713e4df9b6d622192 URL: https://github.com/kamailio/kamailio/commit/9229cb397e3afebd5e25e67713e4df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-01T08:22:16+02:00 app_mono: added section ids --- Modified: src/modules/app_mono/doc/app_mono_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9229cb397e3afebd5e25e67713e4df9… Patch: https://github.com/kamailio/kamailio/commit/9229cb397e3afebd5e25e67713e4df9… --- diff --git a/src/modules/app_mono/doc/app_mono_admin.xml b/src/modules/app_mono/doc/app_mono_admin.xml index d5a06da0a5..aae3589cfe 100644 --- a/src/modules/app_mono/doc/app_mono_admin.xml +++ b/src/modules/app_mono/doc/app_mono_admin.xml @@ -11,20 +11,20 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> - This module allows the execution of assemblies of managed code, among + This module allows the execution of assemblies of managed code, among the most popular of which is C# (.NET). It uses the Mono project (http://www.mono-project.com/) to embed the managed code interpreter inside the SIP server, providing fast execution. </para> <para> Besides C#, other languages can be used to build managed assemblies, - such as: Java, Python, VisualBasic.NET, JavaScript. For more details on + such as: Java, Python, VisualBasic.NET, JavaScript. For more details on what kind of languages can be used to build managed assemblies, see: http://www.mono-project.com/Languages </para> @@ -36,7 +36,7 @@ <para> There are two ways to execute managed code assemblies: load the code at startup and only execute at runtime, or load and execute at runtime. Only - one mode at a time may be used. The mode is determined by the 'load' + one mode at a time may be used. The mode is determined by the 'load' parameter and the function used to execute the code. </para> </section> @@ -72,7 +72,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="app_mono.p.load"> <title><varname>load</varname> (string)</title> <para> Set the path to the Mono assembly to be loaded at startup. You @@ -93,10 +93,10 @@ modparam("app_mono", "load", "/usr/local/etc/kamailio/mono/myscript.exe") </example> </section> </section> - + <section> <title>Functions</title> - <section> + <section id="app_mono.f.mono_exec"> <title> <function moreinfo="none">mono_exec(path [, param])</function> </title> @@ -119,8 +119,8 @@ mono_exec("/usr/local/etc/kamailio/mono/myscript.exe"); </programlisting> </example> </section> - - <section> + + <section id="app_mono.mono_run"> <title> <function moreinfo="none">mono_run([param])</function> </title> @@ -147,7 +147,7 @@ if(!mono_run("myparam")) </example> </section> </section> - + <section> <title>Usage</title> <para>

1 0

git:master:0b0d282e: Merge pull request #1259 from sergey-safarov/libressl
by GitHub 01 Oct '17

01 Oct '17

Module: kamailio Branch: master Commit: 0b0d282e8db3c230b11a78aa5e37f3ab3fba990b URL: https://github.com/kamailio/kamailio/commit/0b0d282e8db3c230b11a78aa5e37f3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-01T08:15:00+02:00 Merge pull request #1259 from sergey-safarov/libressl pkg/kamailio/alpine: Set of updates alpine packaging and docker --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/alpine_docker/build.sh Removed: pkg/kamailio/alpine/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/0b0d282e8db3c230b11a78aa5e37f3a… Patch: https://github.com/kamailio/kamailio/commit/0b0d282e8db3c230b11a78aa5e37f3a…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev