sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

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

← Newer
1
...
21
22
23
24
25
26
27
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020