From 32e4f786601712e57992ce4c8f46e5d38620a5dd Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 23 Oct 2023 14:23:45 +1100 Subject: [PATCH] ctdb-scripts: Remove superseded compatibility code Since commit 224e99804efef960ef4ce2ff2f4f6dced1e74146, square brackets have been parsed by daemon and tool code, so drop the compatibility code from here. Signed-off-by: Martin Schwenke Reviewed-by: Volker Lendecke Reviewed-by: Jerry Heyman --- ctdb/config/functions | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ctdb/config/functions b/ctdb/config/functions index fb5a1d90935..85757a89744 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -1205,16 +1205,10 @@ update_tickles() _my_connections="${tickledir}/${_port}.connections.$$" # Parentheses are needed around the filters for precedence but # the parentheses can't be empty! - # - # Recent versions of ss print square brackets around IPv6 - # addresses. While it is desirable to update CTDB's address - # parsing and printing code, something needs to be done here - # for backward compatibility, so just delete the brackets. ss -tn state established \ "${_ip_filter:+( ${_ip_filter} )}" \ "${_port_filter:+( ${_port_filter} )}" | awk 'NR > 1 {print $4, $3}' | - tr -d '][' | sort >"$_my_connections" # Record our current tickles in a temporary file