- sr-dev - kamailio.org

git:5.6:ea782be2: rtpengine: avoid repeated queries to same node
by Henning Westerholt 16 Feb '23

16 Feb '23

Module: kamailio Branch: 5.6 Commit: ea782be2cc29589f4dd55f0d91c11049b5280fe0 URL: https://github.com/kamailio/kamailio/commit/ea782be2cc29589f4dd55f0d91c1104… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-16T11:09:42Z rtpengine: avoid repeated queries to same node If we know which node handles a particular call from the hash table, only query that node once and then return error if it's dead, instead of going into a pointless loop looking for other nodes to query which don't exist. closes #3370 (cherry picked from commit bd0ce126109f40f5217053f20e687b93b2268164) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/ea782be2cc29589f4dd55f0d91c1104… Patch: https://github.com/kamailio/kamailio/commit/ea782be2cc29589f4dd55f0d91c1104… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index ab6920c01d6..1b1f8b0ca92 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3349,6 +3349,12 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer // lookup node node = select_rtpp_node_old(callid, viabranch, do_test, op); + if (node && is_queried_node(node, queried_nodes_ptr, queried_nodes)) { + LM_ERR("rtpengine node for callid=%.*s is known (%.*s) but it has already been queried, therefore not returning it\n", + callid.len, callid.s, node->rn_url.len, node->rn_url.s); + return NULL; + } + // check node if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm

1 0

[kamailio/kamailio] topoh: th_mask_decode (th_mask_encode (x)) ≠ x (Issue #3358)
by Дилян Палаузов 15 Feb '23

15 Feb '23

The file [th-test.c.txt](https://github.com/kamailio/kamailio/files/10608862/th-test.… contains the exact copy of the th_mask_encode() and th_mask_decode() functions from src/modules/topoh/th_mask.c . (except LM_ERR is removed and pkg_malloc/pkg_free are replaced with malloc/free). When I run Kamilio under topoh and the websocket client calls, at some moment `sip:test-gnome-calls@bapha.be;gr=urn:uuid:f2f5a3cf-a0fb-0047-be50-740fb9bdc562;alias=87.118.146.153~60472~2>;+sip.instance="<urn:uuid:f2f5a3cf-a0fb-0047-be50-740fb9bdc562>";+org.linphone.specs="conference/1.0,ephemeral/1.1,groupchat/1.1,groupchat/1.2,lime"` is passed to th_mask_encode(). The output it `sip:127.3.4.84;line=sr-if7s1mg7i36PNf0AbdwPpfzlbqWEpLzsSGItpLwyN39ZMY4t1mCTSd6DNo4LWdIOpfpPp5FLpUQscX63Kd47W5EPWO6sNL90pLgoW5p-1fzlSdzO25n3KoIk1vHkWXptc5wOeopsWXi-eo9*`. This is put in a Contact: header. When that last string is passed to th_mask_decode(), e.g. because BYE or ACK have it as R-URI, the output is `sip:test-gnome-calls@bapha.be;gr=urn:uuid:f2f5a3cf-a0fb-0047-be50-740fb9bdc562;alias=87.118.1`. From the initial input the final output misses at least `46.153`. The attached file contains under `b2` another input, which is passed ot th_mask_decode. This is the actual input Kamailio gets at runtime and passes to th_mask_decode. The result is not a string — callu.b.p...b.;.r...n:s..d..2lQ — where the dots represent unprintable bytes. The error report is that th_mask_encode() produces output, which th_mask_decode() does not convert to its origin. N.B.: The above problem happens, when a websocket client calls TCP-client with topoh-module. When a TLS-client calls TCP-client (no websockets involved), topoh does not make problems — BYE is delivered properly. See also: * https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… * https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… This might also be related: * https://lists.kamailio.org/mailman3/hyperkitty/list/sr-users@lists.kamailio… -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3358 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3358(a)github.com>

2 4

Build failed in Jenkins: kamailio56-nightly-binaries » amd64,bookworm #50
by kamailio＠sipwise.com 15 Feb '23

15 Feb '23

See <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> Changes: ------------------------------------------ [...truncated 1.82 MB...] ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:107: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:326:99: note: in definition of macro 'LOG_FX' 326 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1844:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1844 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1844:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1844 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1845:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1845 | (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:58: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:91: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ apy_kemi.c:1846:107: error: invalid use of incomplete typedef 'PyFrameObject' {aka 'struct _frame'} 1846 | (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); | ^~ ../../core/dprint.h:337:99: note: in definition of macro 'LOG_FX' 337 | LOGV_FUNCSUFFIX_STR(funcname), ## args); \ | ^~~~ ../../core/dprint.h:351:25: note: in expansion of macro 'LOG_FL' 351 | LOG_FL(facility, level, NULL, prefix, fmt, ## args) | ^~~~~~ ../../core/dprint.h:354:25: note: in expansion of macro 'LOG_FP' 354 | LOG_FP(DEFAULT_FACILITY, (level), LOC_INFO, fmt, ## args) | ^~~~~~ apy_kemi.c:1839:25: note: in expansion of macro 'LOG' 1839 | LOG(cfg_get(core, core_cfg, latency_log), | ^~~ make[3]: *** [../../Makefile.rules:100: apy_kemi.o] Error 1 make[2]: *** [Makefile:511: modules] Error 1 make[2]: Leaving directory '/build/kamailio-5.6.4~bpo12.20230211004740.50/src' make[1]: *** [Makefile:34: every-module] Error 2 make[1]: Leaving directory '/build/kamailio-5.6.4~bpo12.20230211004740.50' make: *** [debian/rules:140: build-stamp] Error 2 dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.18611/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.18611/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_tcCqiU filesystem I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: Cleaning COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.18611 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /run/lock/bookworm-amd64.building.18278 + '[' -r /run/lock/bookworm-amd64.update.18278 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio56-nightly-binaries/architecture=a…'> + '[' -n /tmp/tmp.9odg8EyHnU ']' + rm -rf /tmp/tmp.9odg8EyHnU + '[' -n /tmp/apt-jdg_tcCqiU ']' + sudo rm -rf /tmp/apt-jdg_tcCqiU + '[' -n 300 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=620 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sat Feb 11 01:05:41 UTC 2023 [running 620 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sat Feb 11 01:05:41 UTC 2023 [running 620 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

[kamailio/kamailio] rtpengine: queried_nodes_limit incorrectly applies to delete commands which can cause all processes to be blocked (Issue #3370)
by shaneqld 15 Feb '23

15 Feb '23

## Description When one rtpengine instance becomes unavailable on a Kamailio instance with moderate call traffic, even where there are multiple rtpengine instances configured for high availability, all processes can become blocked and Kamailio stops responding to all requests. We produced this in a real world test, with two Kamailio servers running (20 child processes) and two rtpengine servers running. We loaded the Kamailio servers with calls, some answered, some ringing/busy/etc, and then made one rtpengine server drop all packets. Both Kamailio servers were able to briefly detect that the rtpengine instance was unavailable when it attempted to send an offer to it, but then as existing calls began to complete, both Kamailio servers became congested attempting to send "delete" commands to rtpengine. Both Kamailio servers then became unavailable and stopped responding to all messages for 10 minutes, until we restored rtpengine. As such, an rtpengine server that crashes can cause a complete Kamailio outage. ## Troubleshooting By using the reproduction steps below, we were easily able to make Kamailio stop responding to all incoming SIP messages when taking down an rtpengine instance. The logs below show the sequence of events when this is reproduced for a single call. Configuration: - `rtpengine_tout_ms` was not configured and had the default value of 1000ms. - `rtpengine_retr` was not configured and had the default value of 5. - `queried_nodes_limit` was not configured and had the default value (of 30?). - TM's `exec_time_check` was not configured and had the default value of 5000ms. **A call is forwarded using t_relay and rtpengine_manage. rtpengine is killed mid-call. The call ends with 486.** When the t_on_failure route is called, the config makes a singular call to rtpengine_manage, however what follows is 30 errors, all mentioning the same rtpengine instance: ``` ERROR: rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> ``` Followed by the below: ``` ERROR: rtpengine [rtpengine.c:2729]: rtpp_function_call(): queried nodes limit reached WARNING: tm [t_reply.c:1094]: run_failure_handlers(): failure route execution took too long: 150153261 us ``` Each timeout is 5 seconds (5x retries of 1000ms), which corresponds to about 150 seconds over 30 attempts. This matches the warning generated by tm. In this case, there was about 5 minutes of time where a process was blocked. 150 seconds for the child leg's failure route, and 150 seconds for the parent leg's failure route. When this happens for many calls at once, congestion is guaranteed. The 30 attempts to delete the call from rtpengine comes from the default value of `queried_nodes_limit`. This behavior doesn't make sense to me -- it's a retry loop that runs a retry loop. ## Reproduction _tldr: kill rtpengine via iptables mid-call with the default rtpengine settings and you'll see lots of errors._ You can reproduce this with one or multiple rtpengine instances configured in Kamailio. It's easier with just one. Standard setup, but importantly: - forwarding a call using t_relay - t_on_branch is configured which calls rtpengine_manage - t_on_failure is configured which calls rtpengine_manage To reproduce easily, we configured the destination server to send a 100, a 180, wait 20 seconds, then send a 486. Place a number of calls to Kamailio (we used sipp) -- importantly, exceeding the number of child processes configured. You can reproduce the issue with just one call, but this wont make Kamailio unresponsive. Once the calls are placed, and still in progress (ie before the 486 is returned), use iptables on the rtpengine server to drop all traffic on its control port. When the call(s) start receiving the 486, you will notice a flood of error messages `timeout waiting reply for command "delete" from RTPEngine` for approximately 5 minutes per call. This blocks the process. If it's now attempting to send the delete command to rtpengine for a number of calls greater than your child process count: attempt to send any other SIP messages to Kamailio and you will not receive a response. ## Log Messages This is a log for a single call, forwarded using t_relay. All calls to rtpengine_manage are immediately surrounded by info log messages "calling rtpengine_manage" and "completed calling rtpengine_manage". ``` Feb 12 23:40:54 debian-kamailio kamailio[27715]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: new branch [0] to sip:0421XXXXXX@192.168.X.X:9060 Feb 12 23:40:54 debian-kamailio kamailio[27715]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: branch_route: calling rtpengine_manage Feb 12 23:40:54 debian-kamailio kamailio[27715]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: branch_route: completed calling rtpengine_manage Feb 12 23:40:54 debian-kamailio kamailio[27732]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:54 debian-kamailio kamailio[27732]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27730]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: new branch [0] to sip:61421764018@192.168.X.X:9092;transport=udp Feb 12 23:40:55 debian-kamailio kamailio[27730]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: branch_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27730]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: branch_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27717]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27717]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27714]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27714]: INFO: {2 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27735]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:40:55 debian-kamailio kamailio[27735]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:41:15 debian-kamailio kamailio[27713]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: failure_route: calling rtpengine_manage Feb 12 23:41:20 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:25 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:30 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:35 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:40 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:45 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:50 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:41:55 debian-kamailio kamailio[27740]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:41:55 debian-kamailio kamailio[27740]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:41:55 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:00 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:05 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:10 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:16 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:21 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:26 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:31 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:36 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:41 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:46 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:51 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:42:55 debian-kamailio kamailio[27734]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: calling rtpengine_manage Feb 12 23:42:55 debian-kamailio kamailio[27734]: INFO: {2 1 INVITE 1-27864(a)127.0.1.1} <script>: onreply_route: completed calling rtpengine_manage Feb 12 23:42:56 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:01 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:06 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:11 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:16 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:21 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:26 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:31 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:36 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:41 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:46 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:46 debian-kamailio kamailio[27713]: ERROR: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} rtpengine [rtpengine.c:2729]: rtpp_function_call(): queried nodes limit reached Feb 12 23:43:46 debian-kamailio kamailio[27713]: INFO: {1 63577835 INVITE 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: failure_route: completed calling rtpengine_manage Feb 12 23:43:46 debian-kamailio kamailio[27713]: WARNING: tm [t_reply.c:1094]: run_failure_handlers(): failure route execution took too long: 150153207 us Feb 12 23:43:46 debian-kamailio kamailio[27736]: INFO: {1 63577835 ACK 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: ACK: calling rtpengine_manage Feb 12 23:43:46 debian-kamailio kamailio[27736]: INFO: {1 63577835 ACK 720bf6d9-25fb-123c-cb91-80fa5d718101} <script>: ACK: completed calling rtpengine_manage Feb 12 23:43:46 debian-kamailio kamailio[27738]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: failure_route: calling rtpengine_manage Feb 12 23:43:51 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:43:56 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:01 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:06 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:11 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:21 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:26 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:31 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:36 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:41 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:46 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:51 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:44:56 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:01 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:06 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:11 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:21 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:26 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:31 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:36 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:41 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:46 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:51 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:45:56 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:01 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:06 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:11 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:3129]: send_rtpp_command(): timeout waiting reply for command "delete" from RTPEngine <udp:192.168.X.X:2223> Feb 12 23:46:16 debian-kamailio kamailio[27738]: ERROR: {1 1 INVITE 1-27864(a)127.0.1.1} rtpengine [rtpengine.c:2729]: rtpp_function_call(): queried nodes limit reached Feb 12 23:46:16 debian-kamailio kamailio[27738]: INFO: {1 1 INVITE 1-27864(a)127.0.1.1} <script>: failure_route: completed calling rtpengine_manage Feb 12 23:46:16 debian-kamailio kamailio[27738]: WARNING: tm [t_reply.c:1094]: run_failure_handlers(): failure route execution took too long: 150153261 us ``` ### Possible Solutions To minimize the issue, `rtpengine_tout_ms` and `rtpengine_retr` can be reduced. This doesn't exactly the fix the problem, as you need reasonable values here. Additionally, `queried_nodes_limit` can be reduced to limit the number of unnecessary retries, at the expense of the functionality it gives you to initially select candidate nodes. **Actual solution:** I think that, when a call has already selected an rtpengine instance successfully, and that's in the hash table, then `queried_nodes_limit` should not apply. It should only attempt to send commands with a total number of attempts = `rtpengine_retr`, not `rtpengine_retr * queried_nodes_limit`. By changing the behavior as above, tweaking `rtpengine_tout_ms` and `rtpengine_retr`, and increasing the number of child workers, an rtpengine becoming unavailable should cause much less impactful blocking. ## Additional Information **Kamailio version:** (attempted on 5.4.1 and latest master) ``` version: kamailio 5.4.1 (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, TLS_PTHREAD_MUTEX_SHARED 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 on 23:22:15 Aug 15 2022 with gcc 8.3.0 ``` ``` version: kamailio 5.7.0-dev3 (x86_64/linux) 2384c3 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 2384c3 compiled on 23:22:22 Feb 12 2023 with gcc 8.3.0 ``` **Operating System**:  ``` Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux debian-kamailio 4.19.0-20-amd64 #1 SMP Debian 4.19.235-1 (2022-03-17) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3370 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3370(a)github.com>

4 11

git:master:bd0ce126: rtpengine: avoid repeated queries to same node
by Richard Fuchs 15 Feb '23

15 Feb '23

Module: kamailio Branch: master Commit: bd0ce126109f40f5217053f20e687b93b2268164 URL: https://github.com/kamailio/kamailio/commit/bd0ce126109f40f5217053f20e687b9… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2023-02-15T08:49:01-05:00 rtpengine: avoid repeated queries to same node If we know which node handles a particular call from the hash table, only query that node once and then return error if it's dead, instead of going into a pointless loop looking for other nodes to query which don't exist. closes #3370 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/bd0ce126109f40f5217053f20e687b9… Patch: https://github.com/kamailio/kamailio/commit/bd0ce126109f40f5217053f20e687b9… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 5444b0d461..46640a5d3d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3378,6 +3378,12 @@ select_rtpp_node(str callid, str viabranch, int do_test, struct rtpp_node **quer // lookup node node = select_rtpp_node_old(callid, viabranch, do_test, op); + if (node && is_queried_node(node, queried_nodes_ptr, queried_nodes)) { + LM_ERR("rtpengine node for callid=%.*s is known (%.*s) but it has already been queried, therefore not returning it\n", + callid.len, callid.s, node->rn_url.len, node->rn_url.s); + return NULL; + } + // check node if (!node || (node_in_set(node, active_rtpp_set) == 0)) { // run the selection algorithm

1 0

git:5.6:92f15de3: app_python3: use new Python 3.10+ API functions for tracking execution
by Victor Seva 15 Feb '23

15 Feb '23

Module: kamailio Branch: 5.6 Commit: 92f15de3d026405c749ce10fb4b11200c9b365b1 URL: https://github.com/kamailio/kamailio/commit/92f15de3d026405c749ce10fb4b1120… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-15T10:35:23+01:00 app_python3: use new Python 3.10+ API functions for tracking execution - GH #3187 (cherry picked from commit b8bf86eb11a17c853450e5c7f81d2446cf719fbc) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/92f15de3d026405c749ce10fb4b1120… Patch: https://github.com/kamailio/kamailio/commit/92f15de3d026405c749ce10fb4b1120… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 421db19b78..47a34a4cb6 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1810,6 +1810,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; +#if PY_VERSION_HEX >= 0x03100000 + PyCodeObject *pcode = NULL; +#endif struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff; @@ -1832,10 +1835,27 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) + (tve.tv_usec - tvb.tv_usec); if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); - if (pstate != NULL && pstate->frame != NULL) { + if (pstate != NULL) { +#if PY_VERSION_HEX >= 0x03100000 + pframe = PyThreadState_GetFrame(pstate); + if(pframe != NULL) { + pcode = PyFrame_GetCode(pframe); + } +#else pframe = pstate->frame; +#endif } +#if PY_VERSION_HEX >= 0x03100000 + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u ms] (file:%s func:%s line:%d)\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, tdiff, + (pcode)?PyBytes_AsString(pcode->co_filename):"", + (pcode)?PyBytes_AsString(pcode->co_name):"", + (pframe)?PyFrame_GetLineNumber(pframe):0); +#else LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (file:%s func:%s line:%d)\n", @@ -1844,6 +1864,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); +#endif } }

1 0

git:5.6:82caa486: app_python3: proper check of PY_VERSION_HEX for python 3.11
by Victor Seva 15 Feb '23

15 Feb '23

Module: kamailio Branch: 5.6 Commit: 82caa486216930ff634e4b9eeee8184eabaf504c URL: https://github.com/kamailio/kamailio/commit/82caa486216930ff634e4b9eeee8184… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-15T10:35:23+01:00 app_python3: proper check of PY_VERSION_HEX for python 3.11 (cherry picked from commit 8546fb87e3277b675bd47eba9435f739cf3bb69d) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/82caa486216930ff634e4b9eeee8184… Patch: https://github.com/kamailio/kamailio/commit/82caa486216930ff634e4b9eeee8184… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 47a34a4cb6..09d0560b39 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1810,7 +1810,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; -#if PY_VERSION_HEX >= 0x03100000 +#if PY_VERSION_HEX >= 0x030B0000 PyCodeObject *pcode = NULL; #endif struct timeval tvb = {0}, tve = {0}; @@ -1836,7 +1836,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { pstate = PyThreadState_GET(); if (pstate != NULL) { -#if PY_VERSION_HEX >= 0x03100000 +#if PY_VERSION_HEX >= 0x030B0000 pframe = PyThreadState_GetFrame(pstate); if(pframe != NULL) { pcode = PyFrame_GetCode(pframe); @@ -1846,7 +1846,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) #endif } -#if PY_VERSION_HEX >= 0x03100000 +#if PY_VERSION_HEX >= 0x030B0000 LOG(cfg_get(core, core_cfg, latency_log), "alert - action KSR.%s%s%s(...)" " took too long [%u ms] (file:%s func:%s line:%d)\n",

1 0

git:5.6:07fc4d54: app_python3: use Py_SET_TYPE() from python 3.9
by Victor Seva 15 Feb '23

15 Feb '23

Module: kamailio Branch: 5.6 Commit: 07fc4d54e1c00a155dc17c25998ab2cbf75d0862 URL: https://github.com/kamailio/kamailio/commit/07fc4d54e1c00a155dc17c25998ab2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-15T10:35:23+01:00 app_python3: use Py_SET_TYPE() from python 3.9 (cherry picked from commit fc75b4c3f8f9bdba320f74ddf942686c09316b56) --- Modified: src/modules/app_python3/python_msgobj.c --- Diff: https://github.com/kamailio/kamailio/commit/07fc4d54e1c00a155dc17c25998ab2c… Patch: https://github.com/kamailio/kamailio/commit/07fc4d54e1c00a155dc17c25998ab2c… --- diff --git a/src/modules/app_python3/python_msgobj.c b/src/modules/app_python3/python_msgobj.c index db6da6a07a..22aebd5404 100644 --- a/src/modules/app_python3/python_msgobj.c +++ b/src/modules/app_python3/python_msgobj.c @@ -507,7 +507,11 @@ static PyTypeObject MSGtype = { int python_msgobj_init(void) { +#if PY_VERSION_HEX >= 0x03090000 + Py_SET_TYPE(&MSGtype, &PyType_Type); +#else Py_TYPE(&MSGtype) = &PyType_Type; +#endif if (PyType_Ready(&MSGtype) < 0) return -1; return 0;

1 0

git:master:f301ca9c: nat_traversal: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 15 Feb '23

15 Feb '23

Module: kamailio Branch: master Commit: f301ca9cdcc044dd05e9d82139e1db368be6dc5c URL: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-15T09:33:56+01:00 nat_traversal: cast to uint64_t when using time_t value --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… Patch: https://github.com/kamailio/kamailio/commit/f301ca9cdcc044dd05e9d82139e1db3… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index c5cf7fa15b..d659aced45 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -39,6 +39,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <stdint.h> #include <ctype.h> #include <errno.h> #include <time.h> @@ -922,7 +923,7 @@ static time_t get_register_expire( } } - LM_DBG("maximum expire for all contacts: %u\n", (unsigned)expire); + LM_DBG("maximum expire for all contacts: %llu\n", (uint64_t)expire); return (expire ? expire + now : 0); }

1 0

git:master:92934589: avpops: cast db value for avp number field as long
by Daniel-Constantin Mierla 15 Feb '23

15 Feb '23

Module: kamailio Branch: master Commit: 929345896700fb116facc41e3542125dfbb79b41 URL: https://github.com/kamailio/kamailio/commit/929345896700fb116facc41e3542125… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-15T09:28:03+01:00 avpops: cast db value for avp number field as long --- Modified: src/modules/avpops/avpops_db.c --- Diff: https://github.com/kamailio/kamailio/commit/929345896700fb116facc41e3542125… Patch: https://github.com/kamailio/kamailio/commit/929345896700fb116facc41e3542125… --- diff --git a/src/modules/avpops/avpops_db.c b/src/modules/avpops/avpops_db.c index 9b36709aad..cca0b84b07 100644 --- a/src/modules/avpops/avpops_db.c +++ b/src/modules/avpops/avpops_db.c @@ -21,6 +21,7 @@ #include <stdlib.h> +#include <stdint.h> #include <string.h> #include "../../core/mem/mem.h" @@ -66,7 +67,7 @@ int avpops_db_bind(const str* db_url) int avpops_db_init(const str* db_url, const str* db_table, str** db_cols) { - + db_hdl = avpops_dbf.init(db_url); if (db_hdl==0) { @@ -313,16 +314,16 @@ int db_query_avp(struct sip_msg *msg, char *query, pvname_list_t* dest) int i, j; pvname_list_t* crt; static str query_str; - + if(query==NULL) { LM_ERR("bad parameter\n"); return -1; } - + query_str.s = query; query_str.len = strlen(query); - + if(avpops_dbf.raw_query(db_hdl, &query_str, &db_res)!=0) { LM_ERR("cannot do the query\n"); @@ -338,11 +339,11 @@ int db_query_avp(struct sip_msg *msg, char *query, pvname_list_t* dest) LM_DBG("rows [%d]\n", RES_ROW_N(db_res)); /* reverse order of rows so that first row get's in front of avp list */ - for(i = RES_ROW_N(db_res)-1; i >= 0; i--) + for(i = RES_ROW_N(db_res)-1; i >= 0; i--) { LM_DBG("row [%d]\n", i); crt = dest; - for(j = 0; j < RES_COL_N(db_res); j++) + for(j = 0; j < RES_COL_N(db_res); j++) { if(RES_ROWS(db_res)[i].values[j].nul) goto next_avp; @@ -388,19 +389,19 @@ int db_query_avp(struct sip_msg *msg, char *query, pvname_list_t* dest) break; case DB1_INT: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.int_val; + = (long)RES_ROWS(db_res)[i].values[j].val.int_val; break; case DB1_BIGINT: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.ll_val; + = (long)RES_ROWS(db_res)[i].values[j].val.ll_val; break; case DB1_DATETIME: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.time_val; + = (long)(uint64_t)RES_ROWS(db_res)[i].values[j].val.time_val; break; case DB1_BITMAP: avp_val.n - = (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; + = (long)RES_ROWS(db_res)[i].values[j].val.bitmap_val; break; default: goto next_avp;

1 0

git:master:e203aaf7: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: e203aaf7294b5f320ede58636649246167974983 URL: https://github.com/kamailio/kamailio/commit/e203aaf7294b5f320ede58636649246… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-14T17:31:29+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/e203aaf7294b5f320ede58636649246… Patch: https://github.com/kamailio/kamailio/commit/e203aaf7294b5f320ede58636649246… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 203283ebed..8d6172584e 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -88,6 +88,7 @@ Juha Heinanen 5.3. presence.updateWatchers 5.4. presence.presentity_list 5.5. presence.presentity_show + 5.6. presence.watcher_list 6. Exported Variables @@ -239,6 +240,7 @@ Chapter 1. Admin Guide 5.3. presence.updateWatchers 5.4. presence.presentity_list 5.5. presence.presentity_show + 5.6. presence.watcher_list 6. Exported Variables @@ -1070,6 +1072,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); 5.3. presence.updateWatchers 5.4. presence.presentity_list 5.5. presence.presentity_show + 5.6. presence.watcher_list 5.1. presence.cleanup @@ -1169,6 +1172,22 @@ kamctl rpc presence.presentity_show basic alice sipserver.com kamctl rpc presence.presentity_show full * sipserver.com ... +5.6. presence.watcher_list + + Return the watcher records for a specific presentity uri. + + Name: presence.watcher_list + + Parameters: + * mode - it can be 'basic' or 'full' to print a selection or all the + fields of watcher record. + * uri - the presentity uri. + + RPC Command Format: +... +kamctl rpc presence.watcher_list basic sip:alice@sipserver.com +... + 6. Exported Variables 6.1. $subs(attr)

1 0

git:master:6b30c100: presence: docs for presence.watcher_list rpc command
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: 6b30c100e7618cabf4d241f4b5b28bb334cf5340 URL: https://github.com/kamailio/kamailio/commit/6b30c100e7618cabf4d241f4b5b28bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T17:16:19+01:00 presence: docs for presence.watcher_list rpc command --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b30c100e7618cabf4d241f4b5b28bb… Patch: https://github.com/kamailio/kamailio/commit/6b30c100e7618cabf4d241f4b5b28bb… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index cd67be7e54..dbad0acf65 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1426,6 +1426,33 @@ kamctl rpc presence.presentity_list full ... kamctl rpc presence.presentity_show basic alice sipserver.com kamctl rpc presence.presentity_show full * sipserver.com +... + </programlisting> + </section> + <section id="presence.rpc.watcher_list"> + <title>presence.watcher_list</title> + <para> + Return the watcher records for a specific presentity uri. + </para> + <para> + Name: <emphasis>presence.watcher_list</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>mode - it can be 'basic' or 'full' to print a selection or + all the fields of watcher record.</para> + </listitem> + <listitem> + <para>uri - the presentity uri.</para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc presence.watcher_list basic sip:alice@sipserver.com ... </programlisting> </section>

1 0

git:master:f66a071d: auth: use time_t instead of casting to int in nonce check
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: f66a071d18820fc71e421d1a73ebd959c4423655 URL: https://github.com/kamailio/kamailio/commit/f66a071d18820fc71e421d1a73ebd95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T13:48:59+01:00 auth: use time_t instead of casting to int in nonce check - use unsigned int instead of int for building the nonce --- Modified: src/modules/auth/challenge.c Modified: src/modules/auth/nonce.c Modified: src/modules/auth/nonce.h --- Diff: https://github.com/kamailio/kamailio/commit/f66a071d18820fc71e421d1a73ebd95… Patch: https://github.com/kamailio/kamailio/commit/f66a071d18820fc71e421d1a73ebd95… --- diff --git a/src/modules/auth/challenge.c b/src/modules/auth/challenge.c index c5a769ed21..6f5084a9ae 100644 --- a/src/modules/auth/challenge.c +++ b/src/modules/auth/challenge.c @@ -21,6 +21,8 @@ * */ +#include <stdint.h> + #include "../../core/data_lump.h" #include "../../core/mem/mem.h" #include "../../core/parser/digest/digest.h" @@ -94,14 +96,14 @@ void strip_realm(str* _realm) */ int calc_new_nonce(char* nonce, int *nonce_len, int cfg, struct sip_msg* msg) { - int t; + unsigned int t; #if defined USE_NC || defined USE_OT_NONCE unsigned int n_id; unsigned char pool; unsigned char pool_flags; #endif - t=time(0); + t=(unsigned int)(uint64_t)time(0); #if defined USE_NC || defined USE_OT_NONCE if (nc_enabled || otn_enabled){ pool=nid_get_pool(); diff --git a/src/modules/auth/nonce.c b/src/modules/auth/nonce.c index 3e28df9be4..bd6bc2b755 100644 --- a/src/modules/auth/nonce.c +++ b/src/modules/auth/nonce.c @@ -203,7 +203,8 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * message will be included in the generated nonce. * @return 0 on success and -1 on error */ -int calc_nonce(char* nonce, int *nonce_len, int cfg, int since, int expires, +int calc_nonce(char* nonce, int *nonce_len, int cfg, unsigned int since, + unsigned int expires, #if defined USE_NC || defined USE_OT_NONCE unsigned int n_id, unsigned char pf, #endif /* USE_NC || USE_OT_NONCE */ @@ -310,7 +311,8 @@ int check_nonce(auth_body_t* auth, str* secret1, str* secret2, struct sip_msg* msg, int update_nonce) { str * nonce; - int since, b_nonce2_len, b_nonce_len, cfg; + time_t since; + int b_nonce2_len, b_nonce_len, cfg; union bin_nonce b_nonce; union bin_nonce b_nonce2; time_t t; diff --git a/src/modules/auth/nonce.h b/src/modules/auth/nonce.h index 2d04051380..cf8713ea93 100644 --- a/src/modules/auth/nonce.h +++ b/src/modules/auth/nonce.h @@ -208,7 +208,8 @@ int get_auth_checks(struct sip_msg* msg); /* * Calculate nonce value */ -int calc_nonce(char* nonce, int* nonce_len, int cfg, int since, int expires, +int calc_nonce(char* nonce, int* nonce_len, int cfg, unsigned int since, + unsigned int expires, #if defined USE_NC || defined USE_OT_NONCE unsigned int n_id, unsigned char pf, #endif /* USE_NC || USE_OT_NONCE */

1 0

git:master:9cbebc1d: presence: added presence.watcher_list rpc command
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: 9cbebc1d7c0eda71162ce3d90de1ac3110c10bb0 URL: https://github.com/kamailio/kamailio/commit/9cbebc1d7c0eda71162ce3d90de1ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T17:13:09+01:00 presence: added presence.watcher_list rpc command - list the watchers for a presentity uri --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/9cbebc1d7c0eda71162ce3d90de1ac3… Patch: https://github.com/kamailio/kamailio/commit/9cbebc1d7c0eda71162ce3d90de1ac3… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 5138b1381e..06b73df61d 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -2029,6 +2029,103 @@ static const char *rpc_presence_presentity_show_doc[2] = { 0 }; +/*! \brief + * rpc cmd: presence.watcher_list + * \mode - output attributes control + * \presuri - filter by presentity uri + */ +void rpc_presence_watcher_list(rpc_t *rpc, void *ctx) +{ + int i = 0; + str omode = {0, 0}; + int imode = 0; + str presuri = str_init(""); + str pempty = str_init(""); + subs_t *s = NULL; + void *th = NULL; + + LM_DBG("listing in memory presentity records\n"); + + imode = rpc->scan(ctx, "SS", &omode, &presuri); + if(imode < 2) { + rpc->fault(ctx, 500, "Not enough parameters"); + return; + } + if(omode.len == 4 && strncmp(omode.s, "full", 4)==0) { + imode = 1; + } else if(omode.len == 5 && strncmp(omode.s, "basic", 5)==0) { + imode = 0; + } else { + rpc->fault(ctx, 500, "Unknown output mode"); + return; + } + + for(i = 0; i < shtable_size; i++) { + lock_get(&subs_htable[i].lock); + for(s = subs_htable[i].entries->next; s!=NULL; s = s->next) { + if(s->pres_uri.len == presuri.len + && strncasecmp(s->pres_uri.s, presuri.s, presuri.len)==0) { + /* add record node */ + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating response"); + lock_release(&subs_htable[i].lock); + return; + } + + /* add common fields */ + if(rpc->struct_add(th, "SSSSSSSSSSSuudu", + "pres_uri", &s->pres_uri, + "to_user", &s->to_user, + "to_domain", &s->to_domain, + "from_user", &s->from_user, + "from_domain", &s->from_domain, + "watcher_user", &s->watcher_user, + "watcher_domain", &s->watcher_domain, + "contact", &s->contact, + "event_id", &s->event_id, + "callid", &s->callid, + "user_agent", (s->user_agent.s)?&s->user_agent:&pempty, + "expires", s->expires, + "status", s->status, + "version", s->version, + "flags", s->flags)<0) { + rpc->fault(ctx, 500, "Internal error adding attributes"); + lock_release(&subs_htable[i].lock); + return; + } + if(imode==1) { + /* add extra fields */ + if(rpc->struct_add(th, "SSSSSSSuuddd", + "reason", (s->reason.s)?&s->reason:&pempty, + "to_tag", &s->to_tag, + "from_tag", &s->from_tag, + "socket", (s->sockinfo_str.s)?&s->sockinfo_str:&pempty, + "local_contact", (s->local_contact.s)?&s->local_contact:&pempty, + "record_route", (s->record_route.s)?&s->record_route:&pempty, + "auth_rules", (s->auth_rules_doc)?s->auth_rules_doc:&pempty, + "remote_cseq", s->remote_cseq, + "local_cseq", s->local_cseq, + "recv_event", s->recv_event, + "updated", s->updated, + "updated_winfo", s->updated_winfo)<0) { + rpc->fault(ctx, 500, "Internal error adding extra attributes"); + lock_release(&subs_htable[i].lock); + return; + } + } + + } + } + lock_release(&subs_htable[i].lock); + } +} + +static const char *rpc_presence_watcher_list_doc[2] = { + "Show the watcher records for a specific presentity user", + 0 +}; + + rpc_export_t presence_rpc[] = { {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, {"presence.refreshWatchers", rpc_presence_refresh_watchers, @@ -2039,6 +2136,8 @@ rpc_export_t presence_rpc[] = { rpc_presence_presentity_list_doc, RET_ARRAY}, {"presence.presentity_show", rpc_presence_presentity_show, rpc_presence_presentity_show_doc, RET_ARRAY}, + {"presence.watcher_list", rpc_presence_watcher_list, + rpc_presence_watcher_list_doc, RET_ARRAY}, {0, 0, 0, 0} };

1 0

git:master:41cd4fe9: acc_radius: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: 41cd4fe940e2867a348d45840363dfef2b9e05dc URL: https://github.com/kamailio/kamailio/commit/41cd4fe940e2867a348d45840363dfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-14T13:48:59+01:00 acc_radius: cast to uint64_t when using time_t value --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/41cd4fe940e2867a348d45840363dfe… Patch: https://github.com/kamailio/kamailio/commit/41cd4fe940e2867a348d45840363dfe… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index 41e70c73fb..59c977a9e4 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -364,7 +364,7 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) snprintf(smicrosec, 18, "%17.6f", tsecmicro); ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); } else { - av_type = (uint32_t)inf->env->ts; + av_type = (uint32_t)(uint64_t)inf->env->ts; ADD_RAD_AVPAIR(RA_TIME_STAMP, &av_type, -1); }

1 0

git:master:e9f1a426: sipcapture: remove not used parameter table_time_suffix
by Henning Westerholt 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: e9f1a426b6ca5fb9b4c9dc67f2b3f744c20f40b0 URL: https://github.com/kamailio/kamailio/commit/e9f1a426b6ca5fb9b4c9dc67f2b3f74… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-14T10:27:25Z sipcapture: remove not used parameter table_time_suffix --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/e9f1a426b6ca5fb9b4c9dc67f2b3f74… Patch: https://github.com/kamailio/kamailio/commit/e9f1a426b6ca5fb9b4c9dc67f2b3f74… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 46514a3eb6..c81b8c45e6 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -178,7 +178,6 @@ static int hep_version(struct sip_msg *msg); static str db_url = str_init(DEFAULT_DB_URL); static str table_name = str_init("sip_capture"); static str hash_source = str_init("call_id"); -static str table_time_suffix = str_init("%Y%m%D"); static str mt_mode = str_init("rand"); static str date_column = str_init("date"); static str micro_ts_column = str_init("micro_ts"); @@ -400,7 +399,6 @@ static param_export_t params[] = { {"capture_bad_msgs", INT_PARAM, &parse_bad_msgs }, {"insert_retries", INT_PARAM, &insert_retries}, {"insert_retry_timeout", INT_PARAM, &insert_retry_timeout}, - {"table_time_suffix", PARAM_STR, &table_time_suffix}, {"topoh_unmask", PARAM_INT, &sc_topoh_unmask}, {"nonsip_hook", PARAM_INT, &nonsip_hook}, {"event_callback", PARAM_STR, &sc_event_callback},

1 0

git:master:f3ab1aa0: modules: readme files regenerated - sctp ... [skip ci]
by Kamailio Dev 14 Feb '23

14 Feb '23

Module: kamailio Branch: master Commit: f3ab1aa02955493dd3f095d0ebbcb64d2d6751e5 URL: https://github.com/kamailio/kamailio/commit/f3ab1aa02955493dd3f095d0ebbcb64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-14T11:01:49+01:00 modules: readme files regenerated - sctp ... [skip ci] --- Modified: src/modules/sctp/README Modified: src/modules/sdpops/README Modified: src/modules/secfilter/README Modified: src/modules/secsipid/README Modified: src/modules/sipcapture/README Modified: src/modules/sipjson/README Modified: src/modules/sipt/README Modified: src/modules/siptrace/README Modified: src/modules/slack/README Modified: src/modules/sms/README Modified: src/modules/smsops/README Modified: src/modules/sqlops/README Modified: src/modules/sst/README Modified: src/modules/stirshaken/README Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/f3ab1aa02955493dd3f095d0ebbcb64… Patch: https://github.com/kamailio/kamailio/commit/f3ab1aa02955493dd3f095d0ebbcb64…

1 0

[kamailio/kamailio] Typos (PR #3374)
by Дилян Палаузов 14 Feb '23

14 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3374 -- Commit Summary -- * sanity: typos * sca: typos * sctp: typos * sdpops: typos * secfilter: typo * secsipid: typos * secsipid_proc: typos * sipcapture: typos * sipjson: typos * sipt: typos * siptrace: typos * sl: typos * slack: typos * sms: typos * smsops: typos * snmpstats: typo * sqlops: typo * sst: typos * statsc: typos * stirshaken: typos * stun: typos * sworker: typos -- File Changes -- M src/modules/sanity/sanity.c (8) M src/modules/sca/sca_call_info.c (2) M src/modules/sca/sca_notify.c (2) M src/modules/sctp/doc/sctp_admin.xml (18) M src/modules/sctp/sctp_server.c (8) M src/modules/sdpops/doc/sdpops_admin.xml (10) M src/modules/sdpops/sdpops_mod.c (2) M src/modules/secfilter/doc/secfilter_admin.xml (2) M src/modules/secsipid/doc/secsipid_admin.xml (4) M src/modules/secsipid_proc/libsecsipid.h (4) M src/modules/sipcapture/doc/sipcapture_admin.xml (6) M src/modules/sipcapture/hep.c (4) M src/modules/sipcapture/sipcapture.c (6) M src/modules/sipjson/doc/sipjson_admin.xml (2) M src/modules/sipjson/sipjson_mod.c (2) M src/modules/sipt/doc/sipt_admin.xml (6) M src/modules/sipt/sipt.c (2) M src/modules/sipt/ss7_parser.c (4) M src/modules/siptrace/doc/siptrace_admin.xml (10) M src/modules/siptrace/siptrace.c (4) M src/modules/siptrace/siptrace_hep.c (2) M src/modules/sl/sl.c (4) M src/modules/sl/sl_funcs.c (2) M src/modules/slack/doc/slack_admin.xml (2) M src/modules/sms/doc/params.xml (8) M src/modules/sms/doc/sms.xml (2) M src/modules/sms/sms_funcs.c (6) M src/modules/smsops/doc/smsops_admin.xml (2) M src/modules/smsops/examples/kamailio.cfg (4) M src/modules/smsops/smsops_impl.c (6) M src/modules/snmpstats/mibs/KAMAILIO-TC (2) M src/modules/sqlops/doc/sqlops_admin.xml (2) M src/modules/sst/doc/sst_admin.xml (6) M src/modules/sst/sst.c (2) M src/modules/sst/sst_handlers.c (32) M src/modules/statsc/statsc_mod.c (4) M src/modules/stirshaken/doc/stirshaken_admin.xml (6) M src/modules/stun/kam_stun.c (36) M src/modules/sworker/doc/sworker_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3374.patch https://github.com/kamailio/kamailio/pull/3374.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3374 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3374(a)github.com>

2 2

git: new commits in branch master
by Henning Westerholt 14 Feb '23

14 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/63a7b8932adf1b2d0f76d40b960df03… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sanity: typos - URL: https://github.com/kamailio/kamailio/commit/21ce3506dea9a8873ba4b127f4a8ad6… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sca: typos - URL: https://github.com/kamailio/kamailio/commit/0c8226457ae2d94ec615719fed71b1b… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sctp: typos - URL: https://github.com/kamailio/kamailio/commit/334efbb1d2e1ed4a1086694e6006365… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sdpops: typos - URL: https://github.com/kamailio/kamailio/commit/d08cef5bc5b1cacbfcb70c3f5298f61… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 secfilter: typo - URL: https://github.com/kamailio/kamailio/commit/47c9ddf2ae08c07e222dfbe98d314ad… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 secsipid: typos - URL: https://github.com/kamailio/kamailio/commit/f175444552745f33796ef1dded89a62… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 secsipid_proc: typos - URL: https://github.com/kamailio/kamailio/commit/a763ee9faa95dd616542b2e25f54b15… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sipcapture: typos - URL: https://github.com/kamailio/kamailio/commit/70910e72000d1be7513d1869ac0c4e6… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sipjson: typos - URL: https://github.com/kamailio/kamailio/commit/469f86fd958fd79bdc24aebbaf16830… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sipt: typos - URL: https://github.com/kamailio/kamailio/commit/d79f5c2d69920edd6feea68b6fd89f3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 siptrace: typos - URL: https://github.com/kamailio/kamailio/commit/80aeb90fd837f20c4b6524b3df64cc7… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sl: typos - URL: https://github.com/kamailio/kamailio/commit/f9b6fc83ef7106bb6ee5fd96695e84e… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 slack: typos - URL: https://github.com/kamailio/kamailio/commit/766824a3da2798cb9efa4802c056806… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sms: typos - URL: https://github.com/kamailio/kamailio/commit/88bcbef21d570e0b853262d7880ba21… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 smsops: typos - URL: https://github.com/kamailio/kamailio/commit/4235d2e8300a8e135ec9768e27797ba… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 snmpstats: typo - URL: https://github.com/kamailio/kamailio/commit/ac16ccd332ba8b0a3ac41d007408049… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sqlops: typo - URL: https://github.com/kamailio/kamailio/commit/8e899ee6e2efd5287fb627412209a38… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sst: typos - URL: https://github.com/kamailio/kamailio/commit/a8367fa4fa8519193f5ed5693e78c14… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 statsc: typos - URL: https://github.com/kamailio/kamailio/commit/f8f94e46baa85a811dcf1f8be82ca4e… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 stirshaken: typos - URL: https://github.com/kamailio/kamailio/commit/698a92dd87a067bfbba68689e982328… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 stun: typos - URL: https://github.com/kamailio/kamailio/commit/a308dc748aa819b46aab82c148b7bda… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-14T10:46:20+01:00 sworker: typos

1 0

git:master:4f201cbd: modules: readme files regenerated - db_berkeley ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 4f201cbd2e9d0c645e1f6618e6db95389731ef95 URL: https://github.com/kamailio/kamailio/commit/4f201cbd2e9d0c645e1f6618e6db953… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T21:46:37+01:00 modules: readme files regenerated - db_berkeley ... [skip ci] --- Modified: src/modules/db_berkeley/README Modified: src/modules/db_cassandra/README Modified: src/modules/db_oracle/README Modified: src/modules/db_text/README Modified: src/modules/debugger/README Modified: src/modules/dialog/README Modified: src/modules/dialplan/README Modified: src/modules/dispatcher/README Modified: src/modules/dlgs/README Modified: src/modules/dmq/README Modified: src/modules/dmq_usrloc/README Modified: src/modules/domain/README Modified: src/modules/domainpolicy/README --- Diff: https://github.com/kamailio/kamailio/commit/4f201cbd2e9d0c645e1f6618e6db953… Patch: https://github.com/kamailio/kamailio/commit/4f201cbd2e9d0c645e1f6618e6db953…

1 0

[kamailio/kamailio] Typos (PR #3373)
by Дилян Палаузов 13 Feb '23

13 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3373 -- Commit Summary -- * drouting: typos * domainpolicy: typos * domain: typo * dmq: typos * dlgs: typos * dmq_usrloc: typo * dispatcher: typos * dialplan: typos * dialog: typos * debugger: typos * db_text: typos * db_postgres: typos * db_redis: typo * db_perlvdb: typos * db_oracle: typos * db_unixodbc: typos * db_mysql: typos * db_mongodb: typos * db_flatstore: typos * db_cluster: typos * db_cassandra: typos * db_berkeley: typos * db2_ops: typo * db2_ldap: typos -- File Changes -- M src/modules/db2_ldap/ld_con.c (2) M src/modules/db2_ldap/ld_fld.h (2) M src/modules/db2_ldap/ldap.cfg (2) M src/modules/db2_ops/db2_ops.c (2) M src/modules/db_berkeley/bdb_cmd.c (4) M src/modules/db_berkeley/bdb_con.c (2) M src/modules/db_berkeley/bdb_fld.h (2) M src/modules/db_berkeley/bdb_lib.c (4) M src/modules/db_berkeley/db_berkeley.c (8) M src/modules/db_berkeley/doc/db_berkeley_admin.xml (6) M src/modules/db_berkeley/km_bdb_lib.c (4) M src/modules/db_cassandra/dbcassa_base.cpp (10) M src/modules/db_cassandra/doc/db_cassandra_admin.xml (2) M src/modules/db_cassandra/kamailio_cassa.cfg (8) M src/modules/db_cluster/dbcl_api.h (2) M src/modules/db_cluster/dbcl_data.h (2) M src/modules/db_flatstore/db_flatstore.c (2) M src/modules/db_flatstore/flat_con.c (2) M src/modules/db_flatstore/km_doc/db_flatstore_admin.xml (2) M src/modules/db_flatstore/km_flat_pool.c (2) M src/modules/db_flatstore/km_flat_pool.h (2) M src/modules/db_mongodb/mongodb_connection.h (2) M src/modules/db_mongodb/mongodb_dbase.c (4) M src/modules/db_mongodb/mongodb_dbase.h (2) M src/modules/db_mysql/km_dbase.c (4) M src/modules/db_oracle/asynch.c (2) M src/modules/db_oracle/dbase.c (10) M src/modules/db_oracle/doc/db_oracle_admin.xml (2) M src/modules/db_oracle/val.c (2) M src/modules/db_oracle/val.h (2) M src/modules/db_perlvdb/perlvdb_conv.c (2) M src/modules/db_postgres/km_dbase.c (10) M src/modules/db_postgres/pg_con.c (4) M src/modules/db_postgres/pg_fld.h (4) M src/modules/db_postgres/pg_oid.h (2) M src/modules/db_redis/redis_dbase.h (2) M src/modules/db_text/dbt_api.c (2) M src/modules/db_text/dbt_base.c (4) M src/modules/db_text/dbt_res.c (2) M src/modules/db_text/doc/db_text_admin.xml (2) M src/modules/db_unixodbc/dbase.c (4) M src/modules/debugger/debugger_api.c (6) M src/modules/debugger/doc/debugger_admin.xml (4) M src/modules/dialog/dialog.c (4) M src/modules/dialog/dlg_cb.c (6) M src/modules/dialog/dlg_cseq.c (10) M src/modules/dialog/dlg_handlers.c (2) M src/modules/dialog/dlg_req_within.c (2) M src/modules/dialog/dlg_var.c (2) M src/modules/dialog/doc/dialog_admin.xml (14) M src/modules/dialog/doc/dialog_devel.xml (4) M src/modules/dialplan/doc/dialplan_admin.xml (6) M src/modules/dispatcher/dispatch.c (4) M src/modules/dispatcher/dispatch.h (4) M src/modules/dispatcher/doc/dispatcher.cfg (4) M src/modules/dispatcher/doc/dispatcher_admin.xml (6) M src/modules/dlgs/doc/dlgs_admin.xml (2) M src/modules/dmq/dmq_funcs.c (2) M src/modules/dmq/dmqnode.h (2) M src/modules/dmq/doc/dmq_admin.xml (4) M src/modules/dmq/notification_peer.h (2) M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (2) M src/modules/domain/doc/domain_admin.xml (2) M src/modules/domainpolicy/doc/domainpolicy_admin.xml (12) M src/modules/domainpolicy/domainpolicy.c (4) M src/modules/domainpolicy/domainpolicy.h (2) M src/modules/drouting/dr_load.c (2) M src/modules/drouting/drouting.c (2) M src/modules/drouting/routing.c (4) M src/modules/drouting/routing.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3373.patch https://github.com/kamailio/kamailio/pull/3373.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3373 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3373(a)github.com>

2 2

git: new commits in branch master
by Henning Westerholt 13 Feb '23

13 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/dd61ae2a6a1bc01c662fdcc6c33d86f… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 drouting: typos - URL: https://github.com/kamailio/kamailio/commit/c7d5f359b4f1bd4872ef924c52597b3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 domainpolicy: typos - URL: https://github.com/kamailio/kamailio/commit/f68ea71a12f236f2d19b537f8775456… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 domain: typo - URL: https://github.com/kamailio/kamailio/commit/e0a42350d019f55163cf55bd72f1e65… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dmq: typos - URL: https://github.com/kamailio/kamailio/commit/bd2f9d7ab113f351f75d3121db3ffb9… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dlgs: typos - URL: https://github.com/kamailio/kamailio/commit/0723d3cd4da5ed03118bdbee6d960b4… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dmq_usrloc: typo - URL: https://github.com/kamailio/kamailio/commit/c871fd693676c51ce18f017e7f3f631… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dispatcher: typos - URL: https://github.com/kamailio/kamailio/commit/dd07a5cd5762d9142f95c5ab367d2f3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dialplan: typos - URL: https://github.com/kamailio/kamailio/commit/2822cc8067d2dd7f865f724228cda8c… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 dialog: typos - URL: https://github.com/kamailio/kamailio/commit/f63cf3cc56e9cad458e5531d07bd579… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 debugger: typos - URL: https://github.com/kamailio/kamailio/commit/78c25be36d0c0bcbf721d03903b6869… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_text: typos - URL: https://github.com/kamailio/kamailio/commit/1a743d094762edb26721184fa4671a7… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_postgres: typos - URL: https://github.com/kamailio/kamailio/commit/0b6013a2c739a6270820b2110970169… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_redis: typo - URL: https://github.com/kamailio/kamailio/commit/7699387c163ad94f0b96d3460d33a74… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_perlvdb: typos - URL: https://github.com/kamailio/kamailio/commit/0291d13584caef9fb491cca18c0194d… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_oracle: typos - URL: https://github.com/kamailio/kamailio/commit/9459b93dfb85bd4916e0b9ae6f567f6… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_unixodbc: typos - URL: https://github.com/kamailio/kamailio/commit/8aee342bd9149f22e8423b75e23fea2… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_mysql: typos - URL: https://github.com/kamailio/kamailio/commit/1c500b7881c2e4677371acd66236a45… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_mongodb: typos - URL: https://github.com/kamailio/kamailio/commit/9920c228856289af92294396959710e… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_flatstore: typos - URL: https://github.com/kamailio/kamailio/commit/fa77972687a0117290ae979f45b3767… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_cluster: typos - URL: https://github.com/kamailio/kamailio/commit/e09bb7e1880ab7204b915efc86c2949… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_cassandra: typos - URL: https://github.com/kamailio/kamailio/commit/ceb4ca6b2a25e04df5029949fb6d1d9… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db_berkeley: typos - URL: https://github.com/kamailio/kamailio/commit/e0e6adfcb27d336ecb156e3b88c4d72… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db2_ops: typo - URL: https://github.com/kamailio/kamailio/commit/6b1c1e7727f8f210f7d20f1473458c8… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T21:41:52+01:00 db2_ldap: typos

1 0

git:master:c572bcc1: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c572bcc113097efb7641f98deb729258ff4ec02a URL: https://github.com/kamailio/kamailio/commit/c572bcc113097efb7641f98deb72925… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T21:31:15+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/c572bcc113097efb7641f98deb72925… Patch: https://github.com/kamailio/kamailio/commit/c572bcc113097efb7641f98deb72925… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index c5f3c6763b..203283ebed 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -1166,7 +1166,7 @@ kamctl rpc presence.presentity_list full RPC Command Format: ... kamctl rpc presence.presentity_show basic alice sipserver.com -kamctl rpc presence.presentity_list full * sipserver.com +kamctl rpc presence.presentity_show full * sipserver.com ... 6. Exported Variables

1 0

Re: [kamailio/kamailio] presence: docs for rpc presence.presentity_show command (c167c47)
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Thanks, fixed, -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/c167c4738fce31cec292edc803160d607a3faaf6/100477082(a)github.com>

1 0

git:master:911d5786: presence: docs - fix example for presence.presentity_show
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 911d5786da6bbd22f954908f7157b5421bdf47f7 URL: https://github.com/kamailio/kamailio/commit/911d5786da6bbd22f954908f7157b54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T21:16:51+01:00 presence: docs - fix example for presence.presentity_show --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/911d5786da6bbd22f954908f7157b54… Patch: https://github.com/kamailio/kamailio/commit/911d5786da6bbd22f954908f7157b54… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index e2e171a3d1..cd67be7e54 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1425,7 +1425,7 @@ kamctl rpc presence.presentity_list full <programlisting format="linespecific"> ... kamctl rpc presence.presentity_show basic alice sipserver.com -kamctl rpc presence.presentity_list full * sipserver.com +kamctl rpc presence.presentity_show full * sipserver.com ... </programlisting> </section>

1 0

Re: [kamailio/kamailio] presence: docs for rpc presence.presentity_show command (c167c47)
by Дилян Палаузов 13 Feb '23

13 Feb '23

This line likely means > kamctl rpc presence.presentity_show full * sipserver.com -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/c167c4738fce31cec292edc803160d607a3faaf6/100474300(a)github.com>

1 0

git:master:e4f0c082: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: e4f0c082422bbd9478cf0607a68c6e7c6bef47ad URL: https://github.com/kamailio/kamailio/commit/e4f0c082422bbd9478cf0607a68c6e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T20:31:26+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/e4f0c082422bbd9478cf0607a68c6e7… Patch: https://github.com/kamailio/kamailio/commit/e4f0c082422bbd9478cf0607a68c6e7… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index 92fdd05330..c5f3c6763b 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -87,6 +87,7 @@ Juha Heinanen 5.2. presence.refreshWatchers 5.3. presence.updateWatchers 5.4. presence.presentity_list + 5.5. presence.presentity_show 6. Exported Variables @@ -237,6 +238,7 @@ Chapter 1. Admin Guide 5.2. presence.refreshWatchers 5.3. presence.updateWatchers 5.4. presence.presentity_list + 5.5. presence.presentity_show 6. Exported Variables @@ -1067,6 +1069,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); 5.2. presence.refreshWatchers 5.3. presence.updateWatchers 5.4. presence.presentity_list + 5.5. presence.presentity_show 5.1. presence.cleanup @@ -1145,6 +1148,27 @@ kamctl rpc presence.presentity_list kamctl rpc presence.presentity_list full ... +5.5. presence.presentity_show + + Return the presentity records stored in memory by filtering with + username and/or domain. + + Name: presence.presentity_show + + Parameters: + * mode - it can be 'basic' or 'full' to print a selection or all the + fields of presentity record. + * user - username to match presentity records, use '*' to match any + username. + * domain - the value to match the domain of the presentity records, + use '*' to match any domain. + + RPC Command Format: +... +kamctl rpc presence.presentity_show basic alice sipserver.com +kamctl rpc presence.presentity_list full * sipserver.com +... + 6. Exported Variables 6.1. $subs(attr)

1 0

git:master:c167c473: presence: docs for rpc presence.presentity_show command
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c167c4738fce31cec292edc803160d607a3faaf6 URL: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T20:19:38+01:00 presence: docs for rpc presence.presentity_show command --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… Patch: https://github.com/kamailio/kamailio/commit/c167c4738fce31cec292edc803160d6… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 0545bbab6a..e2e171a3d1 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1392,6 +1392,40 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... kamctl rpc presence.presentity_list kamctl rpc presence.presentity_list full +... + </programlisting> + </section> + <section id="presence.rpc.presentity_show"> + <title>presence.presentity_show</title> + <para> + Return the presentity records stored in memory by filtering with username + and/or domain. + </para> + <para> + Name: <emphasis>presence.presentity_show</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>mode - it can be 'basic' or 'full' to print a selection or + all the fields of presentity record.</para> + </listitem> + <listitem> + <para>user - username to match presentity records, use '*' to + match any username.</para> + </listitem> + <listitem> + <para>domain - the value to match the domain of the presentity + records, use '*' to match any domain.</para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc presence.presentity_show basic alice sipserver.com +kamctl rpc presence.presentity_list full * sipserver.com ... </programlisting> </section>

1 0

git:master:44689233: topos: use proper field for datetime value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 446892331900c2303e531da55bcb494ccb2d8bce URL: https://github.com/kamailio/kamailio/commit/446892331900c2303e531da55bcb494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T20:19:38+01:00 topos: use proper field for datetime value --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/446892331900c2303e531da55bcb494… Patch: https://github.com/kamailio/kamailio/commit/446892331900c2303e531da55bcb494… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 56d56776a4..e0649b683d 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -890,7 +890,7 @@ int tps_db_insert_branch(tps_data_t *td) db_keys[nr_keys] = &tt_col_rectime; db_vals[nr_keys].type = DB1_DATETIME; - db_vals[nr_keys].val.int_val = time(NULL); + db_vals[nr_keys].val.time_val = time(NULL); nr_keys++; db_keys[nr_keys] = &tt_col_a_callid;

1 0

git:master:2aaa77b1: presence: added rpc command presence.presentity_show
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 2aaa77b11a89cc088393d4ad7fe63f2e54bbd8ce URL: https://github.com/kamailio/kamailio/commit/2aaa77b11a89cc088393d4ad7fe63f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T20:19:38+01:00 presence: added rpc command presence.presentity_show - get records filtering by user and/or domain --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/2aaa77b11a89cc088393d4ad7fe63f2… Patch: https://github.com/kamailio/kamailio/commit/2aaa77b11a89cc088393d4ad7fe63f2…

1 0

git:master:bbb62e2a: modules: readme files regenerated - pdb ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: bbb62e2a163cf0ba6c711074cbed2f1c3cb8ee7c URL: https://github.com/kamailio/kamailio/commit/bbb62e2a163cf0ba6c711074cbed2f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T19:46:22+01:00 modules: readme files regenerated - pdb ... [skip ci] --- Modified: src/modules/pdb/README Modified: src/modules/peering/README Modified: src/modules/permissions/README Modified: src/modules/pipelimit/README Modified: src/modules/presence/README Modified: src/modules/presence_xml/README Modified: src/modules/pua_reginfo/README Modified: src/modules/pv_headers/README --- Diff: https://github.com/kamailio/kamailio/commit/bbb62e2a163cf0ba6c711074cbed2f1… Patch: https://github.com/kamailio/kamailio/commit/bbb62e2a163cf0ba6c711074cbed2f1…

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

- URL: https://github.com/kamailio/kamailio/commit/ea7baa2bca20899f354129f8a83d04c… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 p_usrloc: typos - URL: https://github.com/kamailio/kamailio/commit/e56fce96beae5be8339fb202a395bb3… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pdb: typos - URL: https://github.com/kamailio/kamailio/commit/8832136ca6c638d6bb39c647262cd35… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 peering: typo - URL: https://github.com/kamailio/kamailio/commit/9c52dcbbfa6ae9a39e035fc6cc25612… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 permissions: typos - URL: https://github.com/kamailio/kamailio/commit/dc4d1ffa9aabeaa119fefe1c3eaebcf… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pike: typos - URL: https://github.com/kamailio/kamailio/commit/55868bfcc966931176f6e23fbb10457… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pipelimit: typo - URL: https://github.com/kamailio/kamailio/commit/d355a590feebf34e8c1d1d2b5e7b3a1… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence: typos - URL: https://github.com/kamailio/kamailio/commit/256848273d867beb273d0f80fd7ee41… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_conference: typos - URL: https://github.com/kamailio/kamailio/commit/3b848a3878ac1655ef236505f05040a… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_dialoginfo: typos - URL: https://github.com/kamailio/kamailio/commit/b22d7686895f45dc93fc1979faf70ef… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_mwi: typo - URL: https://github.com/kamailio/kamailio/commit/38f90a4bd6585b9c54b628620e9ced0… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_profile: typo - URL: https://github.com/kamailio/kamailio/commit/f82553b2ce4693c618744ddfdc06163… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_reginfo: typos - URL: https://github.com/kamailio/kamailio/commit/f7e7ddd74093ddd83a93a75e1e37b24… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 presence_xml: typos - URL: https://github.com/kamailio/kamailio/commit/6d05d873f42e268bbe275a4938a11c5… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 print_lib: typo - URL: https://github.com/kamailio/kamailio/commit/2272fba9d98dea9dec541c4c6b7ede8… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua: typos - URL: https://github.com/kamailio/kamailio/commit/8275f3742a44bb686e953c4b9e4d7a4… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua_dialoginfo: typos - URL: https://github.com/kamailio/kamailio/commit/b9f7591ad595e396feb85bad9d70e21… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua_reginfo: typos - URL: https://github.com/kamailio/kamailio/commit/3b8608770862ab37b3cd82414f06992… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pua_xmpp: typos - URL: https://github.com/kamailio/kamailio/commit/1d26ac7aecf122528dcfd576ea6a3e9… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pv: typos - URL: https://github.com/kamailio/kamailio/commit/a89170a2e08584be33da9464f75ee09… Author: �� <git-dpa(a)aegee.org> Date: 2023-02-13T19:41:23+01:00 pv_headers: typos

1 0

[kamailio/kamailio] Typos (PR #3371)
by Дилян Палаузов 13 Feb '23

13 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3371 -- Commit Summary -- * p_usrloc: typos * pdb: typos * peering: typo * permissions: typos * pike: typos * pipelimit: typo * presence: typos * presence_conference: typos * presence_dialoginfo: typos * presence_mwi: typo * presence_profile: typo * presence_reginfo: typos * presence_xml: typos * print_lib: typo * pua: typos * pua_dialoginfo: typos * pua_reginfo: typos * pua_xmpp: typos * pv: typos * pv_headers: typos -- File Changes -- M src/modules/p_usrloc/p_usrloc_mod.c (4) M src/modules/p_usrloc/udomain.c (2) M src/modules/p_usrloc/ul_db_handle.c (2) M src/modules/p_usrloc/urecord.c (2) M src/modules/p_usrloc/urecord.h (2) M src/modules/pdb/doc/pdb_admin.xml (2) M src/modules/pdb/pdb.c (2) M src/modules/peering/doc/peering_admin.xml (2) M src/modules/permissions/doc/permissions_admin.xml (12) M src/modules/permissions/rule.c (2) M src/modules/pike/pike_funcs.c (4) M src/modules/pipelimit/doc/pipelimit_admin.xml (2) M src/modules/presence/doc/presence_admin.xml (14) M src/modules/presence/doc/presence_devel.xml (2) M src/modules/presence/event_list.h (2) M src/modules/presence/notify.c (2) M src/modules/presence/presence.c (2) M src/modules/presence/presentity.c (2) M src/modules/presence_conference/notify_body.c (6) M src/modules/presence_conference/presence_conference.c (2) M src/modules/presence_dialoginfo/notify_body.c (12) M src/modules/presence_dialoginfo/presence_dialoginfo.c (2) M src/modules/presence_mwi/presence_mwi.c (2) M src/modules/presence_profile/presence_profile.c (2) M src/modules/presence_reginfo/notify_body.c (8) M src/modules/presence_reginfo/presence_reginfo.c (2) M src/modules/presence_xml/doc/presence_xml_admin.xml (2) M src/modules/presence_xml/notify_body.c (32) M src/modules/presence_xml/presence_xml.c (2) M src/modules/print_lib/print_lib.c (2) M src/modules/pua/pua.c (4) M src/modules/pua/pua_db.c (2) M src/modules/pua/send_publish.c (2) M src/modules/pua/send_publish.h (2) M src/modules/pua/send_subscribe.h (2) M src/modules/pua_dialoginfo/dialog_publish.c (2) M src/modules/pua_dialoginfo/pua_dialoginfo.c (2) M src/modules/pua_dialoginfo/pua_dialoginfo.h (2) M src/modules/pua_reginfo/doc/pua_reginfo_admin.xml (4) M src/modules/pua_xmpp/simple2xmpp.c (2) M src/modules/pua_xmpp/xmpp2simple.c (2) M src/modules/pv/pv.c (8) M src/modules/pv/pv_branch.c (2) M src/modules/pv/pv_core.c (8) M src/modules/pv/pv_shv.c (2) M src/modules/pv/pv_trans.c (2) M src/modules/pv_headers/doc/functions.xml (2) M src/modules/pv_headers/doc/params.xml (2) M src/modules/pv_headers/pv_headers.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3371.patch https://github.com/kamailio/kamailio/pull/3371.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3371 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3371(a)github.com>

2 1

git:master:d87120df: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: d87120dfb77d018cdf571cbcf18cf1950ce61987 URL: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T13:16:18+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19… Patch: https://github.com/kamailio/kamailio/commit/d87120dfb77d018cdf571cbcf18cf19… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 941cee9465..b1edb5d450 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -191,10 +191,10 @@ Chapter 1. Admin Guide save() and should be used for ��REGISTER�� requests. Note: fix_nated_contact() changes the ��Contact�� header, thus it breaks - the RFC. Although usually this is not an issue, it may cause problems + the RFC. Although this is not always an issue, it may cause problems with strict SIP clients. An alternative is to use add_contact_alias() - that together with the handle_ruri_alias() is standards conforming and - also supports reuse of TCP/TLS connections. + (or set_contact_alias()) that together with the handle_ruri_alias() is + standards conforming and also supports reuse of TCP/TLS connections. 2. NAT pinging types @@ -285,12 +285,15 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) If this parameter is set to 1 then only contacts that have the behind - NAT ��nat_bflag�� flag in user location database set will get - SIP-request-based ping. - - If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is - sent to all contacts. If it is 0 and sipping_bflag parameter is set, - then SIP-request-based pinging is sent to all contacts. + NAT ��nat_bflag�� flag set in user location records get the NAT ping (the + ��nat_bflag�� is specified via modparam of usrloc module). By default the + ping is done with 4-bytes UDP packet. If sipping_bflag is also set, + then the ping is done with a stateless SIP request (by default: OPTIONS + request). + + If it is 0, then all contacts get a NAT ping, by default being the + 4-bytes UDP packet. If it is 0 and sipping_bflag parameter is set, then + SIP-request-based pinging is sent to all contacts. Default value is 0.

1 0

[kamailio/kamailio] nathelper: ping_nated_only=1 sends 4-bytes UDP-packet pings (PR #3346)
by Дилян Палаузов 13 Feb '23

13 Feb '23

My experiments show that with ``` modparam("nathelper", "ping_nated_only", 1) modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("usrloc", "nat_bflag", FLB_NATB) ``` when both FLB_NATB and FLB_NATSIPPING branch flags are set, no OPTIONS from Kamailio to UAC is generated, so I assume that nathelper.ping_nated_only=1 does force 4-bytes UDP keepalive. This change spells the above, as the behaviour currently is not specified. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3346 -- Commit Summary -- * nathelper: ping_nated_only sends 4-bytes UDP-packet pings -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (12) M src/modules/nathelper/examples/4to6.cfg (2) M src/modules/nathelper/examples/alg.cfg (2) M src/modules/nathelper/nathelper.c (6) M src/modules/nathelper/nhelpr_funcs.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3346.patch https://github.com/kamailio/kamailio/pull/3346.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3346 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3346(a)github.com>

3 8

git:master:ff106fb9: nathelper: docs - updates to the nat pinging types
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: ff106fb93c5b872e529106f58a1b42c4fa092349 URL: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T13:02:35+01:00 nathelper: docs - updates to the nat pinging types --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c… Patch: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c…

1 0

git:master:fdf72bec: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: fdf72bec2d6cc20618bc30d0978d7f24f8106d44 URL: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T13:01:34+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… Patch: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index e091d2018f..941cee9465 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -107,7 +107,7 @@ Ovidiu Sas 1.17. Set alias_name parameter 1.18. fix_nated_contact usage 1.19. fix_nated_sdp usage - 1.20. add_rcv_paramer usage + 1.20. add_rcv_param usage 1.21. fix_nated_register usage 1.22. nat_uac_test usage 1.23. is_rfc1918 usage @@ -187,10 +187,10 @@ Chapter 1. Admin Guide with request's source address:port pair. The function fix_nated_sdp() adds the active direction indication to SDP (flag 0x01) and updates the source IP address too (flag 0x02). The function fix_nated_register() - exports exports the request's source address:port into an AVP to be - used during save() and should be used for ��REGISTER�� requests. + exports the request's source address:port into an AVP to be used during + save() and should be used for ��REGISTER�� requests. - Note: fix_nated_contact changes the ��Contact�� header, thus it breaks + Note: fix_nated_contact() changes the ��Contact�� header, thus it breaks the RFC. Although usually this is not an issue, it may cause problems with strict SIP clients. An alternative is to use add_contact_alias() that together with the handle_ruri_alias() is standards conforming and @@ -205,7 +205,7 @@ Chapter 1. Admin Guide Kamailio; + Disadvantages: unidirectional traffic through NAT (inbound - from outside to inside); As many NATs do update the bind - timeout only on outbound traffic, the bind may expire and + timeout only on outbound traffic, the bind may expire and get closed. * SIP request - a stateless SIP request is sent to the UDP contact address. @@ -285,7 +285,8 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) If this parameter is set to 1 then only contacts that have the behind - NAT ��nat_bflag�� flag in user location database set will get ping. + NAT ��nat_bflag�� flag in user location database set will get + SIP-request-based ping. If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is sent to all contacts. If it is 0 and sipping_bflag parameter is set, @@ -583,7 +584,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; This function can be used from REQUEST_ROUTE. - Example 1.20. add_rcv_paramer usage + Example 1.20. add_rcv_param usage ... add_rcv_param(); # add the parameter to the Contact header .... @@ -821,7 +822,7 @@ $ kamcmd nathelper.enable_ping 1 8.1. @nathelper.rewrite_contact[n] Get n-th Contact value with IP:Port rewritten to source ip:port. N is - counted from 1. Only IP:port is rewritten, remaining part are left + counted from 1. Only IP:port is rewritten, remaining parts are left unchanged. Full nameaddr is supported. Example 1.31. @nathelper.rewrite_contact usage

1 0

git:master:8218c14d: nathelper: ping_nated_only sends 4-bytes UDP-packet pings
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 8218c14d144ef4539c94c8aabe5e73b5c8a11b08 URL: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:48:02+01:00 nathelper: ping_nated_only sends 4-bytes UDP-packet pings --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/examples/4to6.cfg Modified: src/modules/nathelper/examples/alg.cfg Modified: src/modules/nathelper/nathelper.c Modified: src/modules/nathelper/nhelpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b… Patch: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b…

1 0

git:master:d81e26fb: modules: readme files regenerated - dmq_usrloc ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: d81e26fb399c5fadda2d70de1d95e008d47bd3d5 URL: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T12:31:34+01:00 modules: readme files regenerated - dmq_usrloc ... [skip ci] --- Modified: src/modules/dmq_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… Patch: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… --- diff --git a/src/modules/dmq_usrloc/README b/src/modules/dmq_usrloc/README index 1536fd5f85..d179d1cfa1 100644 --- a/src/modules/dmq_usrloc/README +++ b/src/modules/dmq_usrloc/README @@ -224,13 +224,14 @@ modparam("dmq_usrloc", "usrloc_domain", "my_domain") The parameter controls whether the socket replication is active or not. This is important for anycast scenarios. The value can be: * 0 - disabled - * 1 - enabled + * 1 - enabled, replicate socket by proto:host:port + * 2 - enabled, replicate socket by socket name Default value is 0. Example 1.8. Set replicate_socket_info parameter ... -modparam("dmq_usrloc", "replicate_socket_info", 0) +modparam("dmq_usrloc", "replicate_socket_info", 1) ... 3.9. usrloc_delete (int)

1 0

git:5.5:05ea1752: usrloc: correct AOR value on usrloc:contact-expired
by Victor Seva 13 Feb '23

13 Feb '23

Module: kamailio Branch: 5.5 Commit: 05ea1752c9f941b624ce5f0b8f4e94d5e81195b2 URL: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:27:10+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 (cherry picked from commit f3d00c91a7919207dac23ada58e59a13b9f334d8) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… Patch: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 204ddfd29f..534583e018 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -905,7 +905,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -913,6 +913,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1007,6 +1010,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1015,18 +1026,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1045,11 +1068,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 0

git:5.6:baa91762: usrloc: correct AOR value on usrloc:contact-expired
by Victor Seva 13 Feb '23

13 Feb '23

Module: kamailio Branch: 5.6 Commit: baa91762aa9f5ee6ede385148c6302c14537cd15 URL: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:26:38+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 (cherry picked from commit f3d00c91a7919207dac23ada58e59a13b9f334d8) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… Patch: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 4025cc549e..d7b9e8a3e5 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -956,7 +956,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -964,6 +964,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1058,6 +1061,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1066,18 +1077,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1096,11 +1119,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 0

[kamailio/kamailio] AOR value at event_route[usrloc:contact-expired] has no domain part even with usrloc.use_domain == 1 (Issue #3365)
by Victor Seva 13 Feb '23

13 Feb '23

### Description When event_route[usrloc:contact-expired] is triggered, the pseudo-var $ulc(exp=>aor) contains only the userpart of the aor of the expired registration ### Troubleshooting ``` modparam("usrloc", "use_domain", 1) [...] event_route[usrloc:contact-expired] { xlog("L_NOTICE", "Contact ruid $ulc(exp=>ruid) to $ulc(exp=>addr) for user $ulc(exp=>aor) expired\n"); } ``` #### Log Messages REGISTER... AOR is ``43991002(a)ce-trunk.lab`` ``` │Feb 9 16:19:47.152646 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE usrloc [udomain.c:697]: db_load_urecord(): aor 43991002(a)ce-trunk.lab not found in table location │Feb 9 16:19:47.152816 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [path.c:108]: build_path_vector(): received is <sip:192.168.2.177:5160> │Feb 9 16:19:47.152843 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [path.c:116]: build_path_vector(): path is <<sip:lb@127.0.0.1;lr;received=sip:192.168.2.177:5160;socket=sip:192.168.2.70:5060>> │Feb 9 16:19:47.152866 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [save.c:421]: pack_ci(): generated ruid is: uloc-63e50ec8-580d-1 │Feb 9 16:19:47.154051 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [reply.c:334]: build_contact(): created Contact HF: Contact: <sip:43991002@192.168.2.177:5160>;expires=600;received="sip:192.168.2.177:5160"#015#012 │Feb 9 16:19:47.154354 spce proxy[22541]: NOTICE: ROUTE_REG_HANDLE <script>: Contacts successfully saved, expires in 600s - R=«sip:ce-trunk.lab» ID=«pgflewbuqnvhmid(a)debbox.xn--lab-3ga UA='Twinkle/1.10.2' ``` let it expire.. AOR in event_route[usrloc:contact-expired] is ``43991002`` ``` │Feb 9 16:30:32.980631 spce proxy[22543]: DEBUG: usrloc [udomain.c:1050]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] │Feb 9 16:30:32.980655 spce proxy[22543]: DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f434b8a1220, callback type 8/8, id 0 entered │Feb 9 16:30:32.980776 spce proxy[22543]: DEBUG: registrar [regpv.c:734]: reg_ul_expired_contact(): saved contact for <43991002> in [exp] │Feb 9 16:30:32.980799 spce proxy[22543]: NOTICE: usrloc:contact-expired <script>: Contact ruid uloc-63e50ec8-580d-1 to sip:43991002@192.168.2.177:5160 for user 43991002 expired ``` ### Possible Solutions PR will follow with possible solution ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is kamailio Sipwise flavor ``` version: kamailio 5.6.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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 10.2.1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3365 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3365(a)github.com>

2 6

[kamailio/kamailio] usrloc: correct AOR value on usrloc:contact-expired (PR #3366)
by Victor Seva 13 Feb '23

13 Feb '23

#### 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 #3365 #### Description previously $ulc(x=>aor) had only the user part even with use_domain set output after applied the fix ``` │Feb 9 16:47:58.089067 spce proxy[30268]: DEBUG: usrloc [udomain.c:1053]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] │Feb 9 16:47:58.089100 spce proxy[30268]: DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f8859ed4f50, callback type 8/8, id 0 entered │Feb 9 16:47:58.089197 spce proxy[30268]: DEBUG: registrar [regpv.c:734]: reg_ul_expired_contact(): saved contact for <43991002(a)ce-trunk.lab> in [exp] │Feb 9 16:47:58.089220 spce proxy[30268]: NOTICE: usrloc:contact-expired <script>: Contact ruid uloc-63e5131a-7639-1 to sip:43991002@192.168.2.177:5160 for user 43991002(a)ce-trunk.lab expired ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3366 -- Commit Summary -- * usrloc: correct AOR value on usrloc:contact-expired -- File Changes -- M src/modules/usrloc/udomain.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3366.patch https://github.com/kamailio/kamailio/pull/3366.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3366 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3366(a)github.com>

2 2

git:master:f3d00c91: usrloc: correct AOR value on usrloc:contact-expired
by Victor Seva 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: f3d00c91a7919207dac23ada58e59a13b9f334d8 URL: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:24:30+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… Patch: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index f64df09daa..1d30d813bd 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -955,7 +955,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -963,6 +963,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1057,6 +1060,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1065,18 +1076,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1095,11 +1118,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 0

git:master:d2e73f9c: dmq_usrloc: check if socket name is set when replicating
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: d2e73f9c51630f47fa7660b4c4831fcecd661f87 URL: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:20:37+01:00 dmq_usrloc: check if socket name is set when replicating --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… Patch: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index dd2a7f2f42..62477198a2 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -692,7 +692,7 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node srjson_AddStrToObject(jdoc, jdoc_contact, "sock", ptr->sock->sock_str.s, ptr->sock->sock_str.len); jdoc_contact_group.size += ptr->sock->sock_str.len; } - else if (_dmq_usrloc_replicate_socket_info==DMQ_USRLOC_REPLICATE_SOCKNAME) { + else if (_dmq_usrloc_replicate_socket_info==DMQ_USRLOC_REPLICATE_SOCKNAME && ptr->sock!=NULL && ptr->sock->sockname.s!=NULL) { srjson_AddStrToObject(jdoc, jdoc_contact, "sockname", ptr->sock->sockname.s, ptr->sock->sockname.len); jdoc_contact_group.size += ptr->sock->sockname.len; }

1 0

[kamailio/kamailio] dmq_usrloc: Add option to replicate socket via its name (PR #3364)
by Bastian Triller 13 Feb '23

13 Feb '23

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [x] Tested changes locally #### Description  Allow replicating location's socket via its name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3364 -- Commit Summary -- * dmq_usrloc: Add option to replicate socket via its name -- File Changes -- M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (9) M src/modules/dmq_usrloc/usrloc_sync.c (24) M src/modules/dmq_usrloc/usrloc_sync.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3364.patch https://github.com/kamailio/kamailio/pull/3364.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3364 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3364(a)github.com>

2 2

git:master:353d7e6a: dmq_usrloc: Add option to replicate socket via its name
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 353d7e6a5f8d751fc647fd687716cc2e0fb1aa77 URL: https://github.com/kamailio/kamailio/commit/353d7e6a5f8d751fc647fd687716cc2… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:18:09+01:00 dmq_usrloc: Add option to replicate socket via its name --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Modified: src/modules/dmq_usrloc/usrloc_sync.c Modified: src/modules/dmq_usrloc/usrloc_sync.h --- Diff: https://github.com/kamailio/kamailio/commit/353d7e6a5f8d751fc647fd687716cc2… Patch: https://github.com/kamailio/kamailio/commit/353d7e6a5f8d751fc647fd687716cc2…

1 0

git:master:cc234290: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: cc2342908d08ee5322fd6830b0db9fd762bef38f URL: https://github.com/kamailio/kamailio/commit/cc2342908d08ee5322fd6830b0db9fd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T12:17:06+01:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README Modified: src/modules/ims_auth/README Modified: src/modules/ims_charging/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_diameter_server/README Modified: src/modules/ims_icscf/README Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_isc/README Modified: src/modules/ims_qos/README Modified: src/modules/ims_registrar_pcscf/README Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/cc2342908d08ee5322fd6830b0db9fd… Patch: https://github.com/kamailio/kamailio/commit/cc2342908d08ee5322fd6830b0db9fd…

1 0

git:master:398cf4dd: ims_usrloc_scscf: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 398cf4dd9645f8a9f7a1e4f1bb9659814bc2d041 URL: https://github.com/kamailio/kamailio/commit/398cf4dd9645f8a9f7a1e4f1bb96598… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_usrloc_scscf: typos --- Modified: src/modules/ims_usrloc_scscf/bin_utils.c Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/ims_usrloc_scscf/subscribe.c Modified: src/modules/ims_usrloc_scscf/udomain.c Modified: src/modules/ims_usrloc_scscf/ul_callback.h Modified: src/modules/ims_usrloc_scscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/398cf4dd9645f8a9f7a1e4f1bb96598… Patch: https://github.com/kamailio/kamailio/commit/398cf4dd9645f8a9f7a1e4f1bb96598…

1 0

git:master:c28b3a0a: ipops: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c28b3a0ae61c9fd1fc8e8b2972686a0f8424c44a URL: https://github.com/kamailio/kamailio/commit/c28b3a0ae61c9fd1fc8e8b2972686a0… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ipops: typos --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/c28b3a0ae61c9fd1fc8e8b2972686a0… Patch: https://github.com/kamailio/kamailio/commit/c28b3a0ae61c9fd1fc8e8b2972686a0… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index d9f01317e5..a9f3962f61 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -695,7 +695,7 @@ static int ki_is_ip6_reference(sip_msg_t *msg, str *sval) } /*! \brief Return the IP type of the given argument (string or pv): - * 1 = IPv4, 2 = IPv6, 3 = IPv6 refenrece, -1 = invalid IP. */ + * 1 = IPv4, 2 = IPv6, 3 = IPv6 reference, -1 = invalid IP. */ static int w_ip_type(sip_msg_t* _msg, char* _s, char *_p2) { str string; @@ -728,7 +728,7 @@ static int w_ip_type(sip_msg_t* _msg, char* _s, char *_p2) } /*! \brief Return the IP type of the given argument (string or pv): - * 1 = IPv4, 2 = IPv6, 3 = IPv6 refenrece, -1 = invalid IP. */ + * 1 = IPv4, 2 = IPv6, 3 = IPv6 reference, -1 = invalid IP. */ static int ki_ip_type(sip_msg_t *msg, str *sval) { switch (ip_parser_execute(sval->s, sval->len)) { @@ -990,7 +990,7 @@ static int w_compare_pure_ips(sip_msg_t* _msg, char* _s1, char* _s2) } /*! \brief Return true if the first IP (string or pv) is within the subnet - * defined by the second commma-separated IP list in CIDR notation. + * defined by the second comma-separated IP list in CIDR notation. * IPv6 references not allowed. */ static int ki_ip_is_in_subnet(sip_msg_t* _msg, str* _sval1, str* _sval2) { @@ -1042,7 +1042,7 @@ static int ki_ip_is_in_subnet(sip_msg_t* _msg, str* _sval1, str* _sval2) /*! \brief Return true if the first IP (string or pv) is within the subnet - * defined by the second commma-separated IP list in CIDR notation. + * defined by the second comma-separated IP list in CIDR notation. * IPv6 references not allowed. */ static int w_ip_is_in_subnet(sip_msg_t* _msg, char* _s1, char* _s2) { diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 9ee6f5879a..4eabbcac86 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -109,7 +109,7 @@ sr_dns_item_t *sr_dns_add_item(str *name) n++; } if(n > 20) { - LM_WARN("too many dns containers - adding nunmber %d - can fill memory\n", + LM_WARN("too many dns containers - adding number %d - can fill memory\n", n); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev