sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:master:0607cd0b: kemix: function to get the body length

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0607cd0b42ff2c692e8a096a73df41017449bde5 URL: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T10:44:24+02:00 kemix: function to get the body length --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… Patch: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index fdedda04be..4bd6f839d1 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -739,6 +739,30 @@ static sr_kemi_xval_t* ki_kx_getw_body(sip_msg_t *msg) return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static int ki_kx_get_bodylen(sip_msg_t *msg) +{ + str s; + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + return 0; + } + + s.s = get_body(msg); + + if(s.s == NULL) { + return 0; + } + s.len = msg->buf + msg->len - s.s; + if(s.len <=0) { + return 0; + } + + return s.len; +} + /** * */ @@ -1116,6 +1140,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_bodylen"), + SR_KEMIP_INT, ki_kx_get_bodylen, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_timestamp"), SR_KEMIP_INT, ki_kx_get_timestamp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

4 years, 1 month

Send large responses with tcp_send() results in full write queue

by Alex Hermann

Hi, I'm using tcp_send() to send responses to incoming RPC requests over TCP. This works fine when responses are small, but tends to fail on larger responses on somewhat slower links or clients (it fails whenever the links is not on the loopback interface, even on sub-ms RTT links). The error message thrown in the logs is: ERROR: <core> [core/tcp_main.c:618]: _wbufq_add(): (32007 bytes): write queue full or timeout (18042, total 18042, last write 0 s ago) I verified the error is due to a full buffer, not a timeout. I would like the tcp_send() not to fail on a full send buffer. Instead of failing, it should wait until there is enough space in the buffer again and send the data. Timeout should still be honoured though. >From the code this looks like a "feature", but I would classify this as a bug. The receiver is still receiving, the timeout is not hit but Kamailio just decides not to send any more data because its (by default small) buffer is full. If the buffer is full, it should wait until enough space becomes free again, not fail before the timeout triggers. The chunks of data that are sent via tcp_send() are always smaller than tcpconn_wq_max, so they should fit in an empty write buffer. I'd prefer not to increase tcpconn_wq_max as this will be a never ending story, the responses will keep growing over time. They're already in the 10's of MB at this time. Retrying tcp_send() is not an option. After the first failure, the connection is closed and there is no way for the server (Kamailio) to open a new connection to the RPC client. tcp_async is enabled, as that's needed/preferred for the SIP processing. Is there a way around the (full) write buffer for the caller of tcp_send()? -- Alex Hermann

4 years, 1 month

git:5.3:ef221027: pdb: use memcpy() for PDB_BUFTOSHORT macro

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: ef221027a448d77337225e376362b26b2618f050 URL: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-08T19:43:18+02:00 pdb: use memcpy() for PDB_BUFTOSHORT macro - related to GH #2345 (cherry picked from commit be57be33d0e48d412ddab9801ee4d6d906329d70) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… Patch: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 1ab15af2e7..5fb1204e52 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -190,7 +190,7 @@ static int pdb_msg_format_send(struct pdb_msg *msg, /* two chars to short-int without caring of memory alignment in char buffer */ -#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) +#define PDB_BUFTOSHORT(_sv, _b, _n) memcpy(&(_sv), (char*)(_b) + (_n), sizeof(short int)) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -347,7 +347,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, msg.bdy.payload, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } @@ -370,7 +370,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, buf, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; }

4 years, 1 month

[kamailio/kamailio] PDB return wrong values (#2345)

by Earn330

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data ### Possible Solutions  ### Additional Information ``` version: kamailio 5.3.4 (x86_64/linux) a35a2f-dirty 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: a35a2f -dirty compiled with gcc 4.9.2 ``` * **Operating System**: ``` Debian GNU/Linux 8 Linux voip-lab-proxy02 3.16.0-4-amd64 #1 SMP Debian 3.16.43-2+deb8u5 (2017-09-19) x86_64 GNU/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/2345

4 years, 1 month

[kamailio/kamailio] tools/kemi: add script to generate mock api for kemi python testing (#2350)

by tsearle

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2350 -- Commit Summary -- * tools/kemi: add script to generate mock api for kemi python testing -- File Changes -- A misc/tools/kemi/python_mock/README.md (24) A misc/tools/kemi/python_mock/kemi_mock.py (177) A misc/tools/kemi/python_mock/test.py (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2350.patch https://github.com/kamailio/kamailio/pull/2350.diff -- 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/pull/2350

4 years, 1 month

ICMP port-unreachable for UDP INVITEs

by Sergey Safarov

HI. Could you help me understand this maillist message. https://lists.kamailio.org/pipermail/sr-dev/2020-April/056608.html Is that mean - on modern kernel with correct settings Kamailio, sendto() will fail after ICMP message and then Kamailio is able send INVITE to other destination? Sergey

4 years, 1 month

git:master:2d2594d3: remove unused import

by Henning Westerholt

Module: kamailio Branch: master Commit: 2d2594d3cdeead550ccd472f9d0288b72b98d689 URL: https://github.com/kamailio/kamailio/commit/2d2594d3cdeead550ccd472f9d0288b… Author: tsearle <tsearle(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-08T17:39:41+02:00 remove unused import --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/2d2594d3cdeead550ccd472f9d0288b… Patch: https://github.com/kamailio/kamailio/commit/2d2594d3cdeead550ccd472f9d0288b… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 4717c5057e..aa96fadfd9 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -6,7 +6,6 @@ import json import sys -import os from collections import defaultdict

4 years, 1 month

git:master:f4ec9239: tools/kemi: add script to generate mock api for kemi python testing

by Henning Westerholt

Module: kamailio Branch: master Commit: f4ec923976cbab5c1451b65268aaca65a33919fd URL: https://github.com/kamailio/kamailio/commit/f4ec923976cbab5c1451b65268aaca6… Author: Torrey Searle <tsearle(a)voxbone.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-08T17:39:41+02:00 tools/kemi: add script to generate mock api for kemi python testing --- Added: misc/tools/kemi/python_mock/README.md Added: misc/tools/kemi/python_mock/kemi_mock.py Added: misc/tools/kemi/python_mock/test.py --- Diff: https://github.com/kamailio/kamailio/commit/f4ec923976cbab5c1451b65268aaca6… Patch: https://github.com/kamailio/kamailio/commit/f4ec923976cbab5c1451b65268aaca6…

4 years, 1 month

missing SAR messages

by Georgi Rosenov Stefanov

These are my findings 2000 - 10/s(1 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 2250 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 1124 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 1124 2000 - 10/s(2 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 2250 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 1125 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 1125 2000 - 100/s (1 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 323 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 160 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 160 2000 - 100/s (2 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 323 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 160 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 160 2000 - 500/s (1 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 379 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 114 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 120 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 0 2000 - 500/s (2 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 349 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 114 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 153

4 years, 1 month

Removing Record-Route header

by Andrey Deykunov

Hi guys, I'm using Kamailio 5.3.1 in the AWS cloud. For this purpose I'm setting up a 'nat_public_ipaddr' in the 'advertise' feature: listen=tls:<%= @ipaddr %>:5061 advertise <%= node['hpbx'][ 'nat_public_ipaddr'] %>:5061 listen=tcp:<%= @ipaddr %>:5060 advertise <%= node['hpbx'][ 'nat_public_ipaddr'] %>:5060 listen=udp:<%= @ipaddr %>:5060 advertise <%= node['hpbx'][ 'nat_public_ipaddr'] %>:5060 When I need relaying an incoming message to one of our internal services (for example B2BUA, VMAIL etc) I'm setting up an internal address '@ipaddr' in the Via header instead of 'nat_public_ipaddr' : set_advertised_address("<%= @ipaddr %>"); set_advertised_port(5060); All works fine, but Kamailio adds a 'Record-Route' header containing 'nat_public_ipaddr' automatically into such messages. How can I remove this header or insert my internal address instead before relaying the message? Is it possible? Thanks, Andrey

4 years, 1 month

← Newer
1
...
30
31
32
33
34
35
36
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020