sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

git:master:a84a3ea6: dialog: unset DMQ flag on replicated dialog removal
by Charles Chance 26 Jul '18

26 Jul '18

Module: kamailio Branch: master Commit: a84a3ea618f0e602a8892c37fce7f4e72ab7371c URL: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-26T12:07:33+01:00 dialog: unset DMQ flag on replicated dialog removal - prevents looping back to other nodes - reported by Patrick Murphy on sr-users list --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e… Patch: https://github.com/kamailio/kamailio/commit/a84a3ea618f0e602a8892c37fce7f4e… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 8ed9dce1d3..0cfd8a522e 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -365,6 +365,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; + dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC; unref++; break;

1 0

[kamailio/kamailio] dialog: unset DMQ flag on replicated dialog removal (#1601)
by Charles Chance 26 Jul '18

26 Jul '18

- prevents looping back to other nodes - reported by Patrick Murphy on sr-users list (https://lists.kamailio.org/pipermail/sr-users/2018-July/102322.html) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1601 -- Commit Summary -- * dialog: unset DMQ flag on replicated dialog removal -- File Changes -- M src/modules/dialog/dlg_dmq.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1601.patch https://github.com/kamailio/kamailio/pull/1601.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/1601

2 3

[kamailio/kamailio] coredumps possibly generated by DMQ in kamailio v5.1.4 (#1594)
by Joel Serrano 25 Jul '18

25 Jul '18

### Description Not sure, found 2 cores generated today, only suggesting it's DMQ related by what I see in the backtrace. They could have been generated during a restart of kamailio, not 100% sure though. ### Troubleshooting TBD #### Reproduction TBD #### Debugging Data Attaching *bt full*, *info locals* and *list* from: ``` -rw------- 1 root kamailio 549019648 Jul 13 16:29 core.kamailio.22907.sbc01.1531517373 -rw------- 1 root kamailio 549019648 Jul 13 17:13 core.kamailio.777.sbc01.1531520031 ``` [core1__bt_full.txt](https://github.com/kamailio/kamailio/files/2194484/core… [core1__info_locals.txt](https://github.com/kamailio/kamailio/files/2194485/… [core1__list.txt](https://github.com/kamailio/kamailio/files/2194486/core1__… [core2__bt_full.txt](https://github.com/kamailio/kamailio/files/2194487/core… [core2__info_locals.txt](https://github.com/kamailio/kamailio/files/2194488/… [core2__list.txt](https://github.com/kamailio/kamailio/files/2194489/core2__… ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@sbc01:~# kamailio -V version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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: unknown compiled with gcc 6.3.0 root@sbc01:~# ``` * **Operating System**: ``` root@sbc01:~# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 9.4 (stretch) Release: 9.4 Codename: stretch root@sbc01:~# root@sbc01:~# uname -a Linux sbc01 4.9.0-6-amd64 #1 SMP Debian 4.9.88-1+deb9u1 (2018-05-07) x86_64 GNU/Linux root@sbc01:~# ``` -- 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/1594

3 14

git:master:b0e5768e: dmq: allow startup even if initial nodelist is empty
by Charles Chance 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: b0e5768ebc62bcf1f08246ec613de1ba71d6365e URL: https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1b… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-25T14:01:19+01:00 dmq: allow startup even if initial nodelist is empty --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1b… Patch: https://github.com/kamailio/kamailio/commit/b0e5768ebc62bcf1f08246ec613de1b… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index f1e9090afa..b374b8de31 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -301,9 +301,8 @@ static int child_init(int rank) notification_node = add_server_and_notify(&dmq_notification_address); if(!notification_node) { - LM_ERR("cannot retrieve initial nodelist from %.*s\n", + LM_WARN("cannot retrieve initial nodelist from %.*s\n", STR_FMT(&dmq_notification_address)); - return -1; } } return 0;

1 0

git:master:bca756f8: dmq: include non-active nodes when requesting initial node list
by Charles Chance 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: bca756f88ce36ab3c7297c7bc4d2cab9009b09fe URL: https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-25T14:01:19+01:00 dmq: include non-active nodes when requesting initial node list --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab… Patch: https://github.com/kamailio/kamailio/commit/bca756f88ce36ab3c7297c7bc4d2cab… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index c8e659c721..c1deb80536 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -570,8 +570,8 @@ int request_nodelist(dmq_node_t *node, int forward) LM_ERR("no notification body\n"); return -1; } - ret = bcast_dmq_message(dmq_notification_peer, body, NULL, - &notification_callback, forward, &notification_content_type); + ret = bcast_dmq_message1(dmq_notification_peer, body, NULL, + &notification_callback, forward, &notification_content_type, 1); pkg_free(body->s); pkg_free(body); return ret;

1 0

git:master:3d2b3868: dmq: improve bus stability and reduce unnecessary state transfer
by Charles Chance 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: 3d2b3868e01bab478408d9f0619db2c9918b72b0 URL: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-07-25T14:01:19+01:00 dmq: improve bus stability and reduce unnecessary state transfer - prevents split cluster in certain scenarios (e.g. GH issue #1349) - add 'pending' state for new, locally added nodes, until confirmed - continue to probe nodes marked as inactive/disabled so that they are eventually removed (but still exclude from normal replication) --- Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmq_funcs.h Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c… Patch: https://github.com/kamailio/kamailio/commit/3d2b3868e01bab478408d9f0619db2c…

1 0

git:master:173f4e90: pipelimit: documentation for rpc command pl.list
by Daniel-Constantin Mierla 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: 173f4e901f0c0e4671965514cb39146eb652f100 URL: https://github.com/kamailio/kamailio/commit/173f4e901f0c0e4671965514cb39146… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-25T14:56:13+02:00 pipelimit: documentation for rpc command pl.list --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/173f4e901f0c0e4671965514cb39146… Patch: https://github.com/kamailio/kamailio/commit/173f4e901f0c0e4671965514cb39146… --- diff --git a/src/modules/pipelimit/doc/pipelimit_admin.xml b/src/modules/pipelimit/doc/pipelimit_admin.xml index e30d197ca5..554c5d5e3b 100644 --- a/src/modules/pipelimit/doc/pipelimit_admin.xml +++ b/src/modules/pipelimit/doc/pipelimit_admin.xml @@ -487,6 +487,28 @@ with unexpected retcode=$var(check_result)\n"); <section> <title>RPC Commands</title> + <section id="pipelimit.r.pl.list"> + <title> + <function moreinfo="none">pl.list</function> + </title> + <para> + Lists the details of one or all pipes, respectively the attributes + pipe name (id), algorithm, limit and counter. + </para> + <para> + Name: <emphasis>pl.list</emphasis> + </para> + <para>Parameters: <emphasis>name</emphasis> - (optional) pipe name</para> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc pl.list +kamctl rpc pl.list testid +... + </programlisting> + </section> <section id="pipelimit.r.pl.stats"> <title> <function moreinfo="none">pl.stats</function> @@ -503,7 +525,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.stats +... +kamcmd pl.stats +... </programlisting> </section> <section id="pipelimit.r.pl.set_pipe"> @@ -534,7 +558,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.set_pipe 2 RED 10 +... +kamcmd pl.set_pipe 2 RED 10 +... </programlisting> </section> <section id="pipelimit.r.pl.get_pipes"> @@ -552,7 +578,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.get_pipes +... +kamcmd pl.get_pipes +... </programlisting> </section> <section id="pipelimit.r.pl.set_pid"> @@ -581,7 +609,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.set_pid 0.5 0.5 0.5 +... +kamcmd pl.set_pid 0.5 0.5 0.5 +... </programlisting> </section> <section id="pipelimit.r.pl.get_pid"> @@ -599,7 +629,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.get_pid +... +kamcmd pl.get_pid +... </programlisting> </section> <section id="pipelimit.r.pl.push_load"> @@ -624,7 +656,9 @@ with unexpected retcode=$var(check_result)\n"); RPC Command Format: </para> <programlisting format="linespecific"> - kamcmd pl.push_load 0.85 +... +kamcmd pl.push_load 0.85 +... </programlisting> </section> </section>

1 0

git:master:d5b65685: pipelimit: added rpc command pl.list
by Daniel-Constantin Mierla 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: d5b6568529a26fb21b0aef9634354ade63aee802 URL: https://github.com/kamailio/kamailio/commit/d5b6568529a26fb21b0aef9634354ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-25T14:48:29+02:00 pipelimit: added rpc command pl.list - get the details of one or all pipes in json format - old pl.stats and pl.get_pipes print details in a string --- Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/d5b6568529a26fb21b0aef9634354ad… Patch: https://github.com/kamailio/kamailio/commit/d5b6568529a26fb21b0aef9634354ad… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index da30bcbd31..ce7935afb0 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -734,15 +734,19 @@ static ticks_t pl_timer_handle(ticks_t ticks, struct timer_ln* tl, void* data) /* rpc function documentation */ const char *rpc_pl_stats_doc[2] = { - "Print pipelimit statistics: \ + "Print pipelimit statistics (string output): \ <id> <load> <counter>", 0 }; const char *rpc_pl_get_pipes_doc[2] = { - "Print pipes info: \ + "Print pipes info (string output): \ <id> <algorithm> <limit> <counter>", 0 }; +const char *rpc_pl_list_doc[2] = { + "List details for one or all pipes", 0 +}; + const char *rpc_pl_set_pipe_doc[2] = { "Sets a pipe params: <pipe_id> <pipe_algorithm> <pipe_limit>", 0 }; @@ -764,6 +768,7 @@ const char *rpc_pl_push_load_doc[2] = { /* rpc function implementations */ void rpc_pl_stats(rpc_t *rpc, void *c); +void rpc_pl_list(rpc_t *rpc, void *c); void rpc_pl_get_pipes(rpc_t *rpc, void *c); void rpc_pl_set_pipe(rpc_t *rpc, void *c); @@ -804,6 +809,7 @@ void rpc_pl_push_load(rpc_t *rpc, void *c) { static rpc_export_t rpc_methods[] = { {"pl.stats", rpc_pl_stats, rpc_pl_stats_doc, RET_ARRAY}, + {"pl.list", rpc_pl_list, rpc_pl_list_doc, RET_ARRAY}, {"pl.get_pipes", rpc_pl_get_pipes, rpc_pl_get_pipes_doc, RET_ARRAY}, {"pl.set_pipe", rpc_pl_set_pipe, rpc_pl_set_pipe_doc, 0}, {"pl.get_pid", rpc_pl_get_pid, rpc_pl_get_pid_doc, 0}, diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index f23414c29a..07f69f666d 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -444,6 +444,76 @@ void rpc_pl_get_pipes(rpc_t *rpc, void *c) } } +int rpc_pl_list_pipe(rpc_t *rpc, void *c, pl_pipe_t *it) +{ + str algo; + void* th; + + if (it->algo == PIPE_ALGO_NOP) { + return 0; + } + + if (str_map_int(algo_names, it->algo, &algo)) { + return -1; + } + /* add structure node */ + if (rpc->add(c, "{", &th) < 0) { + rpc->fault(c, 500, "Internal pipe structure"); + return -1; + } + if(rpc->struct_add(th, "ssdd", + "name", it->name.s, + "algorithm", algo.s, + "limit", it->limit, + "counter", it->counter)<0) { + rpc->fault(c, 500, "Internal error address list structure"); + return -1; + } + return 0; +} + +void rpc_pl_list(rpc_t *rpc, void *c) +{ + int i; + pl_pipe_t *it; + str pipeid = STR_NULL; + int ret; + + if (rpc->scan(c, "*S", &pipeid) < 1) { + pipeid.s = NULL; + pipeid.len = 0; + } + + if(pipeid.len>0) { + it = pl_pipe_get(&pipeid, 1); + if (it==NULL) { + LM_ERR("no pipe: %.*s\n", pipeid.len, pipeid.s); + rpc->fault(c, 400, "Unknown pipe id %.*s", pipeid.len, pipeid.s); + return; + } + if(rpc_pl_list_pipe(rpc, c, it)<0) { + LM_DBG("failed to list pipe: %.*s\n", it->name.len, it->name.s); + } + pl_pipe_release(&pipeid); + return; + } + + for(i=0; i<_pl_pipes_ht->htsize; i++) + { + lock_get(&_pl_pipes_ht->slots[i].lock); + it = _pl_pipes_ht->slots[i].first; + while(it) { + if(rpc_pl_list_pipe(rpc, c, it)<0) { + LM_DBG("failed to list pipe: %.*s\n", it->name.len, it->name.s); + lock_release(&_pl_pipes_ht->slots[i].lock); + return; + } + it = it->next; + } + lock_release(&_pl_pipes_ht->slots[i].lock); + } +} + void rpc_pl_set_pipe(rpc_t *rpc, void *c) { unsigned int algo_id, limit = 0;

1 0

git:master:79aa7201: core: removed unused MAX_LISTEN
by Daniel-Constantin Mierla 25 Jul '18

25 Jul '18

Module: kamailio Branch: master Commit: 79aa72011ae551c6f82816f352fce7582e371f93 URL: https://github.com/kamailio/kamailio/commit/79aa72011ae551c6f82816f352fce75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-25T14:10:00+02:00 core: removed unused MAX_LISTEN - it was printed in version output, not having any relevance anymore --- Modified: src/core/config.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/79aa72011ae551c6f82816f352fce75… Patch: https://github.com/kamailio/kamailio/commit/79aa72011ae551c6f82816f352fce75… --- diff --git a/src/core/config.h b/src/core/config.h index 91d15fa335..e87288f730 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -45,8 +45,6 @@ #define TLS_CA_FILE 0 /*!< no CA list file by default */ #define TLS_CRL_FILE 0 /*!< no CRL by default */ -#define MAX_LISTEN 16 /*!< maximum number of addresses on which we will listen */ - #define CHILD_NO 8 /*!< default number of child processes started */ #define RT_NO 2 /*!< routing tables number */ diff --git a/src/main.c b/src/main.c index 1830b9628f..2062f4a745 100644 --- a/src/main.c +++ b/src/main.c @@ -228,9 +228,9 @@ void print_ct_constants(void) printf("SHM_MEM_SIZE=%d, ", SHM_MEM_SIZE); #endif */ - printf("MAX_RECV_BUFFER_SIZE %d, MAX_LISTEN %d," + printf("MAX_RECV_BUFFER_SIZE %d" " MAX_URI_SIZE %d, BUF_SIZE %d, DEFAULT PKG_SIZE %uMB\n", - MAX_RECV_BUFFER_SIZE, MAX_LISTEN, MAX_URI_SIZE, + MAX_RECV_BUFFER_SIZE, MAX_URI_SIZE, BUF_SIZE, PKG_MEM_SIZE); #ifdef USE_TCP printf("poll method support: %s.\n", poll_support); @@ -246,7 +246,6 @@ void print_internals(void) printf(" Default paths to modules: %s\n", MODS_DIR); printf(" Compile flags: %s\n", ver_flags ); printf(" MAX_RECV_BUFFER_SIZE=%d\n", MAX_RECV_BUFFER_SIZE); - printf(" MAX_LISTEN=%d\n", MAX_LISTEN); printf(" MAX_URI_SIZE=%d\n", MAX_URI_SIZE); printf(" BUF_SIZE=%d\n", BUF_SIZE); printf(" DEFAULT PKG_SIZE=%uMB\n", PKG_MEM_SIZE); @@ -422,12 +421,6 @@ int pmtu_discovery = 0; int auto_bind_ipv6 = 0; -#if 0 -char* names[MAX_LISTEN]; /* our names */ -int names_len[MAX_LISTEN]; /* lengths of the names*/ -struct ip_addr addresses[MAX_LISTEN]; /* our ips */ -int addresses_no=0; /* number of names/ips */ -#endif struct socket_info* udp_listen=0; #ifdef USE_TCP int tcp_main_pid=0; /* set after the tcp main process is started */

1 0

git:5.1:bf6468f7: rtpengine: fixed rtpp_node permanent deletion causing PDD
by Victor Seva 25 Jul '18

25 Jul '18

Module: kamailio Branch: 5.1 Commit: bf6468f7a4a54600e04dc6fd8aab537bde5ee464 URL: https://github.com/kamailio/kamailio/commit/bf6468f7a4a54600e04dc6fd8aab537… Author: Muhammad Zaka <muhammad.zaka(a)synety.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-07-25T09:47:17+02:00 rtpengine: fixed rtpp_node permanent deletion causing PDD rtpp_node->rn_recheck_ticks was never set this means in-memory rtpengine were never permanently deletion causing PDD for the calls requiring rtpengine (cherry picked from commit 0771960358b6450af8e1f75f838915f366f04a95) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/bf6468f7a4a54600e04dc6fd8aab537… Patch: https://github.com/kamailio/kamailio/commit/bf6468f7a4a54600e04dc6fd8aab537… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f2ca1a9f2e..21f981080d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -450,7 +450,8 @@ static int is_queried_node(struct rtpp_node *node, struct rtpp_node **queried_no int rtpengine_delete_node(struct rtpp_node *rtpp_node) { rtpp_node->rn_displayed = 0; - rtpp_node->rn_disabled = RTPENGINE_MAX_RECHECK_TICKS; + rtpp_node->rn_disabled = 1; + rtpp_node->rn_recheck_ticks = RTPENGINE_MAX_RECHECK_TICKS; return 1; }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2018