March 2020 - sr-dev - kamailio.org

[kamailio/kamailio] sipcapture: add new capture_bad_msgs modparam (#2245)
by Stefan Mititelu 23 Mar '20

23 Mar '20

#### 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  Enable the parsing of broken SIP messages. @lbalaceanu is the original developer of this patch. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2245 -- Commit Summary -- * sipcapture: add new capture_bad_msgs modparam -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (18) M src/modules/sipcapture/sipcapture.c (182) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2245.patch https://github.com/kamailio/kamailio/pull/2245.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/2245

2 5

git:master:51bbc555: sipcapture: add new capture_bad_msgs modparam
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 51bbc5557edf4d4c1cdcb268f70d00ef406b53fc URL: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:17:18+01:00 sipcapture: add new capture_bad_msgs modparam In order to enable the parsing of broken SIP messages. By default this behavior is disabled. Updated doc. --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e… Patch: https://github.com/kamailio/kamailio/commit/51bbc5557edf4d4c1cdcb268f70d00e…

1 0

git:master:9d0ea2b4: seas: use ip_addr2sbuf instead of (redundant) buf_print_ip
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 9d0ea2b4323bcafd73322cc2b234231273013bcd URL: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:07:42+01:00 seas: use ip_addr2sbuf instead of (redundant) buf_print_ip --- Modified: src/modules/seas/event_dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… Patch: https://github.com/kamailio/kamailio/commit/9d0ea2b4323bcafd73322cc2b234231… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 6031310aa1..e1c7047beb 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -850,7 +850,7 @@ int process_bind_action(as_p as,unsigned char processor_id,unsigned int flags,ch memcpy(&port,payload+k,2); k+=2; port=ntohs(port); - buf_print_ip(buffer, &my_addr,300); + ip_addr2sbuf(&my_addr,buffer,300); switch(proto){ case PROTO_UDP: proto_s="UDP";

1 0

git:master:279848dd: tls: use ip_addr2sbuf instead of (redundant) buf_print_ip
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 279848dda1fc24428ad3662f6890b6f51fef3518 URL: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:06:33+01:00 tls: use ip_addr2sbuf instead of (redundant) buf_print_ip --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… Patch: https://github.com/kamailio/kamailio/commit/279848dda1fc24428ad3662f6890b6f… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index d084aaecd3..c8e5852556 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -885,10 +885,10 @@ int tls_encode_f(struct tcp_connection *c, ERR("protocol level error\n"); TLS_ERR(err_src); memset(ip_buf, 0, sizeof(buf)); - buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); memset(ip_buf, 0, sizeof(buf)); - buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); ERR("destination IP: %s\n", ip_buf); goto error; @@ -1283,10 +1283,10 @@ int tls_read_f(struct tcp_connection* c, int* flags) ERR("protocol level error\n"); TLS_ERR(err_src); memset(ip_buf, 0, sizeof(ip_buf)); - buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.src_ip), ip_buf, sizeof(ip_buf)); ERR("source IP: %s\n", ip_buf); memset(ip_buf, 0, sizeof(ip_buf)); - buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ip_addr2sbuf(&(c->rcv.dst_ip), ip_buf, sizeof(ip_buf)); ERR("destination IP: %s\n", ip_buf); goto error;

1 0

git:master:3708022d: Revert "core: add new function buf_print_ip(..) to print an IP address to an buffer"
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 3708022dfa24cf250cb34f0d5e5f990711f91d1b URL: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T15:05:51+01:00 Revert "core: add new function buf_print_ip(..) to print an IP address to an buffer" This reverts commit 4acca8ad2f31f465b08f15d98cc4780236e2beb0. --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… Patch: https://github.com/kamailio/kamailio/commit/3708022dfa24cf250cb34f0d5e5f990… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 82f746e0d6..9989063fff 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -274,35 +274,6 @@ void stdout_print_ip(struct ip_addr* ip) } -void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len) -{ - if (len < INET6_ADDRSTRLEN) { - LM_ERR("insufficent buffer length\n"); - return; - } - switch(ip->af){ - case AF_INET: - snprintf(buf, len, "%d.%d.%d.%d", ip->u.addr[0], - ip->u.addr[1], - ip->u.addr[2], - ip->u.addr[3]); - break; - case AF_INET6: - snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", htons(ip->u.addr16[0]), - htons(ip->u.addr16[1]), - htons(ip->u.addr16[2]), - htons(ip->u.addr16[3]), - htons(ip->u.addr16[4]), - htons(ip->u.addr16[5]), - htons(ip->u.addr16[6]), - htons(ip->u.addr16[7]) - ); - break; - default: - snprintf(buf, len, "warning unknown address family %d\n", ip->af); - } -} - void print_net(struct net* net) { diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 896d4b757e..9a7b67ac5d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -265,8 +265,6 @@ int mk_net_str(struct net* dst, str* s); void print_ip(char* prefix, struct ip_addr* ip, char* suffix); void stdout_print_ip(struct ip_addr* ip); -void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len); - void print_net(struct net* net); char* get_proto_name(unsigned int proto);

1 0

git:master:4acca8ad: core: add new function buf_print_ip(..) to print an IP address to an buffer
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 4acca8ad2f31f465b08f15d98cc4780236e2beb0 URL: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:04:54+01:00 core: add new function buf_print_ip(..) to print an IP address to an buffer --- Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… Patch: https://github.com/kamailio/kamailio/commit/4acca8ad2f31f465b08f15d98cc4780… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 9989063fff..82f746e0d6 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -274,6 +274,35 @@ void stdout_print_ip(struct ip_addr* ip) } +void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len) +{ + if (len < INET6_ADDRSTRLEN) { + LM_ERR("insufficent buffer length\n"); + return; + } + switch(ip->af){ + case AF_INET: + snprintf(buf, len, "%d.%d.%d.%d", ip->u.addr[0], + ip->u.addr[1], + ip->u.addr[2], + ip->u.addr[3]); + break; + case AF_INET6: + snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", htons(ip->u.addr16[0]), + htons(ip->u.addr16[1]), + htons(ip->u.addr16[2]), + htons(ip->u.addr16[3]), + htons(ip->u.addr16[4]), + htons(ip->u.addr16[5]), + htons(ip->u.addr16[6]), + htons(ip->u.addr16[7]) + ); + break; + default: + snprintf(buf, len, "warning unknown address family %d\n", ip->af); + } +} + void print_net(struct net* net) { diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 9a7b67ac5d..896d4b757e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -265,6 +265,8 @@ int mk_net_str(struct net* dst, str* s); void print_ip(char* prefix, struct ip_addr* ip, char* suffix); void stdout_print_ip(struct ip_addr* ip); +void buf_print_ip(char *buf, struct ip_addr* ip, unsigned int len); + void print_net(struct net* net); char* get_proto_name(unsigned int proto);

2 2

Re: [sr-dev] error_readline_pkg-config with latest Makefile
by Ovidiu Sas 23 Mar '20

23 Mar '20

Take a look at this makefile: https://github.com/Optware/Optware-ng/blob/master/make/kamailio.mk It was used to cross compile kamailio for several platforms. Through CC_EXTRA_OPTS you can pass extra compiler flags and paths for the target platform. Also, please keep the list in cc, otherwise e-mails will go unanswered, Regards, Ovidiu Sas On Thu, Mar 19, 2020 at 11:53 PM subhra giri <subhraprakash79(a)gmail.com> wrote: > > Dear ovidiu > I am not able to fix the issue in makefile. > Please help me what i should update in makefile for cross-compiling readline for mips. > readline.h is located at > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/readline.h > > And libreadline*.so* are present at > > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/shlib/libreadline.so.5.1 > /home/subhra/SDK3.1.2/linux/embedded_rootfs/build/readline-5.1/shlib/readline.so > Thanks and Regards > Subhra Prakash -- VoIP Embedded, Inc. http://www.voipembedded.com

2 3

git:master:cc34d05b: seas: use new introduced buf_print_ip to print IP addresses instead of own implemenation
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: cc34d05b8371c57cdcfe468fdba036d2b710dbb5 URL: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:06:58+01:00 seas: use new introduced buf_print_ip to print IP addresses instead of own implemenation --- Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/seas/seas.h --- Diff: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… Patch: https://github.com/kamailio/kamailio/commit/cc34d05b8371c57cdcfe468fdba036d… --- diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 86f1b0d722..6031310aa1 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -850,7 +850,7 @@ int process_bind_action(as_p as,unsigned char processor_id,unsigned int flags,ch memcpy(&port,payload+k,2); k+=2; port=ntohs(port); - print_ip_buf(&my_addr,buffer,300); + buf_print_ip(buffer, &my_addr,300); switch(proto){ case PROTO_UDP: proto_s="UDP"; diff --git a/src/modules/seas/seas.h b/src/modules/seas/seas.h index 9f525f48c4..3244cc9692 100644 --- a/src/modules/seas/seas.h +++ b/src/modules/seas/seas.h @@ -159,19 +159,4 @@ void seas_sighandler(int signo); char* create_as_event_t(struct cell *t,struct sip_msg *msg,char processor_id,int *evt_len,int flags); char* create_as_event_sl(struct sip_msg *msg,char processor_id,int *evt_len,int flags); -static inline void print_ip_buf(struct ip_addr* ip, char *where,int len) -{ - switch(ip->af){ - case AF_INET: - snprintf(where,len,"%d.%d.%d.%d", ip->u.addr[0], ip->u.addr[1], ip->u.addr[2], ip->u.addr[3]); - break; - case AF_INET6: - snprintf(where,len,"%x:%x:%x:%x:%x:%x:%x:%x",htons(ip->u.addr16[0]),htons(ip->u.addr16[1]),htons(ip->u.addr16[2]), - htons(ip->u.addr16[3]), htons(ip->u.addr16[4]), htons(ip->u.addr16[5]), htons(ip->u.addr16[6]), - htons(ip->u.addr16[7])); - break; - default: - break; - } -} #endif

1 0

git:master:328d4521: tls: log src and dst IPs in case of protocol level errors in send/receive
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 328d45215514f03d2fcfd88d49e56027f2002b86 URL: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T12:06:26+01:00 tls: log src and dst IPs in case of protocol level errors in send/receive - log src and dst IPs in case of protocol level errors in send/receive - to help debugging TLS errors in multi-domain/multi-dispatching scenarios --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… Patch: https://github.com/kamailio/kamailio/commit/328d45215514f03d2fcfd88d49e5602… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 9ce1b5e2f3..d084aaecd3 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -752,6 +752,7 @@ int tls_encode_f(struct tcp_connection *c, struct tls_mbuf rd, wr; int ssl_error; char* err_src; + char ip_buf[64]; const char* buf; unsigned int len; int x; @@ -881,7 +882,15 @@ int tls_encode_f(struct tcp_connection *c, break; /* or goto end */ case SSL_ERROR_SSL: /* protocol level error */ + ERR("protocol level error\n"); TLS_ERR(err_src); + memset(ip_buf, 0, sizeof(buf)); + buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ERR("source IP: %s\n", ip_buf); + memset(ip_buf, 0, sizeof(buf)); + buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ERR("destination IP: %s\n", ip_buf); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT: @@ -994,6 +1003,7 @@ int tls_read_f(struct tcp_connection* c, int* flags) struct tls_rd_buf* enc_rd_buf; int n, flush_flags; char* err_src; + char ip_buf[64]; int x; int tls_dbg; @@ -1270,7 +1280,15 @@ int tls_read_f(struct tcp_connection* c, int* flags) goto bug; case SSL_ERROR_SSL: /* protocol level error */ + ERR("protocol level error\n"); TLS_ERR(err_src); + memset(ip_buf, 0, sizeof(ip_buf)); + buf_print_ip(ip_buf, &(c->rcv.src_ip), sizeof(ip_buf)); + ERR("source IP: %s\n", ip_buf); + memset(ip_buf, 0, sizeof(ip_buf)); + buf_print_ip(ip_buf, &(c->rcv.dst_ip), sizeof(ip_buf)); + ERR("destination IP: %s\n", ip_buf); + goto error; #if OPENSSL_VERSION_NUMBER >= 0x00907000L /*0.9.7*/ case SSL_ERROR_WANT_CONNECT:

1 0

git:master:ae95a6a2: ims_usrloc_pcscf: fix warning: this âifâ clause does not guard...
by --list 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: ae95a6a2f73e6a4153a415c70d9e21562c651c1a URL: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… Author: --list <hw(a)skalatan.de> Committer: --list <hw(a)skalatan.de> Date: 2020-03-23T11:14:38+01:00 ims_usrloc_pcscf: fix warning: this âifâ clause does not guard... --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… Patch: https://github.com/kamailio/kamailio/commit/ae95a6a2f73e6a4153a415c70d9e215… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 0d156d39c4..1ac55734d7 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -119,11 +119,12 @@ void free_ppublic(ppublic_t* _p) // Keep them in sync! void free_security(security_t* _p) { - if (!_p) + if (!_p) { return; + } - if(_p->sec_header.s) - shm_free(_p->sec_header.s); + if(_p->sec_header.s) + shm_free(_p->sec_header.s); switch (_p->type) {

2 1

git:5.3:f31542bb: ims_usrloc_pcscf: fix warning: this âifâ clause does not guard...
by Henning Westerholt 23 Mar '20

23 Mar '20

Module: kamailio Branch: 5.3 Commit: f31542bb188d69eb4d4e88a54060efc82d1a0bf0 URL: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-23T11:19:52+01:00 ims_usrloc_pcscf: fix warning: this âifâ clause does not guard... --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… Patch: https://github.com/kamailio/kamailio/commit/f31542bb188d69eb4d4e88a54060efc… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 0d156d39c4..1ac55734d7 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -119,11 +119,12 @@ void free_ppublic(ppublic_t* _p) // Keep them in sync! void free_security(security_t* _p) { - if (!_p) + if (!_p) { return; + } - if(_p->sec_header.s) - shm_free(_p->sec_header.s); + if(_p->sec_header.s) + shm_free(_p->sec_header.s); switch (_p->type) {

1 0

git:5.3:c1cc4a07: kamcmd: use pkg-config to get compile flags for lib readline
by Daniel-Constantin Mierla 23 Mar '20

23 Mar '20

Module: kamailio Branch: 5.3 Commit: c1cc4a07d11c829f89ea62206689fba92eb91ea2 URL: https://github.com/kamailio/kamailio/commit/c1cc4a07d11c829f89ea62206689fba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T19:19:58+01:00 kamcmd: use pkg-config to get compile flags for lib readline (cherry picked from commit 0e6e05f8bec1fb451375d71a6b929a6908c5689d) --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/c1cc4a07d11c829f89ea62206689fba… Patch: https://github.com/kamailio/kamailio/commit/c1cc4a07d11c829f89ea62206689fba… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index aae4f1394c..c8a7e6807e 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -18,6 +18,17 @@ readline_localpath=$(LOCALBASE)/include/readline/readline.h readline_locations= /usr/include/readline/readline.h \ $(readline_localpath) +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGREADLINE = $(shell $(BUILDER) --exists readline > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGREADLINE),0) + BUILDER = +endif +endif +endif + + use_readline ?= ifneq (,$(MAKECMDGOALS)) ifeq (,$(filter-out $(nodep_targets),$(MAKECMDGOALS))) @@ -66,6 +77,12 @@ ifneq (,$(findstring cygwin, $(OS))) LIBS:= -lresolv endif +# detect libreadline +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags readline) + LIBS += $(shell $(BUILDER) --libs readline) + use_readline := 1 +else ifeq ($(use_readline),) readline_path := $(shell \ for r in $(readline_locations) ""; do \ @@ -93,14 +110,20 @@ endif LIBS+=-lreadline -lncurses endif -endif +endif # ifeq ($(use_readline),1) + +endif # ifneq ($(BUILDER),) include $(COREPATH)/Makefile.utils ifeq (,$(quiet)) ifeq ($(use_readline),1) +ifneq ($(BUILDER),) +$(info readline detected via pkg-config) +else $(info readline detected ($(readline_path)) ) +endif $(info command completion enabled) else $(info "no readline include files detected, disabling readline support")

2 1

git:master:c53423a7: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: c53423a755a0766d27137d1483edb05178d1a44d URL: https://github.com/kamailio/kamailio/commit/c53423a755a0766d27137d1483edb05… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-23T09:31:19+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/c53423a755a0766d27137d1483edb05… Patch: https://github.com/kamailio/kamailio/commit/c53423a755a0766d27137d1483edb05… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index a67289bdb5..e9f8045f3a 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -10,8 +10,6 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Muhammad Shahzad Shafi <shahzad(a)voip-demos.com> @@ -574,7 +572,15 @@ via_add_srv("1"); Example 1.23. via_add_xavp_params usage ... -via_add_xavp_params("1"); +xavp_via_params="xvia" +... +request_route { + ... + $xavp(xvia=>srvid) = "1"; + $xavp(xvia[0]=>myval) = "xyz"; + via_add_xavp_params("1"); + ... +} ... 4.20. via_use_xavp_fields(flags) @@ -589,7 +595,15 @@ via_add_xavp_params("1"); Example 1.24. via_use_xavp_fields usage ... -via_use_xavp_fields("1"); +xavp_via_fields="mvia" +... +request_route { + ... + $xavp(mvia=>address) = "10.10.10.10"; + $xavp(mvia[0]=>port) = "5060"; + via_use_xavp_fields("1"); + ... +} ... 5. RPC Commands

1 0

git:master:1e58a56c: corex: docs - examples with setting xavps for via functions
by Daniel-Constantin Mierla 23 Mar '20

23 Mar '20

Module: kamailio Branch: master Commit: 1e58a56cb7f9d83ca0c943481d02c429d33e188a URL: https://github.com/kamailio/kamailio/commit/1e58a56cb7f9d83ca0c943481d02c42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-23T09:19:30+01:00 corex: docs - examples with setting xavps for via functions --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e58a56cb7f9d83ca0c943481d02c42… Patch: https://github.com/kamailio/kamailio/commit/1e58a56cb7f9d83ca0c943481d02c42… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 6460d11913..0b1d587e7b 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -662,7 +662,15 @@ via_add_srv("1"); <title><function>via_add_xavp_params</function> usage</title> <programlisting format="linespecific"> ... -via_add_xavp_params("1"); +xavp_via_params="xvia" +... +request_route { + ... + $xavp(xvia=>srvid) = "1"; + $xavp(xvia[0]=>myval) = "xyz"; + via_add_xavp_params("1"); + ... +} ... </programlisting> </example> @@ -690,7 +698,15 @@ via_add_xavp_params("1"); <title><function>via_use_xavp_fields</function> usage</title> <programlisting format="linespecific"> ... -via_use_xavp_fields("1"); +xavp_via_fields="mvia" +... +request_route { + ... + $xavp(mvia=>address) = "10.10.10.10"; + $xavp(mvia[0]=>port) = "5060"; + via_use_xavp_fields("1"); + ... +} ... </programlisting> </example>

1 0

git:master:56ed5c02: sst: debug message when setting timeout avp
by Daniel-Constantin Mierla 22 Mar '20

22 Mar '20

Module: kamailio Branch: master Commit: 56ed5c028bd97837c7a9e0017a2599f09554211f URL: https://github.com/kamailio/kamailio/commit/56ed5c028bd97837c7a9e0017a2599f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-22T15:27:46+01:00 sst: debug message when setting timeout avp --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/56ed5c028bd97837c7a9e0017a2599f… Patch: https://github.com/kamailio/kamailio/commit/56ed5c028bd97837c7a9e0017a2599f… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index be55eb8883..aa39859c34 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -876,15 +876,14 @@ static int set_timeout_avp(struct sip_msg *msg, unsigned int value) if (timeout_avp->setf(msg,&timeout_avp->pvp,EQ_T,&pv_val)!=0) { LM_ERR("failed to set new dialog timeout value\n"); } else { + LM_DBG("Timeout avp value set to %d\n", value); rtn = 0; } } - } - else { + } else { LM_ERR("SST not reset. get avp result is %d\n", result); } - } - else { + } else { LM_ERR("SST needs to know the name of the dialog timeout AVP!\n"); } return(rtn);

1 0

git:master:20013e4e: dialog: detailed debug messages when resolving the timeout
by Daniel-Constantin Mierla 22 Mar '20

22 Mar '20

Module: kamailio Branch: master Commit: 20013e4e2bf1a5d5ce8535e07320dca034639286 URL: https://github.com/kamailio/kamailio/commit/20013e4e2bf1a5d5ce8535e07320dca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-22T15:05:17+01:00 dialog: detailed debug messages when resolving the timeout --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/20013e4e2bf1a5d5ce8535e07320dca… Patch: https://github.com/kamailio/kamailio/commit/20013e4e2bf1a5d5ce8535e07320dca… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 48899e3215..43e01eece7 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -674,11 +674,20 @@ inline static int get_dlg_timeout(struct sip_msg *req) pv_value_t pv_val; if( timeout_avp ) { - if ( pv_get_spec_value( req, timeout_avp, &pv_val)==0 && - pv_val.flags&PV_VAL_INT && pv_val.ri>0 ) { - return pv_val.ri; + if ( pv_get_spec_value( req, timeout_avp, &pv_val)==0) { + if(pv_val.flags&PV_VAL_INT) { + if(pv_val.ri>0 ) { + return pv_val.ri; + } else { + LM_DBG("invalid AVP value\n"); + } + } else { + LM_DBG("invalid AVP type\n"); + } } - LM_DBG("invalid AVP value, using default timeout\n"); + LM_DBG("unable to get valid AVP value, using default timeout\n"); + } else { + LM_DBG("using default timeout\n"); } return default_timeout; }

1 0

[kamailio/kamailio] need to create docker registry for rpm images (#2259)
by sergey-safarov 20 Mar '20

20 Mar '20

As embedded [Codefresh registry is deprecated](https://codefresh.io/codefresh-news/deprecation-of-the-codefresh-private-registry/) need move all RPM build artifacts to other registry. I suggest create `kamailio/kamailio-store` on Docker hub. Could you create new docker registry for rpm artifacts build on codefresh. -- 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/2259

2 2

git:master:21bdbff0: dmq: init worker structure in chid_init for PROC_INIT rank
by Daniel-Constantin Mierla 20 Mar '20

20 Mar '20

Module: kamailio Branch: master Commit: 21bdbff049571ca22f1205a041c8b1162005d319 URL: https://github.com/kamailio/kamailio/commit/21bdbff049571ca22f1205a041c8b11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-20T17:10:05+01:00 dmq: init worker structure in chid_init for PROC_INIT rank - have it ready when other processes are started --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/worker.c Modified: src/modules/dmq/worker.h --- Diff: https://github.com/kamailio/kamailio/commit/21bdbff049571ca22f1205a041c8b11… Patch: https://github.com/kamailio/kamailio/commit/21bdbff049571ca22f1205a041c8b11… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 2b64d0e907..4fa61d947b 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -230,11 +230,12 @@ static int mod_init(void) } /* allocate workers array */ - workers = shm_malloc(num_workers * sizeof(*workers)); + workers = shm_malloc(num_workers * sizeof(dmq_worker_t)); if(workers == NULL) { LM_ERR("error in shm_malloc\n"); return -1; } + memset(workers, 0, num_workers * sizeof(dmq_worker_t)); dmq_init_callback_done = shm_malloc(sizeof(int)); if(!dmq_init_callback_done) { @@ -275,14 +276,24 @@ static int mod_init(void) static int child_init(int rank) { int i, newpid; + + if(rank == PROC_INIT) { + for(i = 0; i < num_workers; i++) { + if (init_worker(&workers[i]) < 0) { + LM_ERR("failed to init struct for worker[%d]\n", i); + return -1; + } + } + return 0; + } + if(rank == PROC_MAIN) { /* fork worker processes */ for(i = 0; i < num_workers; i++) { - init_worker(&workers[i]); LM_DBG("starting worker process %d\n", i); newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); if(newpid < 0) { - LM_ERR("failed to fork process\n"); + LM_ERR("failed to fork worker process %d\n", i); return -1; } else if(newpid == 0) { /* child - this will loop forever */ @@ -307,7 +318,7 @@ static int child_init(int rank) } return 0; } - if(rank == PROC_INIT || rank == PROC_TCP_MAIN) { + if(rank == PROC_TCP_MAIN) { /* do nothing for the main process */ return 0; } diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 14aadfc998..38b49e4512 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -224,7 +224,7 @@ int add_dmq_job(struct sip_msg *msg, dmq_peer_t *peer) /** * @brief init dmq worker */ -void init_worker(dmq_worker_t *worker) +int init_worker(dmq_worker_t *worker) { memset(worker, 0, sizeof(*worker)); if(worker_usleep <= 0) { @@ -233,6 +233,11 @@ void init_worker(dmq_worker_t *worker) lock_get(&worker->lock); } worker->queue = alloc_job_queue(); + if(worker->queue==NULL) { + LM_ERR("queue could not be initialized\n"); + return -1; + } + return 0; } /** diff --git a/src/modules/dmq/worker.h b/src/modules/dmq/worker.h index 9f5fed71cf..cb4fce8ccf 100644 --- a/src/modules/dmq/worker.h +++ b/src/modules/dmq/worker.h @@ -56,7 +56,7 @@ struct dmq_worker typedef struct dmq_worker dmq_worker_t; -void init_worker(dmq_worker_t *worker); +int init_worker(dmq_worker_t *worker); int add_dmq_job(struct sip_msg *, dmq_peer_t *); void worker_loop(int id);

1 0

git:master:0e6e05f8: kamcmd: use pkg-config to get compile flags for lib readline
by Daniel-Constantin Mierla 20 Mar '20

20 Mar '20

Module: kamailio Branch: master Commit: 0e6e05f8bec1fb451375d71a6b929a6908c5689d URL: https://github.com/kamailio/kamailio/commit/0e6e05f8bec1fb451375d71a6b929a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-18T17:39:49+01:00 kamcmd: use pkg-config to get compile flags for lib readline --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/0e6e05f8bec1fb451375d71a6b929a6… Patch: https://github.com/kamailio/kamailio/commit/0e6e05f8bec1fb451375d71a6b929a6… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index aae4f1394c..c8a7e6807e 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -18,6 +18,17 @@ readline_localpath=$(LOCALBASE)/include/readline/readline.h readline_locations= /usr/include/readline/readline.h \ $(readline_localpath) +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGREADLINE = $(shell $(BUILDER) --exists readline > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGREADLINE),0) + BUILDER = +endif +endif +endif + + use_readline ?= ifneq (,$(MAKECMDGOALS)) ifeq (,$(filter-out $(nodep_targets),$(MAKECMDGOALS))) @@ -66,6 +77,12 @@ ifneq (,$(findstring cygwin, $(OS))) LIBS:= -lresolv endif +# detect libreadline +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags readline) + LIBS += $(shell $(BUILDER) --libs readline) + use_readline := 1 +else ifeq ($(use_readline),) readline_path := $(shell \ for r in $(readline_locations) ""; do \ @@ -93,14 +110,20 @@ endif LIBS+=-lreadline -lncurses endif -endif +endif # ifeq ($(use_readline),1) + +endif # ifneq ($(BUILDER),) include $(COREPATH)/Makefile.utils ifeq (,$(quiet)) ifeq ($(use_readline),1) +ifneq ($(BUILDER),) +$(info readline detected via pkg-config) +else $(info readline detected ($(readline_path)) ) +endif $(info command completion enabled) else $(info "no readline include files detected, disabling readline support")

3 6

[kamailio/kamailio] ratelimit: increase default number of queues (#2257)
by Stefan Mititelu 19 Mar '20

19 Mar '20

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  In our setup, we need one more ratelimit queue (in addition to the default of 10). In this pull request, I am increasing the default number of ratelimit queus to 16. Please let me know if this pull request is ok, or if I should do it via a modparam and dynamic allocation of ```static rl_queue_t queues```. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2257 -- Commit Summary -- * ratelimit: increase default number of queues -- File Changes -- M src/modules/ratelimit/ratelimit.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2257.patch https://github.com/kamailio/kamailio/pull/2257.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/2257

2 5

git:5.3:6f871feb: cfgutils: use same type for local variable in rpc gflags functions
by Daniel-Constantin Mierla 19 Mar '20

19 Mar '20

Module: kamailio Branch: 5.3 Commit: 6f871feb31e8d1b53b7d0161f2d5643c567b0f9a URL: https://github.com/kamailio/kamailio/commit/6f871feb31e8d1b53b7d0161f2d5643… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T19:20:55+01:00 cfgutils: use same type for local variable in rpc gflags functions (cherry picked from commit 5411eda4e44a487479d00433583a68a328aca9a3) --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/6f871feb31e8d1b53b7d0161f2d5643… Patch: https://github.com/kamailio/kamailio/commit/6f871feb31e8d1b53b7d0161f2d5643… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 285265d690..b0b063585b 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -301,7 +301,7 @@ void cfgutils_rpc_set_gflag(rpc_t* rpc, void* ctx) void cfgutils_rpc_reset_gflag(rpc_t* rpc, void* ctx) { - long int flag; + unsigned int flag; if(rpc->scan(ctx, "d", (int*)(&flag))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -314,7 +314,7 @@ void cfgutils_rpc_reset_gflag(rpc_t* rpc, void* ctx) void cfgutils_rpc_is_gflag(rpc_t* rpc, void* ctx) { - long int flag; + unsigned int flag; if(rpc->scan(ctx, "d", (int*)(&flag))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -328,7 +328,7 @@ void cfgutils_rpc_is_gflag(rpc_t* rpc, void* ctx) void cfgutils_rpc_get_gflags(rpc_t* rpc, void* ctx) { - static unsigned int flags; + unsigned int flags; flags = *gflags;

1 0

git:5.3:8283d346: pv: do not set ending '\0' for port value in pv_set_ruri_port()
by Daniel-Constantin Mierla 19 Mar '20

19 Mar '20

Module: kamailio Branch: 5.3 Commit: 8283d34684fda83a8f9ec610cd32fb524d09a7be URL: https://github.com/kamailio/kamailio/commit/8283d34684fda83a8f9ec610cd32fb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T19:20:37+01:00 pv: do not set ending '\0' for port value in pv_set_ruri_port() - it can be a reference to a static string, ending up in a crash - GH #2258 (cherry picked from commit 1f76bca74839f35d11f42edf758eb046cedb752c) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8283d34684fda83a8f9ec610cd32fb5… Patch: https://github.com/kamailio/kamailio/commit/8283d34684fda83a8f9ec610cd32fb5… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 18db915cfb..9087fe01bf 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2558,7 +2558,9 @@ int pv_set_ruri_port(struct sip_msg* msg, pv_param_t *param, act.val[0].type = STRING_ST; act.val[0].u.string = val->rs.s; backup = val->rs.s[val->rs.len]; - val->rs.s[val->rs.len] = '\0'; + if(backup != '\0') { + val->rs.s[val->rs.len] = '\0'; + } act.type = SET_PORT_T; init_run_actions_ctx(&h); if (do_action(&h, &act, msg)<0) @@ -2567,7 +2569,9 @@ int pv_set_ruri_port(struct sip_msg* msg, pv_param_t *param, val->rs.s[val->rs.len] = backup; goto error; } - val->rs.s[val->rs.len] = backup; + if(backup != '\0') { + val->rs.s[val->rs.len] = backup; + } return 0; error:

1 0

git:5.3:41967543: Makefile.defs: Only add -ldl on systems that use it
by Daniel-Constantin Mierla 19 Mar '20

19 Mar '20

Module: kamailio Branch: 5.3 Commit: 41967543be401413f5a93682ea537e2e7824ac3b URL: https://github.com/kamailio/kamailio/commit/41967543be401413f5a93682ea537e2… Author: Greg Troxel <gdt(a)lexort.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T19:20:26+01:00 Makefile.defs: Only add -ldl on systems that use it kamailio uses dlopen, and on some systems, one must link with -ldl. On others, this is not needed and there is no libdl. For now, simply omit -ldl on NetBSD (which doesn't have or require it), and don't try to change behavior on other systems. (cherry picked from commit bca9768b6f2667bad8472fa99a113b8249ca0f9a) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/41967543be401413f5a93682ea537e2… Patch: https://github.com/kamailio/kamailio/commit/41967543be401413f5a93682ea537e2… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a57bc2b91e..41f33a51a0 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -210,9 +210,18 @@ endif endif +# dlopen requires -ldl on some systems, but not others. Until there +# is clarity on which require -ldl, add just enough ifeq to fix +# systems known not to use it. +ifeq ($(OS), netbsd) +LIBDL="" +else +LIBDL="-ldl" +endif + ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED -LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions +LD_PMUTEX_OPTS = -pthread -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions else CC_PMUTEX_OPTS = LD_PMUTEX_OPTS =

1 0

git:5.3:75976851: Makefile.defs: On NetBSD, link with -lm
by Daniel-Constantin Mierla 19 Mar '20

19 Mar '20

Module: kamailio Branch: 5.3 Commit: 7597685108228d9d179845ab2771f2010c77bd57 URL: https://github.com/kamailio/kamailio/commit/7597685108228d9d179845ab2771f20… Author: Greg Troxel <gdt(a)lexort.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T19:20:16+01:00 Makefile.defs: On NetBSD, link with -lm (cherry picked from commit 3ccaac365da6078a96681109efebc70dcb12fc55) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/7597685108228d9d179845ab2771f20… Patch: https://github.com/kamailio/kamailio/commit/7597685108228d9d179845ab2771f20… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a4ecc20248..a57bc2b91e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -2056,7 +2056,7 @@ ifeq ($(OS), netbsd) C_DEFS+=-DHAVE_SELECT endif YACC=yacc - LIBS= + LIBS=-lm endif # OS X support, same as freebsd

1 0

git:5.3:fd3527ea: kamcmd: Makefile - updated the msg target to print pkg-config detections
by Daniel-Constantin Mierla 19 Mar '20

19 Mar '20

Module: kamailio Branch: 5.3 Commit: fd3527ea84d7be2c841cdf89cd6b5b6446fc6ae0 URL: https://github.com/kamailio/kamailio/commit/fd3527ea84d7be2c841cdf89cd6b5b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T19:20:08+01:00 kamcmd: Makefile - updated the msg target to print pkg-config detections (cherry picked from commit 331ffea6c8c8b2c7cf38e3d7eda882a6becd326a) --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/fd3527ea84d7be2c841cdf89cd6b5b6… Patch: https://github.com/kamailio/kamailio/commit/fd3527ea84d7be2c841cdf89cd6b5b6… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index c8a7e6807e..f12306bf1e 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -137,7 +137,11 @@ $(NAME).o: .PHONY: msg msg: @if [ "$(use_readline)" = "1" ]; then \ - echo; echo "readline detected ($(readline_path)):"; \ + if [ "$(BUILDER)" = "" ]; then \ + echo; echo "readline detected ($(readline_path)):"; \ + else \ + echo; echo "readline detected via pkg-config"; \ + fi; \ echo "command completion enabled"; echo ; \ else \ echo ; \

1 0

git:master:5411eda4: cfgutils: use same type for local variable in rpc gflags functions
by Daniel-Constantin Mierla 19 Mar '20

19 Mar '20

Module: kamailio Branch: master Commit: 5411eda4e44a487479d00433583a68a328aca9a3 URL: https://github.com/kamailio/kamailio/commit/5411eda4e44a487479d00433583a68a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T16:57:29+01:00 cfgutils: use same type for local variable in rpc gflags functions --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/5411eda4e44a487479d00433583a68a… Patch: https://github.com/kamailio/kamailio/commit/5411eda4e44a487479d00433583a68a… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 22d2250003..7be7181d82 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -301,7 +301,7 @@ void cfgutils_rpc_set_gflag(rpc_t* rpc, void* ctx) void cfgutils_rpc_reset_gflag(rpc_t* rpc, void* ctx) { - long int flag; + unsigned int flag; if(rpc->scan(ctx, "d", (int*)(&flag))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -314,7 +314,7 @@ void cfgutils_rpc_reset_gflag(rpc_t* rpc, void* ctx) void cfgutils_rpc_is_gflag(rpc_t* rpc, void* ctx) { - long int flag; + unsigned int flag; if(rpc->scan(ctx, "d", (int*)(&flag))<1) { LM_WARN("no parameters\n"); rpc->fault(ctx, 500, "Invalid Parameters"); @@ -328,7 +328,7 @@ void cfgutils_rpc_is_gflag(rpc_t* rpc, void* ctx) void cfgutils_rpc_get_gflags(rpc_t* rpc, void* ctx) { - static unsigned int flags; + unsigned int flags; flags = *gflags;

1 0

[kamailio/kamailio] Dispatcher module and $dp variable used to overwrite $rp (#2258)
by Piotr Grabowski 19 Mar '20

19 Mar '20

### Description When using dispatcher module to select destination we didn't configure explicit port: ``` sh-4.1# cat /etc/kamailio/dispatcher.list # $Id$ # dispatcher destination sets # # line format # setit(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(str,opt) 1 sip:127.0.0.1 0 0 ``` When we try to rewrite port in R-URI as in following configuration: ``` sh-4.1# cat /etc/kamailio/kamailio.cfg #!KAMAILIO # debug=3 sip_warning=yes port=5060 mpath="/usr/lib64/kamailio/modules/" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "dispatcher.so" modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list") route { ds_select_dst("1", "4"); xlog("will update <$ru>"); xlog("changing $rd to $dd\n"); $rd = $dd; xlog("changing $rp to $dp\n"); $rp = $dp; xlog("final RURI is <$ru>"); exit; } ``` Kamailio crashes on line: ``` $rp = $dp; ``` Interesting thing is that we get port on previous line (see attached log). ### Troubleshooting #### Reproduction Use provided configuration and dispatcher.list file and send any SIP request message to Kamailio. #### Debugging Data  ``` sh-4.1# gdb /usr/sbin/kamailio /core GNU gdb (GDB) Red Hat Enterprise Linux (7.2-92.el6) Copyright (C) 2010 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/usr/sbin/kamailio.debug...done. done. [New Thread 25] Reading symbols from /lib64/libdl.so.2...(no debugging symbols found)...done. Loaded symbols for /lib64/libdl.so.2 Reading symbols from /lib64/libresolv.so.2...(no debugging symbols found)...done. Loaded symbols for /lib64/libresolv.so.2 Reading symbols from /lib64/libc.so.6...(no debugging symbols found)...done. Loaded symbols for /lib64/libc.so.6 Reading symbols from /lib64/ld-linux-x86-64.so.2...(no debugging symbols found)...done. Loaded symbols for /lib64/ld-linux-x86-64.so.2 Reading symbols from /usr/lib64/kamailio/modules/pv.so...Reading symbols from /usr/lib/debug/usr/lib64/kamailio/modules/pv.so.debug...done. done. Loaded symbols for /usr/lib64/kamailio/modules/pv.so Reading symbols from /usr/lib64/kamailio/libsrutils.so.1...Reading symbols from /usr/lib/debug/usr/lib64/kamailio/libsrutils.so.1.0.debug...done. done. Loaded symbols for /usr/lib64/kamailio/libsrutils.so.1 Reading symbols from /lib64/libm.so.6...(no debugging symbols found)...done. Loaded symbols for /lib64/libm.so.6 Reading symbols from /usr/lib64/kamailio/modules/xlog.so...Reading symbols from /usr/lib/debug/usr/lib64/kamailio/modules/xlog.so.debug...done. done. Loaded symbols for /usr/lib64/kamailio/modules/xlog.so Reading symbols from /usr/lib64/kamailio/modules/dispatcher.so...Reading symbols from /usr/lib/debug/usr/lib64/kamailio/modules/dispatcher.so.debug...done. done. Loaded symbols for /usr/lib64/kamailio/modules/dispatcher.so Reading symbols from /usr/lib64/kamailio/libsrdb1.so.1...Reading symbols from /usr/lib/debug/usr/lib64/kamailio/libsrdb1.so.1.0.debug...done. done. Loaded symbols for /usr/lib64/kamailio/libsrdb1.so.1 Reading symbols from /lib64/libnss_files.so.2...(no debugging symbols found)...done. Loaded symbols for /lib64/libnss_files.so.2 warning: no loadable sections found in added symbol-file system-supplied DSO at 0x7ffe573ea000 Core was generated by `/usr/sbin/kamailio -DD -E'. Program terminated with signal 11, Segmentation fault. #0 0x00007f52b624785b in pv_set_ruri_port (msg=0x7f52b65860c8, param=0x7f52b6564af8, op=254, val=0x7ffe572d2ac0) at pv_core.c:2561 2561 val->rs.s[val->rs.len] = '\0'; Missing separate debuginfos, use: debuginfo-install glibc-2.12-1.212.el6.x86_64 (gdb) bt full #0 0x00007f52b624785b in pv_set_ruri_port (msg=0x7f52b65860c8, param=0x7f52b6564af8, op=254, val=0x7ffe572d2ac0) at pv_core.c:2561 act = {cline = 0, cfile = 0x0, rname = 0x0, type = 0, count = 0, next = 0x0, val = {{type = STRING_ST, u = {number = 139993220313123, string = 0x7f52b62af023 "5060", str = {s = 0x7f52b62af023 "5060", len = 0}, data = 0x7f52b62af023, attr = 0x7f52b62af023, select = 0x7f52b62af023}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}}} h = {rec_lev = 0, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {0, 0, 0, 0, 4294967296, 0, 0, 0}, __mask_was_saved = 0, __saved_mask = {__val = {0 <repeats 16 times>}}}}} backup = 0 '\000' __FUNCTION__ = "pv_set_ruri_port" #1 0x00000000004e4521 in lval_pvar_assign (h=0x7ffe572d3650, msg=0x7f52b65860c8, lv=0x7f52b6564bb0, rv=0x7f52b6565198) at core/lvalue.c:352 pvar = 0x7f52b6564ae0 pval = {rs = {s = 0x7f52b62af023 "5060", len = 4}, ri = 5060, flags = 12} r_avp = 0x7f52b1774583 avp_val = {n = 22, s = {s = 0x16 <Address 0x16 out of bounds>, len = -1235807720}, re = 0x16} ret = 1 v = 0 destroy_pval = 1 __FUNCTION__ = "lval_pvar_assign" #2 0x00000000004e4f88 in lval_assign (h=0x7ffe572d3650, msg=0x7f52b65860c8, lv=0x7f52b6564bb0, rve=0x7f52b6565190) at core/lvalue.c:400 rv = 0x7f52b6565198 ret = 0 __FUNCTION__ = "lval_assign" #3 0x0000000000442484 in do_action (h=0x7ffe572d3650, a=0x7f52b6564e10, msg=0x7f52b65860c8) at core/action.c:1452 ret = -5 v = 1 dst = {send_sock = 0x7f52b769e190, to = {s = {sa_family = 30144, sa_data = "i\267R\177\000\000\227\201B\250\000\000\000"}, sin = {sin_family = 30144, sin_port = 46953, sin_addr = {s_addr = 32594}, sin_zero = "\227\201B\250\000\000\000"}, sin6 = {sin6_family = 30144, sin6_port = 46953, sin6_flowinfo = 32594, sin6_addr = {__in6_u = {__u6_addr8 = "\227\201B\250\000\000\000\000jbH\267R\177\000", __u6_addr16 = {33175, 43074, 0, 0, 25194, 46920, 32594, 0}, __u6_addr32 = {2822930839, 0, 3074974314, 32594}}}, sin6_scope_id = 0}}, id = 0, send_flags = {f = 30144, blst_imask = 46953}, proto = 82 'R', proto_pad0 = 127 '\177', proto_pad1 = 0} tmp = 0x3000000001 <Address 0x3000000001 out of bounds> new_uri = 0x7f52b769e190 "" end = 0x7ffe572d3360 "x\rV\266R\177" crt = 0x7f52b17745b6 "\nMax-Forwards:60\nContact:<sip:127.0.0.1:5060;transport=SCTP>\n\n" cmd = 0x7f52b6560d78 len = 7125671 user = 0 uri = {user = {s = 0xb6563058 <Address 0xb6563058 out of bounds>, len = -1235865792}, passwd = {s = 0x7f52b6563090 "\350", len = 6906779}, host = {s = 0x80ded0 "core", len = -1317583573}, port = {s = 0x80e626 "", len = 18}, params = {s = 0x0, len = 7954568}, sip_params = {s = 0x7ffe572d3510 "X\343\200", len = -1219996010}, headers = {s = 0x3000000030 <Address 0x3000000030 out of bounds>, len = 1462579856}, port_no = 12800, proto = 22317, type = 32766, flags = 1462579856, transport = {s = 0x5 <Address 0x5 out of bounds>, len = -1217825432}, ttl = {s = 0xa8428197 <Address 0xa8428197 out of bounds>, len = -1219993630}, user_param = {s = 0x80ded0 "core", len = 44108294}, maddr = {s = 0xe84ce00000000017 <Address 0xe84ce00000000017 out of bounds>, len = -1228093084}, method = {s = 0x0, len = 1462580240}, lr = {s = 0x7f52b6ccdc48 "", len = -1228065280}, r2 = { s = 0x7f52b64c9010 "\001", len = -1235865848}, gr = {s = 0x7f52b6501440 "", len = -1236265920}, transport_val = {s = 0x809572d33b8 <Address 0x809572d33b8 out of bounds>, len = -1235720032}, ttl_val = {s = 0x7f52b769e190 "", len = 0}, user_param_val = {s = 0x7f52b76975c0 "^dA", len = -1217826816}, maddr_val = {s = 0x40f469 "_setjmp", len = -1228036264}, method_val = {s = 0x403948 "\351\002", len = 0}, lr_val = { s = 0x1000003bd <Address 0x1000003bd out of bounds>, len = 7612120}, r2_val = {s = 0x7f52b6586938 "\020", len = -1217796888}, gr_val = {s = 0x7ffe572d3460 "", len = 1462580360}} next_hop = {user = {s = 0x0, len = 0}, passwd = {s = 0x14 <Address 0x14 out of bounds>, len = 25}, host = {s = 0x796088 "DEBUG", len = 8463808}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = 0, transport = {s = 0x400000000 <Address 0x400000000 out of bounds>, len = 8458000}, ttl = {s = 0x0, len = 0}, user_param = { s = 0x300070064 <Address 0x300070064 out of bounds>, len = -1317583372}, maddr = {s = 0x7ffe572d3270 "@\024P\266R\177", len = 7096900}, method = {s = 0x812e50 "parse_addr_spec", len = 10}, lr = {s = 0x0, len = 0}, r2 = { s = 0x0, len = 0}, gr = {s = 0x0, len = -1235865512}, transport_val = {s = 0x7f52b64c9010 "\001", len = 131077}, ttl_val = {s = 0x7f52b64c9f30 "", len = -1236492496}, user_param_val = { s = 0x22572d3258 <Address 0x22572d3258 out of bounds>, len = -1235865848}, maddr_val = {s = 0x7ffe572d3190 "\220\060V\266R\177", len = 6904354}, method_val = {s = 0x7400000000 <Address 0x7400000000 out of bounds>, len = -1235865792}, lr_val = {s = 0x7f52b17745f4 "", len = -1317583551}, r2_val = {s = 0x4b6562f08 <Address 0x4b6562f08 out of bounds>, len = 0}, gr_val = { s = 0x7f52b177457b "Call-ID:8EFCC0126CBA18AF6D6ECE17@4742ffffffff\nCSeq:1 INVITE\nMax-Forwards:60\nContact:<sip:127.0.0.1:5060;transport=SCTP>\n\n", len = -1317583524}} u = 0x0 ---Type <return> to continue, or q <return> to quit--- port = 0 dst_host = 0x7ffe572d3410 i = 0 flags = 0 avp = 0x7ffe572d3428 st = {flags = 1462579824, id = 32766, name = {n = -1227780152, s = {s = 0x7f52b6d18fc8 "H\201\304\330", len = 48}, re = 0x7f52b6d18fc8}, avp = 0x7ffe572d30d0} sct = 0x1b65868d8 sjt = 0x7f52b17745f4 rve = 0x40f469 mct = 0x7f52b17745b6 rv = 0x0 rv1 = 0x7f52b17745b0 c1 = {cache_type = 1462580848, val_type = 32766, c = {avp_val = {n = -1227824898, s = {s = 0x7f52b6d0e0fe "A\211\304\353\274\017\037D", len = 917540}, re = 0x7f52b6d0e0fe}, pval = {rs = { s = 0x7f52b6d0e0fe "A\211\304\353\274\017\037D", len = 917540}, ri = 8463856, flags = 0}}, i2s = "\210`y\000\000\000\000\000\210`y\000\000\000\000\000\203`y\000\000"} s = {s = 0x7ffe572d3660 "\b\207{", len = -72537977} srevp = {0xffffffff00060014, 0x7f52b7059120} evp = {data = 0x0, rcv = 0x0, dst = 0x0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #4 0x0000000000443f95 in run_actions (h=0x7ffe572d3650, a=0x7f52b6562018, msg=0x7f52b65860c8) at core/action.c:1578 t = 0x7f52b6564e10 ret = 1 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = -1317583372, tz_dsttime = 32594} tdiff = 3059247320 __FUNCTION__ = "run_actions" #5 0x0000000000444710 in run_top_route (a=0x7f52b6562018, msg=0x7f52b65860c8, c=0x0) at core/action.c:1663 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {8095496, 281128530964031683, 7954568, 139993141429635, 8, 139993141429678, 281128531062597827, -280795226126899005}, __mask_was_saved = 0, __saved_mask = {__val = {25, 7954568, 8095461, 120, 139993223291080, 139993223292976, 139993141429687, 139993141429687, 139993141429748, 4294967296, 139993223291080, 0, 1073741825, 8095496, 8095496, 7954568}}}}} p = 0x7ffe572d3650 ret = -1317583442 sfbk = 0 #6 0x0000000000551d16 in receive_msg ( buf=0x7f52b17744c1 "INVITE sip:B@127.0.0.1;user=phone SIP/2.0\nContent-Length:0\nFrom:<sip:A@127.0.0.1>;tag=13X72gb4A0gYZBa5\nTo:<sip:B@127.0.0.1>\nVia:SIP/2.0/UDP 127.0.0.1:5060;branch=z9hG4bKZ2a_U73e_8Z7Be26\nCall-ID:8EFCC0"..., len=307, rcv_info=0x7f52b17741e0) at core/receive.c:424 msg = 0x7f52b65860c8 ctx = {rec_lev = -72515580, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {0, 0, 140733120872452, 140730360994068, 140730361004196, 139993141428680, 140730360994000, 4294983372}, __mask_was_saved = -1317584312, __saved_mask = {__val = {139990164045831, 0, 1, 67108864, 8388608, 7954563, 0, 140730361002720, 6629180, 0, 16262913, 139990164045852, 139993230924336, 0, 140730361002816, 139993230924872}}}}} bctx = 0x7ffe572d19ce ret = 1462581616 tvb = {tv_sec = 1584604157, tv_usec = 660616} tve = {tv_sec = 0, tv_usec = 0} tz = {tz_minuteswest = 0, tz_dsttime = 0} diff = 0 inb = { s = 0x7f52b17744c1 "INVITE sip:B@127.0.0.1;user=phone SIP/2.0\nContent-Length:0\nFrom:<sip:A@127.0.0.1>;tag=13X72gb4A0gYZBa5\nTo:<sip:B@127.0.0.1>\nVia:SIP/2.0/UDP 127.0.0.1:5060;branch=z9hG4bKZ2a_U73e_8Z7Be26\nCall-ID:8EFCC0"..., len = 307} ---Type <return> to continue, or q <return> to quit--- netinfo = {data = {s = 0x796083 "INFO", len = 0}, rcv = 0x7ffe572d3940, dst = 0x651f07} keng = 0x0 evp = {data = 0x7ffe572d3870, rcv = 0x7f52b17741e0, dst = 0x0} cidlockidx = 0 cidlockset = 0 errsipmsg = 0 exectime = 1 __FUNCTION__ = "receive_msg" #7 0x0000000000659729 in receive_tcp_msg ( tcpbuf=0x7f52b17744c1 "INVITE sip:B@127.0.0.1;user=phone SIP/2.0\nContent-Length:0\nFrom:<sip:A@127.0.0.1>;tag=13X72gb4A0gYZBa5\nTo:<sip:B@127.0.0.1>\nVia:SIP/2.0/UDP 127.0.0.1:5060;branch=z9hG4bKZ2a_U73e_8Z7Be26\nCall-ID:8EFCC0"..., len=307, rcv_info=0x7f52b17741e0, con=0x7f52b17741c8) at core/tcp_read.c:1399 buf = 0x0 bsize = 0 blen = -1217796888 __FUNCTION__ = "receive_tcp_msg" #8 0x000000000065bba1 in tcp_read_req (con=0x7f52b17741c8, bytes_read=0x7ffe572d40ac, read_flags=0x7ffe572d40a4) at core/tcp_read.c:1631 bytes = 1 total_bytes = 1 resp = 1 size = 12884901888 req = 0x7f52b1774248 dst = {send_sock = 0x7ffe572d4098, to = {s = {sa_family = 8, sa_data = "\000\000\000\000\000\000\001 \000\000\250+W\266"}, sin = {sin_family = 8, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\001 \000\000\250+W\266"}, sin6 = {sin6_family = 8, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = "\001 \000\000\250+W\266R\177\000\000\000\000\000", __u6_addr16 = {8193, 0, 11176, 46679, 32594, 0, 0, 0}, __u6_addr32 = {8193, 3059166120, 32594, 0}}}, sin6_scope_id = 3059166120}}, id = 32594, send_flags = {f = 29360, blst_imask = 127}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0} c = 0 '\000' ret = 1245623521 __FUNCTION__ = "tcp_read_req" #9 0x000000000065f777 in handle_io (fm=0x7f52b6572ba8, events=1, idx=-1) at core/tcp_read.c:1862 ret = 0 n = 247 read_flags = 1 con = 0x7f52b17741c8 s = 7 resp = 1 t = 1245623521 __FUNCTION__ = "handle_io" #10 0x000000000064d268 in io_wait_loop_epoll (h=0xaf8300, t=2, repeat=0) at core/io_wait.h:1062 n = 1 r = 0 fm = 0x7f52b6572ba8 revents = 1 __FUNCTION__ = "io_wait_loop_epoll" #11 0x0000000000660bd7 in tcp_receive_loop (unix_sock=30) at core/tcp_read.c:1974 __FUNCTION__ = "tcp_receive_loop" #12 0x000000000064336c in tcp_init_children () at core/tcp_main.c:5174 r = 0 i = 7 reader_fd_1 = 30 pid = 0 si_desc = "tcp receiver (generic)\000\000\000\000\200\000\000\000\000\000\203`y", '\000' <repeats 14 times>, "D-W\376\177\000\000\315\213^\000\000\000\000\000\016\323}\000\000\000\000\000\363\261}", '\000' <repeats 13 times>"\220, \351V\266R\177\000\000\000D-W\376\177\000\000\b\237f\000\000\000\000\000\360C-W\027\000\000\000\022\000\000\000\000\000\000" si = 0x0 ---Type <return> to continue, or q <return> to quit--- __FUNCTION__ = "tcp_init_children" #13 0x0000000000426e10 in main_loop () at main.c:1761 i = 8 pid = 23 si = 0x0 si_desc = "udp receiver child=7 sock=172.17.0.2:5060\000q\261R\177\000\000\210`y\000\000\000\000\000\035\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\200\000\000\000\000\000\203`y", '\000' <repeats 13 times>, "@J-W\376\177\000\000\003\000\000\000R\177\000\000\060\000\000\000\060\000\000\000\360E-W\376\177\000" nrprocs = 8 woneinit = 1 __FUNCTION__ = "main_loop" #14 0x000000000042e52a in main (argc=3, argv=0x7ffe572d4b28) at main.c:2802 cfg_stream = 0x2b1a010 c = -1 r = 0 tmp = 0x7f52b769e190 "" tmp_len = 0 port = 1 proto = 0 ahost = 0x0 aport = 0 options = 0x77edf8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2913456231 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x7ffe572d4a10 p = 0x7f52b6d5a457 "H\205\300t\024\017\266P\003\017\266\312\071\351\017\204\345" st = {st_dev = 112, st_ino = 3424178, st_nlink = 2, st_mode = 16877, st_uid = 499, st_gid = 499, __pad0 = 0, st_rdev = 0, st_size = 4096, st_blksize = 4096, st_blocks = 8, st_atim = {tv_sec = 1584572724, tv_nsec = 529744000}, st_mtim = {tv_sec = 1584369530, tv_nsec = 0}, st_ctim = {tv_sec = 1584572724, tv_nsec = 503744000}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 264 times>"\226, VH\267R\177\000\000\000\000\000\000\000\000\000\000PH-W\376\177\000\000\000\000\000\000\000\000\000\000PH-W\376\177\000\000\001\000\000\000\000\000\000\000H\347i\267R\177\000\000\177U\335q\000\000\000\000\226VH\267R\177\000\000\000\000\000\000\000\000\000\000\220H-W\376\177\000\000?\000\000\000\000\000\000\000\220H-W\376\177\000\000\005\000\000\000\000\000\000\000hui\267R\177\000\000.N=\366\000\000\000\000\342_H\267R\177\000\000\000\000\000\000\000\000\000\000\070\365\330\003\000\000\000\000.\000\000\000\000\000\000\000T\332\314\266R\177\000\000\000\000\000\000\000\000\000\000\020J-W\376\177\000\000H\334\314\266R\177\000\000\240\233\315\266R\177\000\000pJ-W\376\177\000\000 \347i\267R\177\000\000_\372\341\266R\177\000\000\230\242>W\376"... option_index = 0 long_options = {{name = 0x781880 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x77b694 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x781885 "alias", has_arg = 1, flag = 0x0, val = 1024}, { name = 0x78188b "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x781891 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x78189a "substdefs", has_arg = 1, flag = 0x0, val = 1027}, { name = 0x7818a4 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) info locals act = {cline = 0, cfile = 0x0, rname = 0x0, type = 0, count = 0, next = 0x0, val = {{type = STRING_ST, u = {number = 139993220313123, string = 0x7f52b62af023 "5060", str = {s = 0x7f52b62af023 "5060", len = 0}, data = 0x7f52b62af023, attr = 0x7f52b62af023, select = 0x7f52b62af023}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}}} h = {rec_lev = 0, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {0, 0, 0, 0, 4294967296, 0, 0, 0}, __mask_was_saved = 0, __saved_mask = {__val = {0 <repeats 16 times>}}}}} backup = 0 '\000' __FUNCTION__ = "pv_set_ruri_port" (gdb) list 2556 2557 memset(&act, 0, sizeof(act)); 2558 act.val[0].type = STRING_ST; 2559 act.val[0].u.string = val->rs.s; 2560 backup = val->rs.s[val->rs.len]; 2561 val->rs.s[val->rs.len] = '\0'; 2562 act.type = SET_PORT_T; 2563 init_run_actions_ctx(&h); 2564 if (do_action(&h, &act, msg)<0) 2565 { ``` #### Log Messages ``` 0(1) DEBUG: <core> [core/cfg.y:1783]: yyparse(): loading modules under /usr/lib64/kamailio/modules/ 0(1) DEBUG: <core> [core/cfg.y:1764]: yyparse(): loading module pv.so 0(1) DEBUG: <core> [core/sr_module.c:505]: load_module(): trying to load </usr/lib64/kamailio/modules/pv.so> 0(1) DEBUG: <core> [core/kemi.c:2642]: sr_kemi_modules_add(): adding core module 0(1) DEBUG: <core> [core/kemi.c:2646]: sr_kemi_modules_add(): adding pv module 0(1) DEBUG: <core> [core/kemi.c:2650]: sr_kemi_modules_add(): adding hdr module 0(1) DEBUG: <core> [core/kemi.c:2664]: sr_kemi_modules_add(): adding module: pvx 0(1) DEBUG: <core> [core/sr_module.c:267]: register_module(): register PV from: pv 0(1) DEBUG: <core> [core/cfg.lex:1781]: pp_define(): defining id: MOD_pv 0(1) DEBUG: <core> [core/cfg.y:1764]: yyparse(): loading module xlog.so 0(1) DEBUG: <core> [core/sr_module.c:505]: load_module(): trying to load </usr/lib64/kamailio/modules/xlog.so> 0(1) DEBUG: <core> [core/kemi.c:2664]: sr_kemi_modules_add(): adding module: xlog 0(1) DEBUG: <core> [core/sr_module.c:267]: register_module(): register PV from: xlog 0(1) DEBUG: <core> [core/cfg.lex:1781]: pp_define(): defining id: MOD_xlog 0(1) DEBUG: <core> [core/cfg.y:1764]: yyparse(): loading module dispatcher.so 0(1) DEBUG: <core> [core/sr_module.c:505]: load_module(): trying to load </usr/lib64/kamailio/modules/dispatcher.so> 0(1) DEBUG: <core> [core/kemi.c:2664]: sr_kemi_modules_add(): adding module: dispatcher 0(1) DEBUG: <core> [core/cfg.lex:1781]: pp_define(): defining id: MOD_dispatcher 0(1) DEBUG: <core> [core/mem/shm.c:100]: shm_core_pools_init(): preparing to initialize shm core pools 0(1) DEBUG: <core> [core/mem/q_malloc.c:200]: qm_malloc_init(): QM_OPTIMIZE=16384, /ROUNDTO=2048 0(1) DEBUG: <core> [core/mem/q_malloc.c:202]: qm_malloc_init(): QM_HASH_SIZE=2099, qm_block size=235152 0(1) DEBUG: <core> [core/mem/q_malloc.c:204]: qm_malloc_init(): qm_malloc_init(0x7f52b16dd000, 67108864), start=0x7f52b16dd000 0(1) DEBUG: <core> [core/mem/q_malloc.c:213]: qm_malloc_init(): size= 67108864, init_overhead=235256 0(1) DEBUG: <core> [core/modparam.c:107]: set_mod_param_regex(): 'dispatcher' matches module 'dispatcher' 0(1) DEBUG: <core> [core/sr_module.c:725]: find_param_export(): found <list_file> in module dispatcher [/usr/lib64/kamailio/modules/dispatcher.so] 0(1) DEBUG: <core> [core/modparam.c:123]: set_mod_param_regex(): found <list_file> in module dispatcher [/usr/lib64/kamailio/modules/dispatcher.so] 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #0/2: 9(9)/ (nil) 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #1/2: 3(3)/ (nil) 0(1) DEBUG: <core> [core/sr_module.c:633]: find_mod_export_record(): found export of <ds_select_dst> in module dispatcher [/usr/lib64/kamailio/modules/dispatcher.so] 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #0/2: 9(9)/ (nil) 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #1/2: 3(3)/ (nil) 0(1) DEBUG: <core> [core/sr_module.c:633]: find_mod_export_record(): found export of <xlog> in module xlog [/usr/lib64/kamailio/modules/xlog.so] 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #0/2: 9(9)/ (nil) 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #1/2: 3(3)/ (nil) 0(1) DEBUG: <core> [core/sr_module.c:633]: find_mod_export_record(): found export of <xlog> in module xlog [/usr/lib64/kamailio/modules/xlog.so] 0(1) DEBUG: <core> [core/pvapi.c:335]: pv_cache_add(): PV cache not initialized, doing it now 0(1) DEBUG: <core> [core/pvapi.c:371]: pv_cache_add(): pvar [$rd] added in cache 0(1) DEBUG: <core> [core/pvapi.c:371]: pv_cache_add(): pvar [$dd] added in cache 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#63 #0/2: 21(15)/ 0x7f52b6563b18 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#63 #1/2: 22(16)/ 0x7f52b6563e40 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #0/2: 9(9)/ (nil) 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #1/2: 3(3)/ (nil) 0(1) DEBUG: <core> [core/sr_module.c:633]: find_mod_export_record(): found export of <xlog> in module xlog [/usr/lib64/kamailio/modules/xlog.so] 0(1) DEBUG: <core> [core/pvapi.c:371]: pv_cache_add(): pvar [$rp] added in cache 0(1) DEBUG: <core> [core/pvapi.c:371]: pv_cache_add(): pvar [$dp] added in cache 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#63 #0/2: 21(15)/ 0x7f52b6564bb0 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#63 #1/2: 22(16)/ 0x7f52b6565190 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #0/2: 9(9)/ (nil) 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#24 #1/2: 3(3)/ (nil) 0(1) DEBUG: <core> [core/sr_module.c:633]: find_mod_export_record(): found export of <xlog> in module xlog [/usr/lib64/kamailio/modules/xlog.so] 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#2 #0/2: 3(3)/ 0x1 0(1) DEBUG: <core> [core/route_struct.c:129]: mk_action(): ACTION_#2 #1/2: 3(3)/ 0x1 0(1) DEBUG: <core> [core/ppcfg.c:231]: pp_ifdef_level_check(): same number of pairing preprocessor directives #!IF[N]DEF - #!ENDIF 0(1) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xb57c00)[core:receive-parse-error] to 1 0(1) INFO: <core> [core/sctp_core.c:75]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module 0(1) DEBUG: <core> [core/socket_info.c:1325]: add_interfaces(): If: lo Fam: 2 Flg: 10049 Adr: 127.0.0.1 0(1) DEBUG: <core> [core/socket_info.c:1325]: add_interfaces(): If: eth0 Fam: 2 Flg: 11043 Adr: 172.17.0.2 0(1) DEBUG: <core> [core/socket_info.c:1325]: add_interfaces(): If: lo Fam: 2 Flg: 10049 Adr: 127.0.0.1 0(1) DEBUG: <core> [core/socket_info.c:1325]: add_interfaces(): If: eth0 Fam: 2 Flg: 11043 Adr: 172.17.0.2 0(1) DEBUG: <core> [core/mem/pkg.c:109]: pkg_print_manager(): pkg - using memory manager: q_malloc 0(1) DEBUG: <core> [core/mem/shm.c:301]: shm_print_manager(): shm - using memory manager: q_malloc 0(1) DEBUG: <core> [core/cfg/cfg.c:174]: cfg_declare(): new config group has been registered: 'core' (num=56, size=224) 0(1) DEBUG: <core> [core/cfg/cfg.c:174]: cfg_declare(): new config group has been registered: 'tcp' (num=27, size=108) 0(1) DEBUG: <core> [core/timer.c:239]: init_timer(): starting with *ticks=1245622805 0(1) DEBUG: <core> [core/timer.c:281]: init_timer(): timer_list between 0x7f52b1716af0 and 0x7f52b175aaf0 0(1) DEBUG: <core> [core/pt.c:139]: register_procs(): registering new processes: 0 (old) + 1 (new) = 1 (total) loading modules under config path: /usr/lib64/kamailio/modules/ Listening on udp: 127.0.0.1:5060 udp: 172.17.0.2:5060 tcp: 127.0.0.1:5060 tcp: 172.17.0.2:5060 Aliases: tcp: 4f94e19b0c05:5060 tcp: localhost:5060 udp: 4f94e19b0c05:5060 udp: localhost:5060 0(1) INFO: <core> [core/tcp_main.c:5043]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(1) DEBUG: <core> [core/daemonize.c:207]: enable_dumpable(): trying enable core dumping... 0(1) DEBUG: <core> [core/daemonize.c:225]: enable_dumpable(): core dumping is enabled now (1)... 0(1) DEBUG: <core> [core/daemonize.c:583]: set_core_dump(): core dump limits set to 18446744073709551615 0(1) DEBUG: <core> [core/async_task.c:123]: async_task_init(): start initializing asynk task framework 0(1) DEBUG: <core> [core/sr_module.c:847]: init_mod(): pv 0(1) DEBUG: <core> [core/sr_module.c:847]: init_mod(): xlog 0(1) DEBUG: <core> [core/cfg/cfg.c:174]: cfg_declare(): new config group has been registered: 'xlog' (num=1, size=4) 0(1) DEBUG: <core> [core/sr_module.c:847]: init_mod(): dispatcher 0(1) DEBUG: <core> [core/cfg/cfg.c:174]: cfg_declare(): new config group has been registered: 'dispatcher' (num=3, size=24) 0(1) DEBUG: dispatcher [dispatch.c:516]: add_dest2list(): dest [1/1] <sip:127.0.0.1> 0(1) DEBUG: dispatcher [dispatch.c:850]: ds_load_list(): found [0] dest sets 0(1) DEBUG: dispatcher [dispatch.c:203]: ds_log_dst_cb(): dst>> 1 sip:127.0.0.1 0 0 (,0,0,0) 0(1) DEBUG: dispatcher [dispatcher.c:388]: mod_init(): loaded dispatching list 0(1) DEBUG: <core> [core/pt.c:100]: init_pt(): registering new processes: 1 (old) + 28 (new) = 29 (total) 0(1) INFO: <core> [main.c:2780]: main(): processes (at least): 29 - shm size: 67108864 - pkg size: 8388608 0(1) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing ds_select_dst() 0(1) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing xlog() 0(1) DEBUG: <core> [core/pvapi.c:497]: pv_spec_lookup(): PV <$ru> is not in cache 0(1) DEBUG: <core> [core/pvapi.c:371]: pv_cache_add(): pvar [$ru] added in cache 0(1) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing xlog() 0(1) DEBUG: <core> [core/pvapi.c:399]: pv_cache_lookup(): pvar [$rd] found in cache 0(1) DEBUG: <core> [core/pvapi.c:399]: pv_cache_lookup(): pvar [$dd] found in cache 0(1) DEBUG: <core> [core/rvalue.c:2873]: fix_rval(): RV fixing type 7 0(1) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing xlog() 0(1) DEBUG: <core> [core/pvapi.c:399]: pv_cache_lookup(): pvar [$rp] found in cache 0(1) DEBUG: <core> [core/pvapi.c:399]: pv_cache_lookup(): pvar [$dp] found in cache 0(1) DEBUG: <core> [core/rvalue.c:2873]: fix_rval(): RV fixing type 7 0(1) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing xlog() 0(1) DEBUG: <core> [core/pvapi.c:399]: pv_cache_lookup(): pvar [$ru] found in cache 0(1) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(1) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 0(1) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(1) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 0(1) DEBUG: <core> [core/tcp_main.c:3060]: tcp_init(): added 127.0.0.1:5060 0(1) DEBUG: <core> [core/tcp_main.c:3060]: tcp_init(): added 172.17.0.2:5060 0(1) DEBUG: <core> [core/daemonize.c:207]: enable_dumpable(): trying enable core dumping... 0(1) DEBUG: <core> [core/daemonize.c:225]: enable_dumpable(): core dumping is enabled now (1)... 0(1) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing PROC_INIT with rank -127 0(1) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 0 rank -127: dispatcher [main] 1(6) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1138164497 657242635 1936217831 1(6) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing PROC_SIPINIT with rank 1 1(6) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 1 rank 1: dispatcher [udp receiver child=0 sock=127.0.0.1:5060] 1(6) DEBUG: <core> [core/action.c:1681]: run_child_one_init_route(): attempting to run event_route[core:worker-one-init] 1(6) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xb57c00)[core:worker-one-init] to 2 2(7) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 767621824 1903169421 3094393287 2(7) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 2 2(7) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 2 rank 2: dispatcher [udp receiver child=1 sock=127.0.0.1:5060] 3(8) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1404086465 261080756 770401788 3(8) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 3 3(8) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 3 rank 3: dispatcher [udp receiver child=2 sock=127.0.0.1:5060] 4(9) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1276199264 1346413345 2657742810 4(9) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 4 4(9) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 4 rank 4: dispatcher [udp receiver child=3 sock=127.0.0.1:5060] 5(10) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 426380731 684525899 1595360440 5(10) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 5 5(10) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 5 rank 5: dispatcher [udp receiver child=4 sock=127.0.0.1:5060] 6(11) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 109773679 1341474029 2008829924 6(11) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 6 6(11) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 6 rank 6: dispatcher [udp receiver child=5 sock=127.0.0.1:5060] 9(14) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 485860116 476468826 2655924202 7(12) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1857608191 1922761176 1237080075 9(14) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 9 9(14) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 9 rank 9: dispatcher [udp receiver child=0 sock=172.17.0.2:5060] 7(12) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 7 7(12) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 7 rank 7: dispatcher [udp receiver child=6 sock=127.0.0.1:5060] 8(13) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 562716326 1340065989 3126261784 8(13) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 8 8(13) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 8 rank 8: dispatcher [udp receiver child=7 sock=127.0.0.1:5060] 10(15) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 202372237 1429362131 3169714441 10(15) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 10 10(15) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 10 rank 10: dispatcher [udp receiver child=1 sock=172.17.0.2:5060] 11(16) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1063199497 966236880 107442987 11(16) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 11 11(16) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 11 rank 11: dispatcher [udp receiver child=2 sock=172.17.0.2:5060] 12(17) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 2020596441 1564950130 866753896 12(17) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 12 12(17) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 12 rank 12: dispatcher [udp receiver child=3 sock=172.17.0.2:5060] 13(18) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 33883575 1983372148 799990916 13(18) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 13 13(18) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 13 rank 13: dispatcher [udp receiver child=4 sock=172.17.0.2:5060] 14(19) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 2007235399 2019994138 2394392753 14(19) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 14 14(19) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 14 rank 14: dispatcher [udp receiver child=5 sock=172.17.0.2:5060] 15(20) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1393726726 1930799296 2068801996 17(22) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1702053370 1759107173 2317004371 17(22) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing PROC_TIMER with rank -1 15(20) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 15 17(22) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 17 rank -1: dispatcher [slow timer] 15(20) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 15 rank 15: dispatcher [udp receiver child=6 sock=172.17.0.2:5060] 0(1) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing PROC_MAIN with rank 0 0(1) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 0 rank 0: dispatcher [main] 19(24) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 2047276621 1783092597 1028234677 19(24) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing PROC_TIMER with rank -1 19(24) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 19 rank -1: dispatcher [secondary timer] 16(21) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 1760686381 1461439773 352661441 16(21) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 16 16(21) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 16 rank 16: dispatcher [udp receiver child=7 sock=172.17.0.2:5060] 21(26) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 18 21(26) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 21 rank 18: dispatcher [tcp receiver (generic) child=1] 21(26) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 22(27) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 19 22(27) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 22 rank 19: dispatcher [tcp receiver (generic) child=2] 21(26) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 32, 1, (nil)), fd_no=0 23(28) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 20 23(28) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 23 rank 20: dispatcher [tcp receiver (generic) child=3] 22(27) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 22(27) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 34, 1, (nil)), fd_no=0 23(28) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 23(28) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 36, 1, (nil)), fd_no=0 25(30) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 22 25(30) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 25 rank 22: dispatcher [tcp receiver (generic) child=5] 25(30) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 25(30) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 40, 1, (nil)), fd_no=0 27(32) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 24 27(32) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 27 rank 24: dispatcher [tcp receiver (generic) child=7] 0(1) DEBUG: <core> [main.c:1796]: main_loop(): Expect maximum 2197 open fds 27(32) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 27(32) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 44, 1, (nil)), fd_no=0 28(33) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 2107779165 267268442 1172423650 28(33) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing PROC_TCP_MAIN with rank -4 28(33) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 28 rank -4: dispatcher [tcp main process] 20(25) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 17 20(25) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 20 rank 17: dispatcher [tcp receiver (generic) child=0] 28(33) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xab4228 and 0xaf8228 20(25) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 6, 1, 0x7f52b656ea08), fd_no=0 20(25) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 30, 1, (nil)), fd_no=0 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 7, 1, 0x7f52b656ec00), fd_no=1 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 8, 4, 0x7f52b1771f44), fd_no=2 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 9, 4, 0x7f52b1771fd8), fd_no=3 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 10, 4, 0x7f52b177206c), fd_no=4 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 11, 4, 0x7f52b1772100), fd_no=5 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 12, 4, 0x7f52b1772194), fd_no=6 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 13, 4, 0x7f52b1772228), fd_no=7 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 14, 4, 0x7f52b17722bc), fd_no=8 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 15, 4, 0x7f52b1772350), fd_no=9 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 16, 4, 0x7f52b17723e4), fd_no=10 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 17, 4, 0x7f52b1772478), fd_no=11 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 18, 4, 0x7f52b177250c), fd_no=12 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 19, 4, 0x7f52b17725a0), fd_no=13 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 20, 4, 0x7f52b1772634), fd_no=14 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 21, 4, 0x7f52b17726c8), fd_no=15 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 22, 4, 0x7f52b177275c), fd_no=16 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 23, 4, 0x7f52b17727f0), fd_no=17 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 24, 4, 0x7f52b1772884), fd_no=18 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 25, 4, 0x7f52b1772918), fd_no=19 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 26, 4, 0x7f52b17729ac), fd_no=20 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 27, 4, 0x7f52b1772a40), fd_no=21 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 28, 4, 0x7f52b1772ad4), fd_no=22 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 30, 4, 0x7f52b1772b68), fd_no=23 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 32, 4, 0x7f52b1772bfc), fd_no=24 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 34, 4, 0x7f52b1772c90), fd_no=25 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 36, 4, 0x7f52b1772d24), fd_no=26 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 38, 4, 0x7f52b1772db8), fd_no=27 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 40, 4, 0x7f52b1772e4c), fd_no=28 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 29, 3, 0x7f52b656e138), fd_no=29 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 31, 3, 0x7f52b656e158), fd_no=30 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 33, 3, 0x7f52b656e178), fd_no=31 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 35, 3, 0x7f52b656e198), fd_no=32 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 37, 3, 0x7f52b656e1b8), fd_no=33 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 39, 3, 0x7f52b656e1d8), fd_no=34 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 41, 3, 0x7f52b656e1f8), fd_no=35 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 43, 3, 0x7f52b656e218), fd_no=36 18(23) DEBUG: <core> [core/pt.c:311]: fork_process(): test random numbers 894168009 1714857032 1695342316 18(23) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing PROC_TIMER with rank -1 18(23) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 18 rank -1: dispatcher [timer] 24(29) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 21 24(29) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 24 rank 21: dispatcher [tcp receiver (generic) child=4] 24(29) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 24(29) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 38, 1, (nil)), fd_no=0 26(31) DEBUG: <core> [core/sr_module.c:820]: init_child(): initializing CHILD with rank 23 26(31) DEBUG: <core> [core/sr_module.c:779]: init_mod_child(): idx 26 rank 23: dispatcher [tcp receiver (generic) child=6] 26(31) DEBUG: <core> [core/local_timer.c:61]: init_local_timer(): timer_list between 0xaf84c8 and 0xb3c4c8 26(31) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 42, 1, (nil)), fd_no=0 28(33) DEBUG: <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: 127.0.0.1 28(33) DEBUG: <core> [core/tcp_main.c:1236]: tcpconn_new(): on port 55080, type 2 28(33) DEBUG: <core> [core/tcp_main.c:1559]: tcpconn_add(): hashes: 1656:1670:1381, 1 28(33) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xab4060, 44, 2, 0x7f52b17741c8), fd_no=37 28(33) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0xab4060, 44, -1, 0x0) fd_no=38 called 28(33) DEBUG: <core> [core/tcp_main.c:4517]: handle_tcpconn_ev(): sending to child, events 1 28(33) DEBUG: <core> [core/tcp_main.c:4190]: send2child(): selected tcp worker idx:0 proc:20 pid:25 for activity on [tcp:127.0.0.1:5060], 0x7f52b17741c8 20(25) DEBUG: <core> [core/tcp_read.c:1759]: handle_io(): received n=8 con=0x7f52b17741c8, fd=7 20(25) DEBUG: <core> [core/io_wait.h:377]: io_watch_add(): DBG: io_watch_add(0xaf8300, 7, 2, 0x7f52b17741c8), fd_no=1 20(25) DEBUG: <core> [core/tcp_read.c:1560]: tcp_read_req(): content-length=0 20(25) DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): SIP Request: 20(25) DEBUG: <core> [core/parser/msg_parser.c:612]: parse_msg(): method: <INVITE> 20(25) DEBUG: <core> [core/parser/msg_parser.c:614]: parse_msg(): uri: <sip:B@127.0.0.1;user=phone> 20(25) DEBUG: <core> [core/parser/msg_parser.c:616]: parse_msg(): version: <SIP/2.0> 20(25) DEBUG: <core> [core/parser/msg_parser.c:185]: get_hdr_field(): content_length=0 20(25) DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 20(25) DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [18]; uri=[sip:B@127.0.0.1] 20(25) DEBUG: <core> [core/parser/msg_parser.c:174]: get_hdr_field(): to body [<sip:B@127.0.0.1> ], to tag [] 20(25) DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKZ2a_U73e_8Z7Be26>; state=15 20(25) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 20(25) DEBUG: <core> [core/parser/msg_parser.c:498]: parse_headers(): Via found, flags=2 20(25) DEBUG: <core> [core/parser/msg_parser.c:500]: parse_headers(): this is the first via 20(25) DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <1> <INVITE> 20(25) DEBUG: <core> [core/receive.c:325]: receive_msg(): --- received sip message - request - call-id: [8EFCC0126CBA18AF6D6ECE17@4742ffffffff] - cseq: [1 INVITE] 20(25) DEBUG: <core> [core/receive.c:380]: receive_msg(): preparing to run routing scripts... 20(25) DEBUG: dispatcher [dispatch.c:2062]: ds_manage_routes(): set [1] 20(25) DEBUG: dispatcher [dispatch.c:2168]: ds_manage_routes(): using alg [4] hash [0] 20(25) DEBUG: dispatcher [dispatch.c:2214]: ds_manage_routes(): selected [4-1-0/0] <sip:127.0.0.1> 20(25) DEBUG: dispatcher [dispatch.c:2023]: ds_select_dst_limit(): selected target destinations: 0 20(25) ERROR: <script>: will update <sip:B@127.0.0.1;user=phone>20(25) ERROR: <script>: changing 127.0.0.1 to 127.0.0.1 20(25) ERROR: <script>: changing 5060 to 5060 18(23) WARNING: <core> [core/timer.c:413]: adjust_ticks(): our timer runs faster than real-time (45000 ms / 720 ticks our time .-> 44929 ms / 718 ticks real time) 28(33) DEBUG: <core> [core/tcp_main.c:3593]: handle_tcp_child(): dead tcp child 0 (pid 25, no 20) (shutting down?) 28(33) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0xab4060, 29, -1, 0x0) fd_no=37 called 28(33) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 27 28(33) DEBUG: <core> [core/tcp_main.c:3825]: handle_ser_child(): dead child 20, pid 25 (shutting down?) 28(33) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0xab4060, 27, -1, 0x0) fd_no=36 called 0(1) ALERT: <core> [main.c:767]: handle_sigs(): child process 25 exited by a signal 11 0(1) ALERT: <core> [main.c:770]: handle_sigs(): core was generated 0(1) INFO: <core> [main.c:792]: handle_sigs(): terminating due to SIGCHLD 0(1) DEBUG: <core> [main.c:794]: handle_sigs(): terminating due to SIGCHLD 1(6) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 3(8) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 2(7) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 8(13) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 11(16) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 4(9) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 14(19) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 16(21) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 7(12) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 15(20) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 6(11) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 25(30) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 17(22) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 23(28) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 12(17) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 5(10) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 19(24) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 26(31) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 10(15) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 21(26) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 22(27) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 28(33) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 13(18) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 9(14) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 18(23) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 24(29) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 27(32) INFO: <core> [main.c:847]: sig_usr(): signal 15 received 0(1) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 0(1) DEBUG: <core> [core/mem/shm.c:289]: shm_destroy_manager(): destroying memory manager: q_malloc 0(1) DEBUG: <core> [core/mem/q_malloc.c:1185]: qm_shm_lock_destroy(): destroying the shared memory lock 0(1) DEBUG: <core> [core/mem/pkg.c:98]: pkg_destroy_manager(): destroying memory manager: q_malloc``` #### SIP Traffic  ``` INVITE sip:B@127.0.0.1;user=phone SIP/2.0 Content-Length:0 From:<sip:A@127.0.0.1>;tag=13X72gb4A0gYZBa5 To:<sip:B@127.0.0.1> Via:SIP/2.0/TCP 127.0.0.1:5060;branch=z9hG4bKZ2a_U73e_8Z7Be26 Call-ID:8EFCC0126CBA18AF6D6ECE17@4742ffffffff CSeq:1 INVITE Max-Forwards:60 Contact:<sip:127.0.0.1:5060;transport=TCP> ``` ### Possible Solutions  As a workaround all dispatcher module entries need to have explicit port configured. ### Additional Information * **Kamailio Version** - output of `kamailio -v` I have used official packages for CentOS 6 for Kamailio 5.3.3. I was able to reproduce it on Kamailio 5.2 also. ``` sh-4.1# kamailio -v version: kamailio 5.3.3 (x86_64/linux) c918a3 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: c918a3 compiled on 14:33:03 Mar 16 2020 with gcc 4.4.7 ``` * **Operating System**: ``` Linux ac8386769ce8 4.19.76-linuxkit #1 SMP Thu Oct 17 19:31:58 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux sh-4.1# cat /etc/redhat-release CentOS release 6.10 (Final) ``` -- 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/2258

2 4

git:master:c52e2331: ratelimit: increase number of queues and pipes
by Stefan Mititelu 19 Mar '20

19 Mar '20

Module: kamailio Branch: master Commit: c52e2331f4823ba488ea9d1d585ab5b1e6999745 URL: https://github.com/kamailio/kamailio/commit/c52e2331f4823ba488ea9d1d585ab5b… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-19T12:27:03+02:00 ratelimit: increase number of queues and pipes --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/c52e2331f4823ba488ea9d1d585ab5b… Patch: https://github.com/kamailio/kamailio/commit/c52e2331f4823ba488ea9d1d585ab5b… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 8082b3ec40..efecfaa779 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -47,8 +47,8 @@ MODULE_VERSION -#define MAX_PIPES 16 -#define MAX_QUEUES 10 +#define MAX_PIPES 32 +#define MAX_QUEUES 32 /* * timer interval length in seconds, tunable via modparam

1 0

git:master:1f76bca7: pv: do not set ending '\0' for port value in pv_set_ruri_port()
by Daniel-Constantin Mierla 19 Mar '20

19 Mar '20

Module: kamailio Branch: master Commit: 1f76bca74839f35d11f42edf758eb046cedb752c URL: https://github.com/kamailio/kamailio/commit/1f76bca74839f35d11f42edf758eb04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-19T10:59:43+01:00 pv: do not set ending '\0' for port value in pv_set_ruri_port() - it can be a reference to a static string, ending up in a crash - GH #2258 --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/1f76bca74839f35d11f42edf758eb04… Patch: https://github.com/kamailio/kamailio/commit/1f76bca74839f35d11f42edf758eb04… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 18db915cfb..9087fe01bf 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2558,7 +2558,9 @@ int pv_set_ruri_port(struct sip_msg* msg, pv_param_t *param, act.val[0].type = STRING_ST; act.val[0].u.string = val->rs.s; backup = val->rs.s[val->rs.len]; - val->rs.s[val->rs.len] = '\0'; + if(backup != '\0') { + val->rs.s[val->rs.len] = '\0'; + } act.type = SET_PORT_T; init_run_actions_ctx(&h); if (do_action(&h, &act, msg)<0) @@ -2567,7 +2569,9 @@ int pv_set_ruri_port(struct sip_msg* msg, pv_param_t *param, val->rs.s[val->rs.len] = backup; goto error; } - val->rs.s[val->rs.len] = backup; + if(backup != '\0') { + val->rs.s[val->rs.len] = backup; + } return 0; error:

1 0

[kamailio/kamailio] Small portability fixes (NetBSD) (#2256)
by Greg Troxel 19 Mar '20

19 Mar '20

#### 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 (5.3 would be nice; earlier doesn't help me) - [x] Tested changes locally (with these, the build gets vastly further) #### Description This PR has two changes for building on NetBSD. One is simply adding -lm to the link line for kamailio, as math functions are used. The other is changing the use of -ldl to a variable, leaving that at -ldl most places, and setting it to empty on NetBSD. (NetBSD does not have a /usr/lib/libdl.* and dlopen does not require any link line arguments.) I am pretty sure that my changes won't affect the build on non-NetBSD. Thanks, Greg You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2256 -- Commit Summary -- * Makefile.defs: On NetBSD, link with -lm * Makefile.defs: Only add -ldl on systems that use it -- File Changes -- M src/Makefile.defs (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2256.patch https://github.com/kamailio/kamailio/pull/2256.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/2256

2 2

git:master:bca9768b: Makefile.defs: Only add -ldl on systems that use it
by Greg Troxel 19 Mar '20

19 Mar '20

Module: kamailio Branch: master Commit: bca9768b6f2667bad8472fa99a113b8249ca0f9a URL: https://github.com/kamailio/kamailio/commit/bca9768b6f2667bad8472fa99a113b8… Author: Greg Troxel <gdt(a)lexort.com> Committer: Greg Troxel <gdt(a)lexort.com> Date: 2020-03-18T19:06:36-04:00 Makefile.defs: Only add -ldl on systems that use it kamailio uses dlopen, and on some systems, one must link with -ldl. On others, this is not needed and there is no libdl. For now, simply omit -ldl on NetBSD (which doesn't have or require it), and don't try to change behavior on other systems. --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bca9768b6f2667bad8472fa99a113b8… Patch: https://github.com/kamailio/kamailio/commit/bca9768b6f2667bad8472fa99a113b8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3d28f3ef38..f6f39e3a01 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -210,9 +210,18 @@ endif endif +# dlopen requires -ldl on some systems, but not others. Until there +# is clarity on which require -ldl, add just enough ifeq to fix +# systems known not to use it. +ifeq ($(OS), netbsd) +LIBDL="" +else +LIBDL="-ldl" +endif + ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED -LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions +LD_PMUTEX_OPTS = -pthread -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions else CC_PMUTEX_OPTS = LD_PMUTEX_OPTS =

1 0

git:master:6728fa97: Merge pull request #2256 from gdt/master
by GitHub 19 Mar '20

19 Mar '20

Module: kamailio Branch: master Commit: 6728fa974723be3e79e7fd9750cd4fdc26fcb013 URL: https://github.com/kamailio/kamailio/commit/6728fa974723be3e79e7fd9750cd4fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-19T07:21:26+01:00 Merge pull request #2256 from gdt/master Small portability fixes (NetBSD) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6728fa974723be3e79e7fd9750cd4fd… Patch: https://github.com/kamailio/kamailio/commit/6728fa974723be3e79e7fd9750cd4fd… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a89a3a6099..f6f39e3a01 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -210,9 +210,18 @@ endif endif +# dlopen requires -ldl on some systems, but not others. Until there +# is clarity on which require -ldl, add just enough ifeq to fix +# systems known not to use it. +ifeq ($(OS), netbsd) +LIBDL="" +else +LIBDL="-ldl" +endif + ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED -LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions +LD_PMUTEX_OPTS = -pthread -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions else CC_PMUTEX_OPTS = LD_PMUTEX_OPTS = @@ -2056,7 +2065,7 @@ ifeq ($(OS), netbsd) C_DEFS+=-DHAVE_SELECT endif YACC=yacc - LIBS= + LIBS=-lm endif # OS X support, same as freebsd

1 0

git:master:3ccaac36: Makefile.defs: On NetBSD, link with -lm
by Greg Troxel 19 Mar '20

19 Mar '20

Module: kamailio Branch: master Commit: 3ccaac365da6078a96681109efebc70dcb12fc55 URL: https://github.com/kamailio/kamailio/commit/3ccaac365da6078a96681109efebc70… Author: Greg Troxel <gdt(a)lexort.com> Committer: Greg Troxel <gdt(a)lexort.com> Date: 2020-03-18T19:01:52-04:00 Makefile.defs: On NetBSD, link with -lm --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/3ccaac365da6078a96681109efebc70… Patch: https://github.com/kamailio/kamailio/commit/3ccaac365da6078a96681109efebc70… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a89a3a6099..3d28f3ef38 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -2056,7 +2056,7 @@ ifeq ($(OS), netbsd) C_DEFS+=-DHAVE_SELECT endif YACC=yacc - LIBS= + LIBS=-lm endif # OS X support, same as freebsd

1 0

[kamailio/kamailio] siptrace: sip_trace_mode("d") not working/segfaults (#2250)
by Bastian Triller 18 Mar '20

18 Mar '20

### Description 1) Using function `sip_trace_mode()` with parameter `d` to enable dialog tracing mode logs: ``` BUG: siptrace [siptrace.c:1671]: add_info_xavp(): URI should be in raw format here ERROR: siptrace [siptrace.c:888]: sip_trace_helper(): failed to serialize siptrace info! Won't trace dialog! ``` 2) If `trace_flag` is set and `sip_trace_mode("d")` is used before one of the parameterized variants of `sip_trace()` Kamailio segfaults. ### Troubleshooting #### Reproduction module parameters: ``` #!define FLT_SIPTRACE 5 modparam("siptrace", "trace_mode", 0) modparam("siptrace", "trace_flag", FLT_SIPTRACE) modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "hep_mode_on", 1) modparam("siptrace", "hep_version", 3) modparam("siptrace", "hep_capture_id", 1234) ``` 1) ``` request_route { ... if (is_method("INVITE")) { sip_trace_mode("d"); } } ``` 2) ``` request_route { ... if (is_method("INVITE")) { setflag(FLT_SIPTRACE); sip_trace_mode("d"); sip_trace("sip:1.2.3.4:9060"); } } ``` #### Debugging Data  ``` (gdb) bt #0 0x00007f498ffddeaf in memcpy () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f495ffb5369 in sip_trace_helper (msg=0x7f498c1703b8, dst=0x7fff45477ab0, duri=0x7fff45477a50, corid=0x0, dir=0x0, trace_type=SIPTRACE_TRANSACTION) at siptrace.c:871 #2 0x00007f495ffb7729 in w_sip_trace3 (msg=0x7f498c1703b8, dest=0x7f498c0863a8 "\210S\t\214I\177", correlation_id=0x0, trace_type_p=0x0) at siptrace.c:1041 #3 0x00007f495ffb6774 in w_sip_trace1 (msg=0x7f498c1703b8, dest=0x7f498c0863a8 "\210S\t\214I\177", p2=0x0) at siptrace.c:978 #4 0x00005603f0600ea1 in do_action (h=0x7fff45479270, a=0x7f498c0949a0, msg=0x7f498c1703b8) at core/action.c:1079 #5 0x00005603f060f4bd in run_actions (h=0x7fff45479270, a=0x7f498c093ca8, msg=0x7f498c1703b8) at core/action.c:1578 #6 0x00005603f0600d85 in do_action (h=0x7fff45479270, a=0x7f498c0a3758, msg=0x7f498c1703b8) at core/action.c:1064 #7 0x00005603f060f4bd in run_actions (h=0x7fff45479270, a=0x7f498c08f758, msg=0x7f498c1703b8) at core/action.c:1578 #8 0x00005603f060b397 in do_action (h=0x7fff45479270, a=0x7f498c0a3f68, msg=0x7f498c1703b8) at core/action.c:1248 #9 0x00005603f060f4bd in run_actions (h=0x7fff45479270, a=0x7f498c019500, msg=0x7f498c1703b8) at core/action.c:1578 #10 0x00005603f060fd0b in run_top_route (a=0x7f498c019500, msg=0x7f498c1703b8, c=0x0) at core/action.c:1663 ... (gdb) frame 1 #1 0x00007f495ffb5369 in sip_trace_helper (msg=0x7f498c1703b8, dst=0x7fff45477ab0, duri=0x7fff45477a50, corid=0x0, dir=0x0, trace_type=SIPTRACE_TRANSACTION) at siptrace.c:871 871 memcpy(info->u.dup_uri.s, duri->s, duri->len); (gdb) info locals alloc_size = 88 info = 0x7f4967941fe0 __func__ = "sip_trace_helper" (gdb) p *info $1 = {correlation_id = {s = 0x0, len = 0}, u = {dup_uri = {s = 0x0, len = 0}, dest_info = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 0, send_flags = {f = 0, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0}}, uriState = STRACE_RAW_URI} (gdb) p *dst $2 = {send_sock = 0x0, to = {s = {sa_family = 2, sa_data = "#d\001\002\003\004\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 25635, sin_addr = {s_addr = 67305985}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 25635, sin6_flowinfo = 67305985, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 0, send_flags = {f = 0, blst_imask = 0}, proto = 1 '\001', proto_pad0 = 0 '\000', proto_pad1 = 0} ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` % kamailio -v version: kamailio 5.4.0-dev3 (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, TLS_PTHREAD_MUTEX_SHARED 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 6.3.0 ``` -- 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/2250

2 4

git:master:331ffea6: kamcmd: Makefile - updated the msg target to print pkg-config detections
by Daniel-Constantin Mierla 18 Mar '20

18 Mar '20

Module: kamailio Branch: master Commit: 331ffea6c8c8b2c7cf38e3d7eda882a6becd326a URL: https://github.com/kamailio/kamailio/commit/331ffea6c8c8b2c7cf38e3d7eda882a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-18T18:41:52+01:00 kamcmd: Makefile - updated the msg target to print pkg-config detections --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/331ffea6c8c8b2c7cf38e3d7eda882a… Patch: https://github.com/kamailio/kamailio/commit/331ffea6c8c8b2c7cf38e3d7eda882a… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index c8a7e6807e..f12306bf1e 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -137,7 +137,11 @@ $(NAME).o: .PHONY: msg msg: @if [ "$(use_readline)" = "1" ]; then \ - echo; echo "readline detected ($(readline_path)):"; \ + if [ "$(BUILDER)" = "" ]; then \ + echo; echo "readline detected ($(readline_path)):"; \ + else \ + echo; echo "readline detected via pkg-config"; \ + fi; \ echo "command completion enabled"; echo ; \ else \ echo ; \

1 0

make install error for mips
by subhra giri 18 Mar '20

18 Mar '20

Hi When i was cross compiling for Mips, 1) make ---- is success 2) make install ------ is giving below error ------------------------------------------------------------------------------ CC (/home/subhra/SDK3.1.2/tools-3.1.2_build_50/bin/mips64-octeon-linux-gnu-gcc) [U kamcmd] kamcmd.o kamcmd.c:47:31: fatal error: readline/readline.h: No such file or directory compilation terminated. ../../src//Makefile.rules:100: recipe for target 'kamcmd.o' failed make[2]: *** [kamcmd.o] Error 1 ------------------------------------------------------- I have installed readline-dev using apt-get install libreadline-dev Please help me how to get rid of this error. Thanks and Regards Subhra Prakash Giri

2 2

make install error for mips
by subhra giri 18 Mar '20

18 Mar '20

Dear Henning When i was cross compiling for Mips, 1) make ---- is success 2) make install ------ is giving below error ------------------------------------------------------------------------------ CC (/home/subhra/SDK3.1.2/tools-3.1.2_build_50/bin/mips64-octeon-linux-gnu-gcc) [U kamcmd] kamcmd.o kamcmd.c:47:31: fatal error: readline/readline.h: No such file or directory compilation terminated. ../../src//Makefile.rules:100: recipe for target 'kamcmd.o' failed make[2]: *** [kamcmd.o] Error 1 ------------------------------------------------------- I have installed readline-dev using apt-get install libreadline-dev Please help me how to get rid of this error. Thanks and Regards Subhra Prakash Giri

1 0

git:master:7ce976a2: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 17 Mar '20

17 Mar '20

Module: kamailio Branch: master Commit: 7ce976a2e2bb19a3f1aedea8fbb910250edd4c56 URL: https://github.com/kamailio/kamailio/commit/7ce976a2e2bb19a3f1aedea8fbb9102… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-17T14:46:18+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7ce976a2e2bb19a3f1aedea8fbb9102… Patch: https://github.com/kamailio/kamailio/commit/7ce976a2e2bb19a3f1aedea8fbb9102…

1 0

[kamailio/kamailio] presence: add delete_same_subs modparam (#2254)
by Stefan Mititelu 17 Mar '20

17 Mar '20

#### 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  We have some user agents that make another subscribe with the same callid, when IP changes. Need to delete the old subscription in that case. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2254 -- Commit Summary -- * presence: add delete_same_subs modparam -- File Changes -- M src/modules/presence/doc/presence_admin.xml (20) M src/modules/presence/hash.c (34) M src/modules/presence/hash.h (4) M src/modules/presence/presence.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2254.patch https://github.com/kamailio/kamailio/pull/2254.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/2254

2 4

git:master:8cbef62a: presence: add delete_same_subs modparam
by Stefan Mititelu 17 Mar '20

17 Mar '20

Module: kamailio Branch: master Commit: 8cbef62a0b9e654dda934edaf3e0f6e9c4a5c9a4 URL: https://github.com/kamailio/kamailio/commit/8cbef62a0b9e654dda934edaf3e0f6e… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-17T15:45:05+02:00 presence: add delete_same_subs modparam --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/8cbef62a0b9e654dda934edaf3e0f6e… Patch: https://github.com/kamailio/kamailio/commit/8cbef62a0b9e654dda934edaf3e0f6e… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 3eb1c1e942..32ffd3a2e6 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -951,6 +951,26 @@ modparam("presence", "pres_subs_mode", 0) </example> </section> +<section id="presence.p.delete_same_subs"> + <title><varname>delete_same_subs</varname> (integer)</title> + <para> + Enable deleting of subscriptions with the same presence uri and callid. + </para> + <para> + <emphasis> + Default value is 0 (disabled behavior). + </emphasis> + </para> + <example> + <title>Set <varname>delete_same_subs</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "delete_same_subs", 1) +... +</programlisting> + </example> +</section> + </section> <section> diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index bf6bc839fb..50d4d9948c 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -258,6 +258,40 @@ int insert_shtable(shtable_t htable, unsigned int hash_code, subs_t *subs) { subs_t *new_rec = NULL; + if (pres_delete_same_subs) { + subs_t* rec = NULL, *prev_rec = NULL; + + lock_get(&htable[hash_code].lock); + /* search if there is another record with the same pres_uri & callid */ + rec = htable[hash_code].entries->next; + while (rec) { + if (subs->pres_uri.len == rec->pres_uri.len && subs->callid.len == rec->callid.len && + memcmp(subs->pres_uri.s, rec->pres_uri.s, subs->pres_uri.len) == 0 && + memcmp(subs->callid.s, rec->callid.s, subs->callid.len) == 0) { + LM_NOTICE("Found another record with the same pres_uri[%.*s] and callid[%.*s]\n", + subs->pres_uri.len, subs->pres_uri.s, subs->callid.len, subs->callid.s); + /* delete this record */ + + if (prev_rec) + prev_rec->next = rec->next; + else + htable[hash_code].entries->next = rec->next; + + if (subs_dbmode != NO_DB) + delete_db_subs(&rec->to_tag, &rec->from_tag, &rec->callid); + + if (rec->contact.s!=NULL) + shm_free(rec->contact.s); + + shm_free(rec); + break; + } + prev_rec = rec; + rec = rec->next; + } + lock_release(&htable[hash_code].lock); + } + new_rec = mem_copy_subs_noc(subs); if(new_rec == NULL) { LM_ERR("copying in share memory a subs_t structure\n"); diff --git a/src/modules/presence/hash.h b/src/modules/presence/hash.h index 7f1276d9ad..676e6b4cff 100644 --- a/src/modules/presence/hash.h +++ b/src/modules/presence/hash.h @@ -56,6 +56,8 @@ struct presentity; #define PKG_MEM_TYPE 1 << 1 #define SHM_MEM_TYPE 1 << 2 +extern int pres_delete_same_subs; + /* subscribe hash entry */ struct subscription; @@ -136,4 +138,6 @@ int delete_phtable(str *pres_uri, int event); void destroy_phtable(void); +int delete_db_subs(str* to_tag, str* from_tag, str* callid); + #endif diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index a8f781c4be..0155cf286f 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -169,6 +169,7 @@ str pres_xavp_cfg = {0}; int pres_retrieve_order = 0; str pres_retrieve_order_by = str_init("priority"); int pres_enable_dmq = 0; +int pres_delete_same_subs = 0; int db_table_lock_type = 1; db_locking_t db_table_lock = DB_LOCKING_WRITE; @@ -245,6 +246,7 @@ static param_export_t params[]={ { "cseq_offset", PARAM_INT, &pres_cseq_offset}, { "enable_dmq", PARAM_INT, &pres_enable_dmq}, { "pres_subs_mode", PARAM_INT, &_pres_subs_mode}, + { "delete_same_subs", PARAM_INT, &pres_delete_same_subs}, {0,0,0} }; /* clang-format on */

1 0

minor issues building on NetBSD
by Greg Troxel 17 Mar '20

17 Mar '20

I'm working on adding 5.3.3 to pkgsrc, and have run into a few minor things. I'm mentioning them here in the hopes of being steered towards the preferred way to fix. (I hope this belongs on -dev; let me know if not.) 1) -ldl In src/Makefile.defs, I had to do: -LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions +LD_PMUTEX_OPTS = -pthread -rdynamic -Wl,-Bsymbolic-functions because on NetBSD there is no -ldl and dlopen is just in libc. My suggested fix is to define a LD_LIBDL per OS and use that variable instead when it would be needed. 2) lib64 I did -LIBDIR ?= -ifeq ($(LIBDIR),) -ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') -ifeq ($(ARCHBSZ),64b) - LIBDIR = lib64 -else - LIBDIR = lib -endif -endif +LIBDIR = lib because on NetBSD native libs always go in lib, and we put emulated (other arch that can be run, so i386 on amd64 is considered emulated) in /emul/foo. As I understand it this is true on other BSDs, Solaris, and probably things like AIX and IRIX. So I would suggest that this be guarded with an "if linux". Perhaps there are other systems that also want lib64. 3) namespace visibility In src/lib/srdb1/db_ut.c there is some complicated namespace visibility macro use, to ensure strptime is vailable. Then after setting one, there are others to recover from that. On NetBSD, it didn't recover. I ripped it all out and +#define _NETBSD_SOURCE +#include <sys/types.h> which isn't right either of course. What I'd suggest is to avoid any namespace mucking except on a particular system and version of that system known to need it, as mostly things seem to go better with no visibility definitions. I also have found problems with changing the visibility defines, running into a situation where one header hid something but then later when it shouldn't have been some other header wanted to include the first header, but it had already been processed. And, the code as is doens't seem to undo the defines after including, even though it seems to try to. Thanks for any hints, Greg

2 1

pthread mutex and openssl 1.1
by Greg Troxel 17 Mar '20

17 Mar '20

My next issue in the NetBSD build is about mutexes. I gather this is very much about openssl 1.1, and all of this is only about non-Linux since there futexes are used. (pkgsrc has switched to openssl 1.1 basically the beginning of 2020.) I am guessing that the basic issue is that the pthread mutexes are placed in shared memory and used from multiple processes, and that regardless of setting attributes, the point is that these need to work in that environment, and if not, some other synchronization scheme needs to be chosen. And, I gather the problem is lack of a wakeup on release to blocked threads in other processes. Close? There is -DKSR_PTHREAD_MUTEX_SHARED defined: ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1) CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED LD_PMUTEX_OPTS = -pthread -rdynamic -Wl,-Bsymbolic-functions else CC_PMUTEX_OPTS = LD_PMUTEX_OPTS = endif and this seems to get turned on regardless of which mutex option an OS uses. Later, in the netbsd if chunk ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_SYSV_SEM # try pthread sems found_lock_method=yes but then -DKSR_PTHREAD_MUTEX_SHARED is still on, and the code that usss pthread_mutexattr_setpshared is compiled in. I am thinking it might not be used, because of SYSV_SEM. (Btw, the check for NetBSD > 2.0.0 and kqueue can be removed; we support only 8 and 9 now, and while I don't like to gratuitously desupport older versions, I really doubt current kamailo would build on anything earlier than 6 anyway. Similar for FreeBSD probably, but I don't want to speak for them.) Thanks, Greg

1 1

git:master:19c6f596: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 16 Mar '20

16 Mar '20

Module: kamailio Branch: master Commit: 19c6f596f1daf246c0f77236ecf0016bfc3c81a2 URL: https://github.com/kamailio/kamailio/commit/19c6f596f1daf246c0f77236ecf0016… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-16T16:01:17+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/19c6f596f1daf246c0f77236ecf0016… Patch: https://github.com/kamailio/kamailio/commit/19c6f596f1daf246c0f77236ecf0016… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index c04e890fdf..84a7c37eba 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -619,18 +619,19 @@ modparam("p_usrloc", "default_db_type", "cluster") 3.25. db_ops_ruid (int) - If set to 1, database queries for update or delete are done using ruid - value. If it is set to 0, the old style using aor, contact and call-id - is done. + Defines how database queries are done: + * 0 uses the old style using aor, contact and call-id + * 1 uses ruid value + * 2 uses the new style using aor, contact and call-id - Default value is “0”. + Default value is 0 Can be set at runtime, e.g.: $ kamcmd cfg.set_now_int p_usrloc db_ops_ruid 1 Example 1.25. Set db_ops_ruid parameter ... -modparam("p_usrloc", "db_ops_ruid", 0) +modparam("p_usrloc", "db_ops_ruid", 2) ... 3.26. db_update_as_insert (string)

1 0

Kamailio v5.3.3 Released
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Hello, Kamailio SIP Server v5.3.3 stable release is out. This is a maintenance release of the latest stable branch, 5.3, that includes fixes since the release of v5.3.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are strongly recommended to be upgraded to v5.3.3. For more details about version 5.3.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/03/kamailio-v5-3-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Special circumstances are now everywhere word wide, impacting all of us, therefore we wish a smooth time during this crisis and to stay healthy to all our developers, supporters and community members along with their beloved ones! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] p_usrloc: add new update function (#2253)
by Stefan Mititelu 16 Mar '20

16 Mar '20

Add also new "uniq" column. The new update function will use this new column.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2253 -- Commit Summary -- * p_usrloc: add new update function -- File Changes -- M src/modules/p_usrloc/config.c (2) M src/modules/p_usrloc/doc/p_usrloc_admin.xml (27) M src/modules/p_usrloc/p_usrloc_mod.c (4) M src/modules/p_usrloc/p_usrloc_mod.h (1) M src/modules/p_usrloc/ucontact.c (265) M src/modules/usrloc/usrloc.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2253.patch https://github.com/kamailio/kamailio/pull/2253.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/2253

2 9

git:master:d1f525c9: p_usrloc: add new update function
by Stefan Mititelu 16 Mar '20

16 Mar '20

Module: kamailio Branch: master Commit: d1f525c972447e28b21df6bb8a698c682873f26d URL: https://github.com/kamailio/kamailio/commit/d1f525c972447e28b21df6bb8a698c6… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-16T16:51:10+02:00 p_usrloc: add new update function Add also new "uniq" column. The new update function will use this new column. --- Modified: src/modules/p_usrloc/config.c Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/location.sql Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ucontact.c Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/d1f525c972447e28b21df6bb8a698c6… Patch: https://github.com/kamailio/kamailio/commit/d1f525c972447e28b21df6bb8a698c6…

1 0

git:5.3:c918a3fc: ChangeLog: content updated for v5.3.2
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Module: kamailio Branch: 5.3 Commit: c918a3fcbf9dd7e697737a54f2b3b95a73b582a9 URL: https://github.com/kamailio/kamailio/commit/c918a3fcbf9dd7e697737a54f2b3b95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-16T14:22:28+01:00 ChangeLog: content updated for v5.3.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c918a3fcbf9dd7e697737a54f2b3b95… Patch: https://github.com/kamailio/kamailio/commit/c918a3fcbf9dd7e697737a54f2b3b95…

1 0

git:5.3:b3e0db66: Makefile.defs: version set to 5.3.3
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Module: kamailio Branch: 5.3 Commit: b3e0db66d5bee1baccb2343eb891fc28ea8d2dde URL: https://github.com/kamailio/kamailio/commit/b3e0db66d5bee1baccb2343eb891fc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-16T14:14:28+01:00 Makefile.defs: version set to 5.3.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b3e0db66d5bee1baccb2343eb891fc2… Patch: https://github.com/kamailio/kamailio/commit/b3e0db66d5bee1baccb2343eb891fc2… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e712e729b5..a4ecc20248 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:64a9592c: pkg: version set to 5.3.3 for rpm and alpine specs
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Module: kamailio Branch: 5.3 Commit: 64a9592c13fb736078cdb3e3e5979621cbd50151 URL: https://github.com/kamailio/kamailio/commit/64a9592c13fb736078cdb3e3e597962… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-16T13:55:36+01:00 pkg: version set to 5.3.3 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/64a9592c13fb736078cdb3e3e597962… Patch: https://github.com/kamailio/kamailio/commit/64a9592c13fb736078cdb3e3e597962… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 86559d7df7..4f2b286946 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.3.2 +pkgver=5.3.3 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 2e62bc0549..92729b8e82 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.3.2 +%define ver 5.3.3 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Info: Kamailio World 2020 – Event Cancelled For April 27-29, 2020
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Source: https://www.kamailioworld.com/k08/2020/03/kamailio-world-2020-event-cancell… It is probably no much of a surprise that the next Kamailio World Conference and the NG-Emergency track cannot be organized any more during April 27-29, 2020. We are trying to find out the best alternatives for later in the year, when we hope the situation will be back to normal and people will be again in mood for social interaction. Being one of proposed alternatives, because we discussed a lot during the last several days with the people involved in organizing the event as well as its active community, we want to make it clear right now that we do not plan to switch to an online version (i.e., video conferencing) at the same dates. With the current situation out there, it is very likely that the level of stress everywhere will be high during the next 6 weeks till the initial planned dates, so putting together the infrastructure for video conferencing, synchronizing with the speakers and participants will just add to it, therefore it is better that everyone is focusing on taking care of the beloved ones and how to deal the best with the daily constraints during this interval. All the payments received for participating at or supporting Kamailio World 2020 will be refunded. If you are among them, thank you once more! We will contact you very soon with the relevant details. Keep also an eye on the event website for updates related to what is going to be next related to the conference! We hope the evolution will turn into a positive perspective very soon and the crisis is going to end rapidly, so everyone can return to the usual activities! Moreover, we wish you and the beloved ones a smooth time during this exceptional situation and to stay healthy! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.3:ee9cd2ea: pkg/kamailio/deb: version set to 5.3.3
by Victor Seva 16 Mar '20

16 Mar '20

Module: kamailio Branch: 5.3 Commit: ee9cd2ea0874f10cb97d899c222e17d8d57385ea URL: https://github.com/kamailio/kamailio/commit/ee9cd2ea0874f10cb97d899c222e17d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-16T11:46:40+01:00 pkg/kamailio/deb: version set to 5.3.3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/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/ee9cd2ea0874f10cb97d899c222e17d… Patch: https://github.com/kamailio/kamailio/commit/ee9cd2ea0874f10cb97d899c222e17d…

1 0

Releasing Kamailio v5.3.3
by Daniel-Constantin Mierla 16 Mar '20

16 Mar '20

Hello, I am considering to release Kamailio v5.3.3 next week, either on Monday (March 16) or Tuesday (March 17). As usual, if any of you are aware of issues not reported on the tracker yet or knows fixes not backported to branch 5.3, reported them as soon as possible to take care of them. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com

1 1

git:5.2:3858b305: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 3858b3057c8a145975556504bbe307cd5383ad28 URL: https://github.com/kamailio/kamailio/commit/3858b3057c8a145975556504bbe307c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-14T21:32:00+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/cdp/README Modified: src/modules/dispatcher/README Modified: src/modules/dmq_usrloc/README Modified: src/modules/dnssec/README Modified: src/modules/htable/README Modified: src/modules/lcr/README Modified: src/modules/msilo/README Modified: src/modules/nsq/README Modified: src/modules/presence_xml/README Modified: src/modules/rls/README Modified: src/modules/sms/README Modified: src/modules/tmx/README Modified: src/modules/xcap_server/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/3858b3057c8a145975556504bbe307c… Patch: https://github.com/kamailio/kamailio/commit/3858b3057c8a145975556504bbe307c…

1 0

git:5.3:9f32f8b8: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 9f32f8b858fc7363704fc8563d206f6ef9698520 URL: https://github.com/kamailio/kamailio/commit/9f32f8b858fc7363704fc8563d206f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-14T21:31:40+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/cdp/README Modified: src/modules/dispatcher/README Modified: src/modules/dmq_usrloc/README Modified: src/modules/dnssec/README Modified: src/modules/htable/README Modified: src/modules/lcr/README Modified: src/modules/msilo/README Modified: src/modules/nsq/README Modified: src/modules/presence_xml/README Modified: src/modules/rls/README Modified: src/modules/sms/README Modified: src/modules/tmx/README Modified: src/modules/xcap_server/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/9f32f8b858fc7363704fc8563d206f6… Patch: https://github.com/kamailio/kamailio/commit/9f32f8b858fc7363704fc8563d206f6…

1 0

git:master:ff8c2a66: modules: readme files regenerated - cdp ... [skip ci]
by Kamailio Dev 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: ff8c2a661ec9b27f01447c1dd24d8b984f4b1625 URL: https://github.com/kamailio/kamailio/commit/ff8c2a661ec9b27f01447c1dd24d8b9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-14T21:31:17+01:00 modules: readme files regenerated - cdp ... [skip ci] --- Modified: src/modules/cdp/README Modified: src/modules/dispatcher/README Modified: src/modules/dmq_usrloc/README Modified: src/modules/dnssec/README Modified: src/modules/htable/README Modified: src/modules/lcr/README Modified: src/modules/msilo/README Modified: src/modules/nsq/README Modified: src/modules/presence_xml/README Modified: src/modules/rls/README Modified: src/modules/sms/README Modified: src/modules/tmx/README Modified: src/modules/xcap_server/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/ff8c2a661ec9b27f01447c1dd24d8b9… Patch: https://github.com/kamailio/kamailio/commit/ff8c2a661ec9b27f01447c1dd24d8b9…

1 0

[kamailio/kamailio] pv_headers: state header, which could not be split (#2251)
by Bastian Triller 14 Mar '20

14 Mar '20

#### 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/2251 -- Commit Summary -- * pv_headers: state header, which could not be split -- File Changes -- M src/modules/pv_headers/pvh_func.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2251.patch https://github.com/kamailio/kamailio/pull/2251.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/2251

2 2

git:master:a09d1b7e: pv_headers: state header, which could not be split
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: a09d1b7ed8480e7543f81e7c5344ad4107cad4e7 URL: https://github.com/kamailio/kamailio/commit/a09d1b7ed8480e7543f81e7c5344ad4… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:25:55+01:00 pv_headers: state header, which could not be split --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/a09d1b7ed8480e7543f81e7c5344ad4… Patch: https://github.com/kamailio/kamailio/commit/a09d1b7ed8480e7543f81e7c5344ad4… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 88a6497a86..688c3f11a3 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -93,8 +93,8 @@ int pvh_collect_headers(struct sip_msg *msg, int is_auto) && strchr(val.s, ',') != NULL) { if(pvh_split_values(&val, hvals, &d_size, 1) < 0) { - LM_ERR("could not parse Diversion header comma separated " - "value"); + LM_ERR("could not parse %.*s header comma separated " + "value", name.len, name.s); return -1; }

1 0

git:5.3:76825c0e: nsq: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 76825c0e76d596ab6d6cebba6850925865f6b5a0 URL: https://github.com/kamailio/kamailio/commit/76825c0e76d596ab6d6cebba6850925… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 nsq: docs fix parameter name (cherry picked from commit e907b53374ead5ec03a01f8a04ff69e70bd0356c) --- Modified: src/modules/nsq/doc/nsq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/76825c0e76d596ab6d6cebba6850925… Patch: https://github.com/kamailio/kamailio/commit/76825c0e76d596ab6d6cebba6850925… --- diff --git a/src/modules/nsq/doc/nsq_admin.xml b/src/modules/nsq/doc/nsq_admin.xml index 4f31746518..a5fa007921 100644 --- a/src/modules/nsq/doc/nsq_admin.xml +++ b/src/modules/nsq/doc/nsq_admin.xml @@ -260,7 +260,7 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name") </section> <section> - <title><varname>consumer_event_sub_key</varname>(str)</title> + <title><varname>consumer_event_subkey</varname>(str)</title> <para> The default name of the field in json payload to compose the event name 2nd part </para> @@ -271,10 +271,10 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name") <emphasis>Default value is <quote>Event-Name</quote>.</emphasis> </para> <example> - <title>Set <varname>consumer_event_sub_key</varname> parameter</title> + <title>Set <varname>consumer_event_subkey</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nsq", "consumer_event_sub_key", "My-JSON-SubField-Name") +modparam("nsq", "consumer_event_subkey", "My-JSON-SubField-Name") ... </programlisting> </example> @@ -384,7 +384,7 @@ modparam("nsq", "topic_channel", "My-NSQ-Topic-2:My-NSQ-Channel-2") <programlisting format="linespecific"> ... modparam("nsq", "consumer_event_key", "Event-Category") -modparam("nsq", "consumer_event_sub_key", "Event-Name") +modparam("nsq", "consumer_event_subkey", "Event-Name") ... event_route[nsq:consumer-event-presence-update] @@ -408,7 +408,7 @@ event_route[nsq:consumer-event-presence] event_route[nsq:consumer-event-event-category-event-name] { # event-category is the name of the consumer_event_key parameter - # event-name is the name of the consumer_event_sub_key parameter + # event-name is the name of the consumer_event_subkey parameter # this event route is executed if we can't find the previous ... }

1 0

git:5.3:06b81521: sms: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 06b81521c9b0c8f9d510e15dfb55e1f61d9b0c0f URL: https://github.com/kamailio/kamailio/commit/06b81521c9b0c8f9d510e15dfb55e1f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 sms: docs fix parameter name (cherry picked from commit e9d4ab30419460175fe76b82c58b26768ea4ef57) --- Modified: src/modules/sms/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/06b81521c9b0c8f9d510e15dfb55e1f… Patch: https://github.com/kamailio/kamailio/commit/06b81521c9b0c8f9d510e15dfb55e1f… --- diff --git a/src/modules/sms/doc/params.xml b/src/modules/sms/doc/params.xml index 242d4513f0..509238a4af 100644 --- a/src/modules/sms/doc/params.xml +++ b/src/modules/sms/doc/params.xml @@ -218,8 +218,8 @@ modparam("sms", "max_sms_parts", 10) </example> </section> - <section id="domain_str"> - <title><varname>domain_str</varname> (string)</title> + <section id="domain"> + <title><varname>domain</varname> (string)</title> <para> Specify a fake domain name to be used by the gateway. The Contact headers and the From header from request will be construct based on @@ -231,10 +231,10 @@ modparam("sms", "max_sms_parts", 10) Default is the name of the machine the gateway is running on. </para> <example> - <title>Set <varname>domain_str</varname> parameter</title> + <title>Set <varname>domain</varname> parameter</title> <programlisting> ... -modparam("sms", "domain_str", "foo.bar") +modparam("sms", "domain", "foo.bar") ... </programlisting> </example>

1 0

git:5.3:589229e4: msilo: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 589229e49ee0365ae53c7dbb91fde7896c6cb85a URL: https://github.com/kamailio/kamailio/commit/589229e49ee0365ae53c7dbb91fde78… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 msilo: docs add missing parameter (cherry picked from commit 34263c603a0b08625c3769a0c5f91012c4a4618f) --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/589229e49ee0365ae53c7dbb91fde78… Patch: https://github.com/kamailio/kamailio/commit/589229e49ee0365ae53c7dbb91fde78… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 885368ea36..3563e2a87a 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -807,3 +807,18 @@ m_dump("$fu"); </section> </chapter> +</programlisting> + </example> + </section> + <section id="msilo.p.sc_stored_hdrs"> + <title><varname>sc_stored_hdrs</varname> (string)</title> + <para> + The name of the column in silo table, storing the extra headers. + </para> + <para>Default value is <quote>extra_hdrs</quote>.</para> + <example> + <title>Set the <quote>sc_stored_hdrs</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "sc_stored_hdrs", "extra_headers") +...

1 0

git:5.3:dbb27612: xmpp: docs fixes
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: dbb276127cfb7ba2872450b817a6ac5f21a51fca URL: https://github.com/kamailio/kamailio/commit/dbb276127cfb7ba2872450b817a6ac5… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 xmpp: docs fixes (cherry picked from commit bba1b9a10d76d8380f3d27dd0120ae902586e481) --- Modified: src/modules/xmpp/doc/xmpp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dbb276127cfb7ba2872450b817a6ac5… Patch: https://github.com/kamailio/kamailio/commit/dbb276127cfb7ba2872450b817a6ac5… --- diff --git a/src/modules/xmpp/doc/xmpp_admin.xml b/src/modules/xmpp/doc/xmpp_admin.xml index 1ad36406a7..ab201c5a84 100644 --- a/src/modules/xmpp/doc/xmpp_admin.xml +++ b/src/modules/xmpp/doc/xmpp_admin.xml @@ -182,7 +182,7 @@ <section> <title>Parameters</title> <section> - <title><varname>backend(string)</varname></title> + <title><varname>backend</varname> (string)</title> <para> The mode you are using the module; it can be either "component" or "server". </para>

1 0

git:5.3:e079ded0: xcap_server: docs fixes
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: e079ded0295045108c7e65e7bd48d3f98e657742 URL: https://github.com/kamailio/kamailio/commit/e079ded0295045108c7e65e7bd48d3f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 xcap_server: docs fixes (cherry picked from commit 64f34d9315d24d9e919ec32c56fca2927e3845c3) --- Modified: src/modules/xcap_server/doc/xcap_server_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e079ded0295045108c7e65e7bd48d3f… Patch: https://github.com/kamailio/kamailio/commit/e079ded0295045108c7e65e7bd48d3f… --- diff --git a/src/modules/xcap_server/doc/xcap_server_admin.xml b/src/modules/xcap_server/doc/xcap_server_admin.xml index a90c531b3f..9e0d1d9df9 100644 --- a/src/modules/xcap_server/doc/xcap_server_admin.xml +++ b/src/modules/xcap_server/doc/xcap_server_admin.xml @@ -163,7 +163,7 @@ modparam("xcap_server", "xcap_table", "xcapdocs") </emphasis> </para> <example> - <title>Set <varname>url_match</varname> parameter</title> + <title>Set <varname>xcap_root</varname> parameter</title> <programlisting format="linespecific"> ... modparam("xcap_server", "xcap_root", "/xcap-root/") @@ -215,7 +215,7 @@ modparam("xcap_server", "xml_ns", </example> </section> <section id="xcap_server.p.directory_scheme"> - <title><varname>directory_scheme (int)</varname></title> + <title><varname>directory_scheme</varname> (int)</title> <para> Allows the scheme used in org.openmobilealliance.xcap-directory listings to be @@ -253,7 +253,7 @@ modparam("xcap_server", "directory_scheme", 0) </example> </section> <section id="xcap_server.p.directory_hostname"> - <title><varname>directory_hostname (str)</varname></title> + <title><varname>directory_hostname</varname> (string)</title> <para> Allows the hostname (and port) used in org.openmobilealliance.xcap-directory listings to be

1 0

git:5.3:7dac0db3: tmx: docs fix varname tag around parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 7dac0db379e3f68f14bbc53284b4f66547cdca6f URL: https://github.com/kamailio/kamailio/commit/7dac0db379e3f68f14bbc53284b4f66… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 tmx: docs fix varname tag around parameter (cherry picked from commit 404c46f358340df2dc4a91c7f83036ea26d05375) --- Modified: src/modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7dac0db379e3f68f14bbc53284b4f66… Patch: https://github.com/kamailio/kamailio/commit/7dac0db379e3f68f14bbc53284b4f66… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index e6646ecdb7..69a18fd85f 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -59,9 +59,7 @@ <section> <title>Parameters</title> <section id="tmx.p.precheck_trans"> - <title> - <function moreinfo="none">precheck_trans</function> - </title> + <title><varname>precheck_trans</varname> (int)</title> <para> Enable/disable transaction pre-check via t_precheck_trans() function. If set to 0, the internal structures are not created @@ -71,7 +69,7 @@ Default value is <emphasis>1</emphasis> (enabled). </para> <example> - <title><function>precheck_trans</function> usage</title> + <title><varname>precheck_trans</varname> (int)</title> <programlisting format="linespecific"> ... modparam("tmx", "precheck_trans", 0)

1 0

git:5.3:2834c24d: rls: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 2834c24d86deac00c866ce1e6cd5c7de7e597525 URL: https://github.com/kamailio/kamailio/commit/2834c24d86deac00c866ce1e6cd5c7d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 rls: docs add missing parameter (cherry picked from commit 2ba86a27a9f7d32eace52815161c0a8b9e48878a) --- Modified: src/modules/rls/doc/rls_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2834c24d86deac00c866ce1e6cd5c7d… Patch: https://github.com/kamailio/kamailio/commit/2834c24d86deac00c866ce1e6cd5c7d… --- diff --git a/src/modules/rls/doc/rls_admin.xml b/src/modules/rls/doc/rls_admin.xml index ab3b2d1664..8a1c03963a 100644 --- a/src/modules/rls/doc/rls_admin.xml +++ b/src/modules/rls/doc/rls_admin.xml @@ -566,6 +566,25 @@ modparam("rls", "max_notify_body_length", 32000) </programlisting> </example> </section> + <section id="rls.p.reload_db_subs"> + <title><varname>reload_db_subs</varname> (integer)</title> + <para> + Reload subscriptions on module initialization (requires db_mode 0 (memory only mode)). + </para> + <para> + <emphasis> + Default value is 0 (do not load rows from db). + </emphasis> + </para> + <example> + <title>Set <varname>reload_db_subs</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rls", "reload_db_subs", 1) +... +</programlisting> + </example> + </section> <section id="rls.p.fetch_rows"> <title><varname>fetch_rows</varname> (integer)</title> <para>

1 0

git:5.3:61c0ffdf: presence_xml: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 61c0ffdf4cc1e769f757315e9281420452a45203 URL: https://github.com/kamailio/kamailio/commit/61c0ffdf4cc1e769f757315e9281420… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 presence_xml: docs add missing parameter (cherry picked from commit 3bbb27de30080a9fedaffcba04575dddb690caad) --- Modified: src/modules/presence_xml/doc/presence_xml_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/61c0ffdf4cc1e769f757315e9281420… Patch: https://github.com/kamailio/kamailio/commit/61c0ffdf4cc1e769f757315e9281420… --- diff --git a/src/modules/presence_xml/doc/presence_xml_admin.xml b/src/modules/presence_xml/doc/presence_xml_admin.xml index d2c33d9c00..162b78e1a4 100644 --- a/src/modules/presence_xml/doc/presence_xml_admin.xml +++ b/src/modules/presence_xml/doc/presence_xml_admin.xml @@ -190,6 +190,25 @@ modparam("presence_xml", "disable_bla", 1) </example> </section> + <section id="presence_xml.p.disable_xcapdiff"> + <title><varname>disable_xcapdiff</varname>(int)</title> + <para> + Set this parameter to disable the handling of the "xcap-diff" event. + </para> + <para> + <emphasis>Default value: <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>disable_xcapdiff</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "disable_xcapdiff", 1) +... +</programlisting> + </example> + </section> + <section id="presence_xml.p.force_active"> <title><varname>force_active</varname> (int)</title> <para>

1 0

git:5.3:acdf1d2d: ldap: docs add varname tag around parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: acdf1d2d4ecacd44ed44814781ca95868db41c12 URL: https://github.com/kamailio/kamailio/commit/acdf1d2d4ecacd44ed44814781ca958… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 ldap: docs add varname tag around parameter (cherry picked from commit 4b2970b5b8addbb6cb325e35060714aa1e8811b2) --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/acdf1d2d4ecacd44ed44814781ca958… Patch: https://github.com/kamailio/kamailio/commit/acdf1d2d4ecacd44ed44814781ca958… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 214582489f..0e3f146ef7 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -440,7 +440,7 @@ ldap_client_bind_timeout = 500 <title>Parameters</title> <section> - <title>config_file (string)</title> + <title><varname>config_file</varname> (string)</title> <para>Full path to LDAP configuration file.</para>

1 0

git:5.3:27efa5e7: lcr: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 27efa5e7591e2b521d56af0cbb5cfd75e3a4ee79 URL: https://github.com/kamailio/kamailio/commit/27efa5e7591e2b521d56af0cbb5cfd7… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 lcr: docs fix parameter name (cherry picked from commit 10f7ff344f546cc1816d5e6882313ba57540387b) --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/27efa5e7591e2b521d56af0cbb5cfd7… Patch: https://github.com/kamailio/kamailio/commit/27efa5e7591e2b521d56af0cbb5cfd7… --- diff --git a/src/modules/lcr/doc/lcr_admin.xml b/src/modules/lcr/doc/lcr_admin.xml index 47bed3ee9f..69574b38a3 100644 --- a/src/modules/lcr/doc/lcr_admin.xml +++ b/src/modules/lcr/doc/lcr_admin.xml @@ -203,7 +203,7 @@ modparam("lcr","db_url","&exampledb;") </emphasis> </para> <example> - <title>Setting <varname>gw_table</varname> module parameter</title> + <title>Setting <varname>lcr_gw_table</varname> module parameter</title> <programlisting format="linespecific"> ... modparam("lcr", "lcr_gw_table","gw")

1 0

git:5.3:c395d4bd: dnssec: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: c395d4bd9bb8cb9a80deabcf0806300ac0d5c769 URL: https://github.com/kamailio/kamailio/commit/c395d4bd9bb8cb9a80deabcf0806300… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 dnssec: docs fix parameter name (cherry picked from commit 6b5689f4079aacf348e60bd7e72560b4fe98d9dd) --- Modified: src/modules/dnssec/doc/dnssec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c395d4bd9bb8cb9a80deabcf0806300… Patch: https://github.com/kamailio/kamailio/commit/c395d4bd9bb8cb9a80deabcf0806300… --- diff --git a/src/modules/dnssec/doc/dnssec_admin.xml b/src/modules/dnssec/doc/dnssec_admin.xml index 9070c890a3..ee7ddd1ab1 100644 --- a/src/modules/dnssec/doc/dnssec_admin.xml +++ b/src/modules/dnssec/doc/dnssec_admin.xml @@ -114,7 +114,7 @@ <para><emphasis> Default value is 0(no changes)</emphasis></para> <example> - <title>Set <varname>enable_full_lr</varname> parameter</title> + <title>Set <varname>general_query_flags</varname> parameter</title> <programlisting format="linespecific"> ...

1 0

git:5.3:1f76b0d7: htable: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 1f76b0d7d4923c95cac9cf8fd40f2e368d564e29 URL: https://github.com/kamailio/kamailio/commit/1f76b0d7d4923c95cac9cf8fd40f2e3… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 htable: docs fix parameter name (cherry picked from commit 65cb844fe0b180e0feeba641fa4d16ab3cb9c375) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1f76b0d7d4923c95cac9cf8fd40f2e3… Patch: https://github.com/kamailio/kamailio/commit/1f76b0d7d4923c95cac9cf8fd40f2e3… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 154f1f0c5a..17391626a1 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -414,7 +414,7 @@ $ kamcmd htable.dump htable </emphasis> </para> <example> - <title>Set <varname>hash_size</varname> parameter</title> + <title>Set <varname>htable</varname> parameter</title> <programlisting format="linespecific"> ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;")

1 0

git:5.3:4d7159e9: dmq_usrloc: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 4d7159e9e289bbbcfcbee1d4b585ca636757aa7f URL: https://github.com/kamailio/kamailio/commit/4d7159e9e289bbbcfcbee1d4b585ca6… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 dmq_usrloc: docs fix parameter name (cherry picked from commit 2771b041d47339b76271d4115bd68ffa7514aa25) --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d7159e9e289bbbcfcbee1d4b585ca6… Patch: https://github.com/kamailio/kamailio/commit/4d7159e9e289bbbcfcbee1d4b585ca6… --- diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index 7379c3724c..3a5584806f 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -134,7 +134,7 @@ modparam("dmq_usrloc", "sync", 0) </emphasis> </para> <example> - <title>Set <varname>batch size</varname> parameter</title> + <title>Set <varname>batch_size</varname> parameter</title> <programlisting format="linespecific"> ... modparam("dmq_usrloc", "batch_size", 4000)

1 0

git:5.3:1e3ff720: dispatcher: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 1e3ff7201510834a3bd1c44667365504d975211e URL: https://github.com/kamailio/kamailio/commit/1e3ff7201510834a3bd1c4466736550… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 dispatcher: docs add missing parameter (cherry picked from commit 4b84dd2e9387efcdab7e501b66a64a72b233a9c4) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e3ff7201510834a3bd1c4466736550… Patch: https://github.com/kamailio/kamailio/commit/1e3ff7201510834a3bd1c4466736550… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 8e6c5072c8..f4d307e667 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -221,6 +221,27 @@ modparam("dispatcher", "priority_col", "dstpriority") </example> </section> + <section id="dispatcher.p.attrs_col"> + <title><varname>attrs_col</varname> (string)</title> + <para> + The column's name in the database storing the attributes for + destination URI. + </para> + <para> + <emphasis> + Default value is <quote>attrs</quote>. + </emphasis> + </para> + <example> + <title>Set <quote>attrs_col</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "attrs_col", "dstattrs") +... +</programlisting> + </example> + </section> + <section id="dispatcher.p.force_dst"> <title><varname>force_dst</varname> (int)</title> <para>

1 0

git:5.3:12319717: cdp: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 12319717a1cd3f42aece39012d5e83dec4cde41a URL: https://github.com/kamailio/kamailio/commit/12319717a1cd3f42aece39012d5e83d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:22:54+01:00 cdp: docs add missing parameter (cherry picked from commit 8668d43ccc814867be9716a548c9d3a4cbf0f3d9) --- Modified: src/modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/12319717a1cd3f42aece39012d5e83d… Patch: https://github.com/kamailio/kamailio/commit/12319717a1cd3f42aece39012d5e83d… --- diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index aaa229767c..698e3e3c04 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -127,7 +127,24 @@ modparam("cdp", "latency_threshold", 1000) </example> </section> <section> - <title>workerq_length_threshold_percentage (int)</title> + <title><varname>workerq_latency_threshold</varname> (int)</title> + + <para>The time in ms above which a log error is written to log file for + putting tasks into task queue.</para> + + <para><emphasis> Default value is <quote>100</quote>. </emphasis></para> + + <example> + <title>Set <varname>workerq_latency_threshold</varname> parameter</title> + + <programlisting format="linespecific">... +modparam("cdp", "workerq_latency_threshold", 250) +... + </programlisting> + </example> + </section> + <section> + <title><varname>workerq_length_threshold_percentage</varname> (int)</title> <para>The threshold of the length of the worker queue as a percentage of the maximum queue size - when exceeded a warning is written to the log

1 0

git:5.2:4b2bbaa4: cdp: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 4b2bbaa4b75545de75877c24bb101bfad5bc53dc URL: https://github.com/kamailio/kamailio/commit/4b2bbaa4b75545de75877c24bb101bf… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:21:12+01:00 cdp: docs add missing parameter (cherry picked from commit 8668d43ccc814867be9716a548c9d3a4cbf0f3d9) --- Modified: src/modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b2bbaa4b75545de75877c24bb101bf… Patch: https://github.com/kamailio/kamailio/commit/4b2bbaa4b75545de75877c24bb101bf… --- diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index aaa229767c..698e3e3c04 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -127,7 +127,24 @@ modparam("cdp", "latency_threshold", 1000) </example> </section> <section> - <title>workerq_length_threshold_percentage (int)</title> + <title><varname>workerq_latency_threshold</varname> (int)</title> + + <para>The time in ms above which a log error is written to log file for + putting tasks into task queue.</para> + + <para><emphasis> Default value is <quote>100</quote>. </emphasis></para> + + <example> + <title>Set <varname>workerq_latency_threshold</varname> parameter</title> + + <programlisting format="linespecific">... +modparam("cdp", "workerq_latency_threshold", 250) +... + </programlisting> + </example> + </section> + <section> + <title><varname>workerq_length_threshold_percentage</varname> (int)</title> <para>The threshold of the length of the worker queue as a percentage of the maximum queue size - when exceeded a warning is written to the log

1 0

git:5.2:77e51115: sms: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 77e51115dedc16d81c4239b7dcb2c99fb42cd785 URL: https://github.com/kamailio/kamailio/commit/77e51115dedc16d81c4239b7dcb2c99… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 sms: docs fix parameter name (cherry picked from commit e9d4ab30419460175fe76b82c58b26768ea4ef57) --- Modified: src/modules/sms/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/77e51115dedc16d81c4239b7dcb2c99… Patch: https://github.com/kamailio/kamailio/commit/77e51115dedc16d81c4239b7dcb2c99… --- diff --git a/src/modules/sms/doc/params.xml b/src/modules/sms/doc/params.xml index 242d4513f0..509238a4af 100644 --- a/src/modules/sms/doc/params.xml +++ b/src/modules/sms/doc/params.xml @@ -218,8 +218,8 @@ modparam("sms", "max_sms_parts", 10) </example> </section> - <section id="domain_str"> - <title><varname>domain_str</varname> (string)</title> + <section id="domain"> + <title><varname>domain</varname> (string)</title> <para> Specify a fake domain name to be used by the gateway. The Contact headers and the From header from request will be construct based on @@ -231,10 +231,10 @@ modparam("sms", "max_sms_parts", 10) Default is the name of the machine the gateway is running on. </para> <example> - <title>Set <varname>domain_str</varname> parameter</title> + <title>Set <varname>domain</varname> parameter</title> <programlisting> ... -modparam("sms", "domain_str", "foo.bar") +modparam("sms", "domain", "foo.bar") ... </programlisting> </example>

1 0

git:5.2:7a394732: nsq: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 7a394732892eb823a5f0440cdc2de2115565c113 URL: https://github.com/kamailio/kamailio/commit/7a394732892eb823a5f0440cdc2de21… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 nsq: docs fix parameter name (cherry picked from commit e907b53374ead5ec03a01f8a04ff69e70bd0356c) --- Modified: src/modules/nsq/doc/nsq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7a394732892eb823a5f0440cdc2de21… Patch: https://github.com/kamailio/kamailio/commit/7a394732892eb823a5f0440cdc2de21… --- diff --git a/src/modules/nsq/doc/nsq_admin.xml b/src/modules/nsq/doc/nsq_admin.xml index 4f31746518..a5fa007921 100644 --- a/src/modules/nsq/doc/nsq_admin.xml +++ b/src/modules/nsq/doc/nsq_admin.xml @@ -260,7 +260,7 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name") </section> <section> - <title><varname>consumer_event_sub_key</varname>(str)</title> + <title><varname>consumer_event_subkey</varname>(str)</title> <para> The default name of the field in json payload to compose the event name 2nd part </para> @@ -271,10 +271,10 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name") <emphasis>Default value is <quote>Event-Name</quote>.</emphasis> </para> <example> - <title>Set <varname>consumer_event_sub_key</varname> parameter</title> + <title>Set <varname>consumer_event_subkey</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nsq", "consumer_event_sub_key", "My-JSON-SubField-Name") +modparam("nsq", "consumer_event_subkey", "My-JSON-SubField-Name") ... </programlisting> </example> @@ -384,7 +384,7 @@ modparam("nsq", "topic_channel", "My-NSQ-Topic-2:My-NSQ-Channel-2") <programlisting format="linespecific"> ... modparam("nsq", "consumer_event_key", "Event-Category") -modparam("nsq", "consumer_event_sub_key", "Event-Name") +modparam("nsq", "consumer_event_subkey", "Event-Name") ... event_route[nsq:consumer-event-presence-update] @@ -408,7 +408,7 @@ event_route[nsq:consumer-event-presence] event_route[nsq:consumer-event-event-category-event-name] { # event-category is the name of the consumer_event_key parameter - # event-name is the name of the consumer_event_sub_key parameter + # event-name is the name of the consumer_event_subkey parameter # this event route is executed if we can't find the previous ... }

1 0

git:5.2:4dd1ec76: msilo: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 4dd1ec7687223623d47a45f1fdaba60ccc4d9c2c URL: https://github.com/kamailio/kamailio/commit/4dd1ec7687223623d47a45f1fdaba60… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 msilo: docs add missing parameter (cherry picked from commit 34263c603a0b08625c3769a0c5f91012c4a4618f) --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4dd1ec7687223623d47a45f1fdaba60… Patch: https://github.com/kamailio/kamailio/commit/4dd1ec7687223623d47a45f1fdaba60… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 885368ea36..3563e2a87a 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -807,3 +807,18 @@ m_dump("$fu"); </section> </chapter> +</programlisting> + </example> + </section> + <section id="msilo.p.sc_stored_hdrs"> + <title><varname>sc_stored_hdrs</varname> (string)</title> + <para> + The name of the column in silo table, storing the extra headers. + </para> + <para>Default value is <quote>extra_hdrs</quote>.</para> + <example> + <title>Set the <quote>sc_stored_hdrs</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "sc_stored_hdrs", "extra_headers") +...

1 0

git:5.2:15adae7c: xmpp: docs fixes
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 15adae7c20dce82284cc296439314b8890455b37 URL: https://github.com/kamailio/kamailio/commit/15adae7c20dce82284cc296439314b8… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 xmpp: docs fixes (cherry picked from commit bba1b9a10d76d8380f3d27dd0120ae902586e481) --- Modified: src/modules/xmpp/doc/xmpp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/15adae7c20dce82284cc296439314b8… Patch: https://github.com/kamailio/kamailio/commit/15adae7c20dce82284cc296439314b8… --- diff --git a/src/modules/xmpp/doc/xmpp_admin.xml b/src/modules/xmpp/doc/xmpp_admin.xml index 1ad36406a7..ab201c5a84 100644 --- a/src/modules/xmpp/doc/xmpp_admin.xml +++ b/src/modules/xmpp/doc/xmpp_admin.xml @@ -182,7 +182,7 @@ <section> <title>Parameters</title> <section> - <title><varname>backend(string)</varname></title> + <title><varname>backend</varname> (string)</title> <para> The mode you are using the module; it can be either "component" or "server". </para>

1 0

git:5.2:094f4882: xcap_server: docs fixes
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 094f4882f7302c5defc474f358b00a00e768412b URL: https://github.com/kamailio/kamailio/commit/094f4882f7302c5defc474f358b00a0… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 xcap_server: docs fixes (cherry picked from commit 64f34d9315d24d9e919ec32c56fca2927e3845c3) --- Modified: src/modules/xcap_server/doc/xcap_server_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/094f4882f7302c5defc474f358b00a0… Patch: https://github.com/kamailio/kamailio/commit/094f4882f7302c5defc474f358b00a0… --- diff --git a/src/modules/xcap_server/doc/xcap_server_admin.xml b/src/modules/xcap_server/doc/xcap_server_admin.xml index a90c531b3f..9e0d1d9df9 100644 --- a/src/modules/xcap_server/doc/xcap_server_admin.xml +++ b/src/modules/xcap_server/doc/xcap_server_admin.xml @@ -163,7 +163,7 @@ modparam("xcap_server", "xcap_table", "xcapdocs") </emphasis> </para> <example> - <title>Set <varname>url_match</varname> parameter</title> + <title>Set <varname>xcap_root</varname> parameter</title> <programlisting format="linespecific"> ... modparam("xcap_server", "xcap_root", "/xcap-root/") @@ -215,7 +215,7 @@ modparam("xcap_server", "xml_ns", </example> </section> <section id="xcap_server.p.directory_scheme"> - <title><varname>directory_scheme (int)</varname></title> + <title><varname>directory_scheme</varname> (int)</title> <para> Allows the scheme used in org.openmobilealliance.xcap-directory listings to be @@ -253,7 +253,7 @@ modparam("xcap_server", "directory_scheme", 0) </example> </section> <section id="xcap_server.p.directory_hostname"> - <title><varname>directory_hostname (str)</varname></title> + <title><varname>directory_hostname</varname> (string)</title> <para> Allows the hostname (and port) used in org.openmobilealliance.xcap-directory listings to be

1 0

git:5.2:cfe83ecc: tmx: docs fix varname tag around parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: cfe83ecc1cfaf8a9ecf85d1d1132d50bb5ba2f9f URL: https://github.com/kamailio/kamailio/commit/cfe83ecc1cfaf8a9ecf85d1d1132d50… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 tmx: docs fix varname tag around parameter (cherry picked from commit 404c46f358340df2dc4a91c7f83036ea26d05375) --- Modified: src/modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cfe83ecc1cfaf8a9ecf85d1d1132d50… Patch: https://github.com/kamailio/kamailio/commit/cfe83ecc1cfaf8a9ecf85d1d1132d50… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index 19c808c931..ccfb0f7be8 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -59,9 +59,7 @@ <section> <title>Parameters</title> <section id="tmx.p.precheck_trans"> - <title> - <function moreinfo="none">precheck_trans</function> - </title> + <title><varname>precheck_trans</varname> (int)</title> <para> Enable/disable transaction pre-check via t_precheck_trans() function. If set to 0, the internal structures are not created @@ -71,7 +69,7 @@ Default value is <emphasis>1</emphasis> (enabled). </para> <example> - <title><function>precheck_trans</function> usage</title> + <title><varname>precheck_trans</varname> (int)</title> <programlisting format="linespecific"> ... modparam("tmx", "precheck_trans", 0)

1 0

git:5.2:0c440584: rls: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 0c4405845d1d0ba5f73e0ce76d9cf905bfa27de6 URL: https://github.com/kamailio/kamailio/commit/0c4405845d1d0ba5f73e0ce76d9cf90… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 rls: docs add missing parameter (cherry picked from commit 2ba86a27a9f7d32eace52815161c0a8b9e48878a) --- Modified: src/modules/rls/doc/rls_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0c4405845d1d0ba5f73e0ce76d9cf90… Patch: https://github.com/kamailio/kamailio/commit/0c4405845d1d0ba5f73e0ce76d9cf90… --- diff --git a/src/modules/rls/doc/rls_admin.xml b/src/modules/rls/doc/rls_admin.xml index 69d898d226..7f62fd676a 100644 --- a/src/modules/rls/doc/rls_admin.xml +++ b/src/modules/rls/doc/rls_admin.xml @@ -566,6 +566,25 @@ modparam("rls", "max_notify_body_length", 32000) </programlisting> </example> </section> + <section id="rls.p.reload_db_subs"> + <title><varname>reload_db_subs</varname> (integer)</title> + <para> + Reload subscriptions on module initialization (requires db_mode 0 (memory only mode)). + </para> + <para> + <emphasis> + Default value is 0 (do not load rows from db). + </emphasis> + </para> + <example> + <title>Set <varname>reload_db_subs</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rls", "reload_db_subs", 1) +... +</programlisting> + </example> + </section> <section id="rls.p.fetch_rows"> <title><varname>fetch_rows</varname> (integer)</title> <para>

1 0

git:5.2:64403a02: presence_xml: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 64403a02d331c04f502a351792cb96668e6e6dde URL: https://github.com/kamailio/kamailio/commit/64403a02d331c04f502a351792cb966… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 presence_xml: docs add missing parameter (cherry picked from commit 3bbb27de30080a9fedaffcba04575dddb690caad) --- Modified: src/modules/presence_xml/doc/presence_xml_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64403a02d331c04f502a351792cb966… Patch: https://github.com/kamailio/kamailio/commit/64403a02d331c04f502a351792cb966… --- diff --git a/src/modules/presence_xml/doc/presence_xml_admin.xml b/src/modules/presence_xml/doc/presence_xml_admin.xml index d2c33d9c00..162b78e1a4 100644 --- a/src/modules/presence_xml/doc/presence_xml_admin.xml +++ b/src/modules/presence_xml/doc/presence_xml_admin.xml @@ -190,6 +190,25 @@ modparam("presence_xml", "disable_bla", 1) </example> </section> + <section id="presence_xml.p.disable_xcapdiff"> + <title><varname>disable_xcapdiff</varname>(int)</title> + <para> + Set this parameter to disable the handling of the "xcap-diff" event. + </para> + <para> + <emphasis>Default value: <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>disable_xcapdiff</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "disable_xcapdiff", 1) +... +</programlisting> + </example> + </section> + <section id="presence_xml.p.force_active"> <title><varname>force_active</varname> (int)</title> <para>

1 0

git:5.2:11684c46: ldap: docs add varname tag around parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 11684c46b9fde7b844b5b3a823d359a096e573b3 URL: https://github.com/kamailio/kamailio/commit/11684c46b9fde7b844b5b3a823d359a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 ldap: docs add varname tag around parameter (cherry picked from commit 4b2970b5b8addbb6cb325e35060714aa1e8811b2) --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/11684c46b9fde7b844b5b3a823d359a… Patch: https://github.com/kamailio/kamailio/commit/11684c46b9fde7b844b5b3a823d359a… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 214582489f..0e3f146ef7 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -440,7 +440,7 @@ ldap_client_bind_timeout = 500 <title>Parameters</title> <section> - <title>config_file (string)</title> + <title><varname>config_file</varname> (string)</title> <para>Full path to LDAP configuration file.</para>

1 0

git:5.2:a235e5f7: lcr: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: a235e5f74ed9208b86832ab4e63ed3ab005f15e6 URL: https://github.com/kamailio/kamailio/commit/a235e5f74ed9208b86832ab4e63ed3a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 lcr: docs fix parameter name (cherry picked from commit 10f7ff344f546cc1816d5e6882313ba57540387b) --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a235e5f74ed9208b86832ab4e63ed3a… Patch: https://github.com/kamailio/kamailio/commit/a235e5f74ed9208b86832ab4e63ed3a… --- diff --git a/src/modules/lcr/doc/lcr_admin.xml b/src/modules/lcr/doc/lcr_admin.xml index e0e8755322..79449a7163 100644 --- a/src/modules/lcr/doc/lcr_admin.xml +++ b/src/modules/lcr/doc/lcr_admin.xml @@ -203,7 +203,7 @@ modparam("lcr","db_url","&exampledb;") </emphasis> </para> <example> - <title>Setting <varname>gw_table</varname> module parameter</title> + <title>Setting <varname>lcr_gw_table</varname> module parameter</title> <programlisting format="linespecific"> ... modparam("lcr", "lcr_gw_table","gw")

1 0

git:5.2:7ccc31ab: htable: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 7ccc31abd5be55f64924f04e726896f0485871f8 URL: https://github.com/kamailio/kamailio/commit/7ccc31abd5be55f64924f04e726896f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 htable: docs fix parameter name (cherry picked from commit 65cb844fe0b180e0feeba641fa4d16ab3cb9c375) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7ccc31abd5be55f64924f04e726896f… Patch: https://github.com/kamailio/kamailio/commit/7ccc31abd5be55f64924f04e726896f… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index f446b84888..9fee52dea6 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -414,7 +414,7 @@ $ kamcmd htable.dump htable </emphasis> </para> <example> - <title>Set <varname>hash_size</varname> parameter</title> + <title>Set <varname>htable</varname> parameter</title> <programlisting format="linespecific"> ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;")

1 0

git:5.2:327fc7ad: dnssec: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 327fc7adb5ae69a21974e799109011a206521cc6 URL: https://github.com/kamailio/kamailio/commit/327fc7adb5ae69a21974e799109011a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 dnssec: docs fix parameter name (cherry picked from commit 6b5689f4079aacf348e60bd7e72560b4fe98d9dd) --- Modified: src/modules/dnssec/doc/dnssec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/327fc7adb5ae69a21974e799109011a… Patch: https://github.com/kamailio/kamailio/commit/327fc7adb5ae69a21974e799109011a… --- diff --git a/src/modules/dnssec/doc/dnssec_admin.xml b/src/modules/dnssec/doc/dnssec_admin.xml index 9070c890a3..ee7ddd1ab1 100644 --- a/src/modules/dnssec/doc/dnssec_admin.xml +++ b/src/modules/dnssec/doc/dnssec_admin.xml @@ -114,7 +114,7 @@ <para><emphasis> Default value is 0(no changes)</emphasis></para> <example> - <title>Set <varname>enable_full_lr</varname> parameter</title> + <title>Set <varname>general_query_flags</varname> parameter</title> <programlisting format="linespecific"> ...

1 0

git:5.2:047e0914: dmq_usrloc: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: 047e09144604962965eade47016a3b98d478e311 URL: https://github.com/kamailio/kamailio/commit/047e09144604962965eade47016a3b9… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 dmq_usrloc: docs fix parameter name (cherry picked from commit 2771b041d47339b76271d4115bd68ffa7514aa25) --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/047e09144604962965eade47016a3b9… Patch: https://github.com/kamailio/kamailio/commit/047e09144604962965eade47016a3b9… --- diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index 7379c3724c..3a5584806f 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -134,7 +134,7 @@ modparam("dmq_usrloc", "sync", 0) </emphasis> </para> <example> - <title>Set <varname>batch size</varname> parameter</title> + <title>Set <varname>batch_size</varname> parameter</title> <programlisting format="linespecific"> ... modparam("dmq_usrloc", "batch_size", 4000)

1 0

git:5.2:d09c07ae: dispatcher: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.2 Commit: d09c07ae5ae7d26da06e49ed26146d488b8319b2 URL: https://github.com/kamailio/kamailio/commit/d09c07ae5ae7d26da06e49ed26146d4… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:20:08+01:00 dispatcher: docs add missing parameter (cherry picked from commit 4b84dd2e9387efcdab7e501b66a64a72b233a9c4) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d09c07ae5ae7d26da06e49ed26146d4… Patch: https://github.com/kamailio/kamailio/commit/d09c07ae5ae7d26da06e49ed26146d4… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index ed8b1808ad..dbf12c9af5 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -221,6 +221,27 @@ modparam("dispatcher", "priority_col", "dstpriority") </example> </section> + <section id="dispatcher.p.attrs_col"> + <title><varname>attrs_col</varname> (string)</title> + <para> + The column's name in the database storing the attributes for + destination URI. + </para> + <para> + <emphasis> + Default value is <quote>attrs</quote>. + </emphasis> + </para> + <example> + <title>Set <quote>attrs_col</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "attrs_col", "dstattrs") +... +</programlisting> + </example> + </section> + <section id="dispatcher.p.force_dst"> <title><varname>force_dst</varname> (int)</title> <para>

1 0

[kamailio/kamailio] Doc fixes (#2252)
by Bastian Triller 14 Mar '20

14 Mar '20

#### 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/2252 -- Commit Summary -- * cdp: docs add missing parameter * dispatcher: docs add missing parameter * dmq_usrloc: docs fix parameter name * dnssec: docs fix parameter name * htable: docs fix parameter name * lcr: docs fix parameter name * ldap: docs add varname tag around parameter * presence_xml: docs add missing parameter * rls: docs add missing parameter * tmx: docs fix varname tag around parameter * xcap_server: docs fixes * xmpp: docs fixes * msilo: docs add missing parameter * sms: docs fix parameter name * nsq: docs fix parameter name -- File Changes -- M src/modules/cdp/doc/cdp_admin.xml (19) M src/modules/dispatcher/doc/dispatcher_admin.xml (21) M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (2) M src/modules/dnssec/doc/dnssec_admin.xml (2) M src/modules/htable/doc/htable_admin.xml (2) M src/modules/lcr/doc/lcr_admin.xml (2) M src/modules/ldap/doc/ldap_admin.xml (2) M src/modules/msilo/doc/msilo_admin.xml (15) M src/modules/nsq/doc/nsq_admin.xml (10) M src/modules/presence_xml/doc/presence_xml_admin.xml (19) M src/modules/rls/doc/rls_admin.xml (19) M src/modules/sms/doc/params.xml (8) M src/modules/tmx/doc/tmx_admin.xml (6) M src/modules/xcap_server/doc/xcap_server_admin.xml (6) M src/modules/xmpp/doc/xmpp_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2252.patch https://github.com/kamailio/kamailio/pull/2252.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/2252

2 2

git:master:e907b533: nsq: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: e907b53374ead5ec03a01f8a04ff69e70bd0356c URL: https://github.com/kamailio/kamailio/commit/e907b53374ead5ec03a01f8a04ff69e… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 nsq: docs fix parameter name --- Modified: src/modules/nsq/doc/nsq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e907b53374ead5ec03a01f8a04ff69e… Patch: https://github.com/kamailio/kamailio/commit/e907b53374ead5ec03a01f8a04ff69e… --- diff --git a/src/modules/nsq/doc/nsq_admin.xml b/src/modules/nsq/doc/nsq_admin.xml index 4f31746518..a5fa007921 100644 --- a/src/modules/nsq/doc/nsq_admin.xml +++ b/src/modules/nsq/doc/nsq_admin.xml @@ -260,7 +260,7 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name") </section> <section> - <title><varname>consumer_event_sub_key</varname>(str)</title> + <title><varname>consumer_event_subkey</varname>(str)</title> <para> The default name of the field in json payload to compose the event name 2nd part </para> @@ -271,10 +271,10 @@ modparam("nsq", "consumer_event_key", "My-JSON-Field-Name") <emphasis>Default value is <quote>Event-Name</quote>.</emphasis> </para> <example> - <title>Set <varname>consumer_event_sub_key</varname> parameter</title> + <title>Set <varname>consumer_event_subkey</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nsq", "consumer_event_sub_key", "My-JSON-SubField-Name") +modparam("nsq", "consumer_event_subkey", "My-JSON-SubField-Name") ... </programlisting> </example> @@ -384,7 +384,7 @@ modparam("nsq", "topic_channel", "My-NSQ-Topic-2:My-NSQ-Channel-2") <programlisting format="linespecific"> ... modparam("nsq", "consumer_event_key", "Event-Category") -modparam("nsq", "consumer_event_sub_key", "Event-Name") +modparam("nsq", "consumer_event_subkey", "Event-Name") ... event_route[nsq:consumer-event-presence-update] @@ -408,7 +408,7 @@ event_route[nsq:consumer-event-presence] event_route[nsq:consumer-event-event-category-event-name] { # event-category is the name of the consumer_event_key parameter - # event-name is the name of the consumer_event_sub_key parameter + # event-name is the name of the consumer_event_subkey parameter # this event route is executed if we can't find the previous ... }

1 0

git:master:e9d4ab30: sms: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: e9d4ab30419460175fe76b82c58b26768ea4ef57 URL: https://github.com/kamailio/kamailio/commit/e9d4ab30419460175fe76b82c58b267… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 sms: docs fix parameter name --- Modified: src/modules/sms/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/e9d4ab30419460175fe76b82c58b267… Patch: https://github.com/kamailio/kamailio/commit/e9d4ab30419460175fe76b82c58b267… --- diff --git a/src/modules/sms/doc/params.xml b/src/modules/sms/doc/params.xml index 242d4513f0..509238a4af 100644 --- a/src/modules/sms/doc/params.xml +++ b/src/modules/sms/doc/params.xml @@ -218,8 +218,8 @@ modparam("sms", "max_sms_parts", 10) </example> </section> - <section id="domain_str"> - <title><varname>domain_str</varname> (string)</title> + <section id="domain"> + <title><varname>domain</varname> (string)</title> <para> Specify a fake domain name to be used by the gateway. The Contact headers and the From header from request will be construct based on @@ -231,10 +231,10 @@ modparam("sms", "max_sms_parts", 10) Default is the name of the machine the gateway is running on. </para> <example> - <title>Set <varname>domain_str</varname> parameter</title> + <title>Set <varname>domain</varname> parameter</title> <programlisting> ... -modparam("sms", "domain_str", "foo.bar") +modparam("sms", "domain", "foo.bar") ... </programlisting> </example>

1 0

git:master:34263c60: msilo: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 34263c603a0b08625c3769a0c5f91012c4a4618f URL: https://github.com/kamailio/kamailio/commit/34263c603a0b08625c3769a0c5f9101… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 msilo: docs add missing parameter --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/34263c603a0b08625c3769a0c5f9101… Patch: https://github.com/kamailio/kamailio/commit/34263c603a0b08625c3769a0c5f9101… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 885368ea36..3563e2a87a 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -807,3 +807,18 @@ m_dump("$fu"); </section> </chapter> +</programlisting> + </example> + </section> + <section id="msilo.p.sc_stored_hdrs"> + <title><varname>sc_stored_hdrs</varname> (string)</title> + <para> + The name of the column in silo table, storing the extra headers. + </para> + <para>Default value is <quote>extra_hdrs</quote>.</para> + <example> + <title>Set the <quote>sc_stored_hdrs</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "sc_stored_hdrs", "extra_headers") +...

1 0

git:master:bba1b9a1: xmpp: docs fixes
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: bba1b9a10d76d8380f3d27dd0120ae902586e481 URL: https://github.com/kamailio/kamailio/commit/bba1b9a10d76d8380f3d27dd0120ae9… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 xmpp: docs fixes --- Modified: src/modules/xmpp/doc/xmpp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bba1b9a10d76d8380f3d27dd0120ae9… Patch: https://github.com/kamailio/kamailio/commit/bba1b9a10d76d8380f3d27dd0120ae9… --- diff --git a/src/modules/xmpp/doc/xmpp_admin.xml b/src/modules/xmpp/doc/xmpp_admin.xml index 1ad36406a7..ab201c5a84 100644 --- a/src/modules/xmpp/doc/xmpp_admin.xml +++ b/src/modules/xmpp/doc/xmpp_admin.xml @@ -182,7 +182,7 @@ <section> <title>Parameters</title> <section> - <title><varname>backend(string)</varname></title> + <title><varname>backend</varname> (string)</title> <para> The mode you are using the module; it can be either "component" or "server". </para>

1 0

git:master:64f34d93: xcap_server: docs fixes
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 64f34d9315d24d9e919ec32c56fca2927e3845c3 URL: https://github.com/kamailio/kamailio/commit/64f34d9315d24d9e919ec32c56fca29… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 xcap_server: docs fixes --- Modified: src/modules/xcap_server/doc/xcap_server_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64f34d9315d24d9e919ec32c56fca29… Patch: https://github.com/kamailio/kamailio/commit/64f34d9315d24d9e919ec32c56fca29… --- diff --git a/src/modules/xcap_server/doc/xcap_server_admin.xml b/src/modules/xcap_server/doc/xcap_server_admin.xml index a90c531b3f..9e0d1d9df9 100644 --- a/src/modules/xcap_server/doc/xcap_server_admin.xml +++ b/src/modules/xcap_server/doc/xcap_server_admin.xml @@ -163,7 +163,7 @@ modparam("xcap_server", "xcap_table", "xcapdocs") </emphasis> </para> <example> - <title>Set <varname>url_match</varname> parameter</title> + <title>Set <varname>xcap_root</varname> parameter</title> <programlisting format="linespecific"> ... modparam("xcap_server", "xcap_root", "/xcap-root/") @@ -215,7 +215,7 @@ modparam("xcap_server", "xml_ns", </example> </section> <section id="xcap_server.p.directory_scheme"> - <title><varname>directory_scheme (int)</varname></title> + <title><varname>directory_scheme</varname> (int)</title> <para> Allows the scheme used in org.openmobilealliance.xcap-directory listings to be @@ -253,7 +253,7 @@ modparam("xcap_server", "directory_scheme", 0) </example> </section> <section id="xcap_server.p.directory_hostname"> - <title><varname>directory_hostname (str)</varname></title> + <title><varname>directory_hostname</varname> (string)</title> <para> Allows the hostname (and port) used in org.openmobilealliance.xcap-directory listings to be

1 0

git:master:404c46f3: tmx: docs fix varname tag around parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 404c46f358340df2dc4a91c7f83036ea26d05375 URL: https://github.com/kamailio/kamailio/commit/404c46f358340df2dc4a91c7f83036e… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 tmx: docs fix varname tag around parameter --- Modified: src/modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/404c46f358340df2dc4a91c7f83036e… Patch: https://github.com/kamailio/kamailio/commit/404c46f358340df2dc4a91c7f83036e… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index e6646ecdb7..69a18fd85f 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -59,9 +59,7 @@ <section> <title>Parameters</title> <section id="tmx.p.precheck_trans"> - <title> - <function moreinfo="none">precheck_trans</function> - </title> + <title><varname>precheck_trans</varname> (int)</title> <para> Enable/disable transaction pre-check via t_precheck_trans() function. If set to 0, the internal structures are not created @@ -71,7 +69,7 @@ Default value is <emphasis>1</emphasis> (enabled). </para> <example> - <title><function>precheck_trans</function> usage</title> + <title><varname>precheck_trans</varname> (int)</title> <programlisting format="linespecific"> ... modparam("tmx", "precheck_trans", 0)

1 0

git:master:2ba86a27: rls: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 2ba86a27a9f7d32eace52815161c0a8b9e48878a URL: https://github.com/kamailio/kamailio/commit/2ba86a27a9f7d32eace52815161c0a8… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 rls: docs add missing parameter --- Modified: src/modules/rls/doc/rls_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2ba86a27a9f7d32eace52815161c0a8… Patch: https://github.com/kamailio/kamailio/commit/2ba86a27a9f7d32eace52815161c0a8… --- diff --git a/src/modules/rls/doc/rls_admin.xml b/src/modules/rls/doc/rls_admin.xml index ab3b2d1664..8a1c03963a 100644 --- a/src/modules/rls/doc/rls_admin.xml +++ b/src/modules/rls/doc/rls_admin.xml @@ -566,6 +566,25 @@ modparam("rls", "max_notify_body_length", 32000) </programlisting> </example> </section> + <section id="rls.p.reload_db_subs"> + <title><varname>reload_db_subs</varname> (integer)</title> + <para> + Reload subscriptions on module initialization (requires db_mode 0 (memory only mode)). + </para> + <para> + <emphasis> + Default value is 0 (do not load rows from db). + </emphasis> + </para> + <example> + <title>Set <varname>reload_db_subs</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rls", "reload_db_subs", 1) +... +</programlisting> + </example> + </section> <section id="rls.p.fetch_rows"> <title><varname>fetch_rows</varname> (integer)</title> <para>

1 0

git:master:3bbb27de: presence_xml: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 3bbb27de30080a9fedaffcba04575dddb690caad URL: https://github.com/kamailio/kamailio/commit/3bbb27de30080a9fedaffcba04575dd… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 presence_xml: docs add missing parameter --- Modified: src/modules/presence_xml/doc/presence_xml_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3bbb27de30080a9fedaffcba04575dd… Patch: https://github.com/kamailio/kamailio/commit/3bbb27de30080a9fedaffcba04575dd… --- diff --git a/src/modules/presence_xml/doc/presence_xml_admin.xml b/src/modules/presence_xml/doc/presence_xml_admin.xml index 3b9dcd18e1..4eaf7d82ac 100644 --- a/src/modules/presence_xml/doc/presence_xml_admin.xml +++ b/src/modules/presence_xml/doc/presence_xml_admin.xml @@ -190,6 +190,25 @@ modparam("presence_xml", "disable_bla", 1) </example> </section> + <section id="presence_xml.p.disable_xcapdiff"> + <title><varname>disable_xcapdiff</varname>(int)</title> + <para> + Set this parameter to disable the handling of the "xcap-diff" event. + </para> + <para> + <emphasis>Default value: <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>disable_xcapdiff</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "disable_xcapdiff", 1) +... +</programlisting> + </example> + </section> + <section id="presence_xml.p.force_active"> <title><varname>force_active</varname> (int)</title> <para>

1 0

git:master:4b2970b5: ldap: docs add varname tag around parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 4b2970b5b8addbb6cb325e35060714aa1e8811b2 URL: https://github.com/kamailio/kamailio/commit/4b2970b5b8addbb6cb325e35060714a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 ldap: docs add varname tag around parameter --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b2970b5b8addbb6cb325e35060714a… Patch: https://github.com/kamailio/kamailio/commit/4b2970b5b8addbb6cb325e35060714a… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 214582489f..0e3f146ef7 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -440,7 +440,7 @@ ldap_client_bind_timeout = 500 <title>Parameters</title> <section> - <title>config_file (string)</title> + <title><varname>config_file</varname> (string)</title> <para>Full path to LDAP configuration file.</para>

1 0

git:master:10f7ff34: lcr: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 10f7ff344f546cc1816d5e6882313ba57540387b URL: https://github.com/kamailio/kamailio/commit/10f7ff344f546cc1816d5e6882313ba… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 lcr: docs fix parameter name --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/10f7ff344f546cc1816d5e6882313ba… Patch: https://github.com/kamailio/kamailio/commit/10f7ff344f546cc1816d5e6882313ba… --- diff --git a/src/modules/lcr/doc/lcr_admin.xml b/src/modules/lcr/doc/lcr_admin.xml index 47bed3ee9f..69574b38a3 100644 --- a/src/modules/lcr/doc/lcr_admin.xml +++ b/src/modules/lcr/doc/lcr_admin.xml @@ -203,7 +203,7 @@ modparam("lcr","db_url","&exampledb;") </emphasis> </para> <example> - <title>Setting <varname>gw_table</varname> module parameter</title> + <title>Setting <varname>lcr_gw_table</varname> module parameter</title> <programlisting format="linespecific"> ... modparam("lcr", "lcr_gw_table","gw")

1 0

git:master:65cb844f: htable: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 65cb844fe0b180e0feeba641fa4d16ab3cb9c375 URL: https://github.com/kamailio/kamailio/commit/65cb844fe0b180e0feeba641fa4d16a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 htable: docs fix parameter name --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/65cb844fe0b180e0feeba641fa4d16a… Patch: https://github.com/kamailio/kamailio/commit/65cb844fe0b180e0feeba641fa4d16a… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 154f1f0c5a..17391626a1 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -414,7 +414,7 @@ $ kamcmd htable.dump htable </emphasis> </para> <example> - <title>Set <varname>hash_size</varname> parameter</title> + <title>Set <varname>htable</varname> parameter</title> <programlisting format="linespecific"> ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;")

1 0

git:master:6b5689f4: dnssec: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 6b5689f4079aacf348e60bd7e72560b4fe98d9dd URL: https://github.com/kamailio/kamailio/commit/6b5689f4079aacf348e60bd7e72560b… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 dnssec: docs fix parameter name --- Modified: src/modules/dnssec/doc/dnssec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b5689f4079aacf348e60bd7e72560b… Patch: https://github.com/kamailio/kamailio/commit/6b5689f4079aacf348e60bd7e72560b… --- diff --git a/src/modules/dnssec/doc/dnssec_admin.xml b/src/modules/dnssec/doc/dnssec_admin.xml index 9070c890a3..ee7ddd1ab1 100644 --- a/src/modules/dnssec/doc/dnssec_admin.xml +++ b/src/modules/dnssec/doc/dnssec_admin.xml @@ -114,7 +114,7 @@ <para><emphasis> Default value is 0(no changes)</emphasis></para> <example> - <title>Set <varname>enable_full_lr</varname> parameter</title> + <title>Set <varname>general_query_flags</varname> parameter</title> <programlisting format="linespecific"> ...

1 0

git:master:2771b041: dmq_usrloc: docs fix parameter name
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 2771b041d47339b76271d4115bd68ffa7514aa25 URL: https://github.com/kamailio/kamailio/commit/2771b041d47339b76271d4115bd68ff… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 dmq_usrloc: docs fix parameter name --- Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2771b041d47339b76271d4115bd68ff… Patch: https://github.com/kamailio/kamailio/commit/2771b041d47339b76271d4115bd68ff… --- diff --git a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml index c4fd46b66d..52620f2b13 100644 --- a/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml +++ b/src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml @@ -134,7 +134,7 @@ modparam("dmq_usrloc", "sync", 0) </emphasis> </para> <example> - <title>Set <varname>batch size</varname> parameter</title> + <title>Set <varname>batch_size</varname> parameter</title> <programlisting format="linespecific"> ... modparam("dmq_usrloc", "batch_size", 4000)

1 0

git:master:4b84dd2e: dispatcher: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 4b84dd2e9387efcdab7e501b66a64a72b233a9c4 URL: https://github.com/kamailio/kamailio/commit/4b84dd2e9387efcdab7e501b66a64a7… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 dispatcher: docs add missing parameter --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b84dd2e9387efcdab7e501b66a64a7… Patch: https://github.com/kamailio/kamailio/commit/4b84dd2e9387efcdab7e501b66a64a7… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index cd9afcced4..3a2eaaa49c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -221,6 +221,27 @@ modparam("dispatcher", "priority_col", "dstpriority") </example> </section> + <section id="dispatcher.p.attrs_col"> + <title><varname>attrs_col</varname> (string)</title> + <para> + The column's name in the database storing the attributes for + destination URI. + </para> + <para> + <emphasis> + Default value is <quote>attrs</quote>. + </emphasis> + </para> + <example> + <title>Set <quote>attrs_col</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("dispatcher", "attrs_col", "dstattrs") +... +</programlisting> + </example> + </section> + <section id="dispatcher.p.force_dst"> <title><varname>force_dst</varname> (int)</title> <para>

1 0

git:master:8668d43c: cdp: docs add missing parameter
by Henning Westerholt 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 8668d43ccc814867be9716a548c9d3a4cbf0f3d9 URL: https://github.com/kamailio/kamailio/commit/8668d43ccc814867be9716a548c9d3a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-14T21:17:04+01:00 cdp: docs add missing parameter --- Modified: src/modules/cdp/doc/cdp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8668d43ccc814867be9716a548c9d3a… Patch: https://github.com/kamailio/kamailio/commit/8668d43ccc814867be9716a548c9d3a… --- diff --git a/src/modules/cdp/doc/cdp_admin.xml b/src/modules/cdp/doc/cdp_admin.xml index aaa229767c..698e3e3c04 100644 --- a/src/modules/cdp/doc/cdp_admin.xml +++ b/src/modules/cdp/doc/cdp_admin.xml @@ -127,7 +127,24 @@ modparam("cdp", "latency_threshold", 1000) </example> </section> <section> - <title>workerq_length_threshold_percentage (int)</title> + <title><varname>workerq_latency_threshold</varname> (int)</title> + + <para>The time in ms above which a log error is written to log file for + putting tasks into task queue.</para> + + <para><emphasis> Default value is <quote>100</quote>. </emphasis></para> + + <example> + <title>Set <varname>workerq_latency_threshold</varname> parameter</title> + + <programlisting format="linespecific">... +modparam("cdp", "workerq_latency_threshold", 250) +... + </programlisting> + </example> + </section> + <section> + <title><varname>workerq_length_threshold_percentage</varname> (int)</title> <para>The threshold of the length of the worker queue as a percentage of the maximum queue size - when exceeded a warning is written to the log

1 0

git:master:4830cf41: kamctl: db creation scripts regenerated
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 4830cf41f7a0460c08491f0f14adf8fa84ebe639 URL: https://github.com/kamailio/kamailio/commit/4830cf41f7a0460c08491f0f14adf8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:34:10+01:00 kamctl: db creation scripts regenerated --- Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_redis/kamailio/version Modified: utils/kamctl/db_sqlite/standard-create.sql Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version.json Modified: utils/kamctl/mysql/standard-create.sql Modified: utils/kamctl/oracle/standard-create.sql Modified: utils/kamctl/postgres/standard-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/standard-mod Modified: utils/kamctl/xhttp_pi/standard-table --- Diff: https://github.com/kamailio/kamailio/commit/4830cf41f7a0460c08491f0f14adf8f… Patch: https://github.com/kamailio/kamailio/commit/4830cf41f7a0460c08491f0f14adf8f…

1 0

git:master:5409a604: lib/srdb1: schema - description fields and id column for version table
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 5409a60421a7d5cda281c0fd94cbc2bd038f0dbb URL: https://github.com/kamailio/kamailio/commit/5409a60421a7d5cda281c0fd94cbc2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:30:13+01:00 lib/srdb1: schema - description fields and id column for version table - no change from perspective of kamailio internal usage, just coherence across tables and easier format for management tools --- Modified: src/lib/srdb1/schema/version.xml --- Diff: https://github.com/kamailio/kamailio/commit/5409a60421a7d5cda281c0fd94cbc2b… Patch: https://github.com/kamailio/kamailio/commit/5409a60421a7d5cda281c0fd94cbc2b… --- diff --git a/src/lib/srdb1/schema/version.xml b/src/lib/srdb1/schema/version.xml index c18ea3b0c3..42734bb2b9 100644 --- a/src/lib/srdb1/schema/version.xml +++ b/src/lib/srdb1/schema/version.xml @@ -10,17 +10,35 @@ <name>version</name> <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para> + This table is used by Kamailio modules to check if the structure + of database tables has the expected number. + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> <column id="table_name"> <name>table_name</name> <type>string</type> <size>32</size> <natural/> + <description>Table name</description> </column> <column id="table_version"> <name>table_version</name> <type>unsigned int</type> <default>0</default> + <description>Version number</description> </column> <index> <name>table_name_idx</name>

1 0

git:master:41841dfc: kamctl: cmd trap output file with txt extension
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: master Commit: 41841dfc153894a97609bdc95d78a12cb2b304ca URL: https://github.com/kamailio/kamailio/commit/41841dfc153894a97609bdc95d78a12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:16:34+01:00 kamctl: cmd trap output file with txt extension - easier to view inline when sent via email, without extensions being binary encoding and requiring explicit download --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/41841dfc153894a97609bdc95d78a12… Patch: https://github.com/kamailio/kamailio/commit/41841dfc153894a97609bdc95d78a12… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 7fd9197a35..ffac93065c 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2918,7 +2918,7 @@ kamailio_trap() { exit fi DATE=`/bin/date +%Y%m%d_%H%M%S` - LOG_FILE=/tmp/gdb_kamailio_$DATE + LOG_FILE=/tmp/gdb_kamailio_${DATE}.txt minfo "Trap file: $LOG_FILE" ctl_cmd_run core.psx > $LOG_FILE echo -n "Trapping Kamailio with gdb: "

1 0

git:5.3:c4908816: siptrace: proper setting of dst field when correlation id is not set
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: c4908816950d12eade4a320f399f74eb4ec91599 URL: https://github.com/kamailio/kamailio/commit/c4908816950d12eade4a320f399f74e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:03:30+01:00 siptrace: proper setting of dst field when correlation id is not set - GH #2250 (cherry picked from commit f0ae3c37cdaf4c5d8034062bf27ebeb03aacb99f) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c4908816950d12eade4a320f399f74e… Patch: https://github.com/kamailio/kamailio/commit/c4908816950d12eade4a320f399f74e… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 861161996b..ccd0b72508 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -814,6 +814,7 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, str *corid, char *dir, enum siptrace_type_t trace_type) { siptrace_info_t* info = NULL; + char *p = NULL; if (trace_type == SIPTRACE_TRANSACTION || trace_type == SIPTRACE_DIALOG) { int alloc_size = sizeof(siptrace_info_t); @@ -857,17 +858,18 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, } memset(info, 0, alloc_size); + p = (char *)(info + 1); /* could use the dest_info we've already parsed but there's no way to pass * it to DLGCB_CREATED callback so the only thing to do is keep * it as uri, serialize in a dlg_var and parse again in DLGCB_CREATED */ if(corid) { - info->correlation_id.s = (char *)(info + 1); + info->correlation_id.s = p; info->correlation_id.len = corid->len; memcpy(info->correlation_id.s, corid->s, corid->len); } if (duri) { info->uriState = STRACE_RAW_URI; - info->u.dup_uri.s = (char *)info->correlation_id.s + info->correlation_id.len; + info->u.dup_uri.s = p + ((info->correlation_id.s)?info->correlation_id.len:0); memcpy(info->u.dup_uri.s, duri->s, duri->len); info->u.dup_uri.len = duri->len; } else {

1 0

git:5.3:a20891f5: db_mysql: use cast to (const void*) for mysql_options() value
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: a20891f5d1696db9a87e2a9236572623638d599a URL: https://github.com/kamailio/kamailio/commit/a20891f5d1696db9a87e2a923657262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:02:58+01:00 db_mysql: use cast to (const void*) for mysql_options() value - match the function signature, cast to (char*) or (const char*) being used so far (cherry picked from commit 3bfc01f0f57a25fb53de1dc45d39af747edf309a) --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/a20891f5d1696db9a87e2a923657262… Patch: https://github.com/kamailio/kamailio/commit/a20891f5d1696db9a87e2a923657262… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index bd69d9f109..bed21f92a7 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -71,7 +71,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) egrp = 0; memset(ptr, 0, sizeof(struct my_con)); ptr->ref = 1; - + ptr->con = (MYSQL*)pkg_malloc(sizeof(MYSQL)); if (!ptr->con) { PKG_MEM_ERROR; @@ -94,7 +94,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } // read [client] and [<grp>] sections in the order // given in my.cnf - mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, grp); + mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, (const void*)grp); } else { host = id->host; @@ -109,14 +109,14 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } // set connect, read and write timeout, the value counts three times - mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&db_mysql_timeout_interval); - mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const char *)&db_mysql_timeout_interval); - mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { rec = 1; - mysql_options(ptr->con, MYSQL_OPT_RECONNECT, &rec); + mysql_options(ptr->con, MYSQL_OPT_RECONNECT, (const void*)&rec); } #else if (db_mysql_auto_reconnect) diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index 2314b754de..f64a90f0aa 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -67,7 +67,7 @@ int my_con_connect(db_con_t* con) if (my_connect_to) { if (mysql_options(mcon->con, MYSQL_OPT_CONNECT_TIMEOUT, - (char*)&my_connect_to)) + (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } @@ -77,12 +77,12 @@ int my_con_connect(db_con_t* con) (my_client_ver < 50000))) { if (my_send_to) { if (mysql_options(mcon->con, MYSQL_OPT_WRITE_TIMEOUT , - (char*)&my_send_to)) + (const void*)&my_send_to)) WARN("failed to set MYSQL_OPT_WRITE_TIMEOUT\n"); } if (my_recv_to){ if (mysql_options(mcon->con, MYSQL_OPT_READ_TIMEOUT , - (char*)&my_recv_to)) + (const void*)&my_recv_to)) WARN("failed to set MYSQL_OPT_READ_TIMEOUT\n"); } }

1 0

git:5.3:2776dc9e: db_cluster: trailing spaces removed
by Daniel-Constantin Mierla 14 Mar '20

14 Mar '20

Module: kamailio Branch: 5.3 Commit: 2776dc9e2add3acca8c47323559fd479104fc533 URL: https://github.com/kamailio/kamailio/commit/2776dc9e2add3acca8c47323559fd47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-14T18:02:11+01:00 db_cluster: trailing spaces removed (cherry picked from commit 40128763d8a987e4c64d51584f1d72872b53dff5) --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h --- Diff: https://github.com/kamailio/kamailio/commit/2776dc9e2add3acca8c47323559fd47… Patch: https://github.com/kamailio/kamailio/commit/2776dc9e2add3acca8c47323559fd47…

1 0

git:master:bd387b41: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 13 Mar '20

13 Mar '20

Module: kamailio Branch: master Commit: bd387b4160f67d28fea79bd4168fb7280493ce10 URL: https://github.com/kamailio/kamailio/commit/bd387b4160f67d28fea79bd4168fb72… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-13T11:46:15+01:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/bd387b4160f67d28fea79bd4168fb72… Patch: https://github.com/kamailio/kamailio/commit/bd387b4160f67d28fea79bd4168fb72… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index cd82e0f6e4..201243ac17 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -85,7 +85,7 @@ Alexandr Dubovikov 1.11. Set raw_socket_listen parameter 1.12. Set raw_interface parameter 1.13. Set raw_sock_children parameter - 1.14. Set promiscous_on parameter + 1.14. Set promiscuous_on parameter 1.15. Set raw_moni_bpf_on parameter 1.16. Set capture_node parameter 1.17. Set insert_retries parameter @@ -396,7 +396,7 @@ modparam("sipcapture", "raw_sock_children", 6) Default value is "0". - Example 1.14. Set promiscous_on parameter + Example 1.14. Set promiscuous_on parameter ... modparam("sipcapture", "promiscuous_on", 1) ...

1 0

[kamailio/kamailio] sipcapture: fix spelling errors (#2249)
by Bastian Triller 13 Mar '20

13 Mar '20

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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/2249 -- Commit Summary -- * sipcapture: fix spelling errors -- File Changes -- M src/modules/sipcapture/doc/sipcapture_admin.xml (2) M src/modules/sipcapture/hep.c (2) M src/modules/sipcapture/sipcapture.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2249.patch https://github.com/kamailio/kamailio/pull/2249.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/2249

2 4

git:master:cc1142fc: sipcapture: fix spelling errors
by Henning Westerholt 13 Mar '20

13 Mar '20

Module: kamailio Branch: master Commit: cc1142fcc15e0875d309de894a239325526fa186 URL: https://github.com/kamailio/kamailio/commit/cc1142fcc15e0875d309de894a23932… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-13T11:35:17+01:00 sipcapture: fix spelling errors --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/hep.c Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/cc1142fcc15e0875d309de894a23932… Patch: https://github.com/kamailio/kamailio/commit/cc1142fcc15e0875d309de894a23932… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 0dbfafae96..64cad5f0c0 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -365,7 +365,7 @@ modparam("sipcapture", "raw_sock_children", 6) </emphasis> </para> <example> - <title>Set <varname>promiscous_on</varname> parameter</title> + <title>Set <varname>promiscuous_on</varname> parameter</title> <programlisting format="linespecific"> ... modparam("sipcapture", "promiscuous_on", 1) diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 2934c2c0d2..980cba9095 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -481,7 +481,7 @@ int parsing_hepv3_message(char *buf, unsigned int len) si->addr_info_lst = 0; si->address_str.s = ip_addr2a(&si->address); - ; + si->address_str.len = strlen(si->address_str.s); si->port_no_str.s = int2str(si->port_no, &tmp_len); diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 094d6ea168..58747ad6ae 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -388,7 +388,7 @@ static param_export_t params[] = { {"raw_moni_capture_on", INT_PARAM, &moni_capture_on}, {"db_insert_mode", INT_PARAM, &db_insert_mode}, {"raw_interface", PARAM_STR, &raw_interface}, - {"promiscious_on", INT_PARAM, &promisc_on}, + {"promiscuous_on", INT_PARAM, &promisc_on}, {"raw_moni_bpf_on", INT_PARAM, &bpf_on}, {"callid_aleg_header", PARAM_STR, &callid_aleg_header}, {"custom_field1_header", PARAM_STR, &custom_field1_header}, @@ -824,7 +824,7 @@ static int mod_init(void) c = capture_modes_root; while(c) { - /*for the default capture_mode, don't add it's name to the stat name*/ + /*for the default capture_mode, don't add its name to the stat name*/ def = (capture_def && c == capture_def) ? 1 : 0; stat_name = (char *)shm_malloc( sizeof(char)

1 0

git:master:f0ae3c37: siptrace: proper setting of dst field when correlation id is not set
by Daniel-Constantin Mierla 13 Mar '20

13 Mar '20

Module: kamailio Branch: master Commit: f0ae3c37cdaf4c5d8034062bf27ebeb03aacb99f URL: https://github.com/kamailio/kamailio/commit/f0ae3c37cdaf4c5d8034062bf27ebeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-13T09:41:32+01:00 siptrace: proper setting of dst field when correlation id is not set - GH #2250 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/f0ae3c37cdaf4c5d8034062bf27ebeb… Patch: https://github.com/kamailio/kamailio/commit/f0ae3c37cdaf4c5d8034062bf27ebeb… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index eb18085c90..c27a9eadba 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -833,6 +833,7 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, str *corid, char *dir, enum siptrace_type_t trace_type) { siptrace_info_t* info = NULL; + char *p = NULL; if (trace_type == SIPTRACE_TRANSACTION || trace_type == SIPTRACE_DIALOG) { int alloc_size = sizeof(siptrace_info_t); @@ -876,17 +877,18 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, } memset(info, 0, alloc_size); + p = (char *)(info + 1); /* could use the dest_info we've already parsed but there's no way to pass * it to DLGCB_CREATED callback so the only thing to do is keep * it as uri, serialize in a dlg_var and parse again in DLGCB_CREATED */ if(corid) { - info->correlation_id.s = (char *)(info + 1); + info->correlation_id.s = p; info->correlation_id.len = corid->len; memcpy(info->correlation_id.s, corid->s, corid->len); } if (duri) { info->uriState = STRACE_RAW_URI; - info->u.dup_uri.s = (char *)info->correlation_id.s + info->correlation_id.len; + info->u.dup_uri.s = p + ((info->correlation_id.s)?info->correlation_id.len:0); memcpy(info->u.dup_uri.s, duri->s, duri->len); info->u.dup_uri.len = duri->len; } else {

1 0

git:5.2:44fbc5ee: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Mar '20

13 Mar '20

Module: kamailio Branch: 5.2 Commit: 44fbc5ee49d1ea6f87c7e72103a307227a028342 URL: https://github.com/kamailio/kamailio/commit/44fbc5ee49d1ea6f87c7e72103a3072… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-13T09:32:31+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/44fbc5ee49d1ea6f87c7e72103a3072… Patch: https://github.com/kamailio/kamailio/commit/44fbc5ee49d1ea6f87c7e72103a3072…

1 0

git:5.3:d756e8f2: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Mar '20

13 Mar '20

Module: kamailio Branch: 5.3 Commit: d756e8f2381c9378949a0d7425b0ebb807132d71 URL: https://github.com/kamailio/kamailio/commit/d756e8f2381c9378949a0d7425b0ebb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-13T09:31:52+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/d756e8f2381c9378949a0d7425b0ebb… Patch: https://github.com/kamailio/kamailio/commit/d756e8f2381c9378949a0d7425b0ebb…

1 0

git:master:6a8e2731: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 13 Mar '20

13 Mar '20

Module: kamailio Branch: master Commit: 6a8e273112ca7059b647a7476d8c388503797644 URL: https://github.com/kamailio/kamailio/commit/6a8e273112ca7059b647a7476d8c388… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-13T09:31:25+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/6a8e273112ca7059b647a7476d8c388… Patch: https://github.com/kamailio/kamailio/commit/6a8e273112ca7059b647a7476d8c388…

1 0

git:5.2:34917a79: p_usrloc: fix doc section related to default_db_url (GH #2247)
by Henning Westerholt 13 Mar '20

13 Mar '20

Module: kamailio Branch: 5.2 Commit: 34917a79e596a6634b3019efb24d92ebdad3053e URL: https://github.com/kamailio/kamailio/commit/34917a79e596a6634b3019efb24d92e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-13T09:24:04+01:00 p_usrloc: fix doc section related to default_db_url (GH #2247) (cherry picked from commit bbc330e768fa462d5e37ad34a7898711cff85b70) --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/34917a79e596a6634b3019efb24d92e… Patch: https://github.com/kamailio/kamailio/commit/34917a79e596a6634b3019efb24d92e… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 8c109280ae..1e313e948b 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -677,8 +677,6 @@ modparam("usrloc", "db_update_as_insert", 1) ... </programlisting> </example> - </section> - </section> <section> @@ -701,6 +699,8 @@ modparam("p_usrloc", "default_db_url", "mysql://ser:ser@localhost/ser") </example> </section> + </section> + <section> <title> Changes from usrloc module </title> <section>

1 0

git:5.3:bbc330e7: p_usrloc: fix doc section related to default_db_url (GH #2247)
by Henning Westerholt 13 Mar '20

13 Mar '20

Module: kamailio Branch: 5.3 Commit: bbc330e768fa462d5e37ad34a7898711cff85b70 URL: https://github.com/kamailio/kamailio/commit/bbc330e768fa462d5e37ad34a789871… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-13T09:22:43+01:00 p_usrloc: fix doc section related to default_db_url (GH #2247) --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bbc330e768fa462d5e37ad34a789871… Patch: https://github.com/kamailio/kamailio/commit/bbc330e768fa462d5e37ad34a789871… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 8c109280ae..1e313e948b 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -677,8 +677,6 @@ modparam("usrloc", "db_update_as_insert", 1) ... </programlisting> </example> - </section> - </section> <section> @@ -701,6 +699,8 @@ modparam("p_usrloc", "default_db_url", "mysql://ser:ser@localhost/ser") </example> </section> + </section> + <section> <title> Changes from usrloc module </title> <section>

1 0

[kamailio/kamailio] p_usrloc: add matching_mode modparam (#2247)
by Stefan Mititelu 13 Mar '20

13 Mar '20

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2247 -- Commit Summary -- * p_usrloc: add matching_mode modparam -- File Changes -- M src/modules/p_usrloc/config.c (5) M src/modules/p_usrloc/config.h (1) M src/modules/p_usrloc/doc/p_usrloc_admin.xml (47) M src/modules/p_usrloc/p_usrloc_mod.c (8) M src/modules/p_usrloc/p_usrloc_mod.h (1) M src/modules/p_usrloc/urecord.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2247.patch https://github.com/kamailio/kamailio/pull/2247.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/2247

2 2

git:master:e7686e8a: p_usrloc: add matching_mode modparam
by Stefan Mititelu 13 Mar '20

13 Mar '20

Module: kamailio Branch: master Commit: e7686e8a3217bac460ea44f00904d794b6a12da9 URL: https://github.com/kamailio/kamailio/commit/e7686e8a3217bac460ea44f00904d79… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-13T10:21:06+02:00 p_usrloc: add matching_mode modparam --- Modified: src/modules/p_usrloc/config.c Modified: src/modules/p_usrloc/config.h Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/e7686e8a3217bac460ea44f00904d79… Patch: https://github.com/kamailio/kamailio/commit/e7686e8a3217bac460ea44f00904d79…

1 0

git:5.3:8b3d3ee3: siptrace: log correct dialog event
by Henning Westerholt 12 Mar '20

12 Mar '20

Module: kamailio Branch: 5.3 Commit: 8b3d3ee39d0f5452451e686a9946951fa69ace8a URL: https://github.com/kamailio/kamailio/commit/8b3d3ee39d0f5452451e686a9946951… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-12T18:12:42+01:00 siptrace: log correct dialog event (cherry picked from commit 6138877fcabfa579fb243c33b2bdde5d6a862668) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8b3d3ee39d0f5452451e686a9946951… Patch: https://github.com/kamailio/kamailio/commit/8b3d3ee39d0f5452451e686a9946951… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index dbaefd40d7..861161996b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1890,7 +1890,7 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p if(dlgb.register_dlgcb(dlg, DLGCB_REQ_WITHIN, trace_dialog_transaction, xavp->val.v.vptr, 0) != 0) { - LM_ERR("Failed to register DLGCB_TERMINATED callback!\n"); + LM_ERR("Failed to register DLGCB_REQ_WITHIN callback!\n"); return; }

1 0

[kamailio/kamailio] siptrace: log correct dialog event (#2248)
by Bastian Triller 12 Mar '20

12 Mar '20

#### 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/2248 -- Commit Summary -- * siptrace: log correct dialog event -- File Changes -- M src/modules/siptrace/siptrace.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2248.patch https://github.com/kamailio/kamailio/pull/2248.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/2248

2 2

git:master:6138877f: siptrace: log correct dialog event
by Henning Westerholt 12 Mar '20

12 Mar '20

Module: kamailio Branch: master Commit: 6138877fcabfa579fb243c33b2bdde5d6a862668 URL: https://github.com/kamailio/kamailio/commit/6138877fcabfa579fb243c33b2bdde5… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-12T18:08:31+01:00 siptrace: log correct dialog event --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/6138877fcabfa579fb243c33b2bdde5… Patch: https://github.com/kamailio/kamailio/commit/6138877fcabfa579fb243c33b2bdde5… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 20603259ff..eb18085c90 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1909,7 +1909,7 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p if(dlgb.register_dlgcb(dlg, DLGCB_REQ_WITHIN, trace_dialog_transaction, xavp->val.v.vptr, 0) != 0) { - LM_ERR("Failed to register DLGCB_TERMINATED callback!\n"); + LM_ERR("Failed to register DLGCB_REQ_WITHIN callback!\n"); return; }

1 0

git:master:4efab96e: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 12 Mar '20

12 Mar '20

Module: kamailio Branch: master Commit: 4efab96e097faa3de6385d09e271d631ee27b47b URL: https://github.com/kamailio/kamailio/commit/4efab96e097faa3de6385d09e271d63… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-12T17:01:15+01:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/4efab96e097faa3de6385d09e271d63… Patch: https://github.com/kamailio/kamailio/commit/4efab96e097faa3de6385d09e271d63… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 749c89ea65..ca0d73ca26 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -75,7 +75,7 @@ Camille Oudot List of Examples 1.1. Set db_url parameter - 1.2. Set sip_trace parameter + 1.2. Set table parameter 1.3. Set trace_flag parameter 1.4. Set trace_on parameter 1.5. Set traced_user_avp parameter @@ -222,7 +222,7 @@ modparam("siptrace", "db_url", "dbdriver://username:password@dbhost/dbname") Default value is “sip_trace”. - Example 1.2. Set sip_trace parameter + Example 1.2. Set table parameter ... modparam("siptrace", "table", "strace") ... @@ -283,7 +283,7 @@ modparam("siptrace", "trace_table_avp", "$avp(s:siptrace_table)") 3.7. duplicate_uri (str) The address in form of a SIP URI where to send a duplicate of traced - message. It uses UDP all the time. + message. Default value is "NULL".

1 0

[kamailio/kamailio] siptrace: duplicate via HEP with any protocol (#2244)
by Bastian Triller 12 Mar '20

12 Mar '20

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Allow duplicating messages via HEP over any configured protocol. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2244 -- Commit Summary -- * siptrace: duplicate via HEP with any protocol -- File Changes -- M src/modules/siptrace/doc/siptrace_admin.xml (4) M src/modules/siptrace/siptrace.c (25) M src/modules/siptrace/siptrace_hep.c (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2244.patch https://github.com/kamailio/kamailio/pull/2244.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/2244

2 3

git:master:711eeeb1: siptrace: duplicate via HEP with any protocol
by Henning Westerholt 12 Mar '20

12 Mar '20

Module: kamailio Branch: master Commit: 711eeeb1eca13fee9521328488dcfec38a2c12a6 URL: https://github.com/kamailio/kamailio/commit/711eeeb1eca13fee9521328488dcfec… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-12T16:46:40+01:00 siptrace: duplicate via HEP with any protocol --- Modified: src/modules/siptrace/doc/siptrace_admin.xml Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_hep.c --- Diff: https://github.com/kamailio/kamailio/commit/711eeeb1eca13fee9521328488dcfec… Patch: https://github.com/kamailio/kamailio/commit/711eeeb1eca13fee9521328488dcfec…

1 0

[kamailio/kamailio] app_python warning about strict-aliasing (#1249)
by Daniel-Constantin Mierla 12 Mar '20

12 Mar '20

Tracking here the issue exposed by @linuxmaniac via PR #924, as it was merged and then reverted (by #1248), so anyone can be aware of as well as comment/propose solutions for it. > Add "-fno-strict-aliasing" to compilation flags > > Fixes a slew of: > "dereferencing type-punned pointer will break strict-aliasing rules" > warnings from GCC for lines of the form: > Py_INCREF(Py_True); > and > Py_INCREF(Py_False); > > due to the cast from PyIntObject* to PyObject* > > GCC is technically correct here; see: > http://www.python.org/dev/peps/pep-3123/ > though this is unlikely to lead to non-working machine code. The initial proposed patch for `src/modules/app_python/Makefile` is: ``` @@ -22,6 +22,8 @@ ifeq ($(OS), freebsd) LIBS+=-pthread endif +# python2 https://www.python.org/dev/peps/pep-3123/ +DEFS+=-fno-strict-aliasing DEFS+=-I${PYTHON_INCDIR} DEFS+=-DKAMAILIO_MOD_INTERFACE ``` -- 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/1249

1 2

git:master:517b3be4: kamctl: kamctlrc - fix CHROOT_DIR example and coherent use of ## for comments
by Daniel-Constantin Mierla 12 Mar '20

12 Mar '20

Module: kamailio Branch: master Commit: 517b3be4b06473d1d64d1fe198c4a9c149bcc1b0 URL: https://github.com/kamailio/kamailio/commit/517b3be4b06473d1d64d1fe198c4a9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-12T11:14:09+01:00 kamctl: kamctlrc - fix CHROOT_DIR example and coherent use of ## for comments - ## is used for explanatory comments - # is used for commented options --- Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/517b3be4b06473d1d64d1fe198c4a9c… Patch: https://github.com/kamailio/kamailio/commit/517b3be4b06473d1d64d1fe198c4a9c…

1 0

Re: [sr-dev] Thank you --- Compilation success
by Henning Westerholt 11 Mar '20

11 Mar '20

Hello Subhra, Great! Could you share the here steps that lead to the success that others might be able to learn from it as well? Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: subhra giri <subhraprakash79(a)gmail.com> Sent: Saturday, March 7, 2020 11:18 AM To: Henning Westerholt <hw(a)skalatan.de> Subject: Thank you --- Compilation success Dear Henning Compilation is successful for MIPS. Thank you very much Subhra Prakash Giri On Sat, Mar 7, 2020 at 1:26 PM subhra giri <subhraprakash79(a)gmail.com<mailto:subhraprakash79@gmail.com>> wrote: Dear Henning I tried to compile directly on MIPS board, but there is no make file in my board. so it is not compiling. I am not getting Make for MIPS board. Is there any other way to compile on x86 for mips board. Thanks and Regards Subhra Prakash Giri On Fri, Mar 6, 2020 at 6:43 PM Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hi Subhra, I meant with native platform – to test compilation directly on the MIPS board, not sure if you understood it the same way. Cheers, Henning From: subhra giri <subhraprakash79(a)gmail.com<mailto:subhraprakash79@gmail.com>> Sent: Friday, March 6, 2020 1:11 PM To: Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> Cc: sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org> Subject: Re: [sr-dev] Regarding MIPS Compilation Dear Henning Executing "make cfg " gives below output [root@www kamailio-5.3.2]# make cfg make -C src/ cfg target architecture <mips64>, host architecture <x86_64> ---------------------------------------------------------------------------------------------------------------------------------------------------------- In native platform it is compiling successfully. But giving problem for target platform i.e mips64-octeon-linux. Please help me with steps for mips compilation Thanks and Regards Subhra Prakash Giri

2 3

git:5.2:fa170b9a: dialog: update event route statistics
by Henning Westerholt 11 Mar '20

11 Mar '20

Module: kamailio Branch: 5.2 Commit: fa170b9a40c79539ce1818918298099f5dd88724 URL: https://github.com/kamailio/kamailio/commit/fa170b9a40c79539ce1818918298099… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-11T09:13:39+01:00 dialog: update event route statistics If dialog was deleted while running the event route, update statistics for early and active dialogs. (cherry picked from commit c6faf3af06129f636f86f9919f0b9db84ca0dab6) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/fa170b9a40c79539ce1818918298099… Patch: https://github.com/kamailio/kamailio/commit/fa170b9a40c79539ce1818918298099… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index ef36db8976..5a1299c47b 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1789,6 +1789,16 @@ int dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate) if (dlg0==0) { LM_ALERT("after event route - dialog not found [%u:%u] (%d/%d) (%p) (%.*s)\n", h_entry, h_id, ostate, nstate, dlg, evname.len, evname.s); + if (nstate == DLG_STATE_DELETED) { + if (ostate == DLG_STATE_UNCONFIRMED) { + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate == DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate != DLG_STATE_DELETED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } + } return -1; } else { dlg_release(dlg0);

1 0

git:5.3:7b90c4e6: dialog: update event route statistics
by Stefan Mititelu 11 Mar '20

11 Mar '20

Module: kamailio Branch: 5.3 Commit: 7b90c4e610b3d07b40b3eb883623981294732652 URL: https://github.com/kamailio/kamailio/commit/7b90c4e610b3d07b40b3eb883623981… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-03-11T10:06:25+02:00 dialog: update event route statistics If dialog was deleted while running the event route, update statistics for early and active dialogs. (cherry picked from commit c6faf3af06129f636f86f9919f0b9db84ca0dab6) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/7b90c4e610b3d07b40b3eb883623981… Patch: https://github.com/kamailio/kamailio/commit/7b90c4e610b3d07b40b3eb883623981… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 71f29e24fc..48899e3215 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1810,6 +1810,16 @@ int dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate) if (dlg0==0) { LM_ALERT("after event route - dialog not found [%u:%u] (%d/%d) (%p) (%.*s)\n", h_entry, h_id, ostate, nstate, dlg, evname.len, evname.s); + if (nstate == DLG_STATE_DELETED) { + if (ostate == DLG_STATE_UNCONFIRMED) { + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate == DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate != DLG_STATE_DELETED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } + } return -1; } else { dlg_release(dlg0);

1 0

git:5.2:c670ba6f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Mar '20

11 Mar '20

Module: kamailio Branch: 5.2 Commit: c670ba6f18c0df83f64a87bf4d02de84b848ad26 URL: https://github.com/kamailio/kamailio/commit/c670ba6f18c0df83f64a87bf4d02de8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-11T09:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/c670ba6f18c0df83f64a87bf4d02de8… Patch: https://github.com/kamailio/kamailio/commit/c670ba6f18c0df83f64a87bf4d02de8… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 3841e32a2e..5b1c2264d9 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -10,20 +10,14 @@ Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> -Edited by - Daniel-Constantin Mierla <miconda(a)gmail.com> -Edited by - Giacomo Vacca <giacomo.vacca(a)gmail.com> -Edited by - Camille Oudot <camille.oudot(a)orange.com> @@ -80,7 +74,7 @@ Camille Oudot List of Examples 1.1. Set db_url parameter - 1.2. Set sip_trace parameter + 1.2. Set table parameter 1.3. Set trace_flag parameter 1.4. Set trace_on parameter 1.5. Set traced_user_avp parameter @@ -225,7 +219,7 @@ modparam("siptrace", "db_url", "dbdriver://username:password@dbhost/dbname") Default value is “sip_trace”. - Example 1.2. Set sip_trace parameter + Example 1.2. Set table parameter ... modparam("siptrace", "table", "strace") ...

1 0

[kamailio/kamailio] dialog: update event route statistics (#2243)
by Stefan Mititelu 11 Mar '20

11 Mar '20

If dialog was deleted while running the event route, update statistics for early and active dialogs.   #### 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  Please let me know if I can backport it to 5.3 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2243 -- Commit Summary -- * dialog: update event route statistics -- File Changes -- M src/modules/dialog/dlg_handlers.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2243.patch https://github.com/kamailio/kamailio/pull/2243.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/2243

2 7

git:master:c6faf3af: dialog: update event route statistics
by Stefan Mititelu 11 Mar '20

11 Mar '20

Module: kamailio Branch: master Commit: c6faf3af06129f636f86f9919f0b9db84ca0dab6 URL: https://github.com/kamailio/kamailio/commit/c6faf3af06129f636f86f9919f0b9db… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-11T10:01:27+02:00 dialog: update event route statistics If dialog was deleted while running the event route, update statistics for early and active dialogs. --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/c6faf3af06129f636f86f9919f0b9db… Patch: https://github.com/kamailio/kamailio/commit/c6faf3af06129f636f86f9919f0b9db… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 71f29e24fc..48899e3215 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1810,6 +1810,16 @@ int dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate) if (dlg0==0) { LM_ALERT("after event route - dialog not found [%u:%u] (%d/%d) (%p) (%.*s)\n", h_entry, h_id, ostate, nstate, dlg, evname.len, evname.s); + if (nstate == DLG_STATE_DELETED) { + if (ostate == DLG_STATE_UNCONFIRMED) { + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate == DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + if_update_stat(dlg_enable_stats, failed_dlgs, 1); + } else if (ostate != DLG_STATE_DELETED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } + } return -1; } else { dlg_release(dlg0);

1 0

git:5.3:acc5cb10: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 11 Mar '20

11 Mar '20

Module: kamailio Branch: 5.3 Commit: acc5cb10fe8f83269ad9ef953d2745aee323fa35 URL: https://github.com/kamailio/kamailio/commit/acc5cb10fe8f83269ad9ef953d2745a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-11T09:01:24+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/acc5cb10fe8f83269ad9ef953d2745a… Patch: https://github.com/kamailio/kamailio/commit/acc5cb10fe8f83269ad9ef953d2745a… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 749c89ea65..5eab39eb23 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -75,7 +75,7 @@ Camille Oudot List of Examples 1.1. Set db_url parameter - 1.2. Set sip_trace parameter + 1.2. Set table parameter 1.3. Set trace_flag parameter 1.4. Set trace_on parameter 1.5. Set traced_user_avp parameter @@ -222,7 +222,7 @@ modparam("siptrace", "db_url", "dbdriver://username:password@dbhost/dbname") Default value is “sip_trace”. - Example 1.2. Set sip_trace parameter + Example 1.2. Set table parameter ... modparam("siptrace", "table", "strace") ...

1 0

git:5.2:3ce82b7d: siptrace: fix table parameter in example (related to GH#2244)
by Henning Westerholt 11 Mar '20

11 Mar '20

Module: kamailio Branch: 5.2 Commit: 3ce82b7db0cef0f16fd43fd4ce9029ed6d02c5bb URL: https://github.com/kamailio/kamailio/commit/3ce82b7db0cef0f16fd43fd4ce9029e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-11T08:58:40+01:00 siptrace: fix table parameter in example (related to GH#2244) (cherry picked from commit 836c6297820014c5ba9519a5039c775fb399f073) --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3ce82b7db0cef0f16fd43fd4ce9029e… Patch: https://github.com/kamailio/kamailio/commit/3ce82b7db0cef0f16fd43fd4ce9029e… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 504e6e98b8..4e1d8af852 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -125,7 +125,7 @@ modparam("siptrace", "db_url", "&exampledb;") </emphasis> </para> <example> - <title>Set <varname>sip_trace</varname> parameter</title> + <title>Set <varname>table</varname> parameter</title> <programlisting format="linespecific"> ... modparam("siptrace", "table", "strace")

1 0

git:5.3:836c6297: siptrace: fix table parameter in example (related to GH#2244)
by Henning Westerholt 11 Mar '20

11 Mar '20

Module: kamailio Branch: 5.3 Commit: 836c6297820014c5ba9519a5039c775fb399f073 URL: https://github.com/kamailio/kamailio/commit/836c6297820014c5ba9519a5039c775… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-11T08:57:40+01:00 siptrace: fix table parameter in example (related to GH#2244) --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/836c6297820014c5ba9519a5039c775… Patch: https://github.com/kamailio/kamailio/commit/836c6297820014c5ba9519a5039c775… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index abf3f47c26..6b3a1f49f8 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -118,7 +118,7 @@ modparam("siptrace", "db_url", "&exampledb;") </emphasis> </para> <example> - <title>Set <varname>sip_trace</varname> parameter</title> + <title>Set <varname>table</varname> parameter</title> <programlisting format="linespecific"> ... modparam("siptrace", "table", "strace")

1 0

git:master:3bfc01f0: db_mysql: use cast to (const void*) for mysql_options() value
by Daniel-Constantin Mierla 11 Mar '20

11 Mar '20

Module: kamailio Branch: master Commit: 3bfc01f0f57a25fb53de1dc45d39af747edf309a URL: https://github.com/kamailio/kamailio/commit/3bfc01f0f57a25fb53de1dc45d39af7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-11T08:41:19+01:00 db_mysql: use cast to (const void*) for mysql_options() value - match the function signature, cast to (char*) or (const char*) being used so far --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/3bfc01f0f57a25fb53de1dc45d39af7… Patch: https://github.com/kamailio/kamailio/commit/3bfc01f0f57a25fb53de1dc45d39af7… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index bd69d9f109..bed21f92a7 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -71,7 +71,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) egrp = 0; memset(ptr, 0, sizeof(struct my_con)); ptr->ref = 1; - + ptr->con = (MYSQL*)pkg_malloc(sizeof(MYSQL)); if (!ptr->con) { PKG_MEM_ERROR; @@ -94,7 +94,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } // read [client] and [<grp>] sections in the order // given in my.cnf - mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, grp); + mysql_options(ptr->con, MYSQL_READ_DEFAULT_GROUP, (const void*)grp); } else { host = id->host; @@ -109,14 +109,14 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } // set connect, read and write timeout, the value counts three times - mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&db_mysql_timeout_interval); - mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const char *)&db_mysql_timeout_interval); - mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const char *)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); + mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { rec = 1; - mysql_options(ptr->con, MYSQL_OPT_RECONNECT, &rec); + mysql_options(ptr->con, MYSQL_OPT_RECONNECT, (const void*)&rec); } #else if (db_mysql_auto_reconnect) diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index 2314b754de..f64a90f0aa 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -67,7 +67,7 @@ int my_con_connect(db_con_t* con) if (my_connect_to) { if (mysql_options(mcon->con, MYSQL_OPT_CONNECT_TIMEOUT, - (char*)&my_connect_to)) + (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } @@ -77,12 +77,12 @@ int my_con_connect(db_con_t* con) (my_client_ver < 50000))) { if (my_send_to) { if (mysql_options(mcon->con, MYSQL_OPT_WRITE_TIMEOUT , - (char*)&my_send_to)) + (const void*)&my_send_to)) WARN("failed to set MYSQL_OPT_WRITE_TIMEOUT\n"); } if (my_recv_to){ if (mysql_options(mcon->con, MYSQL_OPT_READ_TIMEOUT , - (char*)&my_recv_to)) + (const void*)&my_recv_to)) WARN("failed to set MYSQL_OPT_READ_TIMEOUT\n"); } }

1 0

git:master:64cb2f6c: kamctl: kamctlrc - small adjustmet to rpc fifo file to match default naming
by Daniel-Constantin Mierla 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: 64cb2f6c121fe748696f55f797c8342415965c88 URL: https://github.com/kamailio/kamailio/commit/64cb2f6c121fe748696f55f797c8342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T20:24:52+01:00 kamctl: kamctlrc - small adjustmet to rpc fifo file to match default naming --- Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/64cb2f6c121fe748696f55f797c8342… Patch: https://github.com/kamailio/kamailio/commit/64cb2f6c121fe748696f55f797c8342… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index abe4afffbc..4751350934 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -136,7 +136,7 @@ # CTLENGINE="RPCFIFO" ## path to FIFO file for engine RPCFIFO -# RPCFIFOPATH="/run/kamailio/kamailio_rpc_fifo" +# RPCFIFOPATH="/run/kamailio/kamailio_rpc.fifo" ## check ACL names; default on (1); off (0) # VERIFY_ACL=1

1 0

git:master:9f5dc8aa: modules: readme files regenerated - db_cluster ... [skip ci]
by Kamailio Dev 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: 9f5dc8aa20c1f71f54821432837a2bea96e8b6b9 URL: https://github.com/kamailio/kamailio/commit/9f5dc8aa20c1f71f54821432837a2be… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-10T20:16:10+01:00 modules: readme files regenerated - db_cluster ... [skip ci] --- Modified: src/modules/db_cluster/README --- Diff: https://github.com/kamailio/kamailio/commit/9f5dc8aa20c1f71f54821432837a2be… Patch: https://github.com/kamailio/kamailio/commit/9f5dc8aa20c1f71f54821432837a2be… --- diff --git a/src/modules/db_cluster/README b/src/modules/db_cluster/README index 7fd611aea5..4e52d0ab24 100644 --- a/src/modules/db_cluster/README +++ b/src/modules/db_cluster/README @@ -69,8 +69,12 @@ Chapter 1. Admin Guide robin write and read. The following database commands are considered to be write operations: - INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE. The - read operations are done for database commands: QUERY and RAW-QUERY. + INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE, + INSERT-ASYNC. The read operations are done for database commands: QUERY + and RAW-QUERY. + + Note: if INSERT-ASYNC is not implemented by DB connector module, then + standard INSERT operation is done. 2. Dependencies

1 0

git:master:c4105a18: db_cluster: docs updates about insert-async support
by Daniel-Constantin Mierla 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: c4105a1882582f1a7d4315f419adc4ed3025e809 URL: https://github.com/kamailio/kamailio/commit/c4105a1882582f1a7d4315f419adc4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T18:22:27+01:00 db_cluster: docs updates about insert-async support --- Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4105a1882582f1a7d4315f419adc4e… Patch: https://github.com/kamailio/kamailio/commit/c4105a1882582f1a7d4315f419adc4e… --- diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml b/src/modules/db_cluster/doc/db_cluster_admin.xml index eb1e8bc489..9d3da2393a 100644 --- a/src/modules/db_cluster/doc/db_cluster_admin.xml +++ b/src/modules/db_cluster/doc/db_cluster_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -26,8 +26,13 @@ </para> <para> The following database commands are considered to be write operations: - INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE. The - read operations are done for database commands: QUERY and RAW-QUERY. + INSERT, DELETE, UPDATE, REPLACE, INSERT-DELAYED, INSERT-UPDATE, + INSERT-ASYNC. The read operations are done for database commands: + QUERY and RAW-QUERY. + </para> + <para> + Note: if INSERT-ASYNC is not implemented by DB connector module, then + standard INSERT operation is done. </para> </section> @@ -110,7 +115,7 @@ modparam("db_cluster", "connection", <para> <para> The first two characters is priority and mode for read, followed by - two characters for priority and mode for write operations. "p" is + two characters for priority and mode for write operations. "p" is only used for write operations. </para> <emphasis>

1 0

git:master:0ce4310d: db_cluster: support for insert_async db api
by Daniel-Constantin Mierla 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: 0ce4310d8cfae43c194b7f48561dcd85fc7fdb99 URL: https://github.com/kamailio/kamailio/commit/0ce4310d8cfae43c194b7f48561dcd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T18:02:08+01:00 db_cluster: support for insert_async db api --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h --- Diff: https://github.com/kamailio/kamailio/commit/0ce4310d8cfae43c194b7f48561dcd8… Patch: https://github.com/kamailio/kamailio/commit/0ce4310d8cfae43c194b7f48561dcd8…

1 0

git:master:40128763: db_cluster: trailing spaces removed
by Daniel-Constantin Mierla 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: 40128763d8a987e4c64d51584f1d72872b53dff5 URL: https://github.com/kamailio/kamailio/commit/40128763d8a987e4c64d51584f1d728… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T16:11:14+01:00 db_cluster: trailing spaces removed --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h --- Diff: https://github.com/kamailio/kamailio/commit/40128763d8a987e4c64d51584f1d728… Patch: https://github.com/kamailio/kamailio/commit/40128763d8a987e4c64d51584f1d728…

1 0

git:master:3f57257c: tm: t_clean() exported to kemi framework
by Daniel-Constantin Mierla 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: 3f57257c118ede63979d9755dd9d0d809d0cbebd URL: https://github.com/kamailio/kamailio/commit/3f57257c118ede63979d9755dd9d0d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-10T15:27:55+01:00 tm: t_clean() exported to kemi framework --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3f57257c118ede63979d9755dd9d0d8… Patch: https://github.com/kamailio/kamailio/commit/3f57257c118ede63979d9755dd9d0d8… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index ec39c3cd49..69990200ef 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2961,6 +2961,13 @@ static int t_clean(struct sip_msg* msg, char* key, char* value) return 1; } +/* kemi function to clean active but very old transactions */ +static int ki_t_clean(sip_msg_t* msg) +{ + tm_clean_lifetime(); + return 1; +} + /** * */ @@ -3221,6 +3228,12 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_clean"), + SR_KEMIP_INT, ki_t_clean, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:43f6a02e: modules: readme files regenerated - auth_db ... [skip ci]
by Kamailio Dev 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: 43f6a02e45658b734988919151af8e9990b71fb6 URL: https://github.com/kamailio/kamailio/commit/43f6a02e45658b734988919151af8e9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-10T12:16:20+01:00 modules: readme files regenerated - auth_db ... [skip ci] --- Modified: src/modules/auth_db/README --- Diff: https://github.com/kamailio/kamailio/commit/43f6a02e45658b734988919151af8e9… Patch: https://github.com/kamailio/kamailio/commit/43f6a02e45658b734988919151af8e9… --- diff --git a/src/modules/auth_db/README b/src/modules/auth_db/README index 0896481c23..287f1517c5 100644 --- a/src/modules/auth_db/README +++ b/src/modules/auth_db/README @@ -50,6 +50,7 @@ Jan Janak 3.7. use_domain (integer) 3.8. load_credentials (string) 3.9. version_table (integer) + 3.10. force_generate_avps (integer) 4. Functions @@ -71,10 +72,11 @@ Jan Janak 1.7. use_domain parameter usage 1.8. load_credentials parameter usage 1.9. version_table parameter usage - 1.10. www_authorize usage - 1.11. proxy_authorize usage - 1.12. auth_check usage - 1.13. is_subscriber usage + 1.10. force_generate_avps parameter usage + 1.11. www_authorize usage + 1.12. proxy_authorize usage + 1.13. auth_check usage + 1.14. is_subscriber usage Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 3.7. use_domain (integer) 3.8. load_credentials (string) 3.9. version_table (integer) + 3.10. force_generate_avps (integer) 4. Functions @@ -145,6 +148,7 @@ Chapter 1. Admin Guide 3.7. use_domain (integer) 3.8. load_credentials (string) 3.9. version_table (integer) + 3.10. force_generate_avps (integer) 3.1. db_url (string) @@ -297,6 +301,19 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") modparam("auth_db", "version_table", 0) ... +3.10. force_generate_avps (integer) + + If set to different than 0, the module will fetch user DB attributes + even if authentication failed. + + Default value is “0” (don't fetch user DB attributes if authentication + failed). + + Example 1.10. force_generate_avps parameter usage +... +modparam("auth_db", "force_generate_avps", 1) +... + 4. Functions 4.1. www_authenticate(realm, table [, method]) @@ -348,7 +365,7 @@ modparam("auth_db", "version_table", 0) This function can be used from REQUEST_ROUTE. - Example 1.10. www_authorize usage + Example 1.11. www_authorize usage ... if (!www_authorize("kamailio.org", "subscriber")) { www_challenge("kamailio.org", "1"); @@ -388,7 +405,7 @@ if (!www_authorize("kamailio.org", "subscriber")) { This function can be used from REQUEST_ROUTE. - Example 1.11. proxy_authorize usage + Example 1.12. proxy_authorize usage ... if (!proxy_authorize("$fd", "subscriber)) { proxy_challenge("$fd", "1"); # Realm will be autogenerated @@ -439,7 +456,7 @@ if (!proxy_authorize("$fd", "subscriber)) { This function can be used from REQUEST_ROUTE. - Example 1.12. auth_check usage + Example 1.13. auth_check usage ... if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "1"); @@ -472,7 +489,7 @@ if (!auth_check("$fd", "subscriber", "1")) { This function can be used from ANY_ROUTE. - Example 1.13. is_subscriber usage + Example 1.14. is_subscriber usage ... if (!is_subscriber("$ru", "subscriber", "3")) { # callee is not a local subscriber

1 0

[kamailio/kamailio] auth_db: add force_generate_avps parameter (#2242)
by Stefan Mititelu 10 Mar '20

10 Mar '20

In order to fetch user DB attributes even when user authentication failed. Default behavior unchanged.   #### 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  Related to discussion: https://lists.kamailio.org/pipermail/sr-dev/2020-March/055912.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2242 -- Commit Summary -- * auth_db: add force_generate_avps parameter -- File Changes -- M src/modules/auth_db/auth_db_mod.c (2) M src/modules/auth_db/authorize.c (10) M src/modules/auth_db/authorize.h (2) M src/modules/auth_db/doc/auth_db_admin.xml (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2242.patch https://github.com/kamailio/kamailio/pull/2242.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/2242

2 2

git:master:e52aada2: auth_db: add force_generate_avps parameter
by Stefan Mititelu 10 Mar '20

10 Mar '20

Module: kamailio Branch: master Commit: e52aada2a9ffa87136bdc5e1fe44273e601c32b8 URL: https://github.com/kamailio/kamailio/commit/e52aada2a9ffa87136bdc5e1fe44273… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-03-10T13:11:56+02:00 auth_db: add force_generate_avps parameter In order to fetch user DB attributes even when user authentication failed. Default behavior unchanged. --- Modified: src/modules/auth_db/auth_db_mod.c Modified: src/modules/auth_db/authorize.c Modified: src/modules/auth_db/authorize.h Modified: src/modules/auth_db/doc/auth_db_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e52aada2a9ffa87136bdc5e1fe44273… Patch: https://github.com/kamailio/kamailio/commit/e52aada2a9ffa87136bdc5e1fe44273… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index faea44f612..ce8baae838 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -82,6 +82,7 @@ static int version_table_check = 1; int calc_ha1 = 0; int use_domain = 0; /* Use also domain when looking up in table */ +int force_generate_avps = 0; /* Even when user failed to authenticate */ db1_con_t* auth_db_handle = 0; /* database connection handle */ db_func_t auth_dbf; @@ -128,6 +129,7 @@ static param_export_t params[] = { {"use_domain", INT_PARAM, &use_domain }, {"load_credentials", PARAM_STRING, &credentials_list }, {"version_table", INT_PARAM, &version_table_check }, + {"force_generate_avps", INT_PARAM, &force_generate_avps}, {0, 0, 0} }; diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index b45a2d128a..4f8d967454 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -294,13 +294,21 @@ static int digest_authenticate_hdr(sip_msg_t* msg, str *realm, goto end; } + /* Even when user failed to authenticate */ + if (force_generate_avps) { + generate_avps(msg, result); + } + /* Recalculate response, it must be same to authorize successfully */ rauth = auth_api.check_response(&(cred->digest), method, ha1); if(rauth==AUTHENTICATED) { ret = AUTH_OK; switch(auth_api.post_auth(msg, h, ha1)) { case AUTHENTICATED: - generate_avps(msg, result); + /* Only when user succeded to authenticate */ + if (!force_generate_avps) { + generate_avps(msg, result); + } break; default: ret = AUTH_ERROR; diff --git a/src/modules/auth_db/authorize.h b/src/modules/auth_db/authorize.h index e3638a25af..fd26f39e75 100644 --- a/src/modules/auth_db/authorize.h +++ b/src/modules/auth_db/authorize.h @@ -28,6 +28,8 @@ #include "../../core/parser/msg_parser.h" #include "api.h" +extern int force_generate_avps; + int auth_db_init(const str* db_url); int auth_db_bind(const str* db_url); void auth_db_close(void); diff --git a/src/modules/auth_db/doc/auth_db_admin.xml b/src/modules/auth_db/doc/auth_db_admin.xml index 654c889415..422738e869 100644 --- a/src/modules/auth_db/doc/auth_db_admin.xml +++ b/src/modules/auth_db/doc/auth_db_admin.xml @@ -300,6 +300,24 @@ modparam("auth_db", "version_table", 0) </example> </section> + <section id="auth_db.p.force_generate_avps"> + <title><varname>force_generate_avps</varname> (integer)</title> + <para> + If set to different than 0, the module will fetch user DB attributes even if authentication failed. + </para> + <para> + Default value is <quote>0</quote> (don't fetch user DB attributes if authentication failed). + </para> + <example> + <title><varname>force_generate_avps</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("auth_db", "force_generate_avps", 1) +... + </programlisting> + </example> + </section> + </section> <section>

1 0

pv module problems on master
by Juha Heinanen 09 Mar '20

09 Mar '20

May have something to do with recent two commits. -- Juha ----------------------------------------------------------------------- CC (gcc) [M pv.so] pv_trans.o pv_trans.c: In function 'tr_eval_string': pv_trans.c:539:22: warning: pointer targets in passing argument 1 of 'base64url_enc' differ in signedness [-Wpointer-sign] i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:540:6: warning: pointer targets in passing argument 3 of 'base64url_enc' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:552:22: warning: pointer targets in passing argument 1 of 'base64url_dec' differ in signedness [-Wpointer-sign] i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:553:6: warning: pointer targets in passing argument 3 of 'base64url_dec' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:565:22: warning: pointer targets in passing argument 1 of 'base64url_enc' differ in signedness [-Wpointer-sign] i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:566:6: warning: pointer targets in passing argument 3 of 'base64url_enc' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:867:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_enc(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:597:23: warning: pointer targets in passing argument 1 of 'base64url_dec' differ in signedness [-Wpointer-sign] i = base64url_dec((unsigned char *) st.s, st.len, ^~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:598:7: warning: pointer targets in passing argument 3 of 'base64url_dec' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:600:23: warning: pointer targets in passing argument 1 of 'base64url_dec' differ in signedness [-Wpointer-sign] i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, ^~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ pv_trans.c:601:7: warning: pointer targets in passing argument 3 of 'base64url_dec' differ in signedness [-Wpointer-sign] (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from pv_trans.c:40: ../../core/basex.h:868:5: note: expected 'char *' but argument is of type 'unsigned char *' int base64url_dec(char *in, int ilen, char *out, int osize); ^~~~~~~~~~~~~ ------------------------------------------------------------------------ Mar 7 00:15:46 char sip-proxy[21381]: 0(21433) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/sip-proxy/modules/pv.so>: /usr/lib/x86_64-linux-gnu/sip-proxy/modules/pv.so: undefined symbol: base64url_enc

3 10

git:master:957fde95: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 09 Mar '20

09 Mar '20

Module: kamailio Branch: master Commit: 957fde95e15c0b5b4d6d92252df5adbeeb50736d URL: https://github.com/kamailio/kamailio/commit/957fde95e15c0b5b4d6d92252df5adb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-09T20:31:12+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/957fde95e15c0b5b4d6d92252df5adb… Patch: https://github.com/kamailio/kamailio/commit/957fde95e15c0b5b4d6d92252df5adb…

1 0

git:master:c9ff5ef7: Merge pull request #2234 from smititelu/master
by GitHub 09 Mar '20

09 Mar '20

Module: kamailio Branch: master Commit: c9ff5ef72c0562748eff9e2055eba3181be5b8c2 URL: https://github.com/kamailio/kamailio/commit/c9ff5ef72c0562748eff9e2055eba31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-09T20:30:25+01:00 Merge pull request #2234 from smititelu/master registrar: add use_expired_contacts config param --- Modified: src/modules/registrar/config.c Modified: src/modules/registrar/config.h Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ff5ef72c0562748eff9e2055eba31… Patch: https://github.com/kamailio/kamailio/commit/c9ff5ef72c0562748eff9e2055eba31…

1 0

git:master:03289ce3: registrar: update doc for use_expired_contacts
by Stefan Mititelu 09 Mar '20

09 Mar '20

Module: kamailio Branch: master Commit: 03289ce36d12d9397b5d9879e75d56b8baac10fa URL: https://github.com/kamailio/kamailio/commit/03289ce36d12d9397b5d9879e75d56b… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-28T17:12:04+02:00 registrar: update doc for use_expired_contacts --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/03289ce36d12d9397b5d9879e75d56b… Patch: https://github.com/kamailio/kamailio/commit/03289ce36d12d9397b5d9879e75d56b… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 4575bbaf9b..e3140965d4 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1100,6 +1100,46 @@ request_route { </programlisting> </example> </section> + + + <section id="registrar.p.use_expired_contacts"> + <title><varname>use_expired_contacts</varname> (int)</title> + + <para> + Allow/Disallow the usage of the expired contacts. + </para> + + <itemizedlist> + <listitem> + <para> + <emphasis>0</emphasis> Disallow the usage of the expired contacts. + </para> + </listitem> + <listitem> + <para> + <emphasis>1</emphasis> Allow the usage of the expired contacts. + </para> + </listitem> + </itemizedlist> + + <para> + <emphasis> + Default value is 0 (Disallow). + </emphasis> + </para> + + <example> + <title>Set <varname>use_expired_contacts</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "use_expired_contacts", 1) +... + +kamcmd cfg.set_now_int registrar use_expired_contacts 1 +kamcmd cfg.set_now_int registrar use_expired_contacts 0 + </programlisting> + </example> + </section> </section>

1 0

git:master:252d18a0: registrar: add use_expired_contacts config param
by Stefan Mititelu 09 Mar '20

09 Mar '20

Module: kamailio Branch: master Commit: 252d18a032d5c6efbb709b75c0f17cdbd20ac58b URL: https://github.com/kamailio/kamailio/commit/252d18a032d5c6efbb709b75c0f17cd… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-28T17:12:04+02:00 registrar: add use_expired_contacts config param Allow/Disallow the usage of the expired contacts. Useful when some problems happen with new REGISTERs; allow the usage of old REGISTERed contacts. Default value is 0 meaning "disallow the usage of the expired contacts". (no changes to existing behavior) Value can be set dinamically via: kamcmd cfg.set_now_int registrar use_expired_contacts 1 --- Modified: src/modules/registrar/config.c Modified: src/modules/registrar/config.h Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/registrar.c --- Diff: https://github.com/kamailio/kamailio/commit/252d18a032d5c6efbb709b75c0f17cd… Patch: https://github.com/kamailio/kamailio/commit/252d18a032d5c6efbb709b75c0f17cd… --- diff --git a/src/modules/registrar/config.c b/src/modules/registrar/config.c index 937b9ea736..8a08207216 100644 --- a/src/modules/registrar/config.c +++ b/src/modules/registrar/config.c @@ -40,7 +40,8 @@ struct cfg_group_registrar default_registrar_cfg = { 0, /* retry_after */ 0, /* case_sensitive */ Q_UNSPECIFIED, /* default_q */ - 1 /* append_branches */ + 1, /* append_branches */ + 0 /* use_expired_contacts */ }; void *registrar_cfg = &default_registrar_cfg; @@ -68,5 +69,7 @@ cfg_def_t registrar_cfg_def[] = { "The parameter represents default q value for new contacts."}, /* Q_UNSPECIFIED is -1 */ {"append_branches", CFG_VAR_INT , 0, 0, 0, 0, "If set to 1(default), lookup will put all contacts found in msg structure"}, + {"use_expired_contacts",CFG_VAR_INT , 0, 0, 0, 0, + "Toggles using expired contacts as if they were active."}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/registrar/config.h b/src/modules/registrar/config.h index a6d1076ec1..43f5606bc2 100644 --- a/src/modules/registrar/config.h +++ b/src/modules/registrar/config.h @@ -36,6 +36,7 @@ struct cfg_group_registrar { unsigned int case_sensitive; qvalue_t default_q; unsigned int append_branches; + unsigned int use_expired_contacts; }; extern struct cfg_group_registrar default_registrar_cfg; diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 97dd635b38..81f9b7afd9 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -304,7 +304,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) ret = -1; /* look first for an un-expired and suported contact */ while (ptr) { - if(VALID_CONTACT(ptr,act_time)) { + if(VALID_CONTACT(ptr,act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) { if(allowed_method(_m,ptr)) { /* match on instance, if pub-gruu */ if(inst.len>0) { @@ -346,7 +346,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) aor = *ptr->aor; /* test if not expired and contact with suported method */ if(ptr) { - if(!(VALID_CONTACT(ptr,act_time))) { + if(!(VALID_CONTACT(ptr,act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts))) { goto done; } else if(!allowed_method(_m,ptr)) { ret=-2; @@ -485,7 +485,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { - if (VALID_CONTACT(ptr, act_time) && allowed_method(_m, ptr) + if ((VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) && allowed_method(_m, ptr) && reg_lookup_filter_match(ptr)) { path_dst.len = 0; if(ptr->path.s && ptr->path.len) { @@ -847,7 +847,7 @@ int registered4(struct sip_msg* _m, udomain_t* _d, str* _uri, int match_flag, get_act_time(); for (ptr = r->contacts; ptr; ptr = ptr->next) { - if(!VALID_CONTACT(ptr, act_time)) continue; + if(!(VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts))) continue; if (match_callid.s && /* optionally enforce tighter matching w/ Call-ID */ match_callid.len > 0 && (match_callid.len != ptr->callid.len || diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 7f1aa78bd7..11ebbdc8b9 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -248,6 +248,7 @@ static param_export_t params[] = { {"event_callback", PARAM_STR, &reg_event_callback }, {"lookup_filter_mode", INT_PARAM, &reg_lookup_filter_mode }, {"min_expires_mode", PARAM_INT, &reg_min_expires_mode }, + {"use_expired_contacts", INT_PARAM, &default_registrar_cfg.use_expired_contacts }, {0, 0, 0} };

1 0

[kamailio/kamailio] registrar: add use_expired_contacts config param (#2234)
by Stefan Mititelu 09 Mar '20

09 Mar '20

#### 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  Allow/Disallow the usage of the expired contacts. Useful when some problems happen with new REGISTERs; allow the usage of old REGISTERed contacts. Default value is 0 meaning "disallow the usage of the expired contacts". (no changes to existing behavior) Value can be set dinamically via: kamcmd cfg.set_now_int registrar use_expired_contacts 1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2234 -- Commit Summary -- * registrar: add use_expired_contacts config param * registrar: update doc for use_expired_contacts -- File Changes -- M src/modules/registrar/config.c (5) M src/modules/registrar/config.h (1) M src/modules/registrar/doc/registrar_admin.xml (40) M src/modules/registrar/lookup.c (8) M src/modules/registrar/registrar.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2234.patch https://github.com/kamailio/kamailio/pull/2234.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/2234

2 2

[kamailio/kamailio] Fedora 32/Rawhide build error: modules/sms: multiple definition of 'queued_msgs', 'use_contact', 'sms_report_type' (#2236)
by Anthony Messina 09 Mar '20

09 Mar '20

Similar to #2235. After this one, I can try to collect them up rather than reporting an issue for each module--it's only that the build is killed, so I only see the first one that errors out. I'll see what I can do about that. ``` make[2]: Entering directory '/builddir/build/BUILD/kamailio-5.3.2/src/modules/sms' gcc -shared -Wl,-O2 -Wl,-E -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions libsms_getsms.o libsms_putsms.o libsms_modem.o sms_funcs.o sms.o sms_report.o libsms_charset.o -o sms.so make[2]: Leaving directory '/builddir/build/BUILD/kamailio-5.3.2/src/modules/sms' /usr/bin/ld: sms.o:(.bss+0x40): multiple definition of `queued_msgs'; sms_funcs.o:(.bss+0x11a0): first defined here /usr/bin/ld: sms.o:(.bss+0x48): multiple definition of `use_contact'; sms_funcs.o:(.bss+0x11a8): first defined here /usr/bin/ld: sms.o:(.bss+0x4c): multiple definition of `sms_report_type'; libsms_modem.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status make[2]: *** [../../Makefile.rules:191: sms.so] Error 1 make[1]: *** [Makefile:511: modules] Error 1 make: *** [Makefile:34: every-module] Error 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/2236

4 12

uac_replace_from rare behaviour
by David Escartin 09 Mar '20

09 Mar '20

Hello all we just noticed an issue using this function when we call it with 2 params (display and uri) and the SIP INVITE comes with a From uri like sip:anonymous@anonymous.invalid; tag=13133439191609, without <> delimiters, then doing the uac replace in the ACK we have 2(14923) DEBUG: uac [replace.c:922]: replace_callback(): DOWNSTREAM direction detected - replacing uri with the new uri 2(14923) DEBUG: uac [replace.c:943]: replace_callback(): Replace [ sip:anonymous@anonymous.invalid] with ["14254350027" sip:14254350027@1.1.18.171] 2(14923) DEBUG: uac [replace.c:980]: replace_callback(): inserting display ["14254350027"] And this is the From header replaced From: sip:14254350027@1.1.18.171"14254350027" <>;tag=13133439191609 But if the call comes with a From header like <sip:anonymous@anonymous.invalid>; tag=13133439191609 Then this is the From header replaced 2(19741) DEBUG: uac [replace.c:922]: replace_callback(): DOWNSTREAM direction detected - replacing uri with the new uri 2(19741) DEBUG: uac [replace.c:943]: replace_callback(): Replace [ sip:1241342@1.1.18.171:5074] with ["14254350027" sip:14254350027@1.1.18.171] 2(19741) DEBUG: uac [replace.c:980]: replace_callback(): inserting display ["14254350027"] From: "14254350027" <sip:14254350027@1.1.18.171>;tag=13133439191609 Were you aware of this kind of behaviour? If possible we will look for a patch for this. thanks a lot and regards david

2 1

[kamailio/kamailio] Kamailio SDP Error 5.1.8 (#1983)
by nicoonline 09 Mar '20

09 Mar '20

Hello, I got this message under some circumstances (the number called) Jun 12 15:15:01 proxy1 /usr/sbin/kamailio[16096]: ERROR: <core> [core/parser/sdp/sdp.c:228]: set_sdp_payload_fmtp(): Invalid payload location What means "Payload location" ? SDP Debug from the callee: Jun 12 15:15:01 proxy1 /usr/sbin/kamailio[16096]: DEBUG: sdpops [sdpops_mod.c:1626]: sdp_get_helper(): Found SDP v=0#015#012o=- 5793 1 IN IP4 192.168.50.50#015#012s=-#015#012t=0 0#015#012m=audio 24734 RTP/AVP 8 101#015#012c=IN IP4 217.112.190.117#015#012a=rtpmap:101 telephone-event/8000#015#012a=fmtp:18 annexa=yes#015#012a=fmtp:101 0-15#015#012a=ptime:30#015#012a=silenceSupp:off - - - -#015#012a=sendrecv#015#012 SDP Debug called pbx: Jun 12 15:15:01 proxy1 /usr/sbin/kamailio[16097]: DEBUG: sdpops [sdpops_mod.c:1626]: sdp_get_helper(): Found SDP v=0#015#012o=root 1673681431 1673681431 IN IP4 217.112.180.5#015#012s=Asterisk PBX 11.25.1#015#012c=IN IP4 217.112.180.5#015#012t=0 0#015#012m=audio 10884 RTP/AVP 8 101#015#012a=rtpmap:8 PCMA/8000#015#012a=rtpmap:101 telephone-event/8000#015#012a=fmtp:101 0-16#015#012a=ptime:20#015#012a=sendrecv#015#012 -- 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/1983

3 9

git:5.3:48a630a1: app_python3: declare global vars extern in header file
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: 48a630a11b954fe8da5edac7f3cf5b582407416b URL: https://github.com/kamailio/kamailio/commit/48a630a11b954fe8da5edac7f3cf5b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:21:11+01:00 app_python3: declare global vars extern in header file (cherry picked from commit a771d9abd9ce97228efa7a0dfc9c4d89690e9b38) --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/48a630a11b954fe8da5edac7f3cf5b5… Patch: https://github.com/kamailio/kamailio/commit/48a630a11b954fe8da5edac7f3cf5b5… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 92ce10e04f..502a6d540b 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -53,6 +53,7 @@ static int child_init(int rank); static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; char *dname = NULL, *bname = NULL; diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 97c4e72e3e..8859f9a32a 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

1 0

git:5.3:e934227b: app_python: declare global vars extern in header file
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: e934227bf3d7c082a4cd3125f32a002bda3dd8c4 URL: https://github.com/kamailio/kamailio/commit/e934227bf3d7c082a4cd3125f32a002… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:20:59+01:00 app_python: declare global vars extern in header file (cherry picked from commit 9cc9576c025c541264a3679618bb2be8d108a9f6) --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/e934227bf3d7c082a4cd3125f32a002… Patch: https://github.com/kamailio/kamailio/commit/e934227bf3d7c082a4cd3125f32a002… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index e901c91412..ee832feb3d 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -54,6 +54,8 @@ static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; + char *dname = NULL, *bname = NULL; int _apy_process_rank = 0; diff --git a/src/modules/app_python/python_support.h b/src/modules/app_python/python_support.h index 4d25564119..2a97d16ed8 100644 --- a/src/modules/app_python/python_support.h +++ b/src/modules/app_python/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

1 0

git:5.3:dd7e19b1: siputils: proper param type for kemi contact ops exports
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: dd7e19b1a383bc52e0a9fcf22f183e79474508b3 URL: https://github.com/kamailio/kamailio/commit/dd7e19b1a383bc52e0a9fcf22f183e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:20:40+01:00 siputils: proper param type for kemi contact ops exports (cherry picked from commit 92c6f04a3faa917a227fb5d3b8918c981a1b1d96) --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/dd7e19b1a383bc52e0a9fcf22f183e7… Patch: https://github.com/kamailio/kamailio/commit/dd7e19b1a383bc52e0a9fcf22f183e7… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index e9593da3b4..c2da159088 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -553,12 +553,12 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { }, { str_init("siputils"), str_init("decode_contact"), SR_KEMIP_INT, ki_decode_contact, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siputils"), str_init("decode_contact_header"), SR_KEMIP_INT, ki_decode_contact_header, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:5.3:87e2fcb0: pua_reginfo: extern declaration of global vars in header file
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: 87e2fcb0289e148f53719fca6f029e03c62a2c72 URL: https://github.com/kamailio/kamailio/commit/87e2fcb0289e148f53719fca6f029e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:20:19+01:00 pua_reginfo: extern declaration of global vars in header file (cherry picked from commit 7afe5b9837d38cd77f75c3028c9134673c95404e) --- Modified: src/modules/pua_reginfo/pua_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/87e2fcb0289e148f53719fca6f029e0… Patch: https://github.com/kamailio/kamailio/commit/87e2fcb0289e148f53719fca6f029e0… --- diff --git a/src/modules/pua_reginfo/pua_reginfo.h b/src/modules/pua_reginfo/pua_reginfo.h index a15b7e47a8..133191541b 100644 --- a/src/modules/pua_reginfo/pua_reginfo.h +++ b/src/modules/pua_reginfo/pua_reginfo.h @@ -16,8 +16,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,9 +27,9 @@ #include "../pua/pua_bind.h" #include "../usrloc/usrloc.h" -str default_domain; -str outbound_proxy; -str server_address; +extern str default_domain; +extern str outbound_proxy; +extern str server_address; extern usrloc_api_t ul; /*!< Structure containing pointers to usrloc functions*/ extern pua_api_t pua; /*!< Structure containing pointers to PUA functions*/

1 0

git:5.3:c93c0a98: janssonrpcc: use extern not to declare tmb global many times
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: c93c0a989c690acebc6e2896f6b2d7095b95eb3d URL: https://github.com/kamailio/kamailio/commit/c93c0a989c690acebc6e2896f6b2d70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:19:42+01:00 janssonrpcc: use extern not to declare tmb global many times (cherry picked from commit 6bb1e84907a6c8bdb0c72289bad7b9915c9b3385) --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c Modified: src/modules/janssonrpcc/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/c93c0a989c690acebc6e2896f6b2d70… Patch: https://github.com/kamailio/kamailio/commit/c93c0a989c690acebc6e2896f6b2d70… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index a8683407b3..ea96f69532 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -31,7 +31,7 @@ #include "janssonrpc_funcs.h" -struct tm_binds tmb; +extern struct tm_binds tmb; int jsonrpc_request(struct sip_msg* _m, char* _conn, diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 898458b268..a503322057 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -51,7 +51,7 @@ #include "janssonrpc_connect.h" #include "netstring.h" -struct tm_binds tmb; +extern struct tm_binds tmb; /* event bases */ struct event_base* global_ev_base = NULL;

1 0

git:5.3:fe8f6887: ims_diameter_server: extern declaration of global vars in header file
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: fe8f6887f4fa94f72c04d09f6e199218e0b6a90d URL: https://github.com/kamailio/kamailio/commit/fe8f6887f4fa94f72c04d09f6e19921… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:19:17+01:00 ims_diameter_server: extern declaration of global vars in header file (cherry picked from commit 19263243127c40d0418ff04e56048d31e9dd9d0c) --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c Modified: src/modules/ims_diameter_server/ims_diameter_server.h --- Diff: https://github.com/kamailio/kamailio/commit/fe8f6887f4fa94f72c04d09f6e19921… Patch: https://github.com/kamailio/kamailio/commit/fe8f6887f4fa94f72c04d09f6e19921… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index f3e6fe040e..c7fe941b00 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -31,6 +31,13 @@ MODULE_VERSION extern gen_lock_t* process_lock; /* lock on the process table */ +struct cdp_binds cdpb; +cdp_avp_bind_t *cdp_avp; + +AAAMessage *request; +str responsejson; +str requestjson; + struct cdp_binds cdpb; cdp_avp_bind_t *cdp_avp; diff --git a/src/modules/ims_diameter_server/ims_diameter_server.h b/src/modules/ims_diameter_server/ims_diameter_server.h index 26848d5ebb..76775bd00c 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.h +++ b/src/modules/ims_diameter_server/ims_diameter_server.h @@ -26,14 +26,14 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage; -AAAMessage *request; -str responsejson; -str requestjson; +extern AAAMessage *request; +extern str responsejson; +extern str requestjson; AAAMessage* callback_cdp_request(AAAMessage *request, void *param);

1 0

git:5.3:267c9940: ims_ocs: declare extern global variables in header file
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: 267c9940ce9e6f4c5cd57a31d472aba07ee242c7 URL: https://github.com/kamailio/kamailio/commit/267c9940ce9e6f4c5cd57a31d472aba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:19:06+01:00 ims_ocs: declare extern global variables in header file (cherry picked from commit 13da8cf58a2abfcd87a48fbc963d4e1a26d60085) --- Modified: src/modules/ims_ocs/ims_ocs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/267c9940ce9e6f4c5cd57a31d472aba… Patch: https://github.com/kamailio/kamailio/commit/267c9940ce9e6f4c5cd57a31d472aba… --- diff --git a/src/modules/ims_ocs/ims_ocs_mod.h b/src/modules/ims_ocs/ims_ocs_mod.h index b46a29a4b4..cfddfdccc9 100644 --- a/src/modules/ims_ocs/ims_ocs_mod.h +++ b/src/modules/ims_ocs/ims_ocs_mod.h @@ -26,8 +26,8 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage;

1 0

git:5.3:6da1fd36: ims_charging: extern declaration for cdpb
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: 6da1fd36fe4c003ccf20ad629250a1f545e5f189 URL: https://github.com/kamailio/kamailio/commit/6da1fd36fe4c003ccf20ad629250a1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:18:35+01:00 ims_charging: extern declaration for cdpb (cherry picked from commit 9cd1cec4dedadcfcd50322c4709c4844a3db2f4f) --- Modified: src/modules/ims_charging/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/6da1fd36fe4c003ccf20ad629250a1f… Patch: https://github.com/kamailio/kamailio/commit/6da1fd36fe4c003ccf20ad629250a1f… --- diff --git a/src/modules/ims_charging/dialog.c b/src/modules/ims_charging/dialog.c index 9b03998170..fdbaafe663 100644 --- a/src/modules/ims_charging/dialog.c +++ b/src/modules/ims_charging/dialog.c @@ -5,7 +5,7 @@ #include "ims_charging_stats.h" #include "../../core/parser/hf.h" -struct cdp_binds cdpb; +extern struct cdp_binds cdpb; extern int ro_db_mode; extern char *domain;

1 0

git:5.3:17768cd7: ims_charging: use extern to avoid double declaration of globals
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: 17768cd71db7464b295db17706b4593e9dc75b59 URL: https://github.com/kamailio/kamailio/commit/17768cd71db7464b295db17706b4593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:18:19+01:00 ims_charging: use extern to avoid double declaration of globals (cherry picked from commit a13d49fb099dd5e8d832a0559a8e69aa8c61c1ae) --- Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/17768cd71db7464b295db17706b4593… Patch: https://github.com/kamailio/kamailio/commit/17768cd71db7464b295db17706b4593… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index 06284c6732..5fabde6714 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -25,6 +25,8 @@ MODULE_VERSION +struct dlg_binds* dlgb_p; + /* parameters */ char* ro_destination_host_s = "hss.ims.smilecoms.com"; char* ro_service_context_id_root_s = "32260(a)3gpp.org"; @@ -46,6 +48,8 @@ int video_service_identifier = 1001; int video_rating_group = 200; +struct impu_data impu_data_t; + /* DB params */ static str db_url = str_init(DEFAULT_DB_URL); static unsigned int db_update_period = DB_DEFAULT_UPDATE_PERIOD; diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index cd3ae215ae..b78016b99a 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -54,10 +54,10 @@ struct session_setup_data { unsigned int tlabel; }; -struct dlg_binds* dlgb_p; +extern struct dlg_binds* dlgb_p; extern struct tm_binds tmb; -int interim_request_credits; +extern int interim_request_credits; extern int voice_service_identifier; extern int voice_rating_group; diff --git a/src/modules/ims_charging/ro_session_hash.h b/src/modules/ims_charging/ro_session_hash.h index b81e843245..556d11d849 100644 --- a/src/modules/ims_charging/ro_session_hash.h +++ b/src/modules/ims_charging/ro_session_hash.h @@ -42,7 +42,9 @@ struct diameter_avp_value { struct impu_data { str identity; str contact; -} impu_data_t; +}; + +extern struct impu_data impu_data_t; struct ro_session { volatile int ref;

1 0

git:5.3:e58c80bd: ims_usrloc_scscf: extern declaration for duplicated global vars
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: e58c80bdba4feeabbdbcaacb2168ee9f358049c0 URL: https://github.com/kamailio/kamailio/commit/e58c80bdba4feeabbdbcaacb2168ee9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:18:08+01:00 ims_usrloc_scscf: extern declaration for duplicated global vars (cherry picked from commit 1bbab692b749feee7f23a6c5c3fbee1ac890fffa) --- Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/e58c80bdba4feeabbdbcaacb2168ee9… Patch: https://github.com/kamailio/kamailio/commit/e58c80bdba4feeabbdbcaacb2168ee9… --- diff --git a/src/modules/ims_usrloc_scscf/udomain.c b/src/modules/ims_usrloc_scscf/udomain.c index 080b790f34..361d5ba425 100644 --- a/src/modules/ims_usrloc_scscf/udomain.c +++ b/src/modules/ims_usrloc_scscf/udomain.c @@ -73,8 +73,8 @@ extern int unreg_validity; extern int db_mode; -struct contact_list* contact_list; -struct ims_subscription_list* ims_subscription_list; +extern struct contact_list* contact_list; +extern struct ims_subscription_list* ims_subscription_list; extern int subs_hash_size; extern int contact_delete_delay;

1 0

git:5.3:d7c52a7c: ims_registrar_scscf: global vars declared extern in header files
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: d7c52a7c59c27c054a3782b7f004b865006b6d4d URL: https://github.com/kamailio/kamailio/commit/d7c52a7c59c27c054a3782b7f004b86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:17:55+01:00 ims_registrar_scscf: global vars declared extern in header files (cherry picked from commit a041e94c4dce464737d6531d11fbe4d61292d7b4) --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h Modified: src/modules/ims_registrar_scscf/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/d7c52a7c59c27c054a3782b7f004b86… Patch: https://github.com/kamailio/kamailio/commit/d7c52a7c59c27c054a3782b7f004b86… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index b7a408b023..c402ac3985 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -79,8 +79,11 @@ MODULE_VERSION extern gen_lock_t* process_lock; /* lock on the process table */ -int * callback_singleton; /**< Cx callback singleton */ +int *callback_singleton; /**< Cx callback singleton */ +stat_var* stat_sar_timeouts; +stat_var* sar_replies_received; +stat_var* sar_replies_response_time; struct tm_binds tmb; @@ -176,7 +179,10 @@ int max_notification_list_size = 0; int notification_processes = 4; /*Number of processes that processes the notification queue*/ -extern reg_notification_list *notification_list; /**< list of notifications for reg to be sent */ +reg_notification_list *notification_list; /**< list of notifications for reg to be sent */ + +IMS_Events_enum_t IMS_Events; +IMS_Registrar_events_enum_t IMS_Registrar_events; #define RCV_NAME "received" str rcv_param = str_init(RCV_NAME); diff --git a/src/modules/ims_registrar_scscf/registrar_notify.h b/src/modules/ims_registrar_scscf/registrar_notify.h index ee1fec52e8..5491c43b5d 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.h +++ b/src/modules/ims_registrar_scscf/registrar_notify.h @@ -96,13 +96,15 @@ typedef struct { } reg_notification_list; /** Events for subscriptions */ -enum { +typedef enum { IMS_EVENT_NONE, /**< Generic, no event */ IMS_EVENT_REG /**< Registration event */ -} IMS_Events; +} IMS_Events_enum_t; + +extern IMS_Events_enum_t IMS_Events; /** Event types for "reg" to generated notifications after */ -enum { +typedef enum { IMS_REGISTRAR_NONE, /**< no event - donothing */ IMS_REGISTRAR_SUBSCRIBE, /**< Initial SUBSCRIBE - just send all data - this should not be treated though */ IMS_REGISTRAR_UNSUBSCRIBE, /**< Final UnSUBSCRIBE - just send a NOTIFY which will probably fail */ @@ -114,10 +116,11 @@ enum { IMS_REGISTRAR_CONTACT_EXPIRED, /**< A contact has expired and will be removed */ IMS_REGISTRAR_CONTACT_UNREGISTERED, /**< User unregistered with Expires 0 */ IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT, /**< User unregistered implicitly, ie not via explicit deregister */ -} IMS_Registrar_events; +} IMS_Registrar_events_enum_t; +extern IMS_Registrar_events_enum_t IMS_Registrar_events; -reg_notification_list *notification_list; //< List of pending notifications +extern reg_notification_list *notification_list; //< List of pending notifications int can_subscribe_to_reg(struct sip_msg *msg, char *str1, char *str2); diff --git a/src/modules/ims_registrar_scscf/stats.h b/src/modules/ims_registrar_scscf/stats.h index 3b2c61b964..ea4418f426 100644 --- a/src/modules/ims_registrar_scscf/stats.h +++ b/src/modules/ims_registrar_scscf/stats.h @@ -43,9 +43,9 @@ #include "../../core/counters.h" -stat_var* stat_sar_timeouts; -stat_var* sar_replies_received; -stat_var* sar_replies_response_time; +extern stat_var* stat_sar_timeouts; +extern stat_var* sar_replies_received; +extern stat_var* sar_replies_response_time; int register_stats(); unsigned long get_avg_sar_response_time();

1 0

git:5.3:575ab954: tm: safe list iteration in tm_clean_lifetime()
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: 5.3 Commit: 575ab954538cbd7fdd6ac763fa4fd1c9e5b7ab4b URL: https://github.com/kamailio/kamailio/commit/575ab954538cbd7fdd6ac763fa4fd1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:17:42+01:00 tm: safe list iteration in tm_clean_lifetime() (cherry picked from commit 325a45e846faae3e5dfa333727d5fab294e44dac) --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/575ab954538cbd7fdd6ac763fa4fd1c… Patch: https://github.com/kamailio/kamailio/commit/575ab954538cbd7fdd6ac763fa4fd1c… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index d0ec6c8452..cf5201caec 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -596,6 +596,7 @@ void tm_clean_lifetime(void) { int r; tm_cell_t *tcell; + tm_cell_t *bcell; ticks_t texp; texp = get_ticks_raw() - S_TO_TICKS(TM_LIFETIME_LIMIT); @@ -612,7 +613,7 @@ void tm_clean_lifetime(void) continue; } - clist_foreach(&_tm_table->entries[r], tcell, next_c) + clist_foreach_safe(&_tm_table->entries[r], tcell, bcell, next_c) { if(TICKS_GT(texp, tcell->end_of_life)) { tm_log_transaction(tcell, L_WARN, "[hard cleanup]");

1 0

git:master:92c6f04a: siputils: proper param type for kemi contact ops exports
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: master Commit: 92c6f04a3faa917a227fb5d3b8918c981a1b1d96 URL: https://github.com/kamailio/kamailio/commit/92c6f04a3faa917a227fb5d3b8918c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:11:04+01:00 siputils: proper param type for kemi contact ops exports --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/92c6f04a3faa917a227fb5d3b8918c9… Patch: https://github.com/kamailio/kamailio/commit/92c6f04a3faa917a227fb5d3b8918c9… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index e9593da3b4..c2da159088 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -553,12 +553,12 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { }, { str_init("siputils"), str_init("decode_contact"), SR_KEMIP_INT, ki_decode_contact, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siputils"), str_init("decode_contact_header"), SR_KEMIP_INT, ki_decode_contact_header, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:a771d9ab: app_python3: declare global vars extern in header file
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: master Commit: a771d9abd9ce97228efa7a0dfc9c4d89690e9b38 URL: https://github.com/kamailio/kamailio/commit/a771d9abd9ce97228efa7a0dfc9c4d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T08:27:47+01:00 app_python3: declare global vars extern in header file --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/a771d9abd9ce97228efa7a0dfc9c4d8… Patch: https://github.com/kamailio/kamailio/commit/a771d9abd9ce97228efa7a0dfc9c4d8… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 92ce10e04f..502a6d540b 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -53,6 +53,7 @@ static int child_init(int rank); static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; char *dname = NULL, *bname = NULL; diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 97c4e72e3e..8859f9a32a 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

1 0

git:master:9cc9576c: app_python: declare global vars extern in header file
by Daniel-Constantin Mierla 09 Mar '20

09 Mar '20

Module: kamailio Branch: master Commit: 9cc9576c025c541264a3679618bb2be8d108a9f6 URL: https://github.com/kamailio/kamailio/commit/9cc9576c025c541264a3679618bb2be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T08:27:15+01:00 app_python: declare global vars extern in header file --- Modified: src/modules/app_python/app_python_mod.c Modified: src/modules/app_python/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/9cc9576c025c541264a3679618bb2be… Patch: https://github.com/kamailio/kamailio/commit/9cc9576c025c541264a3679618bb2be… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index e901c91412..ee832feb3d 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -54,6 +54,8 @@ static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; + char *dname = NULL, *bname = NULL; int _apy_process_rank = 0; diff --git a/src/modules/app_python/python_support.h b/src/modules/app_python/python_support.h index 4d25564119..2a97d16ed8 100644 --- a/src/modules/app_python/python_support.h +++ b/src/modules/app_python/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

1 0

git:master:7afe5b98: pua_reginfo: extern declaration of global vars in header file
by Daniel-Constantin Mierla 08 Mar '20

08 Mar '20

Module: kamailio Branch: master Commit: 7afe5b9837d38cd77f75c3028c9134673c95404e URL: https://github.com/kamailio/kamailio/commit/7afe5b9837d38cd77f75c3028c91346… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-08T20:25:00+01:00 pua_reginfo: extern declaration of global vars in header file --- Modified: src/modules/pua_reginfo/pua_reginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/7afe5b9837d38cd77f75c3028c91346… Patch: https://github.com/kamailio/kamailio/commit/7afe5b9837d38cd77f75c3028c91346… --- diff --git a/src/modules/pua_reginfo/pua_reginfo.h b/src/modules/pua_reginfo/pua_reginfo.h index a15b7e47a8..133191541b 100644 --- a/src/modules/pua_reginfo/pua_reginfo.h +++ b/src/modules/pua_reginfo/pua_reginfo.h @@ -16,8 +16,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,9 +27,9 @@ #include "../pua/pua_bind.h" #include "../usrloc/usrloc.h" -str default_domain; -str outbound_proxy; -str server_address; +extern str default_domain; +extern str outbound_proxy; +extern str server_address; extern usrloc_api_t ul; /*!< Structure containing pointers to usrloc functions*/ extern pua_api_t pua; /*!< Structure containing pointers to PUA functions*/

1 0

git:master:b514d330: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 08 Mar '20

08 Mar '20

Module: kamailio Branch: master Commit: b514d330012826628f69128fa27afc102934ddc5 URL: https://github.com/kamailio/kamailio/commit/b514d330012826628f69128fa27afc1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-08T09:46:21+01:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/b514d330012826628f69128fa27afc1… Patch: https://github.com/kamailio/kamailio/commit/b514d330012826628f69128fa27afc1… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 357c41d388..d1940ce7e1 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -9,7 +9,7 @@ Edited by Wolfgang Kampichler - Copyright © 20018-2019 Wolfgang Kampichler + Copyright © 20018-2020 Wolfgang Kampichler __________________________________________________________________ Table of Contents @@ -60,9 +60,9 @@ Chapter 1. Admin Guide SIP requests may be forwarded based on a location provided with the request or retrieved from a specific location server using an identity (HELD). This module implements the basic functionality to get or parse - location information and to query a mapping service (LOST) in order to - get next hop based on location and service urn either specified or - provided with the request. + location information (civic and geodetic) and to query a mapping + service (LOST) in order to get next hop based on location and service + urn either specified or provided with the request. This module implements protocol functions that use the http_client api to fetch data from external LOST and HELD servers. The module is using @@ -81,11 +81,11 @@ Chapter 1. Admin Guide The function lost_query allows Kamailio to assemble a LOST findService request as defined in RFC5222 (https://tools.ietf.org/html/rfc5255) to - query routing information for a given (geodetic) location and a service - URN. Both, PIDF-LO and service URN may be provided as function - parameter, or are taken from the request message if applicable. The - findServiceResponse is parsed and represented asdisplay name and SIP - URI typically used as next hop in a Route header. + query routing information for a given (geodetic or civic) location and + a service URN. Both, PIDF-LO and service URN may be provided as + function parameter, or are taken from the request message if + applicable. The findServiceResponse is parsed and represented asdisplay + name and SIP URI typically used as next hop in a Route header. The http_client module use the CURL library setting up connections. The CURL library by default use the system configured DNS resolvers, not @@ -196,24 +196,24 @@ $var(id) = "urn:service:sos"; $var(res) = lost_query("lostsrv", "$var(pidf)", "$var(urn)", "$var(uri)", "$var( name)", "$var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name)\n"); ... # LOST findService request - pidf-lo as parameter, urn taken from request line $var(res) = lost_query("lostsrv", "$var(pidf)", "", "$var(uri)", "$var(name)", " $var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name)\n"); ... # LOST findService request - urn as parameter, pidf-lo taken from message body $var(res) = lost_query("lostsrv", "", "$var(urn)", "$var(uri)", "$var(name)", "$ var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name\n"); ... # LOST findService request - pidf-lo and urn taken from message $var(res) = lost_query("lostsrv", "$var(uri)", "$var(name)", "$var(err)"); xlog("L_INFO", "LOST findService: Result code $var(res)\nUri: $var(uri)\nName: $ -var(uri)\n"); +var(name)\n"); ... 5. Counters @@ -236,5 +236,5 @@ var(uri)\n"); requires query_params.oneline set to 0. In the case lost_query is used with the default http_client API, dereferencing location via HTTP provided with the Geolocation header causes an error. Therefore, to - work properlu=y, it requires to set http_client module parameter + work properly, it requires to set http_client module parameter query_result to 0.

1 0

git:master:d4fe0a9a: lost: added civic address parsing via xpath
by wkampich 08 Mar '20

08 Mar '20

Module: kamailio Branch: master Commit: d4fe0a9a5c553ca25c9e29ab1eb64f4debd9a91e URL: https://github.com/kamailio/kamailio/commit/d4fe0a9a5c553ca25c9e29ab1eb64f4… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: wkampich <wolfgang.kampichler(a)gmail.com> Date: 2020-03-08T09:23:53+01:00 lost: added civic address parsing via xpath - the pidf-lo parsing function now uses xpath to support geolocation (point, circle) and civic address. - as fall-back (failing xpath or malformed pidf-lo) the the function looks for point or cirle attributes. - besides: README update and code refactoring. --- Modified: src/modules/lost/doc/lost.xml Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/pidf.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/d4fe0a9a5c553ca25c9e29ab1eb64f4… Patch: https://github.com/kamailio/kamailio/commit/d4fe0a9a5c553ca25c9e29ab1eb64f4…

1 0

git:master:bc9baca2: jsonrcc: use extern not to declare global variables many times
by Daniel-Constantin Mierla 07 Mar '20

07 Mar '20

Module: kamailio Branch: master Commit: bc9baca2229d09b912a51a2e64ead79f709d45fd URL: https://github.com/kamailio/kamailio/commit/bc9baca2229d09b912a51a2e64ead79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-07T13:25:06+01:00 jsonrcc: use extern not to declare global variables many times --- Modified: src/modules/jsonrpcc/jsonrpc_io.c Modified: src/modules/jsonrpcc/jsonrpc_request.c Modified: src/modules/jsonrpcc/jsonrpc_request.h Modified: src/modules/jsonrpcc/jsonrpcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc9baca2229d09b912a51a2e64ead79… Patch: https://github.com/kamailio/kamailio/commit/bc9baca2229d09b912a51a2e64ead79… --- diff --git a/src/modules/jsonrpcc/jsonrpc_io.c b/src/modules/jsonrpcc/jsonrpc_io.c index ebb93348ba..81627659fb 100644 --- a/src/modules/jsonrpcc/jsonrpc_io.c +++ b/src/modules/jsonrpcc/jsonrpc_io.c @@ -58,7 +58,7 @@ struct jsonrpc_server_group { struct jsonrpc_server_group *next_group; }; -struct tm_binds tmb; +extern struct tm_binds tmb; struct jsonrpc_server_group *server_group; diff --git a/src/modules/jsonrpcc/jsonrpc_request.c b/src/modules/jsonrpcc/jsonrpc_request.c index d2321e5f37..63af54dfe1 100644 --- a/src/modules/jsonrpcc/jsonrpc_request.c +++ b/src/modules/jsonrpcc/jsonrpc_request.c @@ -29,7 +29,7 @@ #include "jsonrpc_io.h" -struct tm_binds tmb; +extern struct tm_binds tmb; int memory_error() { LM_ERR("Out of memory!"); diff --git a/src/modules/jsonrpcc/jsonrpc_request.h b/src/modules/jsonrpcc/jsonrpc_request.h index 16114d9aa7..49cfdb46c1 100644 --- a/src/modules/jsonrpcc/jsonrpc_request.h +++ b/src/modules/jsonrpcc/jsonrpc_request.h @@ -26,6 +26,6 @@ int jsonrpc_request(struct sip_msg* msg, char* method, char* params, char* cb_route, char* err_route, char* cb_pv); int jsonrpc_notification(struct sip_msg* msg, char* method, char* params); -int cmd_pipe; +extern int cmd_pipe; #endif /* _JSONRPC_REQUEST_H_ */ diff --git a/src/modules/jsonrpcc/jsonrpcc_mod.c b/src/modules/jsonrpcc/jsonrpcc_mod.c index c5d067b733..062b5b4096 100644 --- a/src/modules/jsonrpcc/jsonrpcc_mod.c +++ b/src/modules/jsonrpcc/jsonrpcc_mod.c @@ -49,6 +49,7 @@ int fixup_pvar_shm(void** param, int param_no); char *servers_param; int pipe_fds[2] = {-1,-1}; +int cmd_pipe = -1; extern int _jsonrpcc_max_conn_retry; /* max retries to connect */

1 0

git:master:f2959f42: core: remove compiler warnings [-Wstring-plus-int]
by Victor Seva 07 Mar '20

07 Mar '20

Module: kamailio Branch: master Commit: f2959f422bb8171241728f5148d4b21c9cc2c681 URL: https://github.com/kamailio/kamailio/commit/f2959f422bb8171241728f5148d4b21… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-07T12:01:08+01:00 core: remove compiler warnings [-Wstring-plus-int] > core/parser/parse_fline.c:241:17: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ~~~~~~~~~~~^~ > > core/parser/parse_fline.c:241:17: note: use array indexing to silence this warning > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ^ > & [ ] > core/parser/parse_fline.c:247:18: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ~~~~~~~~~~~~^~ > > core/parser/parse_fline.c:247:18: note: use array indexing to silence this warning > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ^ > & [ ] > > 2 warnings generated. --- Modified: src/core/parser/parse_fline.c --- Diff: https://github.com/kamailio/kamailio/commit/f2959f422bb8171241728f5148d4b21… Patch: https://github.com/kamailio/kamailio/commit/f2959f422bb8171241728f5148d4b21… --- diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index a5aefb7ee8..5016a31d59 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -238,13 +238,13 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) && (fl->u.request.version.s[0]=='S' || fl->u.request.version.s[0]=='s') && !strncasecmp(fl->u.request.version.s+1, - SIP_VERSION+1, SIP_VERSION_LEN-1)) { + &SIP_VERSION[1], SIP_VERSION_LEN-1)) { fl->flags|=FLINE_FLAG_PROTO_SIP; } else if(fl->u.request.version.len >= HTTP_VERSION_LEN && (fl->u.request.version.s[0]=='H' || fl->u.request.version.s[0]=='h') && !strncasecmp(fl->u.request.version.s+1, - HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { + &HTTP_VERSION[1], HTTP_VERSION_LEN-1)) { fl->flags|=FLINE_FLAG_PROTO_HTTP; } }

1 0

git:master:6bb1e849: janssonrpcc: use extern not to declare tmb global many times
by Daniel-Constantin Mierla 07 Mar '20

07 Mar '20

Module: kamailio Branch: master Commit: 6bb1e84907a6c8bdb0c72289bad7b9915c9b3385 URL: https://github.com/kamailio/kamailio/commit/6bb1e84907a6c8bdb0c72289bad7b99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-07T11:54:28+01:00 janssonrpcc: use extern not to declare tmb global many times --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c Modified: src/modules/janssonrpcc/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/6bb1e84907a6c8bdb0c72289bad7b99… Patch: https://github.com/kamailio/kamailio/commit/6bb1e84907a6c8bdb0c72289bad7b99… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index 3995174722..93e62bd53d 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -31,7 +31,7 @@ #include "janssonrpc_funcs.h" -struct tm_binds tmb; +extern struct tm_binds tmb; int jsonrpc_request(struct sip_msg* _m, char* _conn, diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index ebb64705b5..5e9d01d004 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -51,7 +51,7 @@ #include "janssonrpc_connect.h" #include "netstring.h" -struct tm_binds tmb; +extern struct tm_binds tmb; /* event bases */ struct event_base* global_ev_base = NULL;

1 0

git:master:2b070a62: core: remove compiler warnings [-Wstring-plus-int]
by Victor Seva 07 Mar '20

07 Mar '20

Module: kamailio Branch: master Commit: 2b070a622fa3c78d929580fda3c7952963c4066b URL: https://github.com/kamailio/kamailio/commit/2b070a622fa3c78d929580fda3c7952… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-03-07T11:35:55+01:00 core: remove compiler warnings [-Wstring-plus-int] > core/parser/parse_fline.c:93:34: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 && > ~~~~~~~~~~~^~ > > core/parser/parse_fline.c:121:9: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > } else IFISMETHOD( INVITE, 'I' ) > ^~~~~~~~~~~~~~~~~~~~~~~~~ > > core/parser/msg_parser.h:131:35: note: expanded from macro 'IFISMETHOD' > strncasecmp( tmp+1, #methodname +1, methodname##_LEN-1)==0 && \ > ~~~~~~~~~~~~^~ --- Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_fline.c --- Diff: https://github.com/kamailio/kamailio/commit/2b070a622fa3c78d929580fda3c7952… Patch: https://github.com/kamailio/kamailio/commit/2b070a622fa3c78d929580fda3c7952… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index f3ea088eb8..ceedf2cda9 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -128,7 +128,7 @@ typedef enum request_method { #define IFISMETHOD(methodname,firstchar) \ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ - strncasecmp( tmp+1, #methodname +1, methodname##_LEN-1)==0 && \ + strncasecmp( tmp+1, &#methodname[1], methodname##_LEN-1)==0 && \ *(tmp+methodname##_LEN)==' ') { \ fl->type=SIP_REQUEST; \ fl->u.request.method.len=methodname##_LEN; \ diff --git a/src/core/parser/parse_fline.c b/src/core/parser/parse_fline.c index c535b49a4c..a5aefb7ee8 100644 --- a/src/core/parser/parse_fline.c +++ b/src/core/parser/parse_fline.c @@ -90,7 +90,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) tmp=buffer; /* is it perhaps a reply, ie does it start with "SIP...." ? */ if ( (*tmp=='S' || *tmp=='s') && - strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 && + strncasecmp( tmp+1, &SIP_VERSION[1], SIP_VERSION_LEN-1)==0 && (*(tmp+SIP_VERSION_LEN)==' ')) { fl->type=SIP_REPLY; fl->flags|=FLINE_FLAG_PROTO_SIP; @@ -98,7 +98,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) tmp=buffer+SIP_VERSION_LEN; } else if (http_reply_parse != 0 && (*tmp=='H' || *tmp=='h')) { /* 'HTTP/1.' */ - if (strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 && + if (strncasecmp( tmp+1, &HTTP_VERSION[1], HTTP_VERSION_LEN-1)==0 && /* [0|1] */ ((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) && (*(tmp+HTTP_VERSION_LEN+1)==' ') ){ @@ -111,7 +111,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl) fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/; tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */; /* 'HTTP/2' */ - } else if (strncasecmp( tmp+1, HTTP2_VERSION+1, HTTP2_VERSION_LEN-1)==0 && + } else if (strncasecmp( tmp+1, &HTTP2_VERSION[1], HTTP2_VERSION_LEN-1)==0 && (*(tmp+HTTP2_VERSION_LEN)==' ')) { fl->type=SIP_REPLY; fl->flags|=FLINE_FLAG_PROTO_HTTP;

1 0

Re: [sr-dev] Regarding MIPS Compilation
by subhra giri 07 Mar '20

07 Mar '20

Dear Henning Executing "make cfg " gives below output [root@www kamailio-5.3.2]# make cfg make -C src/ cfg target architecture <mips64>, host architecture <x86_64> ---------------------------------------------------------------------------------------------------------------------------------------------------------- In native platform it is compiling successfully. But giving problem for target platform i.e mips64-octeon-linux. Please help me with steps for mips compilation Thanks and Regards Subhra Prakash Giri >

2 2

git:master:7c097c1b: pv: remove unnecessary casts that rise warnings with some compilers
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 7c097c1b3715526611668233be79fdf9b1cb0063 URL: https://github.com/kamailio/kamailio/commit/7c097c1b3715526611668233be79fdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T23:56:42+01:00 pv: remove unnecessary casts that rise warnings with some compilers --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/7c097c1b3715526611668233be79fdf… Patch: https://github.com/kamailio/kamailio/commit/7c097c1b3715526611668233be79fdf… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index ed7c4677fe..36dbcf24b5 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -536,8 +536,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_ENCODEBASE64URL: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); - i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_enc(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); if (i < 0) return -1; _tr_buffer[i] = '\0'; @@ -549,8 +549,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_DECODEBASE64URL: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); - i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_dec(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); if (i < 0 || (i == 0 && val->rs.len > 0)) return -1; _tr_buffer[i] = '\0'; @@ -562,8 +562,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_ENCODEBASE64URLT: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); - i = base64url_enc((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_enc(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); if (i < 0) return -1; if (i>1 && _tr_buffer[i-1] == '=') { @@ -594,11 +594,11 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, st.len = val->rs.len + (4 - (val->rs.len % 4)); /* move to next buffer */ tr_set_crt_buffer(); - i = base64url_dec((unsigned char *) st.s, st.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_dec(st.s, st.len, + _tr_buffer, TR_BUFFER_SIZE-1); } else { - i = base64url_dec((unsigned char *) val->rs.s, val->rs.len, - (unsigned char *) _tr_buffer, TR_BUFFER_SIZE-1); + i = base64url_dec(val->rs.s, val->rs.len, + _tr_buffer, TR_BUFFER_SIZE-1); } if (i < 0 || (i == 0 && val->rs.len > 0)) return -1;

1 0

git:master:d78289c3: core: define function name for base64-url encoding as its declaration in .h file
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: d78289c34e4e5fb97fe1670e2c6773cf9ae5710f URL: https://github.com/kamailio/kamailio/commit/d78289c34e4e5fb97fe1670e2c6773c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T23:55:59+01:00 core: define function name for base64-url encoding as its declaration in .h file --- Modified: src/core/basex.c --- Diff: https://github.com/kamailio/kamailio/commit/d78289c34e4e5fb97fe1670e2c6773c… Patch: https://github.com/kamailio/kamailio/commit/d78289c34e4e5fb97fe1670e2c6773c… --- diff --git a/src/core/basex.c b/src/core/basex.c index ce5f7543a1..45abcac028 100644 --- a/src/core/basex.c +++ b/src/core/basex.c @@ -427,7 +427,7 @@ static const int _ksr_b64url_decmap[] = { -1, -1, -1, -1, -1, -1, -1, -1 }; -int base64url_encode(char *in, int ilen, char *out, int osize) +int base64url_enc(char *in, int ilen, char *out, int osize) { int left; int idx;

1 0

[kamailio/kamailio] Write Buffer too small (#2240)
by Natzy 06 Mar '20

06 Mar '20

### Description  We're trying to connect the same subscriber with Kamailio for load testing. Sometimes it registers successfully but sometimes it throws the following error. ### Troubleshooting >From my understanding by checking the source code, TLS_WR_MBUF_SZ is set as 65536 by default. This is the reason for "write buffer too small". Can someone help me with how to change that? #### Reproduction  I don't exactly know how to reproduce as some the clients pass and some fail. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  BUG: tls [tls_server.c:849]: tls_encode_f(): write buffer too small (65536/65536 bytes) ERROR: websocket [ws_frame.c:300]: encode_and_send_ws_frame(): sending WebSocket frame ERROR: websocket [ws_frame.c:800]: ws_frame_transmit(): sending message NOTICE: <script>: WebSocket connection from a.b.c.d:1234 has closed ERROR: registrar [reply.c:745]: reg_send_reply(): failed to send 200 OK ERROR: <core> [core/tcp_main.c:3502]: handle_ser_child(): received CON_ERROR for 0x7f9472eec990 (id 100), refcnt 4, flags 0x4018 NOTICE: <script>: Error in saving location data WARNING: sl [../../core/forward.h:173]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found ERROR: sl [sl_funcs.c:362]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) WARNING: <core> [core/tcp_read.c:1716]: handle_io(): F_TCPCONN connection marked as bad: 0x7f9472eec990 id 100 refcnt 1 #### SIP Traffic  ### Possible Solutions  Need to increase the default tls write buffer size from 65536. I think it is set as "#define TLS_WR_MBUF_SZ 65536" ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.0.8 (x86_64/linux) c35e69 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c35e69 compiled on 05:04:45 Nov 25 2019 with gcc 4.8.5 * **Operating System**:  Linux 3.10.0-957.21.3.el7.x86_64 #1 SMP Tue Jun 18 16:35:19 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux CentOS Linux release 7.7.1908 (Core) -- 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/2240

2 5

git:master:1dd8c578: pv: transformations for base64-url encode/decode variants
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 1dd8c5784aa58bd48a713661a1f3e4ed7db58c88 URL: https://github.com/kamailio/kamailio/commit/1dd8c5784aa58bd48a713661a1f3e4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T17:46:49+01:00 pv: transformations for base64-url encode/decode variants --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1dd8c5784aa58bd48a713661a1f3e4e… Patch: https://github.com/kamailio/kamailio/commit/1dd8c5784aa58bd48a713661a1f3e4e…

1 0

git:master:57d131bc: core: functions to encode/decode base64-url
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 57d131bc26523d4a87d60b9e3fa96079030efa88 URL: https://github.com/kamailio/kamailio/commit/57d131bc26523d4a87d60b9e3fa9607… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T17:45:43+01:00 core: functions to encode/decode base64-url --- Modified: src/core/basex.c Modified: src/core/basex.h --- Diff: https://github.com/kamailio/kamailio/commit/57d131bc26523d4a87d60b9e3fa9607… Patch: https://github.com/kamailio/kamailio/commit/57d131bc26523d4a87d60b9e3fa9607… --- diff --git a/src/core/basex.c b/src/core/basex.c index 592ea0cd96..ce5f7543a1 100644 --- a/src/core/basex.c +++ b/src/core/basex.c @@ -387,3 +387,124 @@ char* b58_encode(char *b58, int *b58sz, char *data, int binsz) return b58; } + +/* base64-url encoding table (RFC 4648 document) */ +static const char _ksr_b64url_encmap[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; + +/* base64-url decoding table */ +static const int _ksr_b64url_decmap[] = { + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 0x3E, -1, -1, + 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, -1, -1, -1, -1, -1, -1, + -1, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, + 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, + 0x17, 0x18, 0x19, -1, -1, -1, -1, 0x3F, + -1, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, + 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, + 0x31, 0x32, 0x33, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1 +}; + +int base64url_encode(char *in, int ilen, char *out, int osize) +{ + int left; + int idx; + int i; + int r; + char *p; + int block; + int olen; + + olen = (((ilen+2)/3)<<2); + if (olen >= osize) { + LM_ERR("not enough output buffer size %d - need %d\n", osize, olen+1); + return -1; + } + memset(out, 0, (olen+1)*sizeof(char)); + + p = out; + for(idx=0; idx<ilen; idx+=3) { + left = ilen - idx - 1 ; + left = (left>1)?2:left; + + block = 0; + for(i=0, r=16; i<=left; i++, r-=8) + block += ((unsigned char)in[idx+i]) << r; + + *(p++) = _ksr_b64url_encmap[(block >> 18) & 0x3f]; + *(p++) = _ksr_b64url_encmap[(block >> 12) & 0x3f]; + *(p++) = (left>0)?_ksr_b64url_encmap[(block >> 6) & 0x3f]:'='; + *(p++) = (left>1)?_ksr_b64url_encmap[block & 0x3f]:'='; + } + + return olen; +} + +int base64url_dec(char *in, int ilen, char *out, int osize) +{ + int n; + int block; + int idx; + int i; + int j; + int end; + char c; + int olen; + + for(n=0,i=ilen-1; in[i]=='='; i--) + n++; + + olen = ((ilen * 6) >> 3) - n; + + if (olen<=0) { + LM_ERR("invalid olen parameter calculated, can't continue %d\n", olen); + return -1; + } + + if(olen >= osize) { + LM_ERR("not enough output buffer size %d - need %d\n", osize, olen+1); + return -1; + } + memset(out, 0, (olen+1)*sizeof(char)); + + end = ilen - n; + for(i=0, idx=0; i<end; idx+=3) { + block = 0; + for(j=0; j<4 && i<end ; j++) { + c = _ksr_b64url_decmap[(int)in[i++]]; + if(c<0) { + LM_ERR("invalid input string\"%.*s\"\n", ilen, in); + return -1; + } + block += c << (18 - 6*j); + } + + for(j=0, n=16; j<3 && idx+j<olen; j++, n-=8) + out[idx+j] = (char)((block >> n) & 0xff); + } + + return olen; +} + diff --git a/src/core/basex.h b/src/core/basex.h index 1c5af1c780..8181e6f512 100644 --- a/src/core/basex.h +++ b/src/core/basex.h @@ -864,4 +864,7 @@ int init_basex(void); char* b58_encode(char *b58, int *b58sz, char *data, int binsz); char* b58_decode(char *outb, int *outbszp, char *b58, int b58sz); +int base64url_enc(char *in, int ilen, char *out, int osize); +int base64url_dec(char *in, int ilen, char *out, int osize); + #endif /* _basex_h */

1 0

git:master:19263243: ims_diameter_server: extern declaration of global vars in header file
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 19263243127c40d0418ff04e56048d31e9dd9d0c URL: https://github.com/kamailio/kamailio/commit/19263243127c40d0418ff04e56048d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T16:28:51+01:00 ims_diameter_server: extern declaration of global vars in header file --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c Modified: src/modules/ims_diameter_server/ims_diameter_server.h --- Diff: https://github.com/kamailio/kamailio/commit/19263243127c40d0418ff04e56048d3… Patch: https://github.com/kamailio/kamailio/commit/19263243127c40d0418ff04e56048d3… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index f3e6fe040e..c7fe941b00 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -31,6 +31,13 @@ MODULE_VERSION extern gen_lock_t* process_lock; /* lock on the process table */ +struct cdp_binds cdpb; +cdp_avp_bind_t *cdp_avp; + +AAAMessage *request; +str responsejson; +str requestjson; + struct cdp_binds cdpb; cdp_avp_bind_t *cdp_avp; diff --git a/src/modules/ims_diameter_server/ims_diameter_server.h b/src/modules/ims_diameter_server/ims_diameter_server.h index 26848d5ebb..76775bd00c 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.h +++ b/src/modules/ims_diameter_server/ims_diameter_server.h @@ -26,14 +26,14 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage; -AAAMessage *request; -str responsejson; -str requestjson; +extern AAAMessage *request; +extern str responsejson; +extern str requestjson; AAAMessage* callback_cdp_request(AAAMessage *request, void *param);

1 0

dev question related to generate_avps()
by Stefan Mititelu 06 Mar '20

06 Mar '20

Hi, I want to ask you if it would make sense for kamailio upstream code to generate_avps() (got from the database) also when the user failed to register? Please have a look in src/modules/auth_db/authorize.c line 303. If it makes sense, I'll do a pull request for it. Thank you, Stefan

2 3

Re: [sr-dev] Regarding MIPS Compilation
by Henning Westerholt 06 Mar '20

06 Mar '20

Hello, please keep the list in CC. it looks that it still tries to compile the x86 code, and not the MIPS one. What do you get when you execute “make cfg” on your system – this is what I get on 64 Linux: henning@static:~/repositories/kamailio/src$ make cfg target architecture <x86_64>, host architecture <x86_64> If you have the possibility to test a native compilation on the platform, maybe this is easier to do as well. It will take some time to compile, but still not too much. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: subhra giri <subhraprakash79(a)gmail.com> Sent: Friday, March 6, 2020 12:20 PM To: Henning Westerholt <hw(a)skalatan.de> Subject: Re: [sr-dev] Regarding MIPS Compilation Dear Henning Thank you very much from my heart. I was trying to cross compile it for mips64-octeon-linux. I followed the below steps.export CC=/home/SDK3.1.2/tools-3.1.2_build_50/bin/mips64-octeon-linux-gnu-gcc 1) downloaded and untrar kamailio-5.3.2. 2)From kamailio-5.3.2 directory, i used below commands export CC=/home/SDK3.1.2/tools-3.1.2_build_50/bin/mips64-octeon-linux-gnu-gcc make then i am getting below errors ------------------------- core/parser/../mem/../atomic/atomic_x86.h: In function 'atomic_dec_and_test_int': core/parser/../mem/../atomic/atomic_x86.h:222:1: error: impossible constraint in 'asm' make: *** [main.o] Error 1 Please help me if i have used right steps for cross compilation. Thanks and Regards Subhra Prakash Giri On Fri, Mar 6, 2020 at 3:05 PM Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hello, do you get some problems during compilation? Please provide more details what you have tried, and which steps don’t work etc.. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: sr-dev <sr-dev-bounces(a)lists.kamailio.org<mailto:sr-dev-bounces@lists.kamailio.org>> On Behalf Of subhra giri Sent: Thursday, March 5, 2020 3:01 PM To: sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org> Subject: [sr-dev] Regarding MIPS Compilation Hi Can any body help me how to compile kamailio for mips Thanks and Regards Subhra Prakash Giri

1 0

Regarding MIPS Compilation
by subhra giri 06 Mar '20

06 Mar '20

Hi Can any body help me how to compile kamailio for mips Thanks and Regards Subhra Prakash Giri

2 1

git:master:51d95e0e: modukles/tm: added t_clean() script function
by Juha Heinanen 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 51d95e0e7cce0483c517e2bcfc5000b60a7e35be URL: https://github.com/kamailio/kamailio/commit/51d95e0e7cce0483c517e2bcfc5000b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2020-03-06T09:08:12+02:00 modukles/tm: added t_clean() script function --- Modified: src/modules/tm/README Modified: src/modules/tm/doc/functions.xml Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/51d95e0e7cce0483c517e2bcfc5000b… Patch: https://github.com/kamailio/kamailio/commit/51d95e0e7cce0483c517e2bcfc5000b…

1 0

git:master:eb4f66de: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: eb4f66de483f17c7736a02dfc9eebfc49b491b01 URL: https://github.com/kamailio/kamailio/commit/eb4f66de483f17c7736a02dfc9eebfc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-06T07:31:09+01:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/eb4f66de483f17c7736a02dfc9eebfc… Patch: https://github.com/kamailio/kamailio/commit/eb4f66de483f17c7736a02dfc9eebfc… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 10fb829f23..7889496941 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -40,7 +40,7 @@ Daniel-Constantin Mierla List of Examples 1.1. Set expire parameter - 1.2. Set expire parameter + 1.2. Set timeout parameter 1.3. secsipid_check_identity usage 1.4. secsipid_add_identity usage 1.5. Libsecsipid usage @@ -115,9 +115,9 @@ modparam("secsipid", "expire", 600) Default value is 5. - Example 1.2. Set expire parameter + Example 1.2. Set timeout parameter ... -modparam("secsipid", "expire", 600) +modparam("secsipid", "timeout", 2) ... 4. Functions

1 0

git:master:0a6323d4: secsipid: docs - fixed example for timeout parameter
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 0a6323d43654a2b6c51eb84f9f7a225573a8e005 URL: https://github.com/kamailio/kamailio/commit/0a6323d43654a2b6c51eb84f9f7a225… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T07:17:21+01:00 secsipid: docs - fixed example for timeout parameter --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0a6323d43654a2b6c51eb84f9f7a225… Patch: https://github.com/kamailio/kamailio/commit/0a6323d43654a2b6c51eb84f9f7a225… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 5ea85d6faf..79e77fc487 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -87,10 +87,10 @@ modparam("secsipid", "expire", 600) </emphasis> </para> <example> - <title>Set <varname>expire</varname> parameter</title> + <title>Set <varname>timeout</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("secsipid", "expire", 600) +modparam("secsipid", "timeout", 2) ... </programlisting> </example>

1 0

git:master:13da8cf5: ims_ocs: declare extern global variables in header file
by Daniel-Constantin Mierla 06 Mar '20

06 Mar '20

Module: kamailio Branch: master Commit: 13da8cf58a2abfcd87a48fbc963d4e1a26d60085 URL: https://github.com/kamailio/kamailio/commit/13da8cf58a2abfcd87a48fbc963d4e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-06T07:02:18+01:00 ims_ocs: declare extern global variables in header file --- Modified: src/modules/ims_ocs/ims_ocs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/13da8cf58a2abfcd87a48fbc963d4e1… Patch: https://github.com/kamailio/kamailio/commit/13da8cf58a2abfcd87a48fbc963d4e1… --- diff --git a/src/modules/ims_ocs/ims_ocs_mod.h b/src/modules/ims_ocs/ims_ocs_mod.h index b46a29a4b4..cfddfdccc9 100644 --- a/src/modules/ims_ocs/ims_ocs_mod.h +++ b/src/modules/ims_ocs/ims_ocs_mod.h @@ -26,8 +26,8 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage;

1 0

git:master:f879b4c4: core: small improvement related to commit 5e42adae624f9741 in cfg parser
by Henning Westerholt 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: f879b4c4d75777892f160d8abe639c6f15f68569 URL: https://github.com/kamailio/kamailio/commit/f879b4c4d75777892f160d8abe639c6… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-05T18:13:33+01:00 core: small improvement related to commit 5e42adae624f9741 in cfg parser --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/f879b4c4d75777892f160d8abe639c6… Patch: https://github.com/kamailio/kamailio/commit/f879b4c4d75777892f160d8abe639c6… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 29b5b4aa1d..114b8b9c0f 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2673,7 +2673,7 @@ attr_mark: ATTR_MARK { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp_spec)); if (!s_attr) { yyerror("No memory left"); YYABORT; } - else { memset(s_attr, 0, (sizeof(struct avp_spec))); s_attr->type = 0; } + else { memset(s_attr, 0, (sizeof(struct avp_spec))); } } ; attr_id:

1 0

Re: [sr-dev] [kamailio/kamailio] core: initialize memory to 0 in cfg parser in a few more places (5e42ada)
by Henning Westerholt 05 Mar '20

05 Mar '20

indeed, thank you -- 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/commit/5e42adae624f9741e26dfb0af4acced…

1 0

Re: [sr-dev] [kamailio/kamailio] core: initialize memory to 0 in cfg parser in a few more places (5e42ada)
by Daniel-Constantin Mierla 05 Mar '20

05 Mar '20

Minor one: the `s_attr->type = 0;` is no longer necessary. -- 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/commit/5e42adae624f9741e26dfb0af4acced…

1 0

git:master:5e42adae: core: initialize memory to 0 in cfg parser in a few more places
by Henning Westerholt 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: 5e42adae624f9741e26dfb0af4accede2a8f92d2 URL: https://github.com/kamailio/kamailio/commit/5e42adae624f9741e26dfb0af4acced… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-05T17:31:53+01:00 core: initialize memory to 0 in cfg parser in a few more places --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/5e42adae624f9741e26dfb0af4acced… Patch: https://github.com/kamailio/kamailio/commit/5e42adae624f9741e26dfb0af4acced… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 6319f8b5b4..29b5b4aa1d 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2673,7 +2673,7 @@ attr_mark: ATTR_MARK { s_attr = (struct avp_spec*)pkg_malloc(sizeof(struct avp_spec)); if (!s_attr) { yyerror("No memory left"); YYABORT; } - else s_attr->type = 0; + else { memset(s_attr, 0, (sizeof(struct avp_spec))); s_attr->type = 0; } } ; attr_id: @@ -3712,6 +3712,7 @@ static struct name_lst* mk_name_lst(char* host, int flags) if (l==0) { PKG_MEM_CRITICAL; } else { + memset(l, 0, sizeof(struct name_lst)); l->name=host; l->flags=flags; l->next=0; @@ -3728,6 +3729,7 @@ static struct socket_id* mk_listen_id(char* host, int proto, int port) if (l==0) { PKG_MEM_CRITICAL; } else { + memset(l, 0, sizeof(struct socket_id)); l->addr_lst=mk_name_lst(host, 0); if (l->addr_lst==0){ pkg_free(l); @@ -3763,6 +3765,7 @@ static struct socket_id* mk_listen_id2(struct name_lst* addr_l, int proto, if (l==0) { PKG_MEM_CRITICAL; } else { + memset(l, 0, sizeof(struct socket_id)); l->flags=addr_l->flags; l->port=port; l->proto=proto;

1 0

git:master:9cd1cec4: ims_charging: extern declaration for cdpb
by Daniel-Constantin Mierla 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: 9cd1cec4dedadcfcd50322c4709c4844a3db2f4f URL: https://github.com/kamailio/kamailio/commit/9cd1cec4dedadcfcd50322c4709c484… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-05T15:08:25+01:00 ims_charging: extern declaration for cdpb --- Modified: src/modules/ims_charging/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/9cd1cec4dedadcfcd50322c4709c484… Patch: https://github.com/kamailio/kamailio/commit/9cd1cec4dedadcfcd50322c4709c484… --- diff --git a/src/modules/ims_charging/dialog.c b/src/modules/ims_charging/dialog.c index 9b03998170..fdbaafe663 100644 --- a/src/modules/ims_charging/dialog.c +++ b/src/modules/ims_charging/dialog.c @@ -5,7 +5,7 @@ #include "ims_charging_stats.h" #include "../../core/parser/hf.h" -struct cdp_binds cdpb; +extern struct cdp_binds cdpb; extern int ro_db_mode; extern char *domain;

1 0

git:master:a13d49fb: ims_charging: use extern to avoid double declaration of globals
by Daniel-Constantin Mierla 05 Mar '20

05 Mar '20

Module: kamailio Branch: master Commit: a13d49fb099dd5e8d832a0559a8e69aa8c61c1ae URL: https://github.com/kamailio/kamailio/commit/a13d49fb099dd5e8d832a0559a8e69a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-05T13:45:36+01:00 ims_charging: use extern to avoid double declaration of globals --- Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/a13d49fb099dd5e8d832a0559a8e69a… Patch: https://github.com/kamailio/kamailio/commit/a13d49fb099dd5e8d832a0559a8e69a… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index 06284c6732..5fabde6714 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -25,6 +25,8 @@ MODULE_VERSION +struct dlg_binds* dlgb_p; + /* parameters */ char* ro_destination_host_s = "hss.ims.smilecoms.com"; char* ro_service_context_id_root_s = "32260(a)3gpp.org"; @@ -46,6 +48,8 @@ int video_service_identifier = 1001; int video_rating_group = 200; +struct impu_data impu_data_t; + /* DB params */ static str db_url = str_init(DEFAULT_DB_URL); static unsigned int db_update_period = DB_DEFAULT_UPDATE_PERIOD; diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index cd3ae215ae..b78016b99a 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -54,10 +54,10 @@ struct session_setup_data { unsigned int tlabel; }; -struct dlg_binds* dlgb_p; +extern struct dlg_binds* dlgb_p; extern struct tm_binds tmb; -int interim_request_credits; +extern int interim_request_credits; extern int voice_service_identifier; extern int voice_rating_group; diff --git a/src/modules/ims_charging/ro_session_hash.h b/src/modules/ims_charging/ro_session_hash.h index b81e843245..556d11d849 100644 --- a/src/modules/ims_charging/ro_session_hash.h +++ b/src/modules/ims_charging/ro_session_hash.h @@ -42,7 +42,9 @@ struct diameter_avp_value { struct impu_data { str identity; str contact; -} impu_data_t; +}; + +extern struct impu_data impu_data_t; struct ro_session { volatile int ref;

1 0

[kamailio/kamailio] corex: check not in SHM before PKG free for path (#2237)
by Stefan Mititelu 05 Mar '20

05 Mar '20

Do the same for reset_path_vector() in core msg parser.   #### 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 #1144 #### Description  Hi, Please have a look on this old discussion: https://lists.kamailio.org/pipermail/sr-dev/2018-July/047190.html We have been doing the shm_address_in() since then and no other apparent issue found since then. Please let me know what you think. Also let me know if I can backport this to 5.3. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2237 -- Commit Summary -- * corex: check not in SHM before PKG free for path -- File Changes -- M src/core/parser/msg_parser.c (11) M src/modules/corex/corex_lib.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2237.patch https://github.com/kamailio/kamailio/pull/2237.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/2237

3 4

git:5.2:1a142067: corex: check not in SHM before PKG free for path
by Henning Westerholt 05 Mar '20

05 Mar '20

Module: kamailio Branch: 5.2 Commit: 1a142067b04e41b98ce2f8d7f0946c2dcbd7914f URL: https://github.com/kamailio/kamailio/commit/1a142067b04e41b98ce2f8d7f0946c2… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-05T12:45:41+01:00 corex: check not in SHM before PKG free for path Do the same for reset_path_vector() in core msg parser. (cherry picked from commit 395303dbb3572e57bd8d16bcbbfb29d6d54a60fe) --- Modified: src/core/parser/msg_parser.c Modified: src/modules/corex/corex_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/1a142067b04e41b98ce2f8d7f0946c2… Patch: https://github.com/kamailio/kamailio/commit/1a142067b04e41b98ce2f8d7f0946c2… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index c220a5bb5c..0a8506e5a3 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -806,11 +806,14 @@ int set_path_vector(struct sip_msg* msg, str* path) void reset_path_vector(struct sip_msg* const msg) { - if (msg->path_vec.s) { - pkg_free(msg->path_vec.s); + if (!shm_address_in(msg->path_vec.s)) { + if (msg->path_vec.s) + pkg_free(msg->path_vec.s); + msg->path_vec.s = 0; + msg->path_vec.len = 0; + } else { + LM_WARN("Found path_vec that is not in pkg mem!\n"); } - msg->path_vec.s = 0; - msg->path_vec.len = 0; } diff --git a/src/modules/corex/corex_lib.c b/src/modules/corex/corex_lib.c index ec5334cb2e..3d3f73c0bd 100644 --- a/src/modules/corex/corex_lib.c +++ b/src/modules/corex/corex_lib.c @@ -63,11 +63,13 @@ int corex_append_branch(sip_msg_t *msg, str *uri, str *qv) msg->dst_uri.len = 0; /* if this is a cloned message, don't free the path vector as it was copied into shm memory and will be freed as contiguous block*/ - if (!(msg->msg_flags&FL_SHM_CLONE)) { - if(msg->path_vec.s!=0) + if (!shm_address_in(msg->path_vec.s)) { + if (msg->path_vec.s) pkg_free(msg->path_vec.s); msg->path_vec.s = 0; msg->path_vec.len = 0; + } else { + LM_WARN("Found path_vec that is not in pkg mem!\n"); } }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020