Attachment 582170 Details for Bug 784520 – also replace netstat with ss

[patch] also replace netstat with ss

firehol-1.273-net-tools.patch (text/plain), 2.21 KB, created by Jiri Popelka on 2012-05-04 17:34:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-05-04 17:34:12 UTC

Size: 2.21 KB

patch

obsolete

>diff -up firehol-1.273/examples/home-adsl.conf.net-tools firehol-1.273/examples/home-adsl.conf
>--- firehol-1.273/examples/home-adsl.conf.net-tools	2008-07-31 03:23:40.000000000 +0200
>+++ firehol-1.273/examples/home-adsl.conf	2012-05-04 19:13:13.030028183 +0200
>@@ -64,7 +64,7 @@ adsl_params=
> # the user did not gave it to us.
> if [ -z "${adsl_interface_ip}" ]
> then
>-	adsl_interface_ip=`ifconfig | grep -A 1 ${adsl_interface} | grep "inet addr:" | cut -d ':' -f 2 | cut -d ' ' -f 1`
>+	adsl_interface_ip=`ip -4 -o addr show dev ${adsl_interface} | awk '{ print $4}' | cut -d '/' -f 1`
> fi
> 
> # Build the optional rule parameters, if we have the adsl_interface_ip
>diff -up firehol-1.273/firehol.sh.net-tools firehol-1.273/firehol.sh
>--- firehol-1.273/firehol.sh.net-tools	2012-05-02 18:12:07.000000000 +0200
>+++ firehol-1.273/firehol.sh	2012-05-04 19:15:43.426979822 +0200
>@@ -132,7 +132,7 @@ require_cmd() {
> # zcat or gzcat or gzip (either or none is fine)
> # less or more (either or none is fine)
> # ip
>-# netstat
>+# ss
> # date
> # hostname
> 
>@@ -5980,7 +5980,7 @@ if [ ${FIREHOL_WIZARD} -eq 1 ]
> then
> 	# require commands for wizard mode
> 	require_cmd ip
>-	require_cmd netstat
>+	require_cmd ss
> 	require_cmd date
> 	require_cmd hostname
> 	
>@@ -6317,7 +6317,7 @@ EOF
> 		(
> 			local x=
> 			local ports=
>-			for x in `${NETSTAT_CMD} -an | ${EGREP_CMD} "^tcp" | ${SED_CMD} "s|:::|0.0.0.0:|g" | ${GREP_CMD} "0.0.0.0:*" | ${EGREP_CMD} " (${ifip}|0.0.0.0):[0-9]+" | ${CUT_CMD} -d ':' -f 2 | ${CUT_CMD} -d ' ' -f 1 | ${SORT_CMD} -n | ${UNIQ_CMD}`
>+			for x in `${SS_CMD} -tln | ${SED_CMD} "s|:::|\*:|g" | ${EGREP_CMD} " (${ifip}|\*):[0-9]+" | ${CUT_CMD} -d ':' -f 2 | ${CUT_CMD} -d ' ' -f 1 | ${SORT_CMD} -n | ${UNIQ_CMD}`
> 			do
> 				if [ -f "tcp/${x}" ]
> 				then
>@@ -6327,7 +6327,7 @@ EOF
> 				fi
> 			done
> 			
>-			for x in `${NETSTAT_CMD} -an | ${EGREP_CMD} "^udp" | ${SED_CMD} "s|:::|0.0.0.0:|g" | ${GREP_CMD} "0.0.0.0:*" | ${EGREP_CMD} " (${ifip}|0.0.0.0):[0-9]+" | ${CUT_CMD} -d ':' -f 2 | ${CUT_CMD} -d ' ' -f 1 | ${SORT_CMD} -n | ${UNIQ_CMD}`
>+			for x in `${SS_CMD} -uln | ${SED_CMD} "s|:::|\*:|g" | ${EGREP_CMD} " (${ifip}|\*):[0-9]+" | ${CUT_CMD} -d ':' -f 2 | ${CUT_CMD} -d ' ' -f 1 | ${SORT_CMD} -n | ${UNIQ_CMD}`
> 			do
> 				if [ -f "udp/${x}" ]
> 				then

Actions: View | Diff

Attachments on bug 784520: 557407 | 557467 | 582170