sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
228 discussions

git:master:b508ef25: iims_registrar_scscf: include header for common c functions
by Daniel-Constantin Mierla 03 Jun '24

03 Jun '24

Module: kamailio Branch: master Commit: b508ef253cf996a5efd8bf13ded0c804f3557ada URL: https://github.com/kamailio/kamailio/commit/b508ef253cf996a5efd8bf13ded0c80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-03T22:09:55+02:00 iims_registrar_scscf: include header for common c functions - GH #3855 --- Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/b508ef253cf996a5efd8bf13ded0c80… Patch: https://github.com/kamailio/kamailio/commit/b508ef253cf996a5efd8bf13ded0c80… --- diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index 984395f8867..b6b7da62afc 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -40,6 +40,11 @@ * */ +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + #include "../../core/parser/parse_uri.h" #include "userdata_parser.h" #include "../../core/parser/parse_hname2.h"

1 0

[kamailio/kamailio] rtpengine: multipart content dropped when used read_sdp_pv (Issue #3854)
by sergey-safarov 03 Jun '24

03 Jun '24

### Description When configured `read_sdp_pv` param for rtpengine module, then multipart content dropped in the body. And the message cannot be parsed because ``` Content-Type: multipart/mixed;boundary=level3-boundary ``` But the message body does not have a separator. ### Troubleshooting #### Reproduction To reproduce need to start Kamailio with config file ``` loadmodule "pv.so" loadmodule "ctl.so" loadmodule "corex.so" loadmodule "sdpops.so" loadmodule "rtpengine.so" modparam("rtpengine", "rtpengine_sock", "udp:localhost:2223") modparam("rtpengine", "read_sdp_pv", "$var(sdp_for_rtpengine)") listen=udp:x.x.x.x:5060 request_route { $var(sdp_for_rtpengine) = $sdp(body); rtpengine_manage("ICE=force"); forward(); } ``` And then send call using `sipp` script ```xml <scenario name="Basic Sipstone UAC">   <send retrans="500"> <![CDATA[ INVITE sip:[service]@example.com:[remote_port] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number] To: sut <sip:[service]@[remote_ip]:[remote_port]> Call-ID: [call_id] CSeq: 1 INVITE Contact: sip:sipp@[local_ip]:[local_port] Max-Forwards: 70 Subject: Performance Test Content-Type: multipart/mixed;boundary=level3-boundary Content-Length: [len] --level3-boundary Content-Type: application/sdp v=0 o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip] s=- c=IN IP[media_ip_type] [media_ip] t=0 0 m=audio [media_port] RTP/AVP 0 a=rtpmap:0 PCMU/8000 --level3-boundary Content-Type: application/isup;version=ansi Content-Disposition: session;handling=optional \x01\x18\x08\x10\x0a\x03\x06\x0d\x03\x80\x90\xa2\x07\x03\x10\x87\x36\x08\x14\x89 \x0a\x07\x03\x13\x27\x97\x45\x28\x49\xc0\x08\xc0\x03\x10\x65\x41\x17\x88\x67\x3d \x01\x11\xc4\x03\x01\x01\x00\xea\x01\x01\xc7\x01\x20\x01\x0d\x0a --level3-boundary-- ]]> </send> ``` If the `read_sdp_pv` param will be commented in the Kamailio config file, then the resulting message will be properly formatted and have the other multipart media. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3854 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3854(a)github.com>

2 2

git:master:48317d31: rtpengine: use extract_body with read_sdp_pv
by Richard Fuchs 03 Jun '24

03 Jun '24

Module: kamailio Branch: master Commit: 48317d3180e8ec67d24862ebcbbb80ab887ff5bd URL: https://github.com/kamailio/kamailio/commit/48317d3180e8ec67d24862ebcbbb80a… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2024-06-03T15:49:12-04:00 rtpengine: use extract_body with read_sdp_pv If the module uses an SDP taken from a pvar, and the current message uses a multipart content, don't replace the entire message body with the rewritten SDP, but only the part of the body that is SDP. closes #3854 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/48317d3180e8ec67d24862ebcbbb80a… Patch: https://github.com/kamailio/kamailio/commit/48317d3180e8ec67d24862ebcbbb80a… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c26f61e2483..775542c5994 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -4718,28 +4718,13 @@ static int rtpengine_offer_answer( } } if(write_sdp_pvar == NULL || write_sdp_pvar_mode != 0) { - if(cl_field.len) { - anchor = del_lump(msg, cl_field.s - msg->buf, cl_field.len, 0); - cl_repl.s = pkg_malloc(10); - if(!cl_repl.s) { - LM_ERR("pkg_malloc for Content-Length failed\n"); - goto error_free; - } - cl_repl.len = snprintf(cl_repl.s, 10, "%i", (int)newbody.len); - if(!insert_new_lump_after(anchor, cl_repl.s, cl_repl.len, 0)) { - LM_ERR("insert_new_lump_after failed\n"); - goto error_free; - } - cl_repl.s = NULL; - } - if(read_sdp_pvar_str.len > 0) { /* get the body from the message as body ptr may have changed * when using read_sdp_pv */ - cur_body.len = 0; - cur_body.s = get_body(msg); - cur_body.len = msg->buf + msg->len - cur_body.s; - + if(extract_body(msg, &cur_body, &cl_field) == -1) { + LM_ERR("failed to extract body from message"); + goto error_free; + } anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); } else { anchor = del_lump(msg, body.s - msg->buf, body.len, 0); @@ -4752,6 +4737,21 @@ static int rtpengine_offer_answer( LM_ERR("insert_new_lump_after failed\n"); goto error_free; } + + if(cl_field.len) { + anchor = del_lump(msg, cl_field.s - msg->buf, cl_field.len, 0); + cl_repl.s = pkg_malloc(10); + if(!cl_repl.s) { + LM_ERR("pkg_malloc for Content-Length failed\n"); + goto error_free; + } + cl_repl.len = snprintf(cl_repl.s, 10, "%i", (int)newbody.len); + if(!insert_new_lump_after(anchor, cl_repl.s, cl_repl.len, 0)) { + LM_ERR("insert_new_lump_after failed\n"); + goto error_free; + } + cl_repl.s = NULL; + } } }

1 0

git:master:f2a1d87d: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 03 Jun '24

03 Jun '24

Module: kamailio Branch: master Commit: f2a1d87d3122c4e7075f6dae31ca48b2ce36869f URL: https://github.com/kamailio/kamailio/commit/f2a1d87d3122c4e7075f6dae31ca48b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-03T21:16:10+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/f2a1d87d3122c4e7075f6dae31ca48b… Patch: https://github.com/kamailio/kamailio/commit/f2a1d87d3122c4e7075f6dae31ca48b…

1 0

[kamailio/kamailio] uac: add reload_delta parameter (PR #3829)
by Tyler Moore 03 Jun '24

03 Jun '24

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Add support for setting a different RPC reload interval than the reg_gc_interval parameter. This allows the cleanup timer to match the user's re-transmission timeout without constraining RPC reload times to a large interval. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3829 -- Commit Summary -- * uac: add reload_delta parameter -- File Changes -- M src/modules/uac/doc/uac.xml (9) M src/modules/uac/doc/uac_admin.xml (37) M src/modules/uac/uac.c (5) M src/modules/uac/uac_reg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3829.patch https://github.com/kamailio/kamailio/pull/3829.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3829 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3829(a)github.com>

3 5

git:master:ad9bef09: uac: add reload_delta parameter
by Daniel-Constantin Mierla 03 Jun '24

03 Jun '24

Module: kamailio Branch: master Commit: ad9bef09935d47729611cf5532300b634f99fec8 URL: https://github.com/kamailio/kamailio/commit/ad9bef09935d47729611cf5532300b6… Author: Tyler Moore <tmoore(a)goflyball.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-03T21:08:04+02:00 uac: add reload_delta parameter - add support for setting a different RPC reload interval than the reg_gc_interval parameter. This allows the cleanup timer to match the user's retransmission timeout without constraining RPC reload times to a large interval. --- Modified: src/modules/uac/doc/uac.xml Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/ad9bef09935d47729611cf5532300b6… Patch: https://github.com/kamailio/kamailio/commit/ad9bef09935d47729611cf5532300b6…

1 0

[kamailio/kamailio] possible memory corruption in sipcapture module (Issue #3835)
by Sven Uhlig 03 Jun '24

03 Jun '24

### Description We send HEP3 data to the UDP listener in kamailio. In this HEP3 data, there are SIP requests and replies. We want to route these SIP messages through `request_route` and `onreply_route`. For this, we use the SipCapture module with the following settings: ``` modparam("sipcapture", "db_url", DBURL) modparam("sipcapture", "capture_on", 1) modparam("sipcapture", "hep_capture_on", 1) modparam("sipcapture", "insert_retries", 0) modparam("sipcapture", "insert_retry_timeout", 0) request_route { xlog("L_INFO", "Got new request ($ci) $rm: $si => $Ri\n"); } onreply_route { xlog("L_INFO", "Got new reply ($ci) $rm: $si => $Ri - Reply Code $rs\n"); } ``` In the past (version kamailio 5.1.x - 5.4.x), this worked as expected. From the logs: ``` 2(8) INFO: <script>: Got new request (7xkVDrAWegvcZl-ACaUb1HWHwiCYhAJR) INVITE: 217.116.121.230 => 172.20.21.4 3(9) INFO: <script>: Got new reply (7xkVDrAWegvcZl-ACaUb1HWHwiCYhAJR) INVITE: 172.20.21.4 => 217.116.121.230 - Reply Code 407 ``` Starting with kamailio 5.5.x, some pseudo variables are broken. From the logs: ``` 1(7) INFO: <script>: Got new request (7xkVDrAWegvcZl-ACaUb1HWHwiCYhAJR) INVITE: 217.116.121.230 => 217.116.121 2(8) INFO: <script>: Got new reply (7xkVDrAWegvcZl-ACaUb1HWHwiCYhAJR) INVITE: 172.20.21.4 => 172.20.21.4 3(9) INFO: <script>: ... ``` As you can see, the `$Ri` in the request is wrong. It looks like the first three octets of the `$si` and the fourth octet is missing entirely. And for the reply: - The `$Ri` is the `$si`. - The line is missing the static text `Reply Code`, the actual reply code. - The next log is on the same line (the new line is gone). (In this case, we simply sent a third HEP3 message.) To my untrained eye this looks like possible memory corruption. ### Troubleshooting #### Reproduction 1. Set up a kamailio 5.8.1 using the attached [kamailio.cfg](https://github.com/kamailio/kamailio/files/15161868/kamailio.… `/usr/sbin/kamailio -E -DD -dd -f "/etc/kamailio/kamailio.cfg"` 2. Send the HEP3 data using [heplify](https://github.com/sipcapture/heplify) `./heplify -t pcap -rf "sipcapture-bug.pcap" -hs localhost:9060 -e -eof-exit` #### Debugging Data #### Log Messages see above #### SIP Traffic see attached [sipcapture-bug.pcap](https://github.com/kamailio/kamailio/files/15161698/si… ### Possible Solutions Use kamailio 5.4.x or earlier versions. ### Additional Information When setting `nonsip_hook` = `1`, then the `$hep(...)` pseudo variables look fine. Unfortunately, we don't know how process the SIP messages after that point. ``` modparam("sipcapture", "nonsip_hook", 1) ... event_route[sipcapture:request] { xlog("L_INFO", "version: $hep(version)\n"); xlog("L_INFO", "src_ipv4: $hep(0x003)\n"); xlog("L_INFO", "dst_ipv4: $hep(0x004)\n"); xlog("L_INFO", "src_proto: $hep(0x007)\n"); xlog("L_INFO", "dst_proto: $hep(0x008)\n"); xlog("L_INFO", "proto: $hep(0x00b)\n"); } ``` * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.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, 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_SEND_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: compiled with gcc 12.2.0 ``` Also tested with same error: 5.5.x, 5.6.x, 5.7.x * **Operating System**: ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3835 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3835(a)github.com>

4 12

[kamailio/kamailio] Crash on shutdown after geoip2.reload (Issue #3861)
by Bastian Triller 03 Jun '24

03 Jun '24

### Description Kamailio crashes on shutdown in `geoip2_destroy_pv` in `main process` process if geoip2 database was reloaded.  ### Troubleshooting `libmaxminddb.so.0` uses `calloc()` internally to allocate memory for metadata languages and descriptions. On reload via e.g. `ctl` metadata memory is allocated in `ctl` process but `main process` tries to cleanup it. #### Reproduction Load `geoip2` module ``` loadmodule "geoip2.so" modparam("geoip2", "path", "/path/to/your/geolite2.mmdb") ``` Reload database and stop/restart Kamailio ``` kamcmd geoip2.reload service kamailio restart ```  #### Debugging Data ``` (gdb) bt #0 __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44 #1 0x00007f117bc59e8f in __pthread_kill_internal (signo=6, threadid=<optimized out>) at ./nptl/pthread_kill.c:78 #2 0x00007f117bc0afb2 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26 #3 0x00007f117bbf5472 in __GI_abort () at ./stdlib/abort.c:79 #4 0x00007f117bc4e430 in __libc_message (action=action@entry=do_abort, fmt=fmt@entry=0x7f117bd68459 "%s\n") at ../sysdeps/posix/libc_fatal.c:155 #5 0x00007f117bc637aa in malloc_printerr (str=str@entry=0x7f117bd660b1 "free(): invalid pointer") at ./malloc/malloc.c:5660 #6 0x00007f117bc65534 in _int_free (av=<optimized out>, p=<optimized out>, have_lock=have_lock@entry=0) at ./malloc/malloc.c:4435 #7 0x00007f117bc67e8f in __GI___libc_free (mem=<optimized out>) at ./malloc/malloc.c:3385 #8 0x00007f1158e6e454 in free_languages_metadata (mmdb=0x7f11592db390) at ./src/maxminddb.c:1860 #9 free_mmdb_struct (mmdb=0x7f11592db390) at ./src/maxminddb.c:1843 #10 0x00007f1158e708a5 in MMDB_close (mmdb=<optimized out>) at ./src/maxminddb.c:1803 #11 0x00007f1158e7ebc9 in geoip2_destroy_pv () at ./src/modules/geoip2/geoip2_pv.c:567 #12 0x000056094fd5f743 in destroy_modules () at core/sr_module.c:881 #13 0x000056094fbb7910 in cleanup (show_status=show_status@entry=1) at ./src/main.c:587 #14 0x000056094fbb86ad in shutdown_children (show_status=show_status@entry=1, sig=15) at ./src/main.c:735 #15 0x000056094fbb932b in handle_sigs () at ./src/main.c:835 #16 0x000056094fbbf1e9 in main_loop () at ./src/main.c:2002 #17 0x000056094fbb353c in main (argc=<optimized out>, argv=<optimized out>) at ./src/main.c:3256 ``` ``` (gdb) f 8 #8 0x00007f1158e6e454 in free_languages_metadata (mmdb=0x7f11592db390) at ./src/maxminddb.c:1860 1860 FREE_AND_SET_NULL(mmdb->metadata.languages.names); (gdb) p *mmdb $1 = {flags = 1, filename = 0x0, file_size = 652795, file_content = 0x7f1158dcd000 <error: Cannot access memory at address 0x7f1158dcd000>, data_section = 0x7f1158e6c430 <error: Cannot access memory at address 0x7f1158e6c430>, data_section_size = 459, metadata_section = 0x7f1158e6c546 <error: Cannot access memory at address 0x7f1158e6c546>, metadata_section_size = 181, full_record_byte_size = 6, depth = 32, ipv4_start_node = {netmask = 0, node_value = 0}, metadata = {node_count = 108720, record_size = 24, ip_version = 4, database_type = 0x0, languages = {count = 1, names = 0x560951ca6250}, binary_format_major_version = 2, binary_format_minor_version = 0, build_epoch = 1648557301, description = {count = 1, descriptions = 0x560951ca5470}}} (gdb) f 9 #9 free_mmdb_struct (mmdb=0x7f11592db390) at ./src/maxminddb.c:1843 1843 free_languages_metadata(mmdb); (gdb) f 10 #10 0x00007f1158e708a5 in MMDB_close (mmdb=<optimized out>) at ./src/maxminddb.c:1803 1803 void MMDB_close(MMDB_s *const mmdb) { free_mmdb_struct(mmdb); } (gdb) f 11 #11 0x00007f1158e7ebc9 in geoip2_destroy_pv () at ./src/modules/geoip2/geoip2_pv.c:567 567 MMDB_close(_handle_GeoIP); ```  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` /usr/sbin/kamailio -V version: kamailio 5.8.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, 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_SEND_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 12.2.0 ``` * **Operating System**:  ``` cat /etc/os-release PRETTY_NAME="Debian GNU/Linux 12 (bookworm)" NAME="Debian GNU/Linux" VERSION_ID="12" VERSION="12 (bookworm)" VERSION_CODENAME=bookworm ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3861 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3861(a)github.com>

2 4

[kamailio/kamailio] geoip2: Reload database before accessing it (PR #3867)
by Bastian Triller 03 Jun '24

03 Jun '24

#### 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 #3861 #### Description  Re-add reloading of database. Fixes: 293193c55c ("geoip2: clang format module file") You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3867 -- Commit Summary -- * geoip2: Reload database before accessing it -- File Changes -- M src/modules/geoip2/geoip2_mod.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3867.patch https://github.com/kamailio/kamailio/pull/3867.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3867 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3867(a)github.com>

2 2

git:master:51dcab01: geoip2: Reload database before accessing it
by Daniel-Constantin Mierla 03 Jun '24

03 Jun '24

Module: kamailio Branch: master Commit: 51dcab019a42e5b1f3b81247ca71ffcaf46180de URL: https://github.com/kamailio/kamailio/commit/51dcab019a42e5b1f3b81247ca71ffc… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-03T11:12:04+02:00 geoip2: Reload database before accessing it Re-add reloading of database. GH #3861 Fixes: 293193c55c ("geoip2: clang format module file") --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/51dcab019a42e5b1f3b81247ca71ffc… Patch: https://github.com/kamailio/kamailio/commit/51dcab019a42e5b1f3b81247ca71ffc… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 7d22b3890d2..cfb40f69860 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -139,6 +139,7 @@ static int geoip2_resid_param(modparam_t type, void *val) static int ki_geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass) { geoip2_pv_reset(pvclass); + geoip2_reload_pv(geoip2_path); return geoip2_update_pv(tomatch, pvclass); } @@ -277,6 +278,8 @@ static int ki_geoip2_distance( return -1; } + geoip2_reload_pv(geoip2_path); + return geoip2_distance(msg, _ipaddr, lat, lon); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024