March 2019 - sr-dev - kamailio.org

[kamailio/kamailio] Kamailio crash while concurrent dialplan.reload (#1874)
by Dmitri Savolainen 01 Mar '19

01 Mar '19

#### Reproduction run this script simultaneously (from two console for example) ``` #!/usr/bin/perl $cmd = q(curl -X GET -H "Content-Type: application/json" -d '{"jsonrpc": "2.0", "method": "dialplan.reload", "params":[], "id": 1 }' http://IP:PORT/jsonrpc/) for ($i=0; $i<1000; $i++){ `$cmd`; } ``` #### Debugging Data ``` Program terminated with signal 11, Segmentation fault. #0 0x00007ffaa39e95f7 in add_rule2hash (rule=0x7ffa9fa05248, h_index=1) at dp_db.c:563 /home/snen/KamailioGitMyFork/src/modules/dialplan/dp_db.c:563:12474:beg:0x7ffaa39e95f7 (gdb) bt #0 0x00007ffaa39e95f7 in add_rule2hash (rule=0x7ffa9fa05248, h_index=1) at dp_db.c:563 #1 0x00007ffaa39e4831 in dp_load_db () at dp_db.c:305 #2 0x00007ffaa39ce914 in dialplan_rpc_reload (rpc=0x7ffa9f382a80 <func_param>, ctx=0x7ffa9f3829a0 <_jsonrpc_ctx_global>) at dialplan.c:610 #3 0x00007ffa9f16398f in jsonrpc_dispatch (msg=0x7ffd427ad880, s1=0x0, s2=0x0) at jsonrpcs_mod.c:1294 #4 0x0000000000461a5f in do_action (h=0x7ffd427ad7a0, a=0x7ffaa72987d8, msg=0x7ffd427ad880) at core/action.c:1067 #5 0x000000000046e23e in run_actions (h=0x7ffd427ad7a0, a=0x7ffaa72987d8, msg=0x7ffd427ad880) at core/action.c:1564 #6 0x00000000004619ce in do_action (h=0x7ffd427ad7a0, a=0x7ffaa729b140, msg=0x7ffd427ad880) at core/action.c:1058 #7 0x000000000046e23e in run_actions (h=0x7ffd427ad7a0, a=0x7ffaa729b140, msg=0x7ffd427ad880) at core/action.c:1564 #8 0x00007ffa9f38868c in xhttp_process_request (orig_msg=0x7ffaa72a6ed0, new_buf=0x7ffaa72c4420 "GET /jsonrpc/ HTTP/1.1\r\nVia: SIP/2.0/TCP 192.168.10.190:48542\r\nUser-Agent: curl/7.29.0\r\nHost: 192.168.10.190:5071\r\nAccept: */*\r\nContent-Type: application/json\r\nContent-Length: 71\r\n\r\n{\"jsonrpc\": \"2.0\","..., new_len=253) at xhttp_mod.c:296 #9 0x00007ffa9f389dcf in xhttp_handler (msg=0x7ffaa72a6ed0) at xhttp_mod.c:383 #10 0x00000000004ff30c in nonsip_msg_run_hooks (msg=0x7ffaa72a6ed0) at core/nonsip_hooks.c:112 #11 0x000000000057b373 in receive_msg ( buf=0x7ffaa02ec618 "GET /jsonrpc/ HTTP/1.1\r\nUser-Agent: curl/7.29.0\r\nHost: 192.168.10.190:5071\r\nAccept: */*\r\nContent-Type: application/json\r\nContent-Length: 71\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\": \"dialplan.reload\", \"params\":"..., len=214, rcv_info=0x7ffaa02ec338) at core/receive.c:270 #12 0x0000000000635eb5 in receive_tcp_msg ( tcpbuf=0x7ffaa02ec618 "GET /jsonrpc/ HTTP/1.1\r\nUser-Agent: curl/7.29.0\r\nHost: 192.168.10.190:5071\r\nAccept: */*\r\nContent-Type: application/json\r\nContent-Length: 71\r\n\r\n{\"jsonrpc\": \"2.0\", \"method\": \"dialplan.reload\", \"params\":"..., len=214, rcv_info=0x7ffaa02ec338, con=0x7ffaa02ec320) at core/tcp_read.c:1399 #13 0x0000000000638372 in tcp_read_req (con=0x7ffaa02ec320, bytes_read=0x7ffd427ae65c, read_flags=0x7ffd427ae658) at core/tcp_read.c:1631 #14 0x000000000063b115 in handle_io (fm=0x7ffaa7302d78, events=1, idx=-1) at core/tcp_read.c:1804 #15 0x00000000006299b6 in io_wait_loop_epoll (h=0xae9060 <io_w>, t=2, repeat=0) at core/io_wait.h:1062 #16 0x000000000063d172 in tcp_receive_loop (unix_sock=16) at core/tcp_read.c:1974 #17 0x00000000004dcaf9 in tcp_init_children () at core/tcp_main.c:5086 #18 0x00000000004266c4 in main_loop () at main.c:1750 #19 0x000000000042d14b in main (argc=13, argv=0x7ffd427aedc8) at main.c:2737 (gdb) l 558 new_id = 0; 559 560 /*search for the corresponding dpl_id*/ 561 for(crt_idp = last_idp =rules_hash[h_index]; crt_idp!= NULL; 562 last_idp = crt_idp, crt_idp = crt_idp->next) 563 if(crt_idp->dp_id == rule->dpid) 564 break; 565 566 /*didn't find a dpl_id*/ 567 if(!crt_idp){ (gdb) p crt_idp->dp_id Cannot access memory at address 0x7ffa9f002429 (gdb) ``` ### Additional Information ``` kamailio 5.3.0-dev3 (x86_64/linux) d726bd ``` -- 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/1874

2 4

git:master:1fd9b508: pv: new variable $rcv(key)
by Daniel-Constantin Mierla 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: 1fd9b508ccba3f52e68f04cd6e4580bc342489e6 URL: https://github.com/kamailio/kamailio/commit/1fd9b508ccba3f52e68f04cd6e4580b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-01T15:06:16+01:00 pv: new variable $rcv(key) - available inside event_route[core:msg-received] - get details of the received message - the key can be: * buf - received message * len - lenght of received message * srcip - source ip * rcvip - local ip where it was received * scrport - source port * rcvport - local port where it was received * proto - protocol as int id * sproto - protocol as string * af - address family --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_branch.c Modified: src/modules/pv/pv_branch.h --- Diff: https://github.com/kamailio/kamailio/commit/1fd9b508ccba3f52e68f04cd6e4580b… Patch: https://github.com/kamailio/kamailio/commit/1fd9b508ccba3f52e68f04cd6e4580b… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 0df9353606..24687d45a1 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -90,6 +90,8 @@ static pv_export_t mod_pvs[] = { pv_parse_snd_name, 0, 0, 0 }, { {"sndfrom", (sizeof("sndfrom")-1)}, PVT_OTHER, pv_get_sndfrom, 0, pv_parse_snd_name, 0, 0, 0 }, + { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0, + pv_parse_rcv_name, 0, 0, 0 }, #ifdef WITH_XAVP { {"xavp", sizeof("xavp")-1}, /* xavp */ PVT_XAVP, pv_get_xavp, pv_set_xavp, diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index b0668c07f8..8100046b94 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -533,6 +533,110 @@ int pv_parse_snd_name(pv_spec_p sp, str *in) return -1; } +int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + sr_net_info_t *neti = NULL; + str s; + + neti = ksr_evrt_rcvnetinfo_get(); + + if (neti==NULL || neti->rcv==NULL || neti->rcv->bind_address==NULL) + return pv_get_null(msg, param, res); + + switch(param->pvn.u.isname.name.n) + { + case 1: /* buf */ + s.s = neti->data.s; + s.len = neti->data.len; + return pv_get_strval(msg, param, res, &s); + case 2: /* len */ + return pv_get_uintval(msg, param, res, + (int)neti->data.len); + case 3: /* proto */ + return pv_get_uintval(msg, param, res, (int)neti->rcv->proto); + case 4: /* srcip */ + s.s = ip_addr2a(&neti->rcv->src_ip); + s.len = strlen(s.s); + return pv_get_strval(msg, param, res, &s); + case 5: /* rcvip */ + s.s = ip_addr2a(&neti->rcv->dst_ip); + s.len = strlen(s.s); + return pv_get_strval(msg, param, res, &s); + case 6: /* sproto */ + if(get_valid_proto_string((int)neti->rcv->proto, + 0, 0, &s)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &s); + case 7: /* srcport */ + return pv_get_uintval(msg, param, res, + (int)neti->rcv->src_port); + case 8: /* rcvport */ + return pv_get_uintval(msg, param, res, + (int)neti->rcv->dst_port); + default: + /* 0 - af */ + return pv_get_uintval(msg, param, res, + (int)neti->rcv->bind_address->address.af); + } + + return 0; +} + +int pv_parse_rcv_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 2: + if(strncmp(in->s, "af", 2)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 3: + if(strncmp(in->s, "buf", 3)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "len", 3)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else goto error; + break; + case 5: + if(strncmp(in->s, "proto", 5)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "srcip", 5)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "rcvip", 5)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + case 6: + if(strncmp(in->s, "sproto", 6)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else goto error; + break; + case 7: + if(strncmp(in->s, "srcport", 7)==0) + sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "rcvport", 7)==0) + sp->pvp.pvn.u.isname.name.n = 8; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV rcv name %.*s\n", in->len, in->s); + return -1; +} + int pv_get_nh(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_branch.h b/src/modules/pv/pv_branch.h index e69e785526..a83c98208b 100644 --- a/src/modules/pv/pv_branch.h +++ b/src/modules/pv/pv_branch.h @@ -40,6 +40,10 @@ int pv_get_sndfrom(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_parse_snd_name(pv_spec_p sp, str *in); +int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +int pv_parse_rcv_name(pv_spec_p sp, str *in); + int pv_get_nh(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_parse_nh_name(pv_spec_p sp, str *in);

1 0

git:master:01a02091: core: init actions context for running event_route[core:msg-received]
by Daniel-Constantin Mierla 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: 01a02091835651d8eccdba05887a4f2e6f8af725 URL: https://github.com/kamailio/kamailio/commit/01a02091835651d8eccdba05887a4f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-01T15:05:36+01:00 core: init actions context for running event_route[core:msg-received] --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/01a02091835651d8eccdba05887a4f2… Patch: https://github.com/kamailio/kamailio/commit/01a02091835651d8eccdba05887a4f2… --- diff --git a/src/core/receive.c b/src/core/receive.c index 7f677865cd..dd9248c721 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -200,6 +200,7 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) ksr_evrt_rcvnetinfo = &netinfo; set_route_type(REQUEST_ROUTE); fmsg = faked_msg_get_next(); + init_run_actions_ctx(&ra_ctx); if(keng) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ra_ctx);

1 0

git:master:bbcbd691: core: option to run event_route[core:msg-received] in incomming message
by Daniel-Constantin Mierla 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: bbcbd691ce86d58e56c7620e6b06093349bd549b URL: https://github.com/kamailio/kamailio/commit/bbcbd691ce86d58e56c7620e6b06093… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-01T12:55:41+01:00 core: option to run event_route[core:msg-received] in incomming message - done before any major SIP parsing - on drop, processing of the message is stopped - enable with received_route_mode=yes (or 1) - for kemi, set the callback name via kemi.received_route_callback param --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/ip_addr.h Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/bbcbd691ce86d58e56c7620e6b06093… Patch: https://github.com/kamailio/kamailio/commit/bbcbd691ce86d58e56c7620e6b06093…

1 0

git:master:99d5da8d: dialplan: basic safety for concurent rpc reload
by Daniel-Constantin Mierla 01 Mar '19

01 Mar '19

Module: kamailio Branch: master Commit: 99d5da8d595961063249f871a5d150474fa6f317 URL: https://github.com/kamailio/kamailio/commit/99d5da8d595961063249f871a5d1504… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-01T10:51:29+01:00 dialplan: basic safety for concurent rpc reload - reported by GH #1874 --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/99d5da8d595961063249f871a5d1504… Patch: https://github.com/kamailio/kamailio/commit/99d5da8d595961063249f871a5d1504… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index a96b246b72..d8685d52f2 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -88,6 +88,8 @@ int dp_fetch_rows = 1000; int dp_match_dynamic = 0; int dp_append_branch = 1; +static time_t *dp_rpc_reload_time = NULL; + static param_export_t mod_params[]={ { "db_url", PARAM_STR, &dp_db_url }, { "table_name", PARAM_STR, &dp_table_name }, @@ -185,6 +187,13 @@ static int mod_init(void) return -1; } + dp_rpc_reload_time = shm_malloc(sizeof(time_t)); + if(dp_rpc_reload_time == NULL) { + SHM_MEM_ERROR; + return -1; + } + *dp_rpc_reload_time = 0; + return 0; } @@ -202,6 +211,10 @@ static void mod_destroy(void) shm_free(default_par2); default_par2 = NULL; } + if(dp_rpc_reload_time!=NULL) { + shm_free(dp_rpc_reload_time); + dp_rpc_reload_time = 0; + } destroy_data(); } @@ -601,6 +614,17 @@ static const char* dialplan_rpc_reload_doc[2] = { */ static void dialplan_rpc_reload(rpc_t* rpc, void* ctx) { + if(dp_rpc_reload_time==NULL) { + LM_ERR("not ready for reload\n"); + rpc->fault(ctx, 500, "Not ready for reload"); + return; + } + if(*dp_rpc_reload_time!=0 && *dp_rpc_reload_time > time(NULL) - 5) { + LM_ERR("ongoing reload\n"); + rpc->fault(ctx, 500, "ongoing reload"); + return; + } + *dp_rpc_reload_time = time(NULL); if (dp_connect_db() < 0) { LM_ERR("failed to reload rules fron database (db connect)\n"); rpc->fault(ctx, 500, "DB Connection Error");

1 0