sr-dev October 2021

sr-dev@lists.kamailio.org

19 participants
243 discussions

git:master:3476eb3a: modules: readme files regenerated - sipdump ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3476eb3aebdbda622194131c008c8309f9ef8524 URL: https://github.com/kamailio/kamailio/commit/3476eb3aebdbda622194131c008c830… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-10-19T22:46:22+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/3476eb3aebdbda622194131c008c830… Patch: https://github.com/kamailio/kamailio/commit/3476eb3aebdbda622194131c008c830… --- diff --git a/src/modules/sipdump/README b/src/modules/sipdump/README index d7da3a8bf7..8b03c3849f 100644 --- a/src/modules/sipdump/README +++ b/src/modules/sipdump/README @@ -313,8 +313,8 @@ event_route[sipdump:msg] { examples shows how to delete the files older than 2 days using Kamailio modules. ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

2 years, 6 months

git:master:f202cfe6: sipdump: docs - fix example config snippet

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f202cfe647c6a1ac92a3c2b8e2ee056d678fb802 URL: https://github.com/kamailio/kamailio/commit/f202cfe647c6a1ac92a3c2b8e2ee056… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-19T22:32:53+02:00 sipdump: docs - fix example config snippet --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f202cfe647c6a1ac92a3c2b8e2ee056… Patch: https://github.com/kamailio/kamailio/commit/f202cfe647c6a1ac92a3c2b8e2ee056… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 301b667d80..f0dd9fc1b4 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -339,8 +339,8 @@ event_route[sipdump:msg] { </para> <programlisting format="linespecific"> ... -loadmodule "rtimer.so -loadmodule "exec.so +loadmodule "rtimer.so" +loadmodule "exec.so" ... modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN")

2 years, 6 months

Proxy protocol issue

by Federico Cabiddu

Hi all, I've been recently testing kamailio support for proxy protocol which was introduced by https://github.com/kamailio/kamailio/issues/1757. As reported by others, even if kamailio is able to decode the proxy protocol and get the client's original IP address, it is unable to send SIP messages to the client which initiated the connection through the HA load balancer (nginx in my case). After investigation I've found that there is no alias added to the tcp connection aliases list for the tuple CLIENT_IP:CLIENT_PORT/LOCAL_KAMAILIO_IP:KAMAILIO_PORT. This means that when trying to forward a message to the originating client kamailio won't use the existing connection with the load balancer/proxy but will try to establish a new connection. The fact is that the function which parses the proxy header overwrites the dst ip/port of the connection with the "Destination IP" and "Destination Port" fields of the proxy header ( https://github.com/kamailio/kamailio/blob/f677dea597db6ceaa66a2755dd6e9e738… for v2, https://github.com/kamailio/kamailio/blob/f677dea597db6ceaa66a2755dd6e9e738… for v1). This fields contain the IP/port of the Load Balancer, not the kamailio IP/Port, and kamailio will fail to find a tcp connection toward the client's src IP since the Load Balancer IP is not a kamailio's local socket. I think that the destination IP of the connection shouldn't be rewritten with the load balancer IP, unless I'm missing something. Hopefully I've been clear enough explaining the issue :) If you agree with the analysis I can prepare a PR for it. Have you all a great weekend, Federico Cabiddu

2 years, 6 months

git:master:f0e8898d: core: parser - detect pai/ppi headers spanning many lines

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f0e8898d83c54e5e4383b70ba54ad340c5ae13b6 URL: https://github.com/kamailio/kamailio/commit/f0e8898d83c54e5e4383b70ba54ad34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-15T16:51:19+02:00 core: parser - detect pai/ppi headers spanning many lines - GH #2837 --- Modified: src/core/parser/parse_ppi_pai.c --- Diff: https://github.com/kamailio/kamailio/commit/f0e8898d83c54e5e4383b70ba54ad34… Patch: https://github.com/kamailio/kamailio/commit/f0e8898d83c54e5e4383b70ba54ad34… --- diff --git a/src/core/parser/parse_ppi_pai.c b/src/core/parser/parse_ppi_pai.c index 4e4ebe392b..c60e33a9fd 100644 --- a/src/core/parser/parse_ppi_pai.c +++ b/src/core/parser/parse_ppi_pai.c @@ -65,6 +65,26 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) while ((*tmp == ',') && (num_uri < NUM_PAI_BODIES)) { tmp++; + while(tmp<buf+len && (*tmp==' ' || *tmp=='\t')) tmp++; + if(tmp>=buf+len) { + LM_ERR("no content after comma when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + if((tmp<buf+len-1 && *tmp=='\n') + || (tmp<buf+len-2 && *tmp=='\r' && *(tmp+1)=='\n')) { + if(*tmp=='\n') { + tmp++; + } else { + tmp += 2; + } + if(*tmp!=' ' && *tmp!='\t') { + LM_ERR("no space after EOL when parsing PAI/PPI body %u '%.*s'\n", + num_uri, len, buf); + return -1; + } + tmp++; + } tmp = parse_addr_spec(tmp, buf+len, &uri_b[num_uri], 1); if (uri_b[num_uri].error == PARSE_ERROR) {

2 years, 6 months

[kamailio/kamailio] snmpstats: get_statistic(): failed to retrieve statistics for local_replies (#2865)

by Marat

### Description I noticed in the logs messages similar to errors (in fact, this is INFO level).  ### Troubleshooting #### Reproduction Retrive **kamailioSIPSummaryOutResponses** statistic `snmpwalk -v 2c -c public localhost .1.3.6.1.4.1.34352.3.1.1.1.3.4` And you will see errors in log file.  #### Log Messages  ``` INFO /usr/local/sbin/kamailio[15984]: INFO: snmpstats [utilities.c:116]: get_statistic(): failed to retrieve statistics for local_replies INFO /usr/local/sbin/kamailio[15984]: INFO: snmpstats [utilities.c:116]: get_statistic(): failed to retrieve statistics for relayed_replies ``` ### Possible Solutions I found part of code https://github.com/kamailio/kamailio/blob/026119200117d20740cbe4d162a14767f… and it seems that tm module no longer has `local_replies` and `relayed_replies` statistics. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.3 (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/2865

2 years, 6 months

git:master:12ea639c: snmp: Update reply stats names

by Stefan Mititelu

Module: kamailio Branch: master Commit: 12ea639c45db95e31c73d632822baa31df98c6a5 URL: https://github.com/kamailio/kamailio/commit/12ea639c45db95e31c73d632822baa3… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2021-10-15T17:18:26+03:00 snmp: Update reply stats names Solves issue #2865. --- Modified: src/modules/snmpstats/snmpSIPCommonObjects.c --- Diff: https://github.com/kamailio/kamailio/commit/12ea639c45db95e31c73d632822baa3… Patch: https://github.com/kamailio/kamailio/commit/12ea639c45db95e31c73d632822baa3… --- diff --git a/src/modules/snmpstats/snmpSIPCommonObjects.c b/src/modules/snmpstats/snmpSIPCommonObjects.c index 3ddf6465b1..4b7b668f54 100644 --- a/src/modules/snmpstats/snmpSIPCommonObjects.c +++ b/src/modules/snmpstats/snmpSIPCommonObjects.c @@ -298,8 +298,8 @@ int handle_kamailioSIPSummaryOutResponses(netsnmp_mib_handler *handler, */ int fwd_replies = get_statistic("fwd_replies"); - int local_replies = get_statistic("local_replies"); - int relayed_replies = get_statistic("relayed_replies"); + int local_replies = get_statistic("rpl_generated"); + int relayed_replies = get_statistic("rpl_sent"); int sent_replies = get_statistic("sent_replies"); int result = fwd_replies + local_replies + relayed_replies + sent_replies; @@ -454,4 +454,4 @@ int handleSipEntityType(modparam_t type, void *val) } return 0; -} \ No newline at end of file +}

2 years, 6 months

git:master:f677dea5: lcr: fix build

by Victor Seva

Module: kamailio Branch: master Commit: f677dea597db6ceaa66a2755dd6e9e738855dc35 URL: https://github.com/kamailio/kamailio/commit/f677dea597db6ceaa66a2755dd6e9e7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-10-14T15:16:52+02:00 lcr: fix build > lcr_mod.c: In function 'find_gateway_by_ip_and_port': > lcr_mod.c:930:2: error: 'for' loop initial declarations are only allowed in C99 or C11 mode > for (int i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { > ^ > lcr_mod.c:930:2: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code > ../../Makefile.rules:100: recipe for target 'lcr_mod.o' failed > make[3]: *** [lcr_mod.o] Error 1 --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f677dea597db6ceaa66a2755dd6e9e7… Patch: https://github.com/kamailio/kamailio/commit/f677dea597db6ceaa66a2755dd6e9e7… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index d796c08c2c..630593bd36 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -925,9 +925,9 @@ static int comp_gws(const void *_g1, const void *_g2) * Compare a gateway using IP address and the src port */ static struct gw_info * find_gateway_by_ip_and_port(struct gw_info * gw, struct gw_info * gws) { - int tmp = 0, gw_index = 0; + int tmp = 0, gw_index = 0, i; - for (int i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { + for (i = 1; i <= gws[0].ip_addr.u.addr32[0]; i++) { tmp = memcmp(gws[i].ip_addr.u.addr, gw->ip_addr.u.addr, gws[i].ip_addr.len); if (gws[i].ip_addr.af == gw->ip_addr.af && gws[i].ip_addr.len == gw->ip_addr.len &&

2 years, 6 months

[kamailio/kamailio] dlgs: dlgs_tags_count(): always returns 1 and not count of dialogs (#2884)

by MikhailKalashnikov

### Description dlgs: dlgs_tags_count(): always returns 1 and not count of dialogs. ### Possible Solutions I guess [ki_dlgs_tags_count](https://github.com/kamailio/kamailio/blob/master/src/mo… should return `ret` instead of 1. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.5 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` -- 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/2884

2 years, 6 months

git:5.4:4bee0582: dlgs: proper return for tags counting

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 4bee05821e9a9a1c72b73da8d1aae82735802602 URL: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:36:45+02:00 dlgs: proper return for tags counting - GH #2884 (cherry picked from commit 1f12e2a03856f9c2d12cf62c1e65e84380729a06) (cherry picked from commit b6484e4614ebc0f3fd54224ba9470d6c5b322a6f) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… Patch: https://github.com/kamailio/kamailio/commit/4bee05821e9a9a1c72b73da8d1aae82… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

2 years, 6 months

git:5.5:b6484e46: dlgs: proper return for tags counting

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b6484e4614ebc0f3fd54224ba9470d6c5b322a6f URL: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-14T10:35:32+02:00 dlgs: proper return for tags counting - GH #2884 (cherry picked from commit 1f12e2a03856f9c2d12cf62c1e65e84380729a06) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… Patch: https://github.com/kamailio/kamailio/commit/b6484e4614ebc0f3fd54224ba9470d6… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 503dd8c197..46de9d5c44 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -344,10 +344,7 @@ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) int ret; ret = dlgs_tags_count(msg, vtags); - if(ret<=0) { - return (ret-1); - } - return 1; + return (ret<=0)?(ret-1):ret; } /**

2 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
24
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2021