- sr-dev - kamailio.org

[kamailio/kamailio] siptrace: frong IPv4 address value (#2092)
by sergey-safarov 30 Jul '23

30 Jul '23

### Description Please check attached pcap. [siptrace.pcap.gz](https://github.com/kamailio/kamailio/files/3688791/siptra… Kamailio send INVITE (packet 1) from port `TCP/42394`. SIP trace encapsulate INVITE (packet 2) and encodes Kamailio source port `TCP/5060` #### Debugging Data HEP header parsed by lua [disector](https://github.com/sipcapture/hep-wireshark) ``` HEP3 Protocol HEP ID: HEP3 Length (Bytes): 1574 Protocol family: IPv4 Protocol ID: TCP Source IPv4 address: 172.21.0.131 Destination IPv4 address: 192.168.57.11 Source port: 5060 Destination port: 5060 Timestamp: 1570150645 Timestamp us: 740165 Protocol Type: SIP Capture ID: 1 Payload [truncated]: INVITE sip:911@192.168.57.11;transport=tcp SIP/2.0\r\nRecord-Route: <sip:172.21.0.131;transport=tcp;lr=on;ftag=KvNj7jXrmK89p>\r\nVia: SIP/2.0/TCP 172.21.0.131;branch=z9hG4bK7c2d.2d8104273b7063309f5694ac963c9ad8.0;i=21 ``` [HEP format description located here](https://github.com/sipcapture/HEP/blob/master/docs/HEP3_Network_Proto…. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 11:01:40 Oct 4 2018 with gcc 6.4.0 ``` * **Operating System**: Docker container Userland ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.1 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" ``` Kernel Amazon Linux 2 ``` / # uname -a Linux proxy-dc0-0 4.14.128-112.105.amzn2.x86_64 #1 SMP Wed Jun 19 16:53:40 UTC 2019 x86_64 Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2092

2 7

[kamailio/kamailio] crypto: SHA1_Init deprecated at openssl 3.0 (PR #3518)
by Victor Seva 27 Jul '23

27 Jul '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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #3502 #### Description From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > Use of low-level digest functions such as SHA1_Init(3) have been informally > discouraged from use for a long time. Applications should instead use the > high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and > EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3518 -- Commit Summary -- * crypto: SHA1_Init deprecated at openssl 3.0 -- File Changes -- M src/modules/crypto/crypto_uuid.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3518.patch https://github.com/kamailio/kamailio/pull/3518.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3518 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3518(a)github.com>

2 4

git:master:e55a6ed0: crypto: SHA1_Init deprecated at openssl 3.0
by Victor Seva 27 Jul '23

27 Jul '23

Module: kamailio Branch: master Commit: e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483 URL: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-27T10:02:55+02:00 crypto: SHA1_Init deprecated at openssl 3.0 From https://www.openssl.org/docs/man3.0/man7/migration_guide.html > Use of low-level digest functions such as SHA1_Init(3) have been informally > discouraged from use for a long time. Applications should instead use the > high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and > EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3). related to #3502 --- Modified: src/modules/crypto/crypto_uuid.c --- Diff: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… Patch: https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d… --- diff --git a/src/modules/crypto/crypto_uuid.c b/src/modules/crypto/crypto_uuid.c index ffe208fb85f..fbc0a3c670d 100644 --- a/src/modules/crypto/crypto_uuid.c +++ b/src/modules/crypto/crypto_uuid.c @@ -177,14 +177,33 @@ static inline int crypto_format_rfc4122_uuid( */ void crypto_generate_callid(str *callid) { +#if OPENSSL_VERSION_NUMBER > 0x030000000L + EVP_MD_CTX *crypto_ctx = NULL; +#else static SHA_CTX crypto_ctx = {0}; +#endif static unsigned char crypto_buf[SHA_DIGEST_LENGTH] = {0}; static char crypto_sbuf[UUID_LEN] = {0}; crypto_inc_counter(crypto_callid_counter, CTR_LEN); + +#if OPENSSL_VERSION_NUMBER > 0x030000000L + if((crypto_ctx = EVP_MD_CTX_new()) == NULL) { + LM_ERR("can't get new context\n"); + callid->s = NULL; + callid->len = 0; + return; + } + EVP_DigestInit_ex(crypto_ctx, EVP_sha1(), NULL); + EVP_DigestUpdate(crypto_ctx, crypto_callid_seed, SEED_LEN); + EVP_DigestUpdate(crypto_ctx, crypto_callid_counter, CTR_LEN); + EVP_DigestFinal_ex(crypto_ctx, crypto_buf, NULL); + EVP_MD_CTX_free(crypto_ctx); +#else SHA1_Init(&crypto_ctx); SHA1_Update(&crypto_ctx, crypto_callid_seed, SEED_LEN); SHA1_Update(&crypto_ctx, crypto_callid_counter, CTR_LEN); SHA1_Final(crypto_buf, &crypto_ctx); +#endif crypto_format_rfc4122_uuid( crypto_sbuf, sizeof(crypto_sbuf), crypto_buf, sizeof(crypto_buf)); callid->s = crypto_sbuf;

1 0

[kamailio/kamailio] failed to find command radius_www_authorize (params 1) (Issue #3525)
by Kachallah Abagana Mahamat 27 Jul '23

27 Jul '23

Hello everyone, I'm trying to authenticate kamailio users using freeradius but I get the following error message when I try to start kamailio: ERROR: <core> [core/cfg.y:3762]: yyparse(): cfg. parser: failed to find command radius_www_authorize (params 1). Thanks for your help. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3525 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3525(a)github.com>

2 2

[kamailio/kamailio] rtpproxy: make sure we null terminate the copy of the string. (PR #3524)
by Maksym Sobolyev 26 Jul '23

26 Jul '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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The module has been broken in d00ceda2c04. The code to replace strcpy() did not terminate the target sting with \0. Discovered by our voiptests rig: https://github.com/sippy/voiptests/actions/workflows/kamailio.yml Results in a broken SDP (note garbage around o= attribute: ``` 1681 00:00:08.271/GLOBAL/alice_ua: RECEIVED message from [::1]:5060: 1682 SIP/2.0 183 Session Progress 1683 Via: SIP/2.0/UDP [::1]:5061;received=::1;rport=5061;branch=z9hG4bK20a1169c6781e4bfe26554e84d3b4925 1684 Record-Route: <sip:[::1];ftag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q;lr> 1685 From: "Alice Smith" <sip:alice_2_ipv6@[::1]>;tag=l5v4RNY4iYqP.*!0LQUA.MLVq8RX'm!q 1686 To: <sip:bob_2@[::1]>;tag=c77c4b2c8430cf6c18566bc3d9212ed3 1687 Call-ID: O%CciL!Yf0-SQn]G46v4J(SPddRr<MtH(a))<0.ev}(]q.\%X[> 1688 CSeq: 200 INVITE 1689 Content-Type: application/sdp 1690 Content-Length: 296 1691 1692 v=0 1693 o=- 577651195072 577651195072 IN IP6 ::1\x86zU 1694 s=BOBSDP Session 1695 c=IN IP6 ::1\x86zU 1696 t=0 0 1697 m=image 13424 udptl t38 1698 a=T38FaxVersion:0 1699 a=T38MaxBitRate:14400 1700 a=T38FaxRateManagement:transferredTCF 1701 a=T38FaxMaxBuffer:262 1702 a=T38FaxMaxDatagram:176 1703 a=T38FaxUdpEC:t38UDPRedundancy 1704 a=nortpproxy:yes 1740 00:00:08.322/GLOBAL/alice_ua: RECEIVED message from 127.0.0.1:5060: 1741 SIP/2.0 183 Session Progress 1742 v: SIP/2.0/UDP 127.0.0.1:5061;received=127.0.0.1;rport=5061;branch=z9hG4bK8e357573055f35a768af0c9be78c836d 1743 Record-Route: <sip:127.0.0.1;ftag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf;lr> 1744 f: "Alice Smith" <sip:alice_7_ipv4@127.0.0.1>;tag=q3~s'YH'`.Krs%LQKdFWrWnWgwPHJHnf 1745 t: <sip:bob_7@127.0.0.1>;tag=8ee80e5205ef358c3cb868fb5e5614f8 1746 i: m6!(QAFQlv}vTlycDH[rpMjW}mVV1phG@z/c{KI:L*n'[`%15 1747 CSeq: 200 INVITE 1748 c: application/sdp 1749 l: 328 1750 1751 v=0 1752 o=- 577651195078 577651195078 IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1753 s=BOBSDP Session 1754 c=IN IP4 127.0.0.1z\xcfpzG\xd1\xcb`\xef=\x86zU 1755 t=0 0 1756 m=image 13696 udptl t38 1757 a=T38FaxVersion:0 1758 a=T38MaxBitRate:14400 1759 a=T38FaxRateManagement:transferredTCF 1760 a=T38FaxMaxBuffer:262 1761 a=T38FaxMaxDatagram:176 1762 a=T38FaxUdpEC:t38UDPRedundancy 1763 a=nortpproxy:yes ``` Looks like there were multiple changes of the same nature. All of them probably needs to be re-evaluated to make sure this pattern is not propagated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3524 -- Commit Summary -- * rtpproxy: make sure we null terminate the copy of the string. -- File Changes -- M src/modules/rtpproxy/rtpproxy.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3524.patch https://github.com/kamailio/kamailio/pull/3524.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3524 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3524(a)github.com>

2 3

git:master:c2f12479: .clang-format: add json settings [skip ci]
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: c2f12479debe7bd5f5819f3c3b332929dd5fe703 URL: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .clang-format: add json settings [skip ci] --- Modified: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… Patch: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b33292… --- diff --git a/.clang-format b/.clang-format index d805149083d..6f7a705477f 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,7 @@ --- +Language: Json +BasedOnStyle: llvm +--- Language: Cpp # BasedOnStyle: LLVM AccessModifierOffset: -4 @@ -87,4 +90,3 @@ Standard: Cpp11 TabWidth: 4 UseTab: Always ... -

1 0

git:master:bad420e9: .devcontainer: Initial support for devcontainers [skip ci]
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: bad420e9f72c237bbd608a9ff06ae3b63bce9625 URL: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:10:03+02:00 .devcontainer: Initial support for devcontainers [skip ci] Allows to develop inside a container using vscode > https://code.visualstudio.com/docs/devcontainers/containers --- Added: .devcontainer/Dockerfile Added: .devcontainer/devcontainer.json --- Diff: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… Patch: https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b… --- diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000000..50a901b764a --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,17 @@ +FROM mcr.microsoft.com/devcontainers/base:bookworm +# utils packages +RUN apt-get update && \ + export DEBIAN_FRONTEND=noninteractive && \ + apt-get -y install --no-install-recommends \ + apt-utils dialog clang-format clang pbuilder + +# bookworm packaging +RUN mkdir -p /usr/local/src/pkg +COPY bookworm /usr/local/src/pkg/debian + +# get build dependences +RUN cd /usr/local/src/pkg/ && \ + /usr/lib/pbuilder/pbuilder-satisfydepends-experimental + +# clean +RUN apt-get clean && rm -rf /var/lib/apt/lists/* diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..98d103801ea --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,34 @@ +{ + /* For format details, see https://aka.ms/devcontainer.json. For config options, see the + * README at: https://github.com/devcontainers/templates/tree/main/src/debian + */ + "name": "Debian", + "build": { + "context": "../pkg/kamailio/deb", + "dockerfile": "Dockerfile" + }, + + // Features to add to the dev container. More info: https://containers.dev/features. + "features": { + "ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {} + }, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + "forwardPorts": [ + 5060 + ], + + // Configure tool-specific properties. + "customizations": { + "vscode": { + "settings": {}, + "extensions": [ + "ms-vscode.cpptools-extension-pack", + "xaver.clang-format" + ] + } + }, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + "remoteUser": "root" +}

1 0

[kamailio/kamailio] Initial support for devcontainers (PR #3516)
by Victor Seva 26 Jul '23

26 Jul '23

#### Description Initial support of [devcontainers](https://containers.dev/) Allows to develop inside a container using [vscode](https://code.visualstudio.com/docs/devcontainers/containers) Next steps: * configure github actions to build and publish the image in our github repository https://github.com/devcontainers/ci/blob/main/docs/github-action.md * include configurations for vscode to build and run kamailio * investigate how to debug inside vscode You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3516 -- Commit Summary -- * .clang-format: add json settings * .devcontainer: Initial support for devcontainers -- File Changes -- M .clang-format (4) A .devcontainer/Dockerfile (17) A .devcontainer/devcontainer.json (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3516.patch https://github.com/kamailio/kamailio/pull/3516.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3516 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3516(a)github.com>

1 1

git:master:192b681c: sipcapture: make sure we null terminate the copy of the string
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 192b681ce7fcd868a4a47a7c26863c733321b8d4 URL: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T15:00:38+02:00 sipcapture: make sure we null terminate the copy of the string bug introduced at cbd7810fff3d5145c1ce34c0e362b5590bb92a12 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… Patch: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c7… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index de0a15174cc..5efb1898036 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2252,7 +2252,8 @@ static int sip_capture( ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; @@ -2839,7 +2840,8 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) /* IP source and destination */ ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port;

1 0

git:master:3c1700fb: rtpproxy: make sure we null terminate the copy of the string.
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 3c1700fb7693c05025be1058e856fe610f4be031 URL: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:55:17+02:00 rtpproxy: make sure we null terminate the copy of the string. bug introduced at d00ceda2c04 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… Patch: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe6… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 9d7190cabc3..bc252982e1c 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1834,7 +1834,8 @@ static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); return force_rtp_proxy(msg, flags, newip, 0, 0); }

1 0

git:master:2750e48b: rtpproxy: make sure we null terminate the copy of the string.
by Victor Seva 26 Jul '23

26 Jul '23

Module: kamailio Branch: master Commit: 2750e48b5445e9334cb7a062d7d53a1fb9a0a411 URL: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-26T14:46:45+02:00 rtpproxy: make sure we null terminate the copy of the string. Broken in d00ceda2c04. --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… Patch: https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 8103fef4edd..9d7190cabc3 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1698,7 +1698,8 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(ip == NULL) { cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); } if(msg->msg_flags & FL_SDP_BODY)

1 0

[kamailio/kamailio] rtpengine: increase buf size to print mos llint range (PR #3517)
by Stefan Mititelu 20 Jul '23

20 Jul '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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  CDR avp() mos values gets trimmed at the first larger mos value received. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3517 -- Commit Summary -- * rtpengine: increase buf size to print mos llint range -- File Changes -- M src/modules/rtpengine/rtpengine.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3517.patch https://github.com/kamailio/kamailio/pull/3517.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3517 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3517(a)github.com>

2 3

git:master:8b113985: rtpengine: increase buf size to print mos llint range
by Stefan Mititelu 20 Jul '23

20 Jul '23

Module: kamailio Branch: master Commit: 8b1139851d9f88add1fd7da0dbc0b2b56933cdd3 URL: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-07-20T15:25:37+03:00 rtpengine: increase buf size to print mos llint range --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… Patch: https://github.com/kamailio/kamailio/commit/8b1139851d9f88add1fd7da0dbc0b2b… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 59bcfb47795..68003908268 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -180,14 +180,15 @@ struct minmax_mos_label_stats }; struct minmax_stats_vals { - long long mos; - long long at; - long long packetloss; - long long jitter; - long long roundtrip; - long long roundtrip_leg; - long long samples; - long long avg_samples; /* our own running count to average the averages */ + long long int mos; + long long int at; + long long int packetloss; + long long int jitter; + long long int roundtrip; + long long int roundtrip_leg; + long long int samples; + long long int + avg_samples; /* our own running count to average the averages */ }; #define RTPE_LIST_VERSION_DELAY 10 @@ -3879,12 +3880,13 @@ static void avp_print_decimal(pv_elem_t *pv, int num, struct sip_msg *msg) len = snprintf(buf, sizeof(buf), "%i.%i", num / 10, abs(num % 10)); avp_print_s(pv, buf, len, msg); } -static void avp_print_int(pv_elem_t *pv, int num, struct sip_msg *msg) +static void avp_print_llint( + pv_elem_t *pv, long long int num, struct sip_msg *msg) { int len; - char buf[8]; + char buf[20]; - len = snprintf(buf, sizeof(buf), "%i", num); + len = snprintf(buf, sizeof(buf), "%lld", num); avp_print_s(pv, buf, len, msg); } static void avp_print_time(pv_elem_t *pv, int num, struct sip_msg *msg) @@ -3904,12 +3906,13 @@ static void avp_print_mos(struct minmax_mos_stats *s, avp_print_decimal(s->mos_pv, vals->mos / vals->avg_samples, msg); avp_print_time(s->at_pv, vals->at - created, msg); - avp_print_int(s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); - avp_print_int(s->jitter_pv, vals->jitter / vals->avg_samples, msg); - avp_print_int(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); - avp_print_int( + avp_print_llint( + s->packetloss_pv, vals->packetloss / vals->avg_samples, msg); + avp_print_llint(s->jitter_pv, vals->jitter / vals->avg_samples, msg); + avp_print_llint(s->roundtrip_pv, vals->roundtrip / vals->avg_samples, msg); + avp_print_llint( s->roundtrip_leg_pv, vals->roundtrip_leg / vals->avg_samples, msg); - avp_print_int(s->samples_pv, vals->samples / vals->avg_samples, msg); + avp_print_llint(s->samples_pv, vals->samples / vals->avg_samples, msg); } static int decode_mos_vals_dict(

1 0

git:5.6:d4d28c09: dialog: set cbs list to NULL after destroying
by Victor Seva 20 Jul '23

20 Jul '23

Module: kamailio Branch: 5.6 Commit: d4d28c098ddc07ab1b956a13878cd8e6f180fe3d URL: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-20T09:38:17+02:00 dialog: set cbs list to NULL after destroying (cherry picked from commit 6881faadec45dd16dd896b13db44862e7df70422) (cherry picked from commit 20be29ab3638d803341ec376b02edd7c14a9174a) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… Patch: https://github.com/kamailio/kamailio/commit/d4d28c098ddc07ab1b956a13878cd8e… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 54b8916d4e0..d61bfb62b49 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -370,8 +370,11 @@ void destroy_dlg(struct dlg_cell *dlg) if (dlg_db_mode) remove_dialog_from_db(dlg); - if (dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if (dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

git:5.7:20be29ab: dialog: set cbs list to NULL after destroying
by Victor Seva 20 Jul '23

20 Jul '23

Module: kamailio Branch: 5.7 Commit: 20be29ab3638d803341ec376b02edd7c14a9174a URL: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-20T09:37:12+02:00 dialog: set cbs list to NULL after destroying (cherry picked from commit 6881faadec45dd16dd896b13db44862e7df70422) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… Patch: https://github.com/kamailio/kamailio/commit/20be29ab3638d803341ec376b02edd7… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 54b8916d4e0..d61bfb62b49 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -370,8 +370,11 @@ void destroy_dlg(struct dlg_cell *dlg) if (dlg_db_mode) remove_dialog_from_db(dlg); - if (dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if (dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

[kamailio/kamailio] dialog: set cbs list to NULL after destroying (PR #3514)
by Stefan Mititelu 19 Jul '23

19 Jul '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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Make sure dialog cbs list is NULL after is destroyed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3514 -- Commit Summary -- * dialog: set cbs list to NULL after destroying -- File Changes -- M src/modules/dialog/dlg_hash.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3514.patch https://github.com/kamailio/kamailio/pull/3514.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3514 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3514(a)github.com>

2 1

git:master:6881faad: dialog: set cbs list to NULL after destroying
by Victor Seva 19 Jul '23

19 Jul '23

Module: kamailio Branch: master Commit: 6881faadec45dd16dd896b13db44862e7df70422 URL: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-19T15:04:25+02:00 dialog: set cbs list to NULL after destroying --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… Patch: https://github.com/kamailio/kamailio/commit/6881faadec45dd16dd896b13db44862… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 2454940fee3..8e740003c24 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -365,8 +365,11 @@ void destroy_dlg(struct dlg_cell *dlg) if(dlg_db_mode) remove_dialog_from_db(dlg); - if(dlg->cbs.first) + if(dlg->cbs.first) { destroy_dlg_callbacks_list(dlg->cbs.first); + dlg->cbs.first = NULL; + dlg->cbs.types = 0; + } if(dlg->profile_links) destroy_linkers(dlg->profile_links);

1 0

Kamailio v5.5.7 Released
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Hello, Kamailio SIP Server v5.5.7 stable release is out. This is a maintenance release of the stable branch 5.5 that includes fixes since the release of v5.5.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.7. Note that 5.5 is now the third last stable branch, v5.5.7 being the last planned released in 5.5.x series. The latest two stable branch are 5.6 and 5.7, with v5.7.1 being released a while ago. For more details about version 5.5.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2023/07/kamailio-v5-5-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 0

git:master:8a61b460: geoip: reformat static export structures
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: master Commit: 8a61b4607d6d079131bdbfff86c3e28167a12605 URL: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T11:06:11+02:00 geoip: reformat static export structures --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… Patch: https://github.com/kamailio/kamailio/commit/8a61b4607d6d079131bdbfff86c3e28… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index f95ee001d33..9c953d06d74 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -45,31 +45,38 @@ static void mod_destroy(void); static int w_geoip_match(struct sip_msg *msg, char *str1, char *str2); static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass); +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"gip", sizeof("gip") - 1}, PVT_OTHER, pv_get_geoip, 0, + {{"gip", sizeof("gip") - 1}, PVT_OTHER, pv_get_geoip, 0, pv_parse_geoip_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{"geoip_match", (cmd_function)w_geoip_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"geoip_match", (cmd_function)w_geoip_match, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"path", PARAM_STRING, &geoip_path}, {0, 0, 0}}; + {"path", PARAM_STRING, &geoip_path}, + {0, 0, 0} +}; struct module_exports exports = { - "geoip", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "geoip", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /**

1 0

git:5.5:43eb1344: ChangeLog: content updated for v5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: 43eb13442166e1293b2188aa410173de9f9837fb URL: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T10:01:54+02:00 ChangeLog: content updated for v5.5.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d… Patch: https://github.com/kamailio/kamailio/commit/43eb13442166e1293b2188aa410173d…

1 0

git:5.5:1339a180: pkg: version set to 5.5.7 for rpm and alpine specs
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: 1339a180f6d386dfcba655a09d327ba528987acd URL: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T09:56:40+02:00 pkg: version set to 5.5.7 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… Patch: https://github.com/kamailio/kamailio/commit/1339a180f6d386dfcba655a09d327ba… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 462dd82cf14..c3d3e3995b0 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.6 +pkgver=5.5.7 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 27e32dc2bfc..9a19366678c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.6 +%define ver 5.5.7 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.5:c8b995c0: Makefile.defs: version set to 5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: c8b995c036fe5d15e43138435d3bc68a83747a55 URL: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-19T09:57:21+02:00 Makefile.defs: version set to 5.5.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… Patch: https://github.com/kamailio/kamailio/commit/c8b995c036fe5d15e43138435d3bc68… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5ec3536ea34..d8458f6bfe1 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:b9fd39ea: pkg/kamailio/deb: version set 5.5.7
by Victor Seva 19 Jul '23

19 Jul '23

Module: kamailio Branch: 5.5 Commit: b9fd39ea259b32fd950080045e0edd0969a9a29d URL: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-19T09:09:41+02:00 pkg/kamailio/deb: version set 5.5.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Patch: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0…

1 0

Releasing Kamailio v5.5.7
by Daniel-Constantin Mierla 19 Jul '23

19 Jul '23

Hello, I am planning to release v5.5.7 our of branch 5.5 this week, most likely on Wednesday, July 19, 2023. It will mark the end of official packaging for release series 5.5.x, currently the latest two stable branches are 5.6 and 5.7. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 1

git:master:c35088bf: geoip2: docs - section ids and formatting
by Daniel-Constantin Mierla 18 Jul '23

18 Jul '23

Module: kamailio Branch: master Commit: c35088bf31b3e3e828433bf03b6ce647a75ef8e2 URL: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-18T16:38:20+02:00 geoip2: docs - section ids and formatting --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Patch: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 50a7d855fa8..cbc6ccb1493 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -11,26 +11,25 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> - This module allows real-time queries against the Max Mind GeoIP2 - database to be performed from the config script. + This module allows real-time queries against the Max Mind GeoIP2 + database to be performed from the config script. </para> <para> - The Max Mind GeoIP2 database is a map of IP network address assignments + The Max Mind GeoIP2 database is a map of IP network address assignments to geographical locales that can be useful -- though approximate -- in identifying the physical location with which an IP host address is associated on a relatively granular level. </para> <para> - This database itself can be obtained on a free or commercial basis + This database itself can be obtained on a free or commercial basis from <ulink url="http://dev.maxmind.com/geoip/"> - http://dev.maxmind.com/geoip/</ulink>. The - library libmaxminddb + http://dev.maxmind.com/geoip/</ulink>. The library libmaxminddb that interfaces with the Max Mind API, as well as scripts to automate downloading of the on-disk version are available at <ulink url="http://dev.maxmind.com/geoip/geoip2/downloadable/"> @@ -126,10 +125,10 @@ if(geoip2_match("$si", "src")) { </example> </section> </section> - + <section> <title>Functions</title> - <section> + <section id="geoip.f.geoip2_match"> <title> <function moreinfo="none">geoip2_match(ipaddr, pvc)</function> </title> @@ -149,7 +148,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - <section> + <section id="geoip.f.geoip2_distance"> <title> <function moreinfo="none">geoip2_distance(ip_addr, latitude, longitude)</function> </title> @@ -172,7 +171,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - + </section> <section> @@ -195,13 +194,13 @@ if(geoip2_match("$si", "src")) </example> </section> </section> - - <section> + + <section id="geoip.pvs"> <title>Exported pseudo-variables</title> <itemizedlist> <listitem><para> - <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an - identifier for this query result; it is designated by the second + <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an + identifier for this query result; it is designated by the second parameter of geoip2_match(). The <emphasis>key</emphasis> can be one of the following: </para>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev