sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:f294b39f: test/misc: updated to use blocklist api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f294b39f5c49972df5af51af6a9d719e70e746c6 URL: https://github.com/kamailio/kamailio/commit/f294b39f5c49972df5af51af6a9d719… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:58:21+01:00 test/misc: updated to use blocklist api --- Modified: test/misc/code/p_uri.c Modified: test/misc/code/parse_to_body.c --- Diff: https://github.com/kamailio/kamailio/commit/f294b39f5c49972df5af51af6a9d719… Patch: https://github.com/kamailio/kamailio/commit/f294b39f5c49972df5af51af6a9d719… --- diff --git a/test/misc/code/p_uri.c b/test/misc/code/p_uri.c index e59135ee3d..cf60f10cad 100644 --- a/test/misc/code/p_uri.c +++ b/test/misc/code/p_uri.c @@ -24,9 +24,9 @@ int my_pid() {return 0; }; struct cfg_group_core default_core_cfg = { L_DBG, /* print only msg. < L_WARN */ LOG_DAEMON, /* log_facility -- see syslog(3) */ -#ifdef USE_DST_BLACKLIST - /* blacklist */ - 0, /* dst blacklist is disabled by default */ +#ifdef USE_DST_BLOCKLIST + /* blocklist */ + 0, /* dst blocklist is disabled by default */ DEFAULT_BLST_TIMEOUT, DEFAULT_BLST_MAX_MEM, #endif diff --git a/test/misc/code/parse_to_body.c b/test/misc/code/parse_to_body.c index c8f87206be..1599ed0d6c 100644 --- a/test/misc/code/parse_to_body.c +++ b/test/misc/code/parse_to_body.c @@ -24,9 +24,9 @@ int my_pid() {return 0; }; struct cfg_group_core default_core_cfg = { L_DBG, /* print only msg. < L_WARN */ LOG_DAEMON, /* log_facility -- see syslog(3) */ -#ifdef USE_DST_BLACKLIST - /* blacklist */ - 0, /* dst blacklist is disabled by default */ +#ifdef USE_DST_BLOCKLIST + /* blocklist */ + 0, /* dst blocklist is disabled by default */ DEFAULT_BLST_TIMEOUT, DEFAULT_BLST_MAX_MEM, #endif

3 years, 8 months

git:master:eec63c13: doc/scripts: use blocklist defines

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eec63c130125f3f5598dd4e604de92d1bb123434 URL: https://github.com/kamailio/kamailio/commit/eec63c130125f3f5598dd4e604de92d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:57:59+01:00 doc/scripts: use blocklist defines --- Modified: doc/scripts/cdefs2doc/dump_cfg_defs.pl Modified: doc/scripts/cdefs2doc/dump_counters.pl Modified: doc/scripts/cdefs2doc/dump_rpcs.pl Modified: doc/scripts/cdefs2doc/dump_selects.pl --- Diff: https://github.com/kamailio/kamailio/commit/eec63c130125f3f5598dd4e604de92d… Patch: https://github.com/kamailio/kamailio/commit/eec63c130125f3f5598dd4e604de92d…

3 years, 8 months

git:master:5523063c: doc/tutorials: use blocklist defines

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5523063c4cb0b49298f4e1f972e58b1fd6519bbc URL: https://github.com/kamailio/kamailio/commit/5523063c4cb0b49298f4e1f972e58b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:57:30+01:00 doc/tutorials: use blocklist defines --- Added: doc/tutorials/dst_blocklist.txt Modified: doc/tutorials/cfg_list/Makefile Modified: doc/tutorials/counter_list/Makefile Modified: doc/tutorials/rpc_list/Makefile Modified: doc/tutorials/select_list/Makefile Removed: doc/tutorials/dst_blacklist.txt --- Diff: https://github.com/kamailio/kamailio/commit/5523063c4cb0b49298f4e1f972e58b1… Patch: https://github.com/kamailio/kamailio/commit/5523063c4cb0b49298f4e1f972e58b1…

3 years, 8 months

git:master:09510269: sctp: use blocklist structures and functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 095102691e809600c35bc529afdc9799fc9eb8c2 URL: https://github.com/kamailio/kamailio/commit/095102691e809600c35bc529afdc979… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:42:38+01:00 sctp: use blocklist structures and functions --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/095102691e809600c35bc529afdc979… Patch: https://github.com/kamailio/kamailio/commit/095102691e809600c35bc529afdc979… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 6690503973..d58c96fad6 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -51,9 +51,9 @@ #include "../../core/mem/mem.h" #include "../../core/ip_addr.h" #include "../../core/cfg/cfg_struct.h" -#ifdef USE_DST_BLACKLIST -#include "../../core/dst_blacklist.h" -#endif /* USE_DST_BLACKLIST */ +#ifdef USE_DST_BLOCKLIST +#include "../../core/dst_blocklist.h" +#endif /* USE_DST_BLOCKLIST */ #include "../../core/timer_ticks.h" #include "../../core/clist.h" #include "../../core/error.h" @@ -2125,15 +2125,15 @@ static int sctp_handle_send_failed(struct socket_info *si, ret = sctp_msg_send_ext(&dst, data, data_len, &sinfo); } -#ifdef USE_DST_BLACKLIST +#ifdef USE_DST_BLOCKLIST else if(cfg_get(sctp, sctp_cfg, send_retries)) { - /* blacklist only if send_retries is on, if off we blacklist + /* blocklist only if send_retries is on, if off we blocklist from SCTP_ASSOC_CHANGE: SCTP_COMM_LOST/SCTP_CANT_STR_ASSOC which is better (because we can tell connect errors from send - errors and we blacklist a failed dst only once) */ - dst_blacklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); + errors and we blocklist a failed dst only once) */ + dst_blocklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); } -#endif /* USE_DST_BLACKLIST */ +#endif /* USE_DST_BLOCKLIST */ return (ret > 0) ? 0 : ret; } @@ -2206,12 +2206,12 @@ static int sctp_handle_assoc_change(struct socket_info *si, break; case SCTP_COMM_LOST: SCTP_STATS_COMM_LOST(); -#ifdef USE_DST_BLACKLIST - /* blacklist only if send_retries is turned off (if on we don't +#ifdef USE_DST_BLOCKLIST + /* blocklist only if send_retries is turned off (if on we don't know here if we did retry or we are at the first error) */ if(cfg_get(sctp, sctp_cfg, send_retries) == 0) - dst_blacklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); -#endif /* USE_DST_BLACKLIST */ + dst_blocklist_su(BLST_ERR_SEND, PROTO_SCTP, su, 0, 0); +#endif /* USE_DST_BLOCKLIST */ /* no break */ goto comm_lost_cont; /* do not increment counters for SCTP_SHUTDOWN_COMP */ @@ -2239,12 +2239,12 @@ static int sctp_handle_assoc_change(struct socket_info *si, /* do nothing when failing to start an assoc (in this case we never see SCTP_COMM_UP so we never track the assoc) */ -#ifdef USE_DST_BLACKLIST - /* blacklist only if send_retries is turned off (if on we don't +#ifdef USE_DST_BLOCKLIST + /* blocklist only if send_retries is turned off (if on we don't know here if we did retry or we are at the first error) */ if(cfg_get(sctp, sctp_cfg, send_retries) == 0) - dst_blacklist_su(BLST_ERR_CONNECT, PROTO_SCTP, su, 0, 0); -#endif /* USE_DST_BLACKLIST */ + dst_blocklist_su(BLST_ERR_CONNECT, PROTO_SCTP, su, 0, 0); +#endif /* USE_DST_BLOCKLIST */ break; default: break;

3 years, 8 months

git:master:e4311a22: blst: : use blocklist structures and functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4311a22632e2f9317f3c33abfee8d29b2bf387c URL: https://github.com/kamailio/kamailio/commit/e4311a22632e2f9317f3c33abfee8d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:39:09+01:00 blst: : use blocklist structures and functions --- Modified: src/modules/blst/blst.c Modified: src/modules/blst/doc/blst.xml Modified: src/modules/blst/doc/blst_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/e4311a22632e2f9317f3c33abfee8d2… Patch: https://github.com/kamailio/kamailio/commit/e4311a22632e2f9317f3c33abfee8d2…

3 years, 8 months

git:master:276059db: tm: use blocklist structures and functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 276059db3844434fbed0b162c4a360384b0fe6bb URL: https://github.com/kamailio/kamailio/commit/276059db3844434fbed0b162c4a3603… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:33:08+01:00 tm: use blocklist structures and functions --- Modified: src/modules/tm/config.c Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/276059db3844434fbed0b162c4a3603… Patch: https://github.com/kamailio/kamailio/commit/276059db3844434fbed0b162c4a3603…

3 years, 8 months

git:master:29758a66: core: switch to use blocklist structures and functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 29758a66396ae4633bdf85fd3be1ee7b4284072a URL: https://github.com/kamailio/kamailio/commit/29758a66396ae4633bdf85fd3be1ee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:25:09+01:00 core: switch to use blocklist structures and functions --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/core_cmd.c Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h Modified: src/core/dst_blocklist.c Modified: src/core/dst_blocklist.h Modified: src/core/error.h Modified: src/core/forward.c Modified: src/core/globals.h Modified: src/core/ip_addr.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c Modified: src/core/ver_defs.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/29758a66396ae4633bdf85fd3be1ee7… Patch: https://github.com/kamailio/kamailio/commit/29758a66396ae4633bdf85fd3be1ee7…

3 years, 8 months

git:master:38b7183c: Makefile.defs: use blocklist defines

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38b7183ccd78f58f0da8ed66baa55625d28daf05 URL: https://github.com/kamailio/kamailio/commit/38b7183ccd78f58f0da8ed66baa5562… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T10:23:05+01:00 Makefile.defs: use blocklist defines --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/38b7183ccd78f58f0da8ed66baa5562… Patch: https://github.com/kamailio/kamailio/commit/38b7183ccd78f58f0da8ed66baa5562… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index dabf05e0bc..dd01923740 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -673,11 +673,11 @@ data_target = $(prefix)/$(data_dir) # -DUSE_DNS_FAILOVER # if the destination resolves to multiple ips, on send error fall back # to the others -# -DUSE_DST_BLACKLIST -# blacklist bad destination (timeout, failed to connect, error sending +# -DUSE_DST_BLOCKLIST +# blocklist bad destination (timeout, failed to connect, error sending # a.s.o) -# -DUSE_DST_BLACKLIST_STATS -# turns on blacklist bad destination measurements +# -DUSE_DST_BLOCKLIST_STATS +# turns on blocklist bad destination measurements # -DPROFILING # if enabled profiling will be enabled for child processes # Don't forget to set PROFILE (see below) @@ -724,11 +724,11 @@ C_DEFS+= -DSHM_MMAP \ -DHAVE_RESOLV_RES \ -DUSE_DNS_CACHE \ -DUSE_DNS_FAILOVER \ - -DUSE_DST_BLACKLIST \ + -DUSE_DST_BLOCKLIST \ -DUSE_NAPTR \ -DWITH_XAVP \ #-DUSE_DNS_CACHE_STATS \ - #-DUSE_DST_BLACKLIST_STATS \ + #-DUSE_DST_BLOCKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \ #-DLL_MALLOC \ #-DSF_MALLOC \

3 years, 8 months

git:master:456cae08: core: dns blacklist to blocklist

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 456cae084320ec4fafa75a77b89e16b57ad394cf URL: https://github.com/kamailio/kamailio/commit/456cae084320ec4fafa75a77b89e16b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T09:45:33+01:00 core: dns blacklist to blocklist --- Added: src/core/dst_blocklist.c Added: src/core/dst_blocklist.h Removed: src/core/dst_blacklist.c Removed: src/core/dst_blacklist.h --- Diff: https://github.com/kamailio/kamailio/commit/456cae084320ec4fafa75a77b89e16b… Patch: https://github.com/kamailio/kamailio/commit/456cae084320ec4fafa75a77b89e16b… --- diff --git a/src/core/dst_blacklist.c b/src/core/dst_blocklist.c similarity index 100% rename from src/core/dst_blacklist.c rename to src/core/dst_blocklist.c diff --git a/src/core/dst_blacklist.h b/src/core/dst_blocklist.h similarity index 100% rename from src/core/dst_blacklist.h rename to src/core/dst_blocklist.h

3 years, 8 months

git:5.3:2a3b8d43: pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391)

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 2a3b8d43923fc49fa9095e20c6e3cfb6cf5516e1 URL: https://github.com/kamailio/kamailio/commit/2a3b8d43923fc49fa9095e20c6e3cfb… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-30T11:27:25Z pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391) - add CAP_CHOWN capability to Kamailio systemd service files to allow chown - needed e.g. for user and group setting from jsonrpcs and ctl modules - related to github issue #2391 (cherry picked from commit 8b72f462deb4b66fb55f754abc93bf7295278afa) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service Modified: pkg/kamailio/obs/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/2a3b8d43923fc49fa9095e20c6e3cfb… Patch: https://github.com/kamailio/kamailio/commit/2a3b8d43923fc49fa9095e20c6e3cfb… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index a411114db9..91f804dbb9 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -20,6 +20,8 @@ Restart=on-failure # /run/kamailio in tmpfs RuntimeDirectory=kamailio RuntimeDirectoryMode=0770 +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index c14d6cb2f2..56d8339939 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -13,6 +13,8 @@ Environment='PKG_MEMORY=4' EnvironmentFile=-/etc/sysconfig/kamailio ExecStart=/usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY Restart=on-failure +# necessary for chown of control files e.g. for jsonrpcs and ctl modules +AmbientCapabilities=CAP_CHOWN [Install] WantedBy=multi-user.target

3 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020