sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-05 09:18:06 +03:00
Code

ctdb-scripts: Use ss -H option to simplify

Browse Source 
This option has been available since ~2018 and has been implemented in
the stub since then.  I guess we didn't use it because CentOS 7?

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15320
RN: Update CTDB to track all TCP connections to public IP addresses

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jerry Heyman <jheyman@ddn.com>
(cherry picked from commit 0505d06b12)
This commit is contained in:
Martin Schwenke 2024-09-16 12:26:53 +10:00 committed by Jule Anger
parent 5920d47149
commit 84deecc5e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ctdb/config/functions
View File

@ -499,7 +499,7 @@ ctdb_check_unix_socket()
return 1
fi
_out=$(ss -l -x "src ${_sockpath}" | tail -n +2)
_out=$(ss -l -xH "src ${_sockpath}")
if [ -z "$_out" ]; then
echo "ERROR: ${service_name} not listening on ${_sockpath}"
return 1
@ -602,7 +602,7 @@ get_tcp_connections_for_ip()
{
_ip="$1"
ss -tn state established "src [$_ip]" | awk 'NR > 1 {print $3, $4}'
ss -tnH state established "src [$_ip]" | awk '{print $3, $4}'
}
########################################################
@ -1200,10 +1200,10 @@ update_tickles()
_my_connections="${tickledir}/${_port}.connections.$$"
# Parentheses are needed around the filters for precedence but
# the parentheses can't be empty!
ss -tn state established \
ss -tnH state established \
"${_ip_filter:+( ${_ip_filter} )}" \
"${_port_filter:+( ${_port_filter} )}" |
awk 'NR > 1 {print $4, $3}' |
awk '{print $4, $3}' |
sort >"$_my_connections"
# Record our current tickles in a temporary file