sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
205 discussions

git:master:26a7b41f: rtpengine: query rtt per call leg (#2576)
by GitHub 07 Dec '20

07 Dec '20

Module: kamailio Branch: master Commit: 26a7b41f7a78f4cc4a7abbb82c1c38cf0927e40a URL: https://github.com/kamailio/kamailio/commit/26a7b41f7a78f4cc4a7abbb82c1c38c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-12-07T08:26:19-05:00 rtpengine: query rtt per call leg (#2576) Co-authored-by: Julien Chavanton <jchavanton(a)subspace.com> --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/26a7b41f7a78f4cc4a7abbb82c1c38c… Patch: https://github.com/kamailio/kamailio/commit/26a7b41f7a78f4cc4a7abbb82c1c38c…

1 0

[kamailio/kamailio] dlgs v5.4.* dlgs_count wrong number (#2568)
by 狐狐 07 Dec '20

07 Dec '20

### Description Recently I upgraded kamailio to 5.4.2 using the dlgs module. No matter how many calls I make, the dlgs_count() and dlgs_tags_count() always return 1. After viewing the source code, I found the following bugs ### Troubleshooting #### Reproduction dlgs_init($fu,$tu,"data"); dlgs_update(); dlgs_count("any","eq","1"); and then make several calls, the dlgs_count always return 1. #### Debugging Data #### Log Messages ![image](https://user-images.githubusercontent.com/26111722/100606180-033c2c80-3344-11eb-9653-ebeefbeb70a7.png) nn ![image](https://user-images.githubusercontent.com/26111722/100606206-0c2cfe00-3344-11eb-98ba-1773046ec951.png) #### SIP Traffic ### Possible Solutions I find the `ki_dlgs_count` functions always return 1; ![image](https://user-images.githubusercontent.com/26111722/100605735-55308280-3343-11eb-9908-aa8f55e60f63.png) I modified the retrun value = 10086, then the `dlgs_count` always return 10086 ! ! I modified the return value = dlgs_count(msg, vfield, vop, vdata); then I found the dlgs_count always return 0; obviously there is still something wrong. then I run the dlgs_ht_dbg() in the dlgs_count (dlgs_records.c) and get some useful dbg log as above. as the picture shows，the slots[i].astats.c_init is always 0 or -1. I think maybe c_init is not initialized to 1 when dlgs_init . and I add the c_init's initial logic in the dlgs_add_items() then everything is fine ! ### Additional Information ``` Linux localhost.localdomain 3.10.0-1127.el7.x86_64 #1 SMP Tue Mar 31 23:36:51 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux kamailio version: kamailio 5.4.2 (x86_64/linux compiled on 20:13:39 Nov 9 2020 with gcc 4.8.5 ``` -- 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/2568

2 7

git:5.4:f8885c99: tm: check end of header name in lw parser
by Daniel-Constantin Mierla 07 Dec '20

07 Dec '20

Module: kamailio Branch: 5.4 Commit: f8885c990642d4f2bebe47ea7d1f6ce8673c29f6 URL: https://github.com/kamailio/kamailio/commit/f8885c990642d4f2bebe47ea7d1f6ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-07T14:07:33+01:00 tm: check end of header name in lw parser - proper identification of header type, prior could mistakenly set the type by matching the prefix of long header name - GH #2572 (cherry picked from commit c0f5382bfbd2022896a9b206967977f827517700) --- Modified: src/modules/tm/lw_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/f8885c990642d4f2bebe47ea7d1f6ce… Patch: https://github.com/kamailio/kamailio/commit/f8885c990642d4f2bebe47ea7d1f6ce…

1 0

[kamailio/kamailio] CANCEL msg results in "500 cancel error" because of "duplicate From header" error (#2572)
by Justin LaVelle 07 Dec '20

07 Dec '20

### CANCEL msg results in "500 cancel error" because of "duplicate From header" error  Cancelling a call before it's answered sometimes results in a "500 cancel error" response and the far end not getting a cancel msg. The from header seems to be wrongly detected as being duplicated. This issue does not exist in version 5.2.8 or 5.1.10, does exist in 5.3.7 and 5.4.2. >From header from CANCEL that generates the error ``` f:"user 1002"<sip:+1002@bf96cc.domain.com>;tag=8FUg427jU6pva ``` >From header from CANCEL that works fine ``` f:"Reseda Ca"<sip:+18185144209@bf96cc.domain.com>;tag=cm0KBFB1Fag7r ``` #### Log Messages  ``` Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): SIP Request: Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:612]: parse_msg(): method: <CANCEL> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): uri: <sip:john.webrtc@bf96cc.domain.com> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:616]: parse_msg(): version: <SIP/2.0> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 235, <rport> = <n/a>; state=6 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKSg9eBr2tSDU5c>; state=16 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:498]: parse_headers(): Via found, flags=2 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:500]: parse_headers(): this is the first via Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <t> [41]; uri=[sip:john.webrtc@bf96cc.domain.com] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:174]: get_hdr_field(): to body (41)[<sip:john.webrtc@bf96cc.domain.com>#015#012], to tag (0)[] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <28924918> <CANCEL> Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/receive.c:319]: receive_msg(): --- received sip message - request - call-id: [39d19e18-afa6-1239-1dba-ea02c604123e] - cseq: [28924918 CANCEL] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:185]: get_hdr_field(): content_length=0 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/receive.c:379]: receive_msg(): preparing to run routing scripts... Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} pv [pv_core.c:1073]: pv_get_useragent(): no User-Agent header Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} maxfwd [mf_funcs.c:74]: is_maxfwd_present(): value = 68 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:727]: t_lookupOriginalT(): searching on hash entry 19365 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:439]: matching_3261(): RFC3261 transaction matched, tid=Sg9eBr2tSDU5c Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:823]: t_lookupOriginalT(): canceled transaction found (0x7f742bb6d000)! Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:826]: t_lookupOriginalT(): found - lookup completed Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [tm.c:1220]: ki_t_lookup_cancel_flags(): lookup_original: t_lookupOriginalT returned: 0x7f742bb6d000 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:1328]: t_newtran(): msg (0x7f74318090e8) id=97/2451 global id=96/2451 T start=0xffffffffffffffff Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:497]: t_lookup_request(): start searching: hash=19365, isACK=0 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:455]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bKSg9eBr2tSDU5c] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:675]: t_lookup_request(): no transaction found Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=N53jU220NtrFH Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/crypto/md5utils.c:67]: MD5StringArray(): MD5 calculated: 3c5f13a67a8cbfe1028669836f4291d4 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:727]: t_lookupOriginalT(): searching on hash entry 19365 Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:430]: matching_3261(): matched skip method - s:0x2 t:0x2 m:0x2 - continue searching Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:439]: matching_3261(): RFC3261 transaction matched, tid=Sg9eBr2tSDU5c Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:823]: t_lookupOriginalT(): canceled transaction found (0x7f742bb6d000)! Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_lookup.c:826]: t_lookupOriginalT(): found - lookup completed Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_msgbuilder.c:412]: build_local_reparse(): duplicate From header Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: ERROR: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_msgbuilder.c:531]: build_local_reparse(): cannot build CANCEL request Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: ERROR: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_cancel.c:297]: cancel_branch(): attempt to build a CANCEL failed Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: ERROR: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_fwd.c:1434]: e2e_cancel(): cancel error Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_reply.c:1761]: cleanup_uac_timers(): RETR/FR timers reset Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_reply.c:633]: _reply_light(): reply sent out - buf=0x7f74317ec440: SIP/2.0 500 cancel e... shmem=0x7f742bb77260: SIP/2.0 500 cancel e Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_reply.c:644]: _reply_light(): finished Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} tm [t_funcs.c:376]: t_relay_to(): new transaction forwarded Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/receive.c:437]: receive_msg(): request-route executed in: 1125 usec Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: message repeated 5 times: [ DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil)] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/xavp.c:539]: xavp_destroy_list(): destroying xavp list (nil) Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: message repeated 2 times: [ DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/xavp.c:539]: xavp_destroy_list(): destroying xavp list (nil)] Dec 3 01:03:43 kam3-lax /usr/sbin/kamailio[2451]: DEBUG: {1 28924918 CANCEL 39d19e18-afa6-1239-1dba-ea02c604123e} <core> [core/receive.c:528]: receive_msg(): cleaning up ``` #### SIP Traffic  ``` CANCEL sip:john.webrtc@bf96cc.domain.com SIP/2.0 v:SIP/2.0/UDP a.b.c.d:5081;rport;branch=z9hG4bKgZ5FU4aUKXjXm Route:<sip:kam3.rtp.lax.domain.net:5060> Max-Forwards:68 f:"user 1002"<sip:+1002@bf96cc.domain.com>;tag=8FUg427jU6pva t:<sip:john.webrtc@bf96cc.domain.com> i:98fa8010-afa4-1239-1dba-ea02c604123e CSeq:28924569 CANCEL Reason:SIP;cause=487;text="ORIGINATOR_CANCEL" l:0 ``` ### Possible Solutions  I found that Kamailio versions 5.2.10 and 5.2.8 do not have this issue, so for now have downgraded to 5.2.8. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.4.0 ``` * **Operating System**: Ubuntu 16.04.7 LTS  ``` Linux kam3-lax 4.4.0-194-generic #226-Ubuntu SMP Wed Oct 21 10:19:36 UTC 2020 x86_64 x86_64 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/2572

2 6

[kamailio/kamailio] kamailio.cfg calling t_check_trans() without using the result? (#2578)
by space88man 07 Dec '20

07 Dec '20

### Description Why does the sample script call `t_check_trans()` without using the result? ``` if (!is_method("ACK")) { if(t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); } ``` ### Troubleshooting N/A #### Reproduction N/A view the kamailio.cfg script at https://github.com/kamailio/kamailio/blob/master/etc/kamailio.cfg #### Debugging Data N/A ### Possible Solutions ### Additional Information master branch * **Operating System**: N/A -- 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/2578

2 2

[kamailio/kamailio] rtpengine_manage sends 180 Responses to rtpengine when onreply_route is enabled (#2577)
by aalba6675 05 Dec '20

05 Dec '20

### Description Different behaviour of rtpengine_manage depending on where it is called 1. Response 180 **is not** sent to rtpengine :12221 using only reply_route 1. Response 180 **is sent** to rtpengine :12221 using `onreply_route[MANAGE_REPLY]` Scenario 1 - reply_route only - call rtpenginge_manage() in reply_route for responses - works for 200 OK - for 180 Ringing, the command does not appear on the wire to rtpengine :12221 Scenario 2 - reply_route is empty, use `onreply_route[MANAGE_REPLY]` - call rtpenginge_manage() in `onreply_route[MANAGE_REPLY]` - works for 200 OK - for 180 Ringing, the command appears on the wire to rtpengine :12221, and SDP is injected ### Troubleshooting #### Reproduction 1. Confirmed that setup is working without `onreply_route[MANAGE_REPLY]` 2. Caller does not see any SDP inside 180 response; this means that rtpengine_manage decided not to end anything to rtpengine :12221 3. Move call to `rtpengine_manage()` inside `onreply_route[MANAGE_REPLAY]` 4. Now observe that SDP appears inside 180 response, indicating that rtpengine_manage decided that it should send the "offer" command to rtpengine :12221 #### Debugging Data -- 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/2577

1 2

git:5.4:b9846143: cfgt: log info when node is created and saved
by Victor Seva 04 Dec '20

04 Dec '20

Module: kamailio Branch: 5.4 Commit: b9846143c171d731e94d7f0d450b40f66f2ac2c6 URL: https://github.com/kamailio/kamailio/commit/b9846143c171d731e94d7f0d450b40f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-12-04T10:32:21+01:00 cfgt: log info when node is created and saved (cherry picked from commit a2eff905626c6428539d3d848e7968f5dd0f2108) --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/b9846143c171d731e94d7f0d450b40f… Patch: https://github.com/kamailio/kamailio/commit/b9846143c171d731e94d7f0d450b40f… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index c47a1cecc0..7b0c991285 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -429,6 +429,8 @@ void cfgt_save_node(cfgt_node_p node) } fclose(fp); node->jdoc.free_fn(dest.s); + LM_INFO("*** node uuid:[%.*s] id:[%d] saved ***\n", + STR_FMT(&node->uuid), node->msgid); } else { LM_ERR("Can't open file [%s] to write\n", dest.s); pkg_free(dest.s); @@ -767,7 +769,7 @@ int cfgt_msgin(sr_event_param_t *evp) int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) { str unknown = {"unknown", 7}; - int get_hdr_result = 0; + int get_hdr_result = 0, res; if(_cfgt_node) { if(_cfgt_node->msgid == 0) { @@ -786,7 +788,10 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) } pkg_str_dup(&_cfgt_node->uuid, &unknown); } - return _cfgt_get_uuid_id(_cfgt_node); + res = _cfgt_get_uuid_id(_cfgt_node); + LM_INFO("*** node uuid:[%.*s] id:[%d] created ***\n", + STR_FMT(&_cfgt_node->uuid), _cfgt_node->msgid); + return res; } else { LM_DBG("_cfgt_node->uuid:[%.*s]\n", _cfgt_node->uuid.len, _cfgt_node->uuid.s);

1 0

git:master:a2eff905: cfgt: log info when node is created and saved
by Victor Seva 04 Dec '20

04 Dec '20

Module: kamailio Branch: master Commit: a2eff905626c6428539d3d848e7968f5dd0f2108 URL: https://github.com/kamailio/kamailio/commit/a2eff905626c6428539d3d848e7968f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-12-04T10:23:04+01:00 cfgt: log info when node is created and saved --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/a2eff905626c6428539d3d848e7968f… Patch: https://github.com/kamailio/kamailio/commit/a2eff905626c6428539d3d848e7968f… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index c47a1cecc0..7b0c991285 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -429,6 +429,8 @@ void cfgt_save_node(cfgt_node_p node) } fclose(fp); node->jdoc.free_fn(dest.s); + LM_INFO("*** node uuid:[%.*s] id:[%d] saved ***\n", + STR_FMT(&node->uuid), node->msgid); } else { LM_ERR("Can't open file [%s] to write\n", dest.s); pkg_free(dest.s); @@ -767,7 +769,7 @@ int cfgt_msgin(sr_event_param_t *evp) int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) { str unknown = {"unknown", 7}; - int get_hdr_result = 0; + int get_hdr_result = 0, res; if(_cfgt_node) { if(_cfgt_node->msgid == 0) { @@ -786,7 +788,10 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) } pkg_str_dup(&_cfgt_node->uuid, &unknown); } - return _cfgt_get_uuid_id(_cfgt_node); + res = _cfgt_get_uuid_id(_cfgt_node); + LM_INFO("*** node uuid:[%.*s] id:[%d] created ***\n", + STR_FMT(&_cfgt_node->uuid), _cfgt_node->msgid); + return res; } else { LM_DBG("_cfgt_node->uuid:[%.*s]\n", _cfgt_node->uuid.len, _cfgt_node->uuid.s);

1 0

git:master:02fc919e: pv: use static buffer for ctime_r() output and check its return
by Daniel-Constantin Mierla 03 Dec '20

03 Dec '20

Module: kamailio Branch: master Commit: 02fc919e4f177cc3ab9c5d53eb9ea2019c572bd9 URL: https://github.com/kamailio/kamailio/commit/02fc919e4f177cc3ab9c5d53eb9ea20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-03T14:07:34+01:00 pv: use static buffer for ctime_r() output and check its return - fixed $TF output, regression introduced when switching to thread safe time function --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/02fc919e4f177cc3ab9c5d53eb9ea20… Patch: https://github.com/kamailio/kamailio/commit/02fc919e4f177cc3ab9c5d53eb9ea20… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index 87b62b71e9..4a9cc14dd1 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -246,12 +246,16 @@ int pv_get_timenowf(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; - char t_buf[26] = {0}; + static char t_buf[26] = {0}; time_t t; t = time(NULL); s.s = ctime_r(&t, t_buf); + if(s.s == NULL) { + return pv_get_null(msg, param, res); + } + s.s = t_buf; s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)t); } @@ -271,7 +275,7 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; - char t_buf[26] = {0}; + static char t_buf[26] = {0}; if(msg==NULL) return -1; @@ -279,6 +283,10 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, msg_set_time(msg); s.s = ctime_r(&msg->tval.tv_sec, t_buf); + if(s.s == NULL) { + return pv_get_null(msg, param, res); + } + s.s = t_buf; s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec); }

1 0

git:master:53664ba2: htable: replicate the operation rm with sw
by Daniel-Constantin Mierla 03 Dec '20

03 Dec '20

Module: kamailio Branch: master Commit: 53664ba26af389855444c1c2c6a78d53b276c0a0 URL: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-03T13:50:58+01:00 htable: replicate the operation rm with sw - GH #2573 --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… Patch: https://github.com/kamailio/kamailio/commit/53664ba26af389855444c1c2c6a78d5… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index ccb67e30d8..42e1847d30 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -350,7 +350,9 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq return 0; } -int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { +int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, + int type, int_str* val, int mode) +{ srjson_doc_t jdoc; @@ -370,7 +372,8 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int srjson_AddStrToObject(&jdoc, jdoc.root, "cname", cname->s, cname->len); } - if (action==HT_DMQ_SET_CELL || action==HT_DMQ_SET_CELL_EXPIRE || action==HT_DMQ_RM_CELL_RE) { + if (action==HT_DMQ_SET_CELL || action==HT_DMQ_SET_CELL_EXPIRE + || action==HT_DMQ_RM_CELL_RE || action==HT_DMQ_RM_CELL_SW) { srjson_AddNumberToObject(&jdoc, jdoc.root, "type", type); if (type&AVP_VAL_STR) { srjson_AddStrToObject(&jdoc, jdoc.root, "strval", val->s.s, val->s.len); @@ -407,7 +410,8 @@ int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int return -1; } -int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode) { +int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, + int type, int_str* val, int mode) { ht_t* ht; ht = ht_get_table(htname); @@ -416,7 +420,8 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int ty return -1; } - LM_DBG("replaying action %d on %.*s=>%.*s...\n", action, htname->len, htname->s, cname->len, cname->s); + LM_DBG("replaying action %d on %.*s=>%.*s...\n", action, + htname->len, htname->s, cname->len, cname->s); if (action==HT_DMQ_SET_CELL) { return ht_set_cell(ht, cname, type, val, mode); @@ -426,6 +431,8 @@ int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int ty return ht_del_cell(ht, cname); } else if (action==HT_DMQ_RM_CELL_RE) { return ht_rm_cell_re(&val->s, ht, mode); + } else if (action==HT_DMQ_RM_CELL_SW) { + return ht_rm_cell_op(&val->s, ht, mode, HT_RM_OP_SW); } else { LM_ERR("unrecognized action\n"); return -1; diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index 55f2af783d..22c4876191 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -33,11 +33,12 @@ extern dmq_resp_cback_t ht_dmq_resp_callback; typedef enum { HT_DMQ_NONE, + HT_DMQ_SYNC, HT_DMQ_SET_CELL, HT_DMQ_SET_CELL_EXPIRE, HT_DMQ_DEL_CELL, HT_DMQ_RM_CELL_RE, - HT_DMQ_SYNC + HT_DMQ_RM_CELL_SW } ht_dmq_action_t; int ht_dmq_initialize(); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 55717ecd94..d449839c2f 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -493,6 +493,10 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, } return 1; } else if(strncmp(op->s, "sw", 2)==0) { + if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_SW, &ht->name, NULL, + AVP_VAL_STR, &isval, mkey)!=0) { + LM_ERR("dmq relication failed (op %d)\n", mkey); + } if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_SW)<0) { return -1; }

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 December 2020