X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=dropcount.sh;h=6278955bb1e967fb60eeb846647c7632a0cfea8f;hb=refs%2Fheads%2Fmain;hp=9864be80aa1be6a68eaa0ba71a8ff7eb040d4a29;hpb=6f38d6623c3282c8f93dedd1b6419946da1311dc;p=flowspec-xdp

diff --git a/dropcount.sh b/dropcount.sh
index 9864be8..6278955 100755
--- a/dropcount.sh
+++ b/dropcount.sh
@@ -1,37 +1,41 @@
 #!/bin/bash
-function PRINTCNT() {
-if [ "$KEY" != "" ]; then
-	if [ "$KEY" = "0x00000000" ]; then
-		echo "Invalid packet length: $CNT"
-	elif [ "$KEY" = "0x00000001" ]; then
-		echo "Invalid VLAN tag: $CNT"
-	elif [ "$KEY" = "0x00000002" ]; then
-		echo "Invalid/rejected IHL IPv4 field: $CNT"
-	elif [ "$KEY" = "0x00000003" ]; then
-		echo "Rejected IPv6 fragments: $CNT"
-	else
-		echo "$KEY: $CNT"
-	fi
-fi
-CNT=0
+MAP_CONTENTS="$(bpftool map show | grep drop_cnt_map | awk '{ print $1 }' | tr -d ':' | while read IF; do
+	bpftool map dump id "$IF" | grep "bytes\|packets\|key" | grep -v '\(bytes\|packets\)": 0\(,\)*$' | tr -d ','
+done)"
+echo "$MAP_CONTENTS" | {
+	declare -a BYTES
+	declare -a PACKETS
+	TOTAL_PACKETS=0
+	TOTAL_BYTES=0
+	KEY=""
+	while read LINE; do
+		case "$LINE" in
+			*"key"*)
+				KEY=${LINE:7}
+				if [ "${BYTES["${KEY}"]}" = "" ]; then
+					BYTES["${KEY}"]=0
+					PACKETS["${KEY}"]=0
+				fi
+				;;
+			*"bytes"*)
+				BYTES["${KEY}"]=$(( ${BYTES["$KEY"]} + ${LINE:9} ))
+				TOTAL_BYTES=$(( $TOTAL_BYTES + ${LINE:9} ))
+				;;
+			*"packets"*)
+				PACKETS["$KEY"]=$(( ${PACKETS["$KEY"]} + ${LINE:11} ))
+				TOTAL_PACKETS=$(( $TOTAL_PACKETS + ${LINE:11} ))
+				;;
+		esac
+	done
+	echo -e "pkts\tKBytes\tRule"
+	echo -e "${TOTAL_PACKETS}\t$(( ${TOTAL_BYTES} / 1000 ))\tTotal"
+	echo -e "${PACKETS[0]}\t$(( ${BYTES[0]} / 1000 ))\tInvalid packet length"
+	echo -e "${PACKETS[1]}\t$(( ${BYTES[1]} / 1000 ))\tInvalid VLAN tag"
+	echo -e "${PACKETS[2]}\t$(( ${BYTES[2]} / 1000 ))\tInvalid/rejected IHL IPv4 field"
+	echo -e "${PACKETS[3]}\t$(( ${BYTES[3]} / 1000 ))\tRejected IPv6 fragments"
+	C=4
+	while read LINE; do
+		echo -e "${PACKETS["$C"]}\t$(( ${BYTES["$C"]} / 1000 ))\t$LINE"
+		C=$(( $C + 1 ))
+	done < "$(dirname ${BASH_SOURCE[0]})/installed-rules.txt"
 }
-bpftool map show | grep drop_cnt_map | awk '{ print $1 }' | tr -d ':' | while read IF; do
-	bpftool map dump id "$IF" | {
-		KEY=""
-		CNT=0
-		while read LINE; do
-			case "$LINE" in
-				"key:") ;;
-				"value"*)
-					CNT=$(( $CNT + $(echo "$LINE" | awk '{ print "0x" $11 $10 $9 $8 $7 $6 $5 $4 }') ))
-					;;
-				"Found "*) ;;
-				*)
-					PRINTCNT
-					KEY=$(echo "$LINE" | awk '{ print "0x" $4 $3 $2 $1 }')
-					;;
-			esac
-		done
-		PRINTCNT
-	}
-done