sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

by Georgi Rosenov Stefanov

Hi Henning, At first I want to thanks you for reading my post :) Actually I tried to use DEBUG logs, but nothing ..... So I put an "abort()" :) into cxdx_send_sar, so I am able to track one successful test case. Here is the backtrace: #2 0x00007fcb469c12f7 in cxdx_send_sar (msg=0x7fcb4d66a968, public_identity=..., private_identity=..., server_name=..., assignment_type=1, data_available=0, transaction_data=0x7fcb3e455610) at cxdx_sar.c:328 #3 0x00007fcb469c3815 in scscf_assign_server (msg=0x7fcb4d66a968, public_identity=..., private_identity=..., assignment_type=1, data_available=0, transaction_data=0x7fcb3e455610) at server_assignment.c:88 #4 0x00007fcb469ba42f in save (msg=0x7fcb4d66a968, str1=0x7fcb3e423158 "X0B>\313\177", route=0x7fcb4d6656e0 " 3]M\313\177") at save.c:1438 #5 0x00007fcb469cce2a in w_save (_m=0x7fcb4d66a968, _route=0x7fcb4d6656e0 " 3]M\313\177", _d=0x7fcb3e423158 "X0B>\313\177", mode=0x7fcb4d66a968 "\001", _cflags=0x0) at ims_registrar_scscf_mod.c:623 #6 0x000000000047c5c9 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5d2f80, msg=0x7fcb4d66a968) at core/action.c:1085 #7 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d5d2be8, msg=0x7fcb4d66a968) at core/action.c:1578 #8 0x000000000047c422 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5d4010, msg=0x7fcb4d66a968) at core/action.c:1064 #9 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d5d4010, msg=0x7fcb4d66a968) at core/action.c:1578 #10 0x000000000047c470 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5d4160, msg=0x7fcb4d66a968) at core/action.c:1068 #11 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d5c4d00, msg=0x7fcb4d66a968) at core/action.c:1578 #12 0x0000000000478ed9 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d573058, msg=0x7fcb4d66a968) at core/action.c:697 #13 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d573058, msg=0x7fcb4d66a968) at core/action.c:1578 #14 0x000000000047c422 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5732f8, msg=0x7fcb4d66a968) at core/action.c:1064 #15 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d571ea0, msg=0x7fcb4d66a968) at core/action.c:1578 #16 0x0000000000489803 in run_top_route (a=0x7fcb4d571ea0, msg=0x7fcb4d66a968, c=0x0) at core/action.c:1663 #17 0x00000000005b510e in receive_msg ( buf=0xa95500 <buf.6971> "REGISTER sip: scscf.mnc001.mcc001.3gppnetwork.org:6060 SIP/2.0\r\nVia: SIP/2.0/UDP 10.82.10.145:4060;branch=z9hG4bKe025.079fd766789513e3068d0dce7e1853f3.0\r\nVia: SIP/2.0/UDP 10.82.10.145;branch=z9hG4bKe02"..., len=1085, rcv_info=0x7ffd2e6d8490) at core/receive.c:424 #18 0x00000000004bc624 in udp_rcv_loop () at core/udp_server.c:548 So w_save is called from pcscf_save("location") from /usr/local/etc/kamailio/pcscf/route/register.cfg and save("PRE_REG_SAR_REPLY","location") or save("REG_SAR_REPLY","location"); from /usr/local/etc/kamailio/scscf/kamailio.cfg So I put err log messages(err to be clearly visible ) and then using "journal | grep "my string" -c I count how many times the SAR is triggered Then I count how many SAR messages a sent and the numbers mismatch

4 years, 5 months

[kamailio/kamailio] cnxcc: when credit reach the limit non confirmed calls of the same customer fail to terminate (#2346)

by Victor Seva

### Description when credit reach the limit non confirmed calls of the same customer fail to terminate #### Reproduction Sending a call of the same customer while there's another call of the same customer consuming all the quota assigned to it. #### Log Messages first call ``[450708880-22683-45(a)BAA.BAE.BJF.BDF]`` established: ``` Jun 3 12:05:39 kamailio[21658]: DEBUG: cnxcc [cnxcc_mod.c:446]: __dialog_created_callback(): Flag is not set for this message. Ignoring Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1583]: ki_set_max_credit(): Setting up new call for client [zs_00000], max-credit[1.000000], connect-cost[0.000000], cost-per-sec[0.100000], initial-pulse [1], final-pulse [1], call-id[450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1521]: set_ctrl_flag(): Flag set! Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1183]: __get_or_create_credit_data_entry(): Credit entry didn't exist. Allocated new entry [0x7f508161ed40] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1312]: __alloc_new_call_by_money(): New call allocated for client [zs_00000] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:450]: __dialog_created_callback(): Dialog created for CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:758]: __setup_billing(): Creating dialog for [450708880-22683-45(a)BAA.BAE.BJF.BDF], h_id [4406], h_entry [1215] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:797]: __setup_billing(): Call [450708880-22683-45(a)BAA.BAE.BJF.BDF] from client [zs_00000], created Jun 3 12:05:48 kamailio[21657]: DEBUG: cnxcc [cnxcc_mod.c:464]: __dialog_confirmed_callback(): Dialog confirmed for CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:48 kamailio[21657]: DEBUG: cnxcc [cnxcc_mod.c:811]: __start_billing(): Billing started for call [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:48 kamailio[21657]: DEBUG: cnxcc [cnxcc_mod.c:927]: __start_billing(): Call [450708880-22683-45(a)BAA.BAE.BJF.BDF] from client [zs_00000], confirmed. from=<sip:zs_pruebas201@pepelux.zoonsuite.com>;tag=1931637637, to=<sip:anonymous@pepelux.zoonsuite.com>;tag=as7138b4b8 Jun 3 12:05:48 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [0], consumed credit [0.100000] Jun 3 12:05:48 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.100000/1.000000 Jun 3 12:05:49 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [1], consumed credit [0.100000] Jun 3 12:05:49 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.100000/1.000000 Jun 3 12:05:50 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [2], consumed credit [0.300000] Jun 3 12:05:50 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.300000/1.000000 ``` Second call ``[d85f4ff9c923c9ea]``, first one is alive and consuming: ``` Jun 3 12:05:50 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:446]: __dialog_created_callback(): Flag is not set for this message. Ignoring Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1583]: ki_set_max_credit(): Setting up new call for client [zs_00000], max-credit[1.000000], connect-cost[0.000000], cost-per-sec[0.100000], initial-pulse [1], final-pulse [1], call-id[d85f4ff9c923c9ea] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1521]: set_ctrl_flag(): Flag set! Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1164]: __get_or_create_credit_data_entry(): Found key zs_00000 in hash table Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1312]: __alloc_new_call_by_money(): New call allocated for client [zs_00000] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:450]: __dialog_created_callback(): Dialog created for CID [d85f4ff9c923c9ea] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:758]: __setup_billing(): Creating dialog for [d85f4ff9c923c9ea], h_id [1000], h_entry [1526] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:797]: __setup_billing(): Call [d85f4ff9c923c9ea] from client [zs_00000], created ``` first call ``[450708880-22683-45(a)BAA.BAE.BJF.BDF]`` will consume all the customer credit and trigger ``terminate_all_calls`` : ``` Jun 3 12:05:51 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [3], consumed credit [0.400000] Jun 3 12:05:51 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.400000/1.000000 Jun 3 12:05:52 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [4], consumed credit [0.500000] Jun 3 12:05:52 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.500000/1.000000 Jun 3 12:05:53 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [5], consumed credit [0.600000] Jun 3 12:05:53 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.600000/1.000000 Jun 3 12:05:54 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [6], consumed credit [0.700000] Jun 3 12:05:54 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.700000/1.000000 Jun 3 12:05:55 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [7], consumed credit [0.800000] Jun 3 12:05:55 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.800000/1.000000 Jun 3 12:05:56 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [8], consumed credit [0.900000] Jun 3 12:05:56 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.900000/1.000000 Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [9], consumed credit [1.000000] Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 1.000000/1.000000 Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:974]: terminate_all_calls(): Killing call with CID [d85f4ff9c923c9ea] ``` second ``[d85f4ff9c923c9ea]`` non-confirmed call doesn't have call->from_uri, call->from_tag, call->to_uri, call->to_tag so...: ``` Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1095]: terminate_call(): Got kill signal for call [d85f4ff9c923c9ea] client [zs_00000] h_id [1000] h_entry [1526]. Dropping it now Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_sip_msg_faker.c:48]: cnxcc_faked_msg_init_with_dlg_info(): fake msg:#012OPTIONS sip:you@kamailio.org SIP/2.0#015#012Via: SIP/2.0/UDP 127.0.0.1#015#012From: <>;tag=#015#012To: <>;tag=#015#012Call-ID: d85f4ff9c923c9ea#015#012CSeq: 1 OPTIONS#015#012Content-Length: 0 Jun 3 12:05:57 kamailio[21673]: ERROR: <core> [core/parser/parse_addr_spec.c:739]: parse_addr_spec(): unexpected char [>] in status 5: [<] . Jun 3 12:05:57 kamailio[21673]: ERROR: <core> [core/parser/msg_parser.c:164]: get_hdr_field(): bad to header Jun 3 12:05:57 kamailio[21673]: ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: <>;tag=#015#012Call-ID: d85f4ff9c923c9ea#015#012CSeq: 1 OPTIONS#015#012Content-Length: 0#015#012#015#012] Jun 3 12:05:57 kamailio[21673]: ERROR: dialog [dlg_handlers.c:709]: pre_match_parse(): bad request or missing CALLID/TO hdr :-/ Jun 3 12:05:57 kamailio[21673]: ERROR: cnxcc [cnxcc_mod.c:1112]: terminate_call(): [d85f4ff9c923c9ea]: cannot get dialog Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1029]: __free_call(): Freeing call [d85f4ff9c923c9ea] ``` but the call ``[d85f4ff9c923c9ea]`` is been freed. The first call ``[450708880-22683-45(a)BAA.BAE.BJF.BDF]`` is been terminated properly and freed ``` Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:974]: terminate_all_calls(): Killing call with CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1095]: terminate_call(): Got kill signal for call [450708880-22683-45(a)BAA.BAE.BJF.BDF] client [zs_00000] h_id [4406] h_entry [1215]. Dropping it now Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_sip_msg_faker.c:48]: cnxcc_faked_msg_init_with_dlg_info(): fake msg:#012OPTIONS sip:you@kamailio.org SIP/2.0#015#012Via: SIP/2.0/UDP 127.0.0.1#015#012From: <sip:zs_pruebas201@pepelux.zoonsuite.com>;tag=1931637637#015#012To: <sip:anonymous@pepelux.zoonsuite.com>;tag=as7138b4b8#015#012Call-ID: 450708880-22683-45(a)BAA.BAE.BJF.BDF#015#012CSeq: 1 OPTIONS#015#012Content-Length: 0 Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:473]: __dialog_terminated_callback(): Dialog terminated for CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:656]: __stop_billing(): Call [450708880-22683-45(a)BAA.BAE.BJF.BDF] of client-ID [zs_00000], ended Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1117]: terminate_call(): dlg_end_dlg sent to call [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:57 kamailio[21673]: INFO: <script>: [450708880-22683-45(a)BAA.BAE.BJF.BDF]: call killed zs_pruebas201->anonymous ... No credit available Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1029]: __free_call(): Freeing call [450708880-22683-45(a)BAA.BAE.BJF.BDF] ``` second call ``[d85f4ff9c923c9ea]`` is confirmed but call info was already freed ``` Jun 3 12:06:03 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:464]: __dialog_confirmed_callback(): Dialog confirmed for CID [d85f4ff9c923c9ea] Jun 3 12:06:03 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:811]: __start_billing(): Billing started for call [d85f4ff9c923c9ea] Jun 3 12:06:03 kamailio[21660]: ERROR: cnxcc [cnxcc_mod.c:819]: __start_billing(): Call [d85f4ff9c923c9ea] not found ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` kamailio master with #2343 applied -- 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/2346

4 years, 5 months

[kamailio/kamailio] cnxcc: don't terminate non confirmed calls (#2347)

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 - [x] Related to issue #2346 #### Description * non confirmed calls can't be terminated via dialog.terminate_dlg() API * set call.max_amount to 0 to terminate the call if gets confirmed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2347 -- Commit Summary -- * cnxcc: don't terminate non confirmed calls -- File Changes -- M src/modules/cnxcc/cnxcc_mod.c (249) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2347.patch https://github.com/kamailio/kamailio/pull/2347.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/2347

4 years, 5 months

git:master:ca0fc18e: cnxcc: don't terminate non confirmed calls

by Victor Seva

Module: kamailio Branch: master Commit: ca0fc18e1cfad86ed6b7530d6c520b680e5d6a4f URL: https://github.com/kamailio/kamailio/commit/ca0fc18e1cfad86ed6b7530d6c520b6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-04T11:12:13+02:00 cnxcc: don't terminate non confirmed calls * non confirmed calls can't be terminated via dialog.terminate_dlg() API * set call.max_amount to 0 to terminate the call if gets confirmed fix #2346 --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ca0fc18e1cfad86ed6b7530d6c520b6… Patch: https://github.com/kamailio/kamailio/commit/ca0fc18e1cfad86ed6b7530d6c520b6…

4 years, 5 months

[kamailio/kamailio] cnxcc: minor changes (#2343)

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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally  #### Description Still WIP * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * add cnxcc to lgtm build You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2343 -- Commit Summary -- * cnxcc: minor changes -- File Changes -- M .lgtm.yml (3) M src/modules/cnxcc/cnxcc_mod.c (61) M src/modules/cnxcc/cnxcc_redis.c (29) M src/modules/cnxcc/cnxcc_rpc.c (30) M src/modules/cnxcc/cnxcc_sip_msg_faker.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2343.patch https://github.com/kamailio/kamailio/pull/2343.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/2343

4 years, 5 months

git:master:e98457fa: cnxcc: minor changes

by Victor Seva

Module: kamailio Branch: master Commit: e98457faf2098ca2f16a831a4a68d2a26e301b0a URL: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-04T11:09:17+02:00 cnxcc: minor changes * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * add cnxcc to lgtm build * use localtime_r() for a safer multi-thread usage * replaced deprecated STR_PARAM with PARAM_STR * clean includes * clang-format --- Modified: .lgtm.yml Modified: src/modules/cnxcc/cnxcc.c Modified: src/modules/cnxcc/cnxcc.h Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/cnxcc_redis.c Modified: src/modules/cnxcc/cnxcc_rpc.c Modified: src/modules/cnxcc/cnxcc_rpc.h Modified: src/modules/cnxcc/cnxcc_select.c Modified: src/modules/cnxcc/cnxcc_select.h Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.h --- Diff: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a… Patch: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a…

4 years, 5 months

git:master:be57be33: pdb: use memcpy() for PDB_BUFTOSHORT macro

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: be57be33d0e48d412ddab9801ee4d6d906329d70 URL: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T21:46:20+02:00 pdb: use memcpy() for PDB_BUFTOSHORT macro - related to GH #2345 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… Patch: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 1ab15af2e7..5fb1204e52 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -190,7 +190,7 @@ static int pdb_msg_format_send(struct pdb_msg *msg, /* two chars to short-int without caring of memory alignment in char buffer */ -#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) +#define PDB_BUFTOSHORT(_sv, _b, _n) memcpy(&(_sv), (char*)(_b) + (_n), sizeof(short int)) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -347,7 +347,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, msg.bdy.payload, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } @@ -370,7 +370,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, buf, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; }

4 years, 5 months

missing SAR messages

by Georgi Rosenov Stefanov

Hi All, I am experimenting with Kamailio 5.3.3 as an IMS and I am trying to do load tests I am using SIPp to generate SIP.REGISTER and MariaDB and a DIAMETER tool ( seagull) For now I achieved registrations with "speed" 200 per/sec. When I send SIP.REGISTER faster(let's say 500 per/sec) I see some SARs missing, not sent at all. I start debugging and found that cxdx_send_sar is responsible to creating SAR message. I put my debug message in it. The strange thing: there is a mismatch of my debug message (cxdx_send_sar invocation) and real SAR send over the network. What is the thing I missing ? Is there anything else responsible for SAR creating except cxdx_send_sar ? Did someone made similar tests ? my test machine is Centos 7 with 3.10.0 Intel(R) Core(TM) i7-9700K CPU @ 3.60GHz 16G RAM During this tests I see kamailio very low CPU usage, even when I push it with 500/sec The biggest CPU load is in MariaDB, but I do not have issues with UAR and MAR

4 years, 5 months

[kamailio/kamailio] warning cleanup (#2298)

by sergey-safarov

**ld_fld.c:273** implicit-function-declaration ``` CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_con.o CC (gcc) [M db2_ldap.so] ld_fld.o ld_fld.c: In function 'ldap_gentime2db_datetime': ld_fld.c:273:10: warning: implicit declaration of function 'timelocal' [-Wimplicit-function-declaration] 273 | *dst = timelocal(&time); | ^~~~~~~~~ CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_uri.o make[3]: 'libsrdb2.so.1.0' is up to date. ``` **redis_table.c:586** maybe-uninitialized ``` CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o CC (gcc) [M db_redis.so] redis_table.o redis_table.c: In function 'db_redis_parse_keys': redis_table.c:586:38: warning: 'table' may be used uninitialized in this function [-Wmaybe-uninitialized] 586 | table->types = type_target = type; | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so ``` **app_python** strict-aliasing ``` CC (gcc) [M app_python.so] app_python_mod.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/Python.h:83, from apy_kemi.c:25: apy_kemi.c: In function 'sr_kemi_apy_return_true': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:121:2: note: in expansion of macro 'Py_INCREF' 121 | Py_INCREF(Py_True); | ^~~~~~~~~ apy_kemi.c: In function 'sr_kemi_apy_return_false': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:130:2: note: in expansion of macro 'Py_INCREF' 130 | Py_INCREF(Py_False); | ^~~~~~~~~ CC (gcc) [M app_python.so] apy_kemi_export.o CC (gcc) [M app_python.so] mod_Core.o ``` **pdb.c:348** address-of-packed-member] ``` LD (gcc) [M p_usrloc.so] p_usrloc.so CC (gcc) [M path.so] path.o CC (gcc) [M path.so] path_mod.o LD (gcc) [M path.so] path.so CC (gcc) [M pdb.so] pdb.o pdb.c: In function 'pdb_query': pdb.c:348:60: warning: taking address of packed member of 'struct pdb_msg' may result in an unaligned pointer value [-Waddress-of-packed-member] 348 | _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ | ^~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M pdb.so] pdb.so CC (gcc) [M pdt.so] pdt.o CC (gcc) [M pdt.so] pdtree.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2298

4 years, 5 months

git:master:4deb5141: core: tcp - log details of the exiting tcp connection on insert failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4deb51419ab66931459709fe44acd3e7a0acc18d URL: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T12:45:05+02:00 core: tcp - log details of the exiting tcp connection on insert failure --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Patch: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8147951b21..db6e8b923a 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1720,7 +1720,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * idx - index in the fd_array (or -1 if not known) * return: -1 on error, or when we are not interested any more on reads * from this fd (e.g.: we are closing it ) - * 0 on EAGAIN or when by some other way it is known that no more + * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). * Usefull to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. @@ -1728,7 +1728,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * queued -- the receive buffer might still be non-empty) */ inline static int handle_io(struct fd_map* fm, short events, int idx) -{ +{ int ret; int n; int read_flags; @@ -1736,10 +1736,11 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) int s; long resp; ticks_t t; - + fd_map_t *ee = NULL; + /* update the local config */ cfg_update(); - + switch(fm->type){ case F_TCPMAIN: again: @@ -1803,7 +1804,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) if (unlikely(read_flags & RD_CONN_REPEAT_READ)) goto repeat_1st_read; #endif /* USE_TLS */ - + /* must be before io_watch_add, io_watch_add might catch some * already existing events => might call handle_io and * handle_io might decide to del. the new connection => @@ -1816,13 +1817,25 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) local_timer_reinit(&con->timer); local_timer_add(&tcp_reader_ltimer, &con->timer, S_TO_TICKS(TCP_CHILD_TIMEOUT), t); - if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)){ + if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)) { LM_CRIT("io_watch_add failed for %p id %d fd %d, state %d, flags %x," " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", con, con->id, con->fd, con->state, con->flags, con->s, atomic_get(&con->refcnt), ip_addr2a(&con->rcv.src_ip), con->rcv.src_port, ip_addr2a(&con->rcv.dst_ip), con->rcv.dst_port); + ee = get_fd_map(&io_w, s); + if(ee!=0 && ee->type==F_TCPCONN) { + tcp_connection_t *ec; + ec = (tcp_connection_t*)ee->data; + LM_CRIT("existing tcp con %p id %d fd %d, state %d, flags %x," + " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", + ec, ec->id, ec->fd, ec->state, ec->flags, + ec->s, atomic_get(&ec->refcnt), + ip_addr2a(&ec->rcv.src_ip), ec->rcv.src_port, + ip_addr2a(&ec->rcv.dst_ip), ec->rcv.dst_port); + + } tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); local_timer_del(&tcp_reader_ltimer, &con->timer); goto con_error;

4 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020