sr-dev

sr-dev@lists.kamailio.org

23 participants
45190 discussions

git:master:9b6ec0a4: core: added --debug=val command line parameter
by Daniel-Constantin Mierla 27 May '20

27 May '20

Module: kamailio Branch: master Commit: 9b6ec0a4912a617239395563cdd29233f65cb57d URL: https://github.com/kamailio/kamailio/commit/9b6ec0a4912a617239395563cdd2923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-27T13:36:42+02:00 core: added --debug=val command line parameter - set the value for debug global parameter from command line, allows negative values corresponding to L_XYZ levels - alternative to -d which operated by incresing debug level starting from 0 --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9b6ec0a4912a617239395563cdd2923… Patch: https://github.com/kamailio/kamailio/commit/9b6ec0a4912a617239395563cdd2923… --- diff --git a/src/main.c b/src/main.c index 8926308ca5..e57bfa40f8 100644 --- a/src/main.c +++ b/src/main.c @@ -169,7 +169,8 @@ Options:\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ - -d Debugging mode (multiple -d increase the level)\n\ + -d Debugging level control (multiple -d to increase the level from 0)\n\ + --debug=val Debugging level value\n\ -D Control how daemonize is done:\n\ -D..do not fork (almost) anyway;\n\ -DD..do not daemonize creator;\n\ @@ -1931,6 +1932,7 @@ int main(int argc, char** argv) {"loadmodule", required_argument, 0, KARGOPTVAL + 5}, {"modparam", required_argument, 0, KARGOPTVAL + 6}, {"log-engine", required_argument, 0, KARGOPTVAL + 7}, + {"debug", required_argument, 0, KARGOPTVAL + 8}, {0, 0, 0, 0 } }; @@ -1992,6 +1994,14 @@ int main(int argc, char** argv) case KARGOPTVAL+7: ksr_slog_init(optarg); break; + case KARGOPTVAL+8: + debug_flag = 1; + default_core_cfg.debug=(int)strtol(optarg, &tmp, 10); + if ((tmp==0) || (*tmp)){ + LM_ERR("bad debug level value: %s\n", optarg); + goto error; + } + break; default: if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { @@ -2153,6 +2163,7 @@ int main(int argc, char** argv) case KARGOPTVAL+5: case KARGOPTVAL+6: case KARGOPTVAL+7: + case KARGOPTVAL+8: break; /* long options */

1 0

git:master:531e288b: evapi: use msg->ldv.vdata for local env data instead of hdr date workaround
by Daniel-Constantin Mierla 27 May '20

27 May '20

Module: kamailio Branch: master Commit: 531e288bc981de536023697e8181cc5589b4d14b URL: https://github.com/kamailio/kamailio/commit/531e288bc981de536023697e8181cc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-27T09:21:24+02:00 evapi: use msg->ldv.vdata for local env data instead of hdr date workaround --- Modified: src/modules/evapi/evapi_dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/531e288bc981de536023697e8181cc5… Patch: https://github.com/kamailio/kamailio/commit/531e288bc981de536023697e8181cc5… --- diff --git a/src/modules/evapi/evapi_dispatch.h b/src/modules/evapi/evapi_dispatch.h index fa6135ae22..23b4c2565c 100644 --- a/src/modules/evapi/evapi_dispatch.h +++ b/src/modules/evapi/evapi_dispatch.h @@ -46,9 +46,9 @@ int pv_get_evapi(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val); -/* set evapi env to shortcut of hdr date - not used in faked msg */ -#define evapi_set_msg_env(_msg, _evenv) do { _msg->date=(hdr_field_t*)_evenv; } while(0) -#define evapi_get_msg_env(_msg) ((evapi_env_t*)_msg->date) +/* set/get evapi env */ +#define evapi_set_msg_env(_msg, _evenv) do { _msg->ldv.vdata=(void*)_evenv; } while(0) +#define evapi_get_msg_env(_msg) ((evapi_env_t*)_msg->ldv.vdata) int evapi_cfg_close(sip_msg_t *msg); int evapi_set_tag(sip_msg_t* msg, str* stag);

1 0

git:master:5cb28a47: core: parser - added vdata void* field inside msg_ldata_t structure
by Daniel-Constantin Mierla 27 May '20

27 May '20

Module: kamailio Branch: master Commit: 5cb28a47cade4b3d20e37ed38c74e575f7343386 URL: https://github.com/kamailio/kamailio/commit/5cb28a47cade4b3d20e37ed38c74e57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-27T09:20:05+02:00 core: parser - added vdata void* field inside msg_ldata_t structure - useful to link to custom local data on message processing --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/5cb28a47cade4b3d20e37ed38c74e57… Patch: https://github.com/kamailio/kamailio/commit/5cb28a47cade4b3d20e37ed38c74e57… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 973b5702b4..aa35fa5185 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -268,6 +268,7 @@ typedef struct ocd_flow { * - add to msg_ldata_reset() if a field uses dynamic memory */ typedef struct msg_ldata { ocd_flow_t flow; + void *vdata; } msg_ldata_t; /*! \brief The SIP message */

1 0

git:master:2a920bde: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 2a920bde45b78d7f31942590ed76a3e7b509213e URL: https://github.com/kamailio/kamailio/commit/2a920bde45b78d7f31942590ed76a3e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-26T16:01:15+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/2a920bde45b78d7f31942590ed76a3e… Patch: https://github.com/kamailio/kamailio/commit/2a920bde45b78d7f31942590ed76a3e…

1 0

git:master:35319cb5: corex: docs for dns_cache parameter
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 35319cb5c0cac7fd656d86e7419dbd3e497fcd92 URL: https://github.com/kamailio/kamailio/commit/35319cb5c0cac7fd656d86e7419dbd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T15:59:01+02:00 corex: docs for dns_cache parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/35319cb5c0cac7fd656d86e7419dbd3… Patch: https://github.com/kamailio/kamailio/commit/35319cb5c0cac7fd656d86e7419dbd3… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index f9572b54f0..203ada5d2f 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -93,6 +93,60 @@ modparam("corex", "alias_subdomains", "kamailio.org") modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") ... +</programlisting> + </example> + </section> + <section id="corex.p.dns_cache"> + <title><varname>dns_cache</varname> (string)</title> + <para> + Add A or AAAA records to internal DNS cache at startup. It can be set + many times to add more than one record. + </para> + <para> + The format of the value follows the SIP params style: + "attr1=val1;attr2=val2;...". The attributes can be: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>type</emphasis> - it can be "A" (IPv4) or "AAAA" (IPv6) + </para> + </listitem> + <listitem> + <para> + <emphasis>name</emphasis> - the domain name + </para> + </listitem> + <listitem> + <para> + <emphasis>addr</emphasis> - the IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>ttl</emphasis> - TTL value + </para> + </listitem> + <listitem> + <para> + <emphasis>flags</emphasis> - can be: 1 - the domain is unresolvable + (like blacklisted); 2 - the record is permanent (never times out, + never deleted, never overwritten) + </para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dns_cache</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") +modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") +... </programlisting> </example> </section>

1 0

git:master:12b8bf9a: corex: new param dns_cache to add values to internal dns cache
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 12b8bf9a9c6e84d9b1dadaa08195a9c56b24cbe4 URL: https://github.com/kamailio/kamailio/commit/12b8bf9a9c6e84d9b1dadaa08195a9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T15:45:10+02:00 corex: new param dns_cache to add values to internal dns cache - it can be set many times - the value is a param-like string with the prototype "type=rectype;name=domain;addr=ip;ttl=ival;flags=ival" - type valye can be 'A' (IPv4) or 'AAAA' (IPv6) - flags can be: 1 - the domain is unresolvable (like blacklisted) 2 - the record is permanent (never times out, never deleted, never overwritten) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/12b8bf9a9c6e84d9b1dadaa08195a9c… Patch: https://github.com/kamailio/kamailio/commit/12b8bf9a9c6e84d9b1dadaa08195a9c… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c0759e6ded..1f9abd497c 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -31,7 +31,9 @@ #include "../../core/pvar.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/dns_cache.h" #include "../../core/parser/parse_uri.h" +#include "../../core/parser/parse_param.h" #include "corex_lib.h" #include "corex_rpc.h" @@ -67,6 +69,7 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int fixup_file_op(void** param, int param_no); int corex_alias_subdomains_param(modparam_t type, void *val); +int corex_dns_cache_param(modparam_t type, void *val); static int mod_init(void); static int child_init(int); @@ -141,6 +144,8 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"alias_subdomains", STR_PARAM|USE_FUNC_PARAM, (void*)corex_alias_subdomains_param}, + {"dns_cache", PARAM_STR|USE_FUNC_PARAM, + (void*)corex_dns_cache_param}, {"nio_intercept", INT_PARAM, &nio_intercept}, {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, @@ -304,9 +309,88 @@ int corex_alias_subdomains_param(modparam_t type, void *val) return corex_add_alias_subdomains((char*)val); error: return -1; +} + +int corex_dns_cache_param(modparam_t type, void *val) +{ + str sval; + param_t* params_list = NULL; + param_hooks_t phooks; + param_t *pit=NULL; + str dns_name = STR_NULL; + str dns_addr = STR_NULL; + unsigned short dns_type = 0; + int dns_ttl = 0; + int dns_flags = 0; + + if(val==NULL) { + LM_ERR("invalid parameter\n"); + goto error; + } + sval = *((str*)val); + if(sval.s==NULL || sval.len<=0) { + LM_ERR("invalid parameter value\n"); + goto error; + } + + if(sval.s[sval.len-1]==';') { + sval.len--; + } + if (parse_params(&sval, CLASS_ANY, &phooks, &params_list)<0) { + return -1; + } + + for (pit = params_list; pit; pit=pit->next) { + if (pit->name.len==4 + && strncasecmp(pit->name.s, "name", 4)==0) { + dns_name = pit->body; + } else if (pit->name.len==4 + && strncasecmp(pit->name.s, "addr", 4)==0) { + dns_addr = pit->body; + } else if (pit->name.len==4 + && strncasecmp(pit->name.s, "type", 4)==0) { + if((pit->body.len == 1) && ((pit->body.s[0]=='a') + || (pit->body.s[0]=='A'))) { + dns_type = T_A; + } else if((pit->body.len == 4) + && strncasecmp(pit->name.s, "aaaa", 4)==0) { + dns_type = T_AAAA; + } + } else if(pit->name.len==3 + && strncasecmp(pit->name.s, "ttl", 3)==0) { + if(dns_ttl==0) { + if (str2sint(&pit->body, &dns_ttl) < 0) { + LM_ERR("invalid ttl: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==5 + && strncasecmp(pit->name.s, "flags", 5)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_flags) < 0) { + LM_ERR("invalid flags: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } + } + + if (dns_cache_add_record(dns_type, + &dns_name, + dns_ttl, + &dns_addr, + 0 /* priority */, + 0 /* weight */, + 0 /* port */, + dns_flags) == 0) { + return 0; + } +error: + return -1; } + typedef struct _msg_iflag_name { str name; int value;

1 0

git:master:d2906da9: tls: better log messages when failing to create ssl ctx
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: d2906da97d2429bfdff089203f933de2d282a86d URL: https://github.com/kamailio/kamailio/commit/d2906da97d2429bfdff089203f933de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T15:05:15+02:00 tls: better log messages when failing to create ssl ctx --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/d2906da97d2429bfdff089203f933de… Patch: https://github.com/kamailio/kamailio/commit/d2906da97d2429bfdff089203f933de… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 3932141f0e..a8859c4a31 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1036,7 +1036,11 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) d->ctx[i] = SSL_CTX_new((SSL_METHOD*)ssl_methods[d->method - 1]); } if (d->ctx[i] == NULL) { - ERR("%s: Cannot create SSL context\n", tls_domain_str(d)); + unsigned long e = 0; + e = ERR_peek_last_error(); + ERR("%s: Cannot create SSL context [%d] (%lu: %s / %s)\n", + tls_domain_str(d), i, e, ERR_error_string(e, NULL), + ERR_reason_error_string(e)); return -1; } if(d->method>TLS_USE_TLSvRANGE) { @@ -1046,7 +1050,11 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) /* libssl >= 1.1.0 */ d->ctx[i] = SSL_CTX_new(sr_tls_methods[d->method - 1].TLSMethod); if (d->ctx[i] == NULL) { - ERR("%s: Cannot create SSL context\n", tls_domain_str(d)); + unsigned long e = 0; + e = ERR_peek_last_error(); + ERR("%s: Cannot create SSL context [%d] (%lu: %s / %s)\n", + tls_domain_str(d), i, e, ERR_error_string(e, NULL), + ERR_reason_error_string(e)); return -1; } if(d->method>TLS_USE_TLSvRANGE) {

1 0

git:master:3e7278f2: tls: Makefile - option to link against libssl static libs
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 3e7278f28c43b830a197e2f7b212ec6f06e5acbf URL: https://github.com/kamailio/kamailio/commit/3e7278f28c43b830a197e2f7b212ec6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T14:56:47+02:00 tls: Makefile - option to link against libssl static libs --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3e7278f28c43b830a197e2f7b212ec6… Patch: https://github.com/kamailio/kamailio/commit/3e7278f28c43b830a197e2f7b212ec6… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 1505bc64ea..f3c15bb724 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -8,6 +8,13 @@ include ../../Makefile.defs auto_gen= NAME=tls.so +# set to yes when wanting to link with static libraries +LIBSSL_STATIC ?= no +# set to yes when wanting to link with static libraries compiled from source +LIBSSL_STATIC_SRCLIB ?= no +# set to the path of the folder with static libraries compiled from source +LIBSSL_STATIC_SRCPATH ?= /usr/local/src/openssl + ifeq ($(CROSS_COMPILE),) SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ @@ -16,8 +23,21 @@ SSL_BUILDER=$(shell \ endif ifneq ($(SSL_BUILDER),) +ifneq ($(LIBSSL_STATIC),yes) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) +else +ifneq ($(LIBSSL_STATIC_SRCLIB),yes) + ## when static libs (*.a) from packages are compiled with -fPIC + DEFS += $(shell $(SSL_BUILDER) --cflags) + LIBS += $(shell $(SSL_BUILDER) --libs-only-L) + LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a +else + ## when linking against static libs compiled from sources + DEFS += -I$(LIBSSL_STATIC_SRCPATH)/include + LIBS += $(LIBSSL_STATIC_SRCPATH)/libssl.a $(LIBSSL_STATIC_SRCPATH)/libcrypto.a +endif # ifneq ($(LIBSSL_STATIC_SRCLIB),yes) +endif # ifneq ($(LIBSSL_STATIC),yes) else DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \

1 0

git:master:8893e6f2: core: async task logging on no callback
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 8893e6f2b30577b065f11a406faf5c5935714f78 URL: https://github.com/kamailio/kamailio/commit/8893e6f2b30577b065f11a406faf5c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T09:24:17+02:00 core: async task logging on no callback --- Modified: src/core/async_task.c --- Diff: https://github.com/kamailio/kamailio/commit/8893e6f2b30577b065f11a406faf5c5… Patch: https://github.com/kamailio/kamailio/commit/8893e6f2b30577b065f11a406faf5c5… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index ee50412790..1045e0ab41 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -280,6 +280,8 @@ int async_task_run(int idx) LM_DBG("task executed [%p] (%p/%p)\n", (void*)ptask, (void*)ptask->exec, (void*)ptask->param); ptask->exec(ptask->param); + } else { + LM_DBG("task with no callback function - ignoring\n"); } shm_free(ptask); }

1 0

Re: [sr-dev] Fwd: RPC command to close all WS connections.
by Henning Westerholt 25 May '20

25 May '20

Hi, please keep the list in CC. Have you looked already into the ws_keepalive function? It uses another method of iterating over the ws_connection list. It iterates over a ws_connection_id list with an index variable and uses wsconn_get(..) to get the actual connection. Just guessing, but maybe this method works better for you. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: Andrey Deykunov <deykunov(a)gmail.com> Sent: Monday, May 25, 2020 5:26 PM To: Henning Westerholt <hw(a)skalatan.de> Subject: Re: [sr-dev] Fwd: RPC command to close all WS connections. Hi Henning, Thanks for your response. Kamailio has crashed when one of our scripts tried getting statistics about websocket module. As I see in core dump, shared memory was previously corrupted: GNU gdb (Debian 7.12-6) 7.12.0.20161007-git Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html<http://gnu.org/licenses/gpl.html>> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/<http://www.gnu.org/software/gdb/bugs/>>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/<http://www.gnu.org/software/gdb/documentation/>>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /var/lib/ums/sbin/kamailio...done. [New LWP 7234] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/var/lib/ums/sbin/kamailio -m 2048 -M 12 -P /var/run/kamailio/kamailio.pid -f /'. Program terminated with signal SIGSEGV, Segmentation fault. #0 __strcmp_sse2_unaligned () at ../sysdeps/x86_64/multiarch/strcmp-sse2-unaligned.S:32 #0 __strcmp_sse2_unaligned () at ../sysdeps/x86_64/multiarch/strcmp-sse2-unaligned.S:32 #1 0x00007eff2ff2e2f5 in rpc_mod_print (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38, mname=0x18e4aa9 "websocket", stats=0x18ffd70, flag=2) at mod_stats.c:117 #2 0x00007eff2ff2e0eb in rpc_mod_print_one (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38, mname=0x18e4aa9 "websocket", pkg_stats=0x18fe3b0, shm_stats=0x18ffd70, flag=2) at mod_stats.c:159 #3 0x00007eff2ff2dee1 in rpc_mod_mem_stats_mode (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38, fmode=0) at mod_stats.c:239 #4 0x00007eff2ff2d84f in rpc_mod_mem_stats (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38) at mod_stats.c:251 #5 0x00007eff2f612c80 in process_rpc_req (buf=0x18e4a94 "\241\003\035Cw\274L\221\nmod.stats", size=36, bytes_needed=0x7ffe484adf80, sh=0x7ffe484adef0, saved_state=0x18f4a98) at binrpc_run.c:678 #6 0x00007eff2f60072f in handle_stream_read (s_c=0x18e4a60, idx=-1) at io_listener.c:511 #7 0x00007eff2f5fc121 in handle_io (fm=0x7effb341f0a0, events=1, idx=-1) at io_listener.c:706 #8 0x00007eff2f5fa93a in io_wait_loop_epoll (h=0x7eff2f843348 <io_h>, t=10, repeat=0) at ./../../core/io_wait.h:1062 #9 0x00007eff2f5ee62c in io_listen_loop (fd_no=2, cs_lst=0x17f9940) at io_listener.c:281 #10 0x00007eff2f62472c in mod_child (rank=0) at ctl.c:338 #11 0x0000000000638c14 in init_mod_child (m=0x7effb3297cd8, rank=0) at core/sr_module.c:780 #12 0x000000000063862d in init_mod_child (m=0x7effb32983a0, rank=0) at core/sr_module.c:776 #13 0x000000000063862d in init_mod_child (m=0x7effb3298840, rank=0) at core/sr_module.c:776 #14 0x000000000063862d in init_mod_child (m=0x7effb3298d50, rank=0) at core/sr_module.c:776 #15 0x000000000063862d in init_mod_child (m=0x7effb32991f0, rank=0) at core/sr_module.c:776 #16 0x000000000063862d in init_mod_child (m=0x7effb3299968, rank=0) at core/sr_module.c:776 #17 0x000000000063862d in init_mod_child (m=0x7effb3299fd8, rank=0) at core/sr_module.c:776 #18 0x000000000063862d in init_mod_child (m=0x7effb329a460, rank=0) at core/sr_module.c:776 #19 0x00000000006385b2 in init_child (rank=0) at core/sr_module.c:825 #20 0x000000000043140c in main_loop () at main.c:1753 #21 0x000000000043df6f in main (argc=9, argv=0x7ffe484b22b8) at main.c:2802 I assume that 'ws.close_all' could affect this corruption because failover service uses this command after node becomes passive. Also I'm using my slightly revised variant of ws_keepalive function with KEEPALIVE_MECHANISM_CONCHECK enabled. Perhaps, something went wrong while websocket connections were removed within this function: void ws_keepalive(unsigned int ticks, void *param) { int check_time = (int)time(NULL) - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_id_t *list_head = NULL; ws_connection_t *wsc = NULL; int i = 0; int idx = (int)(long)param; LM_INFO("Keepalive tick\n"); /* get an array of pointer to all ws connection */ list_head = wsconn_get_list_ids(idx); if(!list_head) return; while(list_head[i].id!=-1) { wsc = wsconn_get(list_head[i].id); if(wsc && wsc->last_used < check_time) { if(wsc->state == WS_S_CLOSING || wsc->awaiting_pong) { LM_WARN("forcibly closing connection\n"); wsconn_close_now(wsc); } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); if(con==NULL) { LM_INFO("tcp connection has been lost -> removing ws_conn\n"); if(wsconn_rm(wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); } else { if (con->state == S_CONN_BAD) { LM_INFO("tcp connection is bad and supposed to be removed\n"); if(wsconn_rm(wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); con->send_flags.f |= SND_F_CON_CLOSE; con->timeout = get_ticks_raw(); } tcpconn_put(con); } } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING) ? OPCODE_PING : OPCODE_PONG; ping_pong(wsc, opcode); } } if(wsc) { wsconn_put_id(list_head[i].id); } i++; } wsconn_put_list_ids(list_head); } Thanks, Andrey пн, 25 мая 2020 г. в 16:18, Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>>: Hi Andrey, as you know, there is an RPC command ws.close() and also a script function to close sessions remotely. So, it should be certainly possible to close the sessions over RPC. Not being the author of this particular module, it is hard to say why it crashes. Try the usual debugging techniques, e.g. gdb to find more clues. If you have a working version, please open a pull request. In case of more questions, just ask on this list again. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: sr-dev <sr-dev-bounces(a)lists.kamailio.org<mailto:sr-dev-bounces@lists.kamailio.org>> On Behalf Of Andrey Deykunov Sent: Monday, May 18, 2020 1:02 PM To: Kamailio (SER) - Development Mailing List <sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org>> Subject: [sr-dev] Fwd: RPC command to close all WS connections. ---------- Forwarded message --------- От: Andrey Deykunov <deykunov(a)gmail.com<mailto:deykunov@gmail.com>> Date: пн, 18 мая 2020 г. в 12:24 Subject: RPC command to close all WS connections. To: Daniel-Constantin Mierla <miconda(a)gmail.com<mailto:miconda@gmail.com>> Hi Daniel, We're using two nodes (active and passive) of our PBX server in production. When an active node becomes passive, we should forcibly close all WS connections, established by clients on this node. So, I've added 'ws.close_all' command to websocket module to let our failover service be able closing WS connections remotely. I've added the following code to ws_frame.c: void ws_rpc_close_all(rpc_t *rpc, void *ctx) { ws_connection_t **list = NULL, **list_head = NULL; ws_connection_t *wsc = NULL; int ret; list_head = wsconn_get_list(); if(!list_head) return; list = list_head; wsc = *list_head; while(wsc) { LM_WARN("Closing connection\n"); ret = close_connection(&wsc, LOCAL_CLOSE, 1000, str_status_normal_closure); wsc = *(++list); } wsconn_put_list(list_head); } but I think this code may be unsafe and could corrupt shared memory, because I've got some segfaults during failovers after adding this command. What do you think? Is it possible to close connections properly and safety for shared memory? Thanks, Andrey

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev