sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:master:ed4559a7: pv_headers: store To info in xavp_parsed_name.r on replies

by Victor Seva

Module: kamailio Branch: master Commit: ed4559a76c32d0addc14a0fae9982b081edc511b URL: https://github.com/kamailio/kamailio/commit/ed4559a76c32d0addc14a0fae9982b0… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-13T09:25:31+01:00 pv_headers: store To info in xavp_parsed_name.r on replies pvh_get_uri was using xavp_parsed_name since xavp_parsed_name.r didn't exist so $x_tt was not there * some refactoring to reduce duplication * skip trying to get the same xavp when br_xname and xname are the same * add more debug, some commented just in case We needed it later Change-Id: I961d176204ddb5d4f726061c413be765187b27ac --- Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/ed4559a76c32d0addc14a0fae9982b0… Patch: https://github.com/kamailio/kamailio/commit/ed4559a76c32d0addc14a0fae9982b0…

4 years, 9 months

git:master:9fb8eb4a: pv_headers: fix detection of branch flag on collect

by Victor Seva

Module: kamailio Branch: master Commit: 9fb8eb4a8db659b4e93c24d0d83d24bcff8149ef URL: https://github.com/kamailio/kamailio/commit/9fb8eb4a8db659b4e93c24d0d83d24b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-02-13T09:22:43+01:00 pv_headers: fix detection of branch flag on collect --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb8eb4a8db659b4e93c24d0d83d24b… Patch: https://github.com/kamailio/kamailio/commit/9fb8eb4a8db659b4e93c24d0d83d24b… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 1340500cc4..22ee74e42d 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -51,7 +51,7 @@ int pvh_collect_headers(struct sip_msg *msg, int is_auto) return -1; } } else { - if(isbflagset(br_idx, FL_PV_HDRS_COLLECTED)) { + if(isbflagset(br_idx, FL_PV_HDRS_COLLECTED) == 1) { LM_ERR("headers are already collected\n"); return -1; }

4 years, 9 months

git:master:03647b03: core: tcp - init value of *tcp_total_wq after allocation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 03647b03c0ede9e2d5f65766ce6b72c593e3f39c URL: https://github.com/kamailio/kamailio/commit/03647b03c0ede9e2d5f65766ce6b72c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-13T09:10:52+01:00 core: tcp - init value of *tcp_total_wq after allocation - use %u to log unsigned variables --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/03647b03c0ede9e2d5f65766ce6b72c… Patch: https://github.com/kamailio/kamailio/commit/03647b03c0ede9e2d5f65766ce6b72c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 4ebd6b7baf..e57a29d99e 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -613,8 +613,8 @@ inline static int _wbufq_add(struct tcp_connection* c, const char* data, ((*tcp_total_wq+size)>cfg_get(tcp, tcp_cfg, tcp_wq_max)) || (q->first && TICKS_LT(q->wr_timeout, t)) )){ - LM_ERR("(%d bytes): write queue full or timeout " - " (%d, total %d, last write %d s ago)\n", + LM_ERR("(%u bytes): write queue full or timeout " + " (%u, total %u, last write %d s ago)\n", size, q->queued, *tcp_total_wq, TICKS_TO_S(t-(q->wr_timeout- cfg_get(tcp, tcp_cfg, send_timeout)))); @@ -4947,6 +4947,7 @@ int init_tcp() SHM_MEM_CRITICAL; goto error; } + *tcp_total_wq=0; #endif /* TCP_ASYNC */ /* alloc hashtables*/ tcpconn_aliases_hash=(struct tcp_conn_alias**)

4 years, 9 months

[kamailio/kamailio] Kemi: sdp_with_transport() missing and sdp_transport() doesn't always help (#2194)

by Sebastian Damm

### Description In plain Kamailio language, we used the following line: ``` if ( sdp_with_transport("RTP/SAVP") ) { ``` Now we wanted to convert that to Kemi. Turns out, the `sdp_with_transport()` function is not exported to Kemi. So we thought, we could use `sdp_transport()` to work around the missing function. This works as long as there is only one transport in SDP. But if a phone sends two media streams in SDP, one with RTP/AVP and one with RTP/SAVP, `sdp_transport()` will return `-2`. ### Troubleshooting #### Reproduction Send an INVITE to Kamailio and try to get the transport type into a variable with ` sdp_transport()`. This can be done for example with a snom phone where in the rtp section of the identity configuration the parameter "RTP/SAVP" is set to "optional". #### Log Messages ``` Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: app_jsdt [app_jsdt_api.c:996]: sr_kemi_jsdt_exec_func_ex(): param[0] for: sdp_transport is str: $avp(mediaTransport) Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: <core> [core/usr_avp.c:887]: parse_avp_ident(): Parsing 'mediaTransport' Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: <core> [core/pvapi.c:368]: pv_cache_add(): pvar [$avp(mediaTransport)] added in cache Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: sdpops [sdpops_mod.c:1214]: sdp_transport_helper(): stream 0 of 0 - transport [RTP/SAVP] Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: sdpops [sdpops_mod.c:1214]: sdp_transport_helper(): stream 1 of 0 - transport [RTP/AVP] Jan 10 13:08:13 hagi /usr/sbin/kamailio[7136]: DEBUG: sdpops [sdpops_mod.c:1219]: sdp_transport_helper(): no common transport ``` ### Additional Information We are still running Kamailio 5.1.x, but as far as I could see, the behavior has not changed since then. -- 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/2194

4 years, 9 months

git:master:c2f0b7b6: sdpops: exported sdp with transport variants to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c2f0b7b6e41e334c8e0695feae3b5e6d4e8a74dc URL: https://github.com/kamailio/kamailio/commit/c2f0b7b6e41e334c8e0695feae3b5e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T22:15:24+01:00 sdpops: exported sdp with transport variants to kemi - GH #2194 --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c2f0b7b6e41e334c8e0695feae3b5e6… Patch: https://github.com/kamailio/kamailio/commit/c2f0b7b6e41e334c8e0695feae3b5e6… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 1492ec0832..bebe01ba5c 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -1323,6 +1323,26 @@ static int w_sdp_with_transport_like(sip_msg_t* msg, char* transport, char *bar) return 1; } +/** + * + */ +static int ki_sdp_with_transport(sip_msg_t* msg, str* transport) +{ + if(sdp_with_transport(msg, transport, 0)<=0) + return -1; + return 1; +} + +/** + * + */ +static int ki_sdp_with_transport_like(sip_msg_t* msg, str* transport) +{ + if(sdp_with_transport(msg, transport, 1)<=0) + return -1; + return 1; +} + /** * @brief remove streams matching the m=media port 'transport' * @return -1 - error; 0 - not found; >=1 - found @@ -2230,6 +2250,16 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("sdp_with_transport"), + SR_KEMIP_INT, ki_sdp_with_transport, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("sdp_with_transport_like"), + SR_KEMIP_INT, ki_sdp_with_transport_like, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sdpops"), str_init("sdp_get_line_startswith"), SR_KEMIP_INT, ki_sdp_get_line_startswith, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

4 years, 9 months

git:master:4bf0c5c9: core: tcp - print socked fd on logs when writing to tcp conenction

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4bf0c5c9e573d587e271400aa55fb56a0fc9601d URL: https://github.com/kamailio/kamailio/commit/4bf0c5c9e573d587e271400aa55fb56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:56:14+01:00 core: tcp - print socked fd on logs when writing to tcp conenction --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/4bf0c5c9e573d587e271400aa55fb56… Patch: https://github.com/kamailio/kamailio/commit/4bf0c5c9e573d587e271400aa55fb56… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e0a66be619..4ebd6b7baf 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1171,7 +1171,7 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su, } } print_ip("tcpconn_new: new tcp connection: ", &c->rcv.src_ip, "\n"); - LM_DBG("on port %d, type %d\n", c->rcv.src_port, type); + LM_DBG("on port %d, type %d, socket %d\n", c->rcv.src_port, type, sock); init_tcp_req(&c->req, (char*)c+sizeof(struct tcp_connection), rd_b_size); c->id=(*connection_id)++; c->rcv.proto_reserved1=0; /* this will be filled before receive_message*/ @@ -2874,7 +2874,7 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, int locked) { int n; - + n=_tcpconn_write_nb(fd, c, buf, len); if (unlikely(n<(int)len)){ /* on EAGAIN or ENOTCONN return success. @@ -2882,12 +2882,12 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, connect() & send immediately) */ if ((n>=0) || errno==EAGAIN || errno==EWOULDBLOCK || errno==ENOTCONN){ if(n<0) { - LM_DBG("pending write on new connection %p " - "(%d/%d bytes written) (err: %d - %s)\n", c, n, len, + LM_DBG("pending write on new connection %p sock %d " + "(%d/%d bytes written) (err: %d - %s)\n", c, fd, n, len, errno, strerror(errno)); } else { - LM_DBG("pending write on new connection %p " - "(%d/%d bytes written)\n", c, n, len); + LM_DBG("pending write on new connection %p sock %d " + "(%d/%d bytes written)\n", c, fd, n, len); } if (unlikely(n<0)) n=0; else{ @@ -2901,8 +2901,9 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, if (unlikely(_wbufq_insert(c, buf+n, len-n)<0)){ if (likely(!locked)) lock_release(&c->write_lock); n=-1; - LM_ERR("%s: EAGAIN and write queue full or failed for %p\n", - su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), c); + LM_ERR("%s: EAGAIN and write queue full or failed for %p" + " sock %d\n", su2a(&c->rcv.src_su, + sizeof(c->rcv.src_su)), c, fd); goto error; } if (likely(!locked)) lock_release(&c->write_lock); @@ -2939,12 +2940,12 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, } /* error: destroy it directly */ TCP_STATS_CONNECT_FAILED(); - LM_ERR("%s: connect & send for %p failed:" " %s (%d)\n", + LM_ERR("%s: connect & send for %p (sock %d) failed:" " %s (%d)\n", su2a(&c->rcv.src_su, sizeof(c->rcv.src_su)), - c, strerror(errno), errno); + c, fd, strerror(errno), errno); goto error; } - LM_INFO("quick connect for %p\n", c); + LM_INFO("quick connect for %p sock %d\n", c, fd); if (likely(c->state == S_CONN_CONNECT)) TCP_STATS_ESTABLISHED(S_CONN_CONNECT); if (unlikely(send_flags.f & SND_F_CON_CLOSE)){

4 years, 9 months

git:master:02cf454f: utils: Makefile - try to use pkg-config if xml2-config is not found

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 02cf454fc601dd3b246a8886ec6d86103ad87a6e URL: https://github.com/kamailio/kamailio/commit/02cf454fc601dd3b246a8886ec6d861… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:30:09+01:00 utils: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/utils/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/02cf454fc601dd3b246a8886ec6d861… Patch: https://github.com/kamailio/kamailio/commit/02cf454fc601dd3b246a8886ec6d861… --- diff --git a/src/modules/utils/Makefile b/src/modules/utils/Makefile index cfcfdd1f3d..85d0eb065c 100644 --- a/src/modules/utils/Makefile +++ b/src/modules/utils/Makefile @@ -10,6 +10,12 @@ NAME=utils.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif endif ifneq ($(XML2CFG),)

4 years, 9 months

git:master:517283c2: presence_dialoginfo: Makefile - try to use pkg-config if xml2-config is not found

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 517283c245be8c35d3c6ee9721fa1e85865b4638 URL: https://github.com/kamailio/kamailio/commit/517283c245be8c35d3c6ee9721fa1e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:29:53+01:00 presence_dialoginfo: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/presence_dialoginfo/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/517283c245be8c35d3c6ee9721fa1e8… Patch: https://github.com/kamailio/kamailio/commit/517283c245be8c35d3c6ee9721fa1e8… --- diff --git a/src/modules/presence_dialoginfo/Makefile b/src/modules/presence_dialoginfo/Makefile index 32ecedfba2..93232b2e7a 100644 --- a/src/modules/presence_dialoginfo/Makefile +++ b/src/modules/presence_dialoginfo/Makefile @@ -1,4 +1,4 @@ -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs @@ -7,6 +7,12 @@ NAME=presence_dialoginfo.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif endif ifneq ($(XML2CFG),)

4 years, 9 months

git:master:77ad9e62: presence_xml: Makefile - try to use pkg-config if xml2-config is not found

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 77ad9e626a8b9f26f3ce904fe35dda70ad4ce164 URL: https://github.com/kamailio/kamailio/commit/77ad9e626a8b9f26f3ce904fe35dda7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:29:39+01:00 presence_xml: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/presence_xml/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/77ad9e626a8b9f26f3ce904fe35dda7… Patch: https://github.com/kamailio/kamailio/commit/77ad9e626a8b9f26f3ce904fe35dda7… --- diff --git a/src/modules/presence_xml/Makefile b/src/modules/presence_xml/Makefile index f6a1dd4d63..826df4d0ad 100644 --- a/src/modules/presence_xml/Makefile +++ b/src/modules/presence_xml/Makefile @@ -8,6 +8,12 @@ LIBS= ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif ifeq ($(OS), darwin) ICU_BUILDER = $(shell \ if pkg-config --exists icu-uc; then \

4 years, 9 months

git:master:5ce96902: presence: Makefile - try to use pkg-config if xml2-config is not found

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5ce9690245e0a075742c7cb8eac1786622c976f4 URL: https://github.com/kamailio/kamailio/commit/5ce9690245e0a075742c7cb8eac1786… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-12T21:29:25+01:00 presence: Makefile - try to use pkg-config if xml2-config is not found --- Modified: src/modules/presence/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5ce9690245e0a075742c7cb8eac1786… Patch: https://github.com/kamailio/kamailio/commit/5ce9690245e0a075742c7cb8eac1786… --- diff --git a/src/modules/presence/Makefile b/src/modules/presence/Makefile index bf5586a32f..3cc6ae6c19 100644 --- a/src/modules/presence/Makefile +++ b/src/modules/presence/Makefile @@ -7,6 +7,12 @@ NAME=presence.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(XML2CFG),) +XML2CFG=$(shell \ + if pkg-config --exists libxml-2.0; then \ + echo 'pkg-config libxml-2.0'; \ + fi) +endif ifeq ($(OS), darwin) ICU_BUILDER = $(shell \ if pkg-config --exists icu-uc; then \

4 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020