sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
306 discussions

git:5.2:75f743d9: usrloc: udomain_contact_expired_cb fix memory leak

by Victor Seva

Module: kamailio Branch: 5.2 Commit: 75f743d9501faaead7a173c8f459d4b2adfcb41d URL: https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-07T09:29:45+02:00 usrloc: udomain_contact_expired_cb fix memory leak We need to call release_urecord in order to free the ucontacts generated at get_urecord() on shared memory (cherry picked from commit 48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b… Patch: https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index c28c881790..11378aadee 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1019,7 +1019,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { LM_ERR("inserting contact failed\n"); - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); goto error; } @@ -1029,7 +1029,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) run_ul_callbacks( UL_CONTACT_EXPIRE, c); } c->state = CS_SYNC; - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); }

4 years, 11 months

[kamailio/kamailio] usrloc: udomain_contact_expired_cb fix memory leak (#1947)

by Victor Seva

#### 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 - [] Related to issue #XXXX (replace XXXX with an open issue number) #### Description 9757bb8c0e2fea5173f4fa3dd7798d61759f04af introduced a memory leak due to not cleaning all the ucontacts created at get_urecord() so every time that there are expired contacts in the db we will leave some ucontacts in shared mem and will be never free This only happens on DB_ONLY mode You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1947 -- Commit Summary -- * usrloc: udomain_contact_expired_cb fix memory leak -- File Changes -- M src/modules/usrloc/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1947.patch https://github.com/kamailio/kamailio/pull/1947.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/1947

4 years, 11 months

git:master:48fd1a23: usrloc: udomain_contact_expired_cb fix memory leak

by Victor Seva

Module: kamailio Branch: master Commit: 48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203 URL: https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-07T09:27:42+02:00 usrloc: udomain_contact_expired_cb fix memory leak We need to call release_urecord in order to free the ucontacts generated at get_urecord() on shared memory --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf… Patch: https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index c28c881790..11378aadee 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -1019,7 +1019,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) { LM_ERR("inserting contact failed\n"); - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); goto error; } @@ -1029,7 +1029,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) run_ul_callbacks( UL_CONTACT_EXPIRE, c); } c->state = CS_SYNC; - free_ucontact(c); + release_urecord(r); unlock_udomain(_d, &user); }

4 years, 11 months

git:master:db89b4ba: modules: readme files regenerated - dialplan ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: db89b4baca48c96df613d441703b63de3522e6d5 URL: https://github.com/kamailio/kamailio/commit/db89b4baca48c96df613d441703b63d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-06T16:31:53+02:00 modules: readme files regenerated - dialplan ... [skip ci] --- Modified: src/modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/db89b4baca48c96df613d441703b63d… Patch: https://github.com/kamailio/kamailio/commit/db89b4baca48c96df613d441703b63d… --- diff --git a/src/modules/dialplan/README b/src/modules/dialplan/README index c5bdaea8eb..3b89fbd7da 100644 --- a/src/modules/dialplan/README +++ b/src/modules/dialplan/README @@ -55,6 +55,7 @@ Luis Martin 5.12. fetch_rows (int) 5.13. match_dynamic (int) 5.14. append_branch (int) + 5.15. reload_delta (int) 6. Functions @@ -89,11 +90,12 @@ Luis Martin 1.12. Set fetch_rows parameter 1.13. Set match_dynamic parameter 1.14. Set append_branch parameter - 1.15. dp_replace usage - 1.16. dp_match usage - 1.17. dp_translate usage + 1.15. Set reload_delta parameter + 1.16. dp_replace usage + 1.17. dp_match usage 1.18. dp_translate usage - 1.19. Example of rules + 1.19. dp_translate usage + 1.20. Example of rules Chapter 1. Admin Guide @@ -123,6 +125,7 @@ Chapter 1. Admin Guide 5.12. fetch_rows (int) 5.13. match_dynamic (int) 5.14. append_branch (int) + 5.15. reload_delta (int) 6. Functions @@ -223,6 +226,7 @@ Chapter 1. Admin Guide 5.12. fetch_rows (int) 5.13. match_dynamic (int) 5.14. append_branch (int) + 5.15. reload_delta (int) 5.1. db_url (string) @@ -393,6 +397,23 @@ modparam("dialplan", "match_dynamic", 1) modparam("dialplan", "append_branch", 0) ... +5.15. reload_delta (int) + + The number of seconds that have to be waited before executing a new + reload of dialplan rules. By default there is a rate limiting of + maximum one reload in five seconds. + + If set to 0, no rate limit is configured. Note carefully: use this + configuration only in tests environments because executing two dialplan + reloads at the same time can cause to kamailio to crash. + + Default value is “5”. + + Example 1.15. Set reload_delta parameter +... +modparam("dialplan", "reload_delta", 1) +... + 6. Functions 6.1. dp_replace(dpid, inval, outvar) @@ -423,7 +444,7 @@ modparam("dialplan", "append_branch", 0) This function can be used from ANY_ROUTE. - Example 1.15. dp_replace usage + Example 1.16. dp_replace usage ... dp_replace("240", "$rU", "$var(newru)"); xlog("'$rU' was translated to '$var(newru)'\n"); @@ -450,7 +471,7 @@ dp_replace("240", "+49$rU", "$var(newval)"); This function can be used from ANY_ROUTE. - Example 1.16. dp_match usage + Example 1.17. dp_match usage ... dp_match("240", "+49$rU"); xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); @@ -491,13 +512,13 @@ xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); This function can be used from ANY_ROUTE. - Example 1.17. dp_translate usage + Example 1.18. dp_translate usage ... dp_translate("240", "$ruri.user/$avp(s:dest)"); xlog("translated to var $avp(s:dest) \n"); ... - Example 1.18. dp_translate usage + Example 1.19. dp_translate usage ... $avp(s:src) = $ruri.user; dp_translate("$var(x)", "$avp(s:src)/$var(y)"); @@ -507,7 +528,8 @@ xlog("translated to var $var(y) \n"); 6.4. dp_reload() Reload the translation rules from the database. Note that there is a - rate limiting of maximum one reload in five seconds. + rate limiting defined by 'reload_delta' paramenter. By default is + allowed maximum one reload in five seconds. Name: dp_reload @@ -571,7 +593,7 @@ xlog("translated to var $var(y) \n"); Some sample records from a dialplan table are presented in the next figure. - Example 1.19. Example of rules + Example 1.20. Example of rules ... dpid: 1 pr: 1

4 years, 12 months

[kamailio/kamailio] dialplan: add reload_delta parameter (#1946)

by Marco Capetta

#### 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  In commit 99d5da8d595961063249f871a5d150474fa6f317 a mechanism for basic safety in case of concurent rpc reload were added. This works fine but it is limiting our test scenarios where multiple changes should happen quickly. The new dialplan paramenter reload_delta allows everyone to configure rpc reload rate limit to the preferred number of seconds. In case the parameter is not specified. the default value is 5 seconds. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1946 -- Commit Summary -- * dialplan: add reload_delta parameter -- File Changes -- M src/modules/dialplan/dialplan.c (7) M src/modules/dialplan/doc/dialplan_admin.xml (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1946.patch https://github.com/kamailio/kamailio/pull/1946.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/1946

4 years, 12 months

git:master:926a97f4: dialplan: add reload_delta parameter

by Victor Seva

Module: kamailio Branch: master Commit: 926a97f4eb741401b193fb711e6c439555c646ab URL: https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-05-06T16:29:48+02:00 dialplan: add reload_delta parameter - make the rate limit of maximum allowed dialplan reload configurable using the new 'reload_delta' paramenter. --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439… Patch: https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index d8685d52f2..20b7744e21 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -87,6 +87,7 @@ dp_param_p default_par2 = NULL; int dp_fetch_rows = 1000; int dp_match_dynamic = 0; int dp_append_branch = 1; +int dp_reload_delta = 5; static time_t *dp_rpc_reload_time = NULL; @@ -105,6 +106,7 @@ static param_export_t mod_params[]={ { "fetch_rows", PARAM_INT, &dp_fetch_rows }, { "match_dynamic", PARAM_INT, &dp_match_dynamic }, { "append_branch", PARAM_INT, &dp_append_branch }, + { "reload_delta", PARAM_INT, &dp_reload_delta }, {0,0,0} }; @@ -182,6 +184,9 @@ static int mod_init(void) if(dp_fetch_rows<=0) dp_fetch_rows = 1000; + if(dp_reload_delta<0) + dp_reload_delta = 5; + if(init_data() != 0) { LM_ERR("could not initialize data\n"); return -1; @@ -619,7 +624,7 @@ static void dialplan_rpc_reload(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Not ready for reload"); return; } - if(*dp_rpc_reload_time!=0 && *dp_rpc_reload_time > time(NULL) - 5) { + if(*dp_rpc_reload_time!=0 && *dp_rpc_reload_time > time(NULL) - dp_reload_delta) { LM_ERR("ongoing reload\n"); rpc->fault(ctx, 500, "ongoing reload"); return; diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index 371120fac4..e524524fb8 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -410,6 +410,33 @@ modparam("dialplan", "append_branch", 0) </example> </section> + <section id="dialplan.p.reload_delta"> + <title><varname>reload_delta</varname> (int)</title> + <para> + The number of seconds that have to be waited before executing a new reload + of dialplan rules. By default there is a rate limiting of maximum one reload + in five seconds. + </para> + <para> + If set to 0, no rate limit is configured. Note carefully: use this configuration + only in tests environments because executing two dialplan reloads at the same + time can cause to kamailio to crash. + </para> + <para> + <emphasis> + Default value is <quote>5</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reload_delta</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialplan", "reload_delta", 1) +... + </programlisting> + </example> + </section> + </section> @@ -620,8 +647,9 @@ xlog("translated to var $var(y) \n"); <function moreinfo="none">dp_reload()</function> </title> <para> - Reload the translation rules from the database. Note that there is - a rate limiting of maximum one reload in five seconds. + Reload the translation rules from the database. Note that there is a + rate limiting defined by 'reload_delta' paramenter. By default is allowed + maximum one reload in five seconds. </para> <para> Name: <emphasis>dp_reload</emphasis>

4 years, 12 months

git:master:02d67f80: rtp_media_server: fix incompatible media format

by Julien Chavanton

Module: kamailio Branch: master Commit: 02d67f80580ca813b98198dcd408c3fcf0b7976a URL: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-05-05T19:25:04Z rtp_media_server: fix incompatible media format --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… Patch: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index f312cff298..4b1d8269b4 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -25,6 +25,7 @@ extern int in_rms_process; static void rms_action_free(rms_dialog_info_t *si) { rms_action_t *a, *tmp; + if (!si->action.prev) return; clist_foreach(&si->action, a, next) { tmp = a; diff --git a/src/modules/rtp_media_server/rms_sdp.c b/src/modules/rtp_media_server/rms_sdp.c index 304fee2b9c..55277987b4 100644 --- a/src/modules/rtp_media_server/rms_sdp.c +++ b/src/modules/rtp_media_server/rms_sdp.c @@ -186,7 +186,7 @@ PayloadType *rms_sdp_check_payload(rms_sdp_info_t *sdp) char *payloads = sdp->payloads.s; char *payload_type_number = strtok(payloads, " "); if(!payload_type_number) { - payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } pt->type = atoi(payload_type_number); @@ -225,7 +225,7 @@ PayloadType *rms_sdp_check_payload(rms_sdp_info_t *sdp) break; payload_type_number = strtok(NULL, " "); if(!payload_type_number) { - payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } pt->type = atoi(payload_type_number);

4 years, 12 months

git:master:e4af8e5a: rtp_media_server: adding docker files

by Julien Chavanton

Module: kamailio Branch: master Commit: e4af8e5a205342dd309493a7bdd1e2cd9335c881 URL: https://github.com/kamailio/kamailio/commit/e4af8e5a205342dd309493a7bdd1e2c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-05-05T18:54:55Z rtp_media_server: adding docker files --- Added: src/modules/rtp_media_server/docker/Dockerfile Added: src/modules/rtp_media_server/docker/build.sh Added: src/modules/rtp_media_server/docker/rtp_media_server.sh Modified: src/modules/rtp_media_server/config_example/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e4af8e5a205342dd309493a7bdd1e2c… Patch: https://github.com/kamailio/kamailio/commit/e4af8e5a205342dd309493a7bdd1e2c…

4 years, 12 months

[kamailio/kamailio] KEMI: KSR.htable.sht_reset segfaults on 5.2.2 (#1941)

by gormania

### Description Resetting an htable from kemi causes a segfault. ```python KSR.htable.sht_reset(self._htable) ``` ### Troubleshooting #### Reproduction  #### Debugging Data ``` #0 0x00007f466dad1c06 in core_case_hash (s1=0x7f4672556ec8, s2=0x0, size=0) at ../../core/hashes.h:317 #1 0x00007f466dad3731 in ht_get_table (name=0x7f4672556ec8) at ht_api.c:240 #2 0x00007f466daeabf4 in ht_reset_by_name (hname=0x7f4672556ec8) at htable.c:669 #3 0x00007f466ed83515 in sr_apy_kemi_exec_func_ex (ket=0x7f466dd0f730 <sr_kemi_htable_exports+144>, self=0x0, args=0x7f4673504b10, idx=303) at apy_kemi.c:438 #4 0x00007f466ed87633 in sr_apy_kemi_exec_func (self=0x0, args=0x7f4673504b10, idx=303) at apy_kemi.c:692 #5 0x00007f466ed706ad in sr_apy_kemi_exec_func_303 (self=0x0, args=0x7f4673504b10) at apy_kemi_export.c:2467 #6 0x00007f466e854091 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #7 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #8 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #9 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #10 0x00007f466e852390 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #11 0x00007f466e9bb29c in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #12 0x00007f466e90f76d in ?? () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #13 0x00007f466e8a75c3 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #14 0x00007f466e84f247 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #15 0x00007f466e9bb29c in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #16 0x00007f466e90f670 in ?? () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #17 0x00007f466e8a75c3 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #18 0x00007f466e964dfc in ?? () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #19 0x00007f466e8a75c3 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #20 0x00007f466e9ba6c7 in PyEval_CallObjectWithKeywords () from /usr/lib/x86_64-linux-gnu/libpython2.7.so.1.0 #21 0x00007f466eda041f in apy_exec (_msg=0x7f4672556ec8, fname=0x560e4d8eadf8 "ksr_reply_route", fparam=0x0, emode=0) at python_exec.c:145 #22 0x00007f466ed781ae in sr_kemi_config_engine_python (msg=0x7f4672556ec8, rtype=128, rname=0x0, rparam=0x0) at apy_kemi.c:67 #23 0x0000560e4d5fb64c in sr_kemi_route (keng=0x560e4dbdcf60 <_sr_kemi_eng_list>, msg=0x7f4672556ec8, rtype=128, ename=0x0, edata=0x0) at core/kemi.c:2421 #24 0x0000560e4d6d7c57 in receive_msg (buf=0x560e4ed34d30 "SIP/2.0 200 OK\r\nRecord-Route: <sip:sipcore;transport=tcp;lr;nat=yes>\r\nVia: SIP/2.0/TCP 172.16.214.19:5060;rport=41056;received=172.28.1.4;branch=z9hG4bK4c66.ff59d957", '0' <repeats 24 times>, ".0\r\nTo: <si"..., len=515, rcv_info=0x7f46694cc418) at core/receive.c:408 #25 0x0000560e4d776eb5 in receive_tcp_msg ( tcpbuf=0x7f46694cc6f8 "SIP/2.0 200 OK\r\nRecord-Route: <sip:sipcore;transport=tcp;lr;nat=yes>\r\nVia: SIP/2.0/TCP 172.16.214.19:5060;rport=41056;received=172.28.1.4;branch=z9hG4bK4c66.ff59d957", '0' <repeats 24 times>, ".0\r\nTo: <si"..., len=515, rcv_info=0x7f46694cc418, con=0x7f46694cc400) at core/tcp_read.c:1448 #26 0x0000560e4d779192 in tcp_read_req (con=0x7f46694cc400, bytes_read=0x7fff72893524, read_flags=0x7fff7289352c) at core/tcp_read.c:1631 #27 0x0000560e4d77cdb9 in handle_io (fm=0x7f4672544500, events=1, idx=-1) at core/tcp_read.c:1862 #28 0x0000560e4d7696ad in io_wait_loop_epoll (h=0x560e4dc371a0 <io_w>, t=2, repeat=0) at core/io_wait.h:1065 #29 0x0000560e4d77e18f in tcp_receive_loop (unix_sock=22) at core/tcp_read.c:1974 #30 0x0000560e4d6503b3 in tcp_init_children () at core/tcp_main.c:4853 #31 0x0000560e4d54a86d in main_loop () at main.c:1745 #32 0x0000560e4d55199d in main (argc=5, argv=0x7fff72893bc8) at main.c:2696 ``` ``` (gdb) frame #2 0x00007f466daeabf4 in ht_reset_by_name (hname=0x7f4672556ec8) at htable.c:669 669 ht = ht_get_table(hname); (gdb) list 664 } 665 666 static int ht_reset_by_name(str *hname) 667 { 668 ht_t *ht; 669 ht = ht_get_table(hname); 670 if(ht==NULL) { 671 LM_ERR("cannot get hash table [%.*s]\n", hname->len, hname->s); 672 return -1; 673 } (gdb) p hname hname hname_data hname_fixup (gdb) p hname. len s (gdb) p hname.len $10 = 1556597679 (gdb) p hname.s $11 = 0x720000000c <error: Cannot access memory at address 0x720000000c> ``` #### Log Messages  ``` May 1 10:18:56 ws3171 lmrncf[1893]: 0(1) INFO: <core> [main.c:772]: handle_sigs(): SIGCHLD received, but no child has stopped, ignoring it May 1 10:18:56 ws3171 lmrncf[1893]: 6(110) INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) May 1 10:18:59 ws3171 lmrncf[1893]: 7(111) INFO: [Media] Media connected to ('172.28.1.8', 53350) May 1 10:19:03 ws3171 lmrncf[1893]: 10(114) INFO: {1 1 REGISTER MLqF3GJQD6ZcDgNvd4clLg..} [LMR] Registered gateway IP: 172.16.195.127 May 1 10:19:03 ws3171 lmrncf[1893]: 10(114) INFO: {1 1 REGISTER MLqF3GJQD6ZcDgNvd4clLg..} <core> [core/tcp_main.c:2703]: tcpconn_1st_send(): quick connect for 0x7f2bf92a59e0 May 1 10:19:03 ws3171 lmrncf[1893]: 11(115) ERROR: {2 10 SUBSCRIBE 358eceb71627d8e0-114(a)172.28.1.4} [PoC] Subscribe failed with code 404 May 1 10:19:03 ws3171 lmrncf[1893]: 11(115) ERROR: {2 10 SUBSCRIBE 358eceb71627d8e0-114(a)172.28.1.4} crumb 1 May 1 10:19:03 ws3171 lmrncf[1893]: 11(115) ERROR: {2 10 SUBSCRIBE 358eceb71627d8e0-114(a)172.28.1.4} crumb -- hmmm here goes reset -- affiliation_groups May 1 10:19:03 ws3171 lmrncf[1893]: 12(116) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 20 May 1 10:19:03 ws3171 lmrncf[1893]: 0(1) ALERT: <core> [main.c:755]: handle_sigs(): child process 115 exited by a signal 11 May 1 10:19:03 ws3171 lmrncf[1893]: 0(1) ALERT: <core> [main.c:758]: handle_sigs(): core was generated May 1 10:19:03 ws3171 lmrncf[1893]: 0(1) INFO: <core> [main.c:781]: handle_sigs(): terminating due to SIGCHLD ``` ### Possible Solutions  It appears that because the kemi htable jump-table references `ht_reset_by_name` (without `ki_` prefix) for `sht_reset` it will be called with `msg` as first argument but `ht_reset_by_name` doesn't accept msg context at all -- its only argument is the name of the htable of interest. ```c++ static sr_kemi_t sr_kemi_htable_exports[] = { { str_init("htable"), str_init("sht_lock"), SR_KEMIP_INT, ki_ht_slot_lock, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_unlock"), SR_KEMIP_INT, ki_ht_slot_unlock, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_reset"), SR_KEMIP_INT, ht_reset_by_name, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_iterator_start"), SR_KEMIP_INT, ki_ht_iterator_start, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_iterator_next"), SR_KEMIP_INT, ki_ht_iterator_next, ``` ```c++ static int ht_reset_by_name(str *hname); ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamcmd 1.5 Copyright 2006 iptelorg GmbH This is free software with ABSOLUTELY NO WARRANTY. For details type `warranty'. kamcmd> ver kamailio 5.2.2 (x86_64/linux) kamcmd> ``` * **Operating System**:  ``` Linux b8af694f9887 4.15.0-47-generic #50-Ubuntu SMP Wed Mar 13 10:44:52 UTC 2019 x86_64 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/1941

4 years, 12 months

git:5.2:e05a3f30: htable: fix export of kemi sht_reset()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: e05a3f30986244d1a1bdbefda63278416b8aa2af URL: https://github.com/kamailio/kamailio/commit/e05a3f30986244d1a1bdbefda632784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-05T08:08:43+02:00 htable: fix export of kemi sht_reset() - GH #1941 (cherry picked from commit 5b9fb55b6697bf3cd16727110a4b4bcb8350357d) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/e05a3f30986244d1a1bdbefda632784… Patch: https://github.com/kamailio/kamailio/commit/e05a3f30986244d1a1bdbefda632784… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index b35397f752..e48d1d4415 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -677,6 +677,11 @@ static int ht_reset_by_name(str *hname) } +static int ki_ht_reset_by_name(sip_msg_t* msg, str *hname) +{ + return ht_reset_by_name(hname); +} + static int ht_reset(struct sip_msg* msg, char* htname, char* foo) { str sname; @@ -1611,7 +1616,7 @@ static sr_kemi_t sr_kemi_htable_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("htable"), str_init("sht_reset"), - SR_KEMIP_INT, ht_reset_by_name, + SR_KEMIP_INT, ki_ht_reset_by_name, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

4 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019