sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
223 discussions

git:master:ad9bef09: uac: add reload_delta parameter

by Daniel-Constantin Mierla

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…

5 months, 3 weeks

[kamailio/kamailio] possible memory corruption in sipcapture module (Issue #3835)

by Sven Uhlig

### 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>

5 months, 3 weeks

[kamailio/kamailio] Crash on shutdown after geoip2.reload (Issue #3861)

by Bastian Triller

### 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>

5 months, 3 weeks

[kamailio/kamailio] geoip2: Reload database before accessing it (PR #3867)

by Bastian Triller

#### 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>

5 months, 3 weeks

git:master:51dcab01: geoip2: Reload database before accessing it

by Daniel-Constantin Mierla

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); }

5 months, 3 weeks

[kamailio/kamailio] bad BYE message from endpoint when using topoh in kamailio 5.5.1 (Issue #3853)

by descartin

### Description we are using version: kamailio 5.5.1 (x86_64/linux) 8aa8df-dirty and we have a setup with 2 kamailio instances. First one is doing topoh, and the second one is supposed to not do it Despite this we do see that some replies the second instance is masking some headers like record route and contact in the 200ok (not in the 180) Besides, seems that when the b-side sends a BYE, kamailio show an error, see in logs part However, in the sip pcap we do see thre BYE like it should be. At least that's what it seems to me i attach you the trace [topoh_bye_bad_message.txt](https://github.com/kamailio/kamailio/files/15324… do you have any idea of what can be the issue?  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` May 15 13:19:42 vqbert-2 /usr/local/kamailio/sbin/kamailio[31824]: ERROR: <core> [core/parser/parse_fline.c:272]: parse_first_line(): parse_first_line: bad message (offset: 54) ��%��QI:19:42 vqbert-2 /usr/local/kamailio/sbin/kamailio[31824]: ERROR: <core> [core/parser/msg_parser.c:748]: parse_msg(): ERROR: parse_msg: message=<BYE �ͥ��ĸ��Ը��ĸ��Ʌ��Ց��!��ᕈ�|�� SIP/2.0 Via: SIP/2.0/UDP 199.244.96.39:5060;TH=ucv;branch=z9hG4bK-524287-1---513df3f6b3057f235eef63c542634016;rport Via: SIP/2.0/UDP 199.244.96.46:5071;rport=5071;branch=z9hG4bK-mx5umw4feykudkd5 Max-Forwards: 69 Route: <sip:79.170.71.169;lr;ftag=11002597000844;did=7842.5393> Route: <sip:79.170.71.168;lr=on;ftag=11002597000844;did=b09.3b49> ��%��QI��ĸ��Ը��ĸ��Ʌ��Ց��!��ᕈ�|�� >��`�!ɉU� Contact: sip:199.244.96.46:5071 To: +233240979290 <sip:+233240979290@79.170.71.168;user=phone>;tag=11002597000844 From: +233307000929 <sip:+233307000929@199.244.96.39.SBC1;user=phone>;tag=W7OXULJ726L2OYQEVKNA____.i Call-ID: Sonoc2Did!!:C9WJ3uq4gtNwMlcfzxFlM.jAkx0J34pvaRgtCt0vPl0EPxFwMJZfWJZfMBy7MP** CSeq: 905 BYE Allow: INVITE, ACK, BYE, CANCEL, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS, UPDATE User-Agent: PortaSIP cisco-GUID: 3592442246-2620412195-1372314391-1317599184 h323-conf-id: 3592442246-2620412195-1372314391-1317599184 Content-Length: 0 TH: uch > May 15 13:19:42 vqbert-2 /usr/local/kamailio/sbin/kamailio[31824]: ERROR: <core> [core/receive.c:377]: receive_msg(): core parsing of SIP message failed (199.244.96.39:5060/1) ``` #### SIP Traffic  ``` No. Time Source Destination Protocol Length Info 17 62.116377 19.24.9.39 10.100.10.169 SIP 1273 Request: BYE sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgE | Frame 17: 1273 bytes on wire (10184 bits), 1273 bytes captured (10184 bits) Linux cooked capture Internet Protocol Version 4, Src: 19.24.9.39, Dst: 10.100.10.169 User Datagram Protocol, Src Port: 5060, Dst Port: 5060 Session Initiation Protocol (BYE) Request-Line: BYE sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgE SIP/2.0 Method: BYE Request-URI: sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgE [Resent Packet: False] Message Header Via: SIP/2.0/UDP 19.24.9.39:5060;branch=z9hG4bK-524287-1---513df3f6b3057f235eef63c542634016;rport Via: SIP/2.0/UDP 19.24.9.46:5071;rport=5071;branch=z9hG4bK-mx5umw4feykudkd5 Max-Forwards: 69 Route: <sip:10.100.10.169;lr;ftag=11002597000844;did=7842.5393> Route: <sip:10.100.10.168;lr=on;ftag=11002597000844;did=b09.3b49> Route: <sip:127.0.0.8;line=sonoc2did-N6IAzBPfOBVfWmZfWBF7WlN-W.y6Mx14NEt7Nw05NhPQpRaAz6fLz4rApx4ZgRVZ9lF6z4WZpFIqH.PXKtexHRgEgEgEgEgEORgEgEgEgEgEzuc1mUpGMEeK3jW5o61Yg.4fWBMLWc**> Contact: sip:19.24.9.46:5071 To: +233240979290 <sip:+233240979290@10.100.10.168;user=phone>;tag=11002597000844 From: +233307000929 <sip:+233307000929@19.24.9.39.SBC1;user=phone>;tag=W7OXULJ726L2OYQEVKNA____.i Call-ID: Sonoc2Did!!:C9WJ3uq4gtNwMlcfzxFlM.jAkx0J34pvaRgtCt0vPl0EPxFwMJZfWJZfMBy7MP** [Generated Call-ID: Sonoc2Did!!:C9WJ3uq4gtNwMlcfzxFlM.jAkx0J34pvaRgtCt0vPl0EPxFwMJZfWJZfMBy7MP**] CSeq: 905 BYE Allow: INVITE, ACK, BYE, CANCEL, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS, UPDATE User-Agent: PortaSIP cisco-GUID: 3592442246-2620412195-1372314391-1317599184 h323-conf-id: 3592442246-2620412195-1372314391-1317599184 Content-Length: 0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3853 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3853(a)github.com>

5 months, 3 weeks

[kamailio/kamailio] Possible memory leak in siputils module (Issue #3857)

by giupand

5 months, 3 weeks

git:master:293193c5: geoip2: clang format module file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 293193c55caaf5d0c39dc456babe92f574b58b3b URL: https://github.com/kamailio/kamailio/commit/293193c55caaf5d0c39dc456babe92f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-02T04:58:23+02:00 geoip2: clang format module file --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/293193c55caaf5d0c39dc456babe92f… Patch: https://github.com/kamailio/kamailio/commit/293193c55caaf5d0c39dc456babe92f… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 1131bba906a..7d22b3890d2 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -50,7 +50,8 @@ static int geoip2_rpc_init(void); static int w_geoip2_match(struct sip_msg *msg, char *str1, char *str2); static int geoip2_resid_param(modparam_t type, void *val); -static int w_geoip2_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); +static int w_geoip2_distance( + struct sip_msg *msg, char *str1, char *str2, char *str3); /* clang-format off */ static pv_export_t mod_pvs[] = { @@ -164,7 +165,8 @@ static int w_geoip2_match(sip_msg_t *msg, char *target, char *pvname) return ki_geoip2_match(msg, &tomatch, &pvclass); } -static int geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) +static int geoip2_distance( + sip_msg_t *msg, str *_ip_addr, double lat, double lon) { char ip_addr[MAX_GEO_STR_SIZE] = {0}; double lat1, lon1, lat2, lon2, orig_lat2, orig_lon2; @@ -253,7 +255,8 @@ static int geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon return dist; } -static int ki_geoip2_distance(sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon) +static int ki_geoip2_distance( + sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon) { double lat = 0; double lon = 0; @@ -262,8 +265,7 @@ static int ki_geoip2_distance(sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon strncpy(buf, _lat->s, _lat->len); lat = atof(buf); if(!lat && errno == ERANGE) { - LM_ERR("cannot convert string to double: %.*s\n", _lat->len, - _lat->s); + LM_ERR("cannot convert string to double: %.*s\n", _lat->len, _lat->s); return -1; } @@ -271,17 +273,15 @@ static int ki_geoip2_distance(sip_msg_t *msg, str *_ipaddr, str *_lat, str *_lon strncpy(buf, _lon->s, _lon->len); lon = atof(buf); if(!lon && errno == ERANGE) { - LM_ERR("cannot convert string to double: %.*s\n", _lon->len, - _lon->s); + LM_ERR("cannot convert string to double: %.*s\n", _lon->len, _lon->s); return -1; } return geoip2_distance(msg, _ipaddr, lat, lon); - } -static int w_geoip2_distance(sip_msg_t *msg, char *ip_addr_param, char *lat_param, - char *lon_param) +static int w_geoip2_distance( + sip_msg_t *msg, char *ip_addr_param, char *lat_param, char *lon_param) { str ip_addr_str = STR_NULL; str lat_str = STR_NULL; @@ -304,7 +304,7 @@ static int w_geoip2_distance(sip_msg_t *msg, char *ip_addr_param, char *lat_para static void geoip2_rpc_reload(rpc_t *rpc, void *ctx) { - if(geoip2_reload_pv(geoip2_path) != 0) { + if(geoip2_reload_set() < 0) { rpc->fault(ctx, 500, "Reload failed"); return; }

5 months, 3 weeks

git:master:baccbe02: geoip2: keep global structure per process

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: baccbe0298f9fa46db285505bc4386f997de5a47 URL: https://github.com/kamailio/kamailio/commit/baccbe0298f9fa46db285505bc4386f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-02T04:51:33+02:00 geoip2: keep global structure per process - parsing db file allocates private memory - reworked reload to rely on a global counter - GH #3861 --- Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/baccbe0298f9fa46db285505bc4386f… Patch: https://github.com/kamailio/kamailio/commit/baccbe0298f9fa46db285505bc4386f… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index 03a5b181242..a3d67e6e9d8 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -70,6 +70,9 @@ static gen_lock_t *_sr_geoip2_lock = NULL; static sr_geoip2_item_t *_sr_geoip2_list = NULL; +static int *_sr_geoip2_reloadG = NULL; +static int _sr_geoip2_reloadL = 0; + MMDB_s *get_geoip_handle(void) { return _handle_GeoIP; @@ -493,6 +496,12 @@ int pv_get_geoip2(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) static int init_shmlock(void) { + _sr_geoip2_reloadG = (int *)shm_malloc(sizeof(int)); + if(_sr_geoip2_reloadG == NULL) { + LM_CRIT("cannot allocate memory for reload step\n"); + return -1; + } + *_sr_geoip2_reloadG = 1; _sr_geoip2_lock = lock_alloc(); if(!_sr_geoip2_lock) { LM_CRIT("cannot allocate memory for lock\n"); @@ -513,18 +522,23 @@ static void destroy_shmlock(void) lock_dealloc((void *)_sr_geoip2_lock); _sr_geoip2_lock = NULL; } + if(_sr_geoip2_reloadG != NULL) { + shm_free(_sr_geoip2_reloadG); + _sr_geoip2_reloadG = NULL; + } } int geoip2_init_pv(char *path) { int status; - _handle_GeoIP = shm_mallocxz(sizeof(struct MMDB_s)); + _handle_GeoIP = (struct MMDB_s *)malloc(sizeof(struct MMDB_s)); if(_handle_GeoIP == NULL) { - SHM_MEM_ERROR; + SYS_MEM_ERROR; return -1; } + memset(_handle_GeoIP, 0, sizeof(struct MMDB_s)); status = MMDB_open(path, MMDB_MODE_MMAP, _handle_GeoIP); if(MMDB_SUCCESS != status) { @@ -539,18 +553,35 @@ int geoip2_init_pv(char *path) return 0; } +int geoip2_reload_set(void) +{ + if(_sr_geoip2_reloadG == NULL) { + LM_ERR("not initialized\n"); + return -1; + } + lock_get(_sr_geoip2_lock); + *_sr_geoip2_reloadG = *_sr_geoip2_reloadG + 1; + lock_release(_sr_geoip2_lock); + + return 0; +} + int geoip2_reload_pv(char *path) { int status = 0; lock_get(_sr_geoip2_lock); + if(*_sr_geoip2_reloadG == _sr_geoip2_reloadL) { + lock_release(_sr_geoip2_lock); + return MMDB_SUCCESS; + } MMDB_close(_handle_GeoIP); status = MMDB_open(path, MMDB_MODE_MMAP, _handle_GeoIP); if(MMDB_SUCCESS != status) { LM_ERR("cannot reload GeoIP database file at: %s\n", path); - } else { LM_INFO("reloaded GeoIP database file at: %s\n", path); + _sr_geoip2_reloadL = *_sr_geoip2_reloadG; } lock_release(_sr_geoip2_lock); @@ -563,10 +594,6 @@ void geoip2_destroy_list(void) void geoip2_destroy_pv(void) { - if(_handle_GeoIP != NULL) { - shm_free(_handle_GeoIP); - _handle_GeoIP = NULL; - } destroy_shmlock(); } diff --git a/src/modules/geoip2/geoip2_pv.h b/src/modules/geoip2/geoip2_pv.h index e50579f92c1..ff54f6d92df 100644 --- a/src/modules/geoip2/geoip2_pv.h +++ b/src/modules/geoip2/geoip2_pv.h @@ -37,5 +37,6 @@ int geoip2_update_pv(str *tomatch, str *pvclass); int sr_geoip2_add_resid(str *rname); MMDB_s *get_geoip_handle(void); gen_lock_t *get_gen_lock(void); +int geoip2_reload_set(void); #endif

5 months, 3 weeks

git:master:4bd619d3: geoip2: rename global lock variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4bd619d3517f129362de3ce50eed2620d5002b42 URL: https://github.com/kamailio/kamailio/commit/4bd619d3517f129362de3ce50eed262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-01T07:50:45+02:00 geoip2: rename global lock variable --- Modified: src/modules/geoip2/geoip2_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/4bd619d3517f129362de3ce50eed262… Patch: https://github.com/kamailio/kamailio/commit/4bd619d3517f129362de3ce50eed262… --- diff --git a/src/modules/geoip2/geoip2_pv.c b/src/modules/geoip2/geoip2_pv.c index de017da1f65..03a5b181242 100644 --- a/src/modules/geoip2/geoip2_pv.c +++ b/src/modules/geoip2/geoip2_pv.c @@ -66,7 +66,7 @@ typedef struct _geoip2_pv } geoip2_pv_t; static MMDB_s *_handle_GeoIP = NULL; -static gen_lock_t *lock = NULL; +static gen_lock_t *_sr_geoip2_lock = NULL; static sr_geoip2_item_t *_sr_geoip2_list = NULL; @@ -77,7 +77,7 @@ MMDB_s *get_geoip_handle(void) gen_lock_t *get_gen_lock(void) { - return lock; + return _sr_geoip2_lock; } sr_geoip2_record_t *sr_geoip2_get_record(str *name) @@ -264,9 +264,9 @@ static int get_mmdb_value2(MMDB_entry_s *entry, MMDB_entry_data_s *data, { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); status = MMDB_get_value(entry, data, first, second, NULL); - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -276,9 +276,9 @@ static int get_mmdb_value3(MMDB_entry_s *entry, MMDB_entry_data_s *data, { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); status = MMDB_get_value(entry, data, first, second, third, NULL); - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -289,9 +289,9 @@ static int get_mmdb_value4(MMDB_entry_s *entry, MMDB_entry_data_s *data, { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); status = MMDB_get_value(entry, data, first, second, third, fourth, NULL); - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -493,12 +493,12 @@ int pv_get_geoip2(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) static int init_shmlock(void) { - lock = lock_alloc(); - if(!lock) { + _sr_geoip2_lock = lock_alloc(); + if(!_sr_geoip2_lock) { LM_CRIT("cannot allocate memory for lock\n"); return -1; } - if(lock_init(lock) == 0) { + if(lock_init(_sr_geoip2_lock) == 0) { LM_CRIT("cannot initialize lock\n"); return -1; } @@ -508,10 +508,10 @@ static int init_shmlock(void) static void destroy_shmlock(void) { - if(lock) { - lock_destroy(lock); - lock_dealloc((void *)lock); - lock = NULL; + if(_sr_geoip2_lock) { + lock_destroy(_sr_geoip2_lock); + lock_dealloc((void *)_sr_geoip2_lock); + _sr_geoip2_lock = NULL; } } @@ -543,7 +543,7 @@ int geoip2_reload_pv(char *path) { int status = 0; - lock_get(lock); + lock_get(_sr_geoip2_lock); MMDB_close(_handle_GeoIP); status = MMDB_open(path, MMDB_MODE_MMAP, _handle_GeoIP); if(MMDB_SUCCESS != status) { @@ -552,7 +552,7 @@ int geoip2_reload_pv(char *path) } else { LM_INFO("reloaded GeoIP database file at: %s\n", path); } - lock_release(lock); + lock_release(_sr_geoip2_lock); return status; } @@ -599,10 +599,10 @@ int geoip2_update_pv(str *tomatch, str *name) strncpy(gr->tomatch, tomatch->s, tomatch->len); tomatch->s[tomatch->len] = '\0'; - lock_get(lock); + lock_get(_sr_geoip2_lock); gr->record = MMDB_lookup_string( _handle_GeoIP, (const char *)gr->tomatch, &gai_error, &mmdb_error); - lock_release(lock); + lock_release(_sr_geoip2_lock); LM_DBG("attempt to match: %s\n", gr->tomatch); if(gai_error || MMDB_SUCCESS != mmdb_error || !gr->record.found_entry) { LM_DBG("no match for: %s\n", gr->tomatch);

5 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024