X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=dropcount.sh;h=6278955bb1e967fb60eeb846647c7632a0cfea8f;hb=822037d58f379cca575bbeb74647cc60ba8113c5;hp=2620b5dd6f836ec25d6a7ad4b0e959e462e367c9;hpb=d05d679fa4de0002100a7cd806897a2d97d19b5f;p=flowspec-xdp

diff --git a/dropcount.sh b/dropcount.sh
index 2620b5d..6278955 100755
--- a/dropcount.sh
+++ b/dropcount.sh
@@ -1,45 +1,41 @@
 #!/bin/bash
-function PRINTCNT() {
-if [ "$KEY" != "" ]; then
-	if [ "$KEY" = "0" ]; then
-		echo -e "$CNT:\tInvalid packet length"
-	elif [ "$KEY" = "1" ]; then
-		echo -e "$CNT:\tInvalid VLAN tag"
-	elif [ "$KEY" = "2" ]; then
-		echo -e "$CNT:\tInvalid/rejected IHL IPv4 field"
-	elif [ "$KEY" = "3" ]; then
-		echo -e "$CNT:\tRejected IPv6 fragments"
-	else
-		echo -en "$CNT:\t"
-		cat "$(dirname ${BASH_SOURCE[0]})/installed-rules.txt" | head -n $(( $KEY - 3 )) | tail -n1
-	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"
+	bpftool map dump id "$IF" | grep "bytes\|packets\|key" | grep -v '\(bytes\|packets\)": 0\(,\)*$' | tr -d ','
 done)"
 echo "$MAP_CONTENTS" | {
-	declare -a COUNTS
+	declare -a BYTES
+	declare -a PACKETS
+	TOTAL_PACKETS=0
+	TOTAL_BYTES=0
 	KEY=""
 	while read LINE; do
 		case "$LINE" in
-			"key:") ;;
-			"value"*)
-				COUNTS["$KEY"]=$(( ${COUNTS["$KEY"]} + $(echo "$LINE" | awk '{ print "0x" $11 $10 $9 $8 $7 $6 $5 $4 }') ))
-				;;
-			"Found "*) ;;
-			*)
-				KEY=$((16#$(echo "$LINE" | awk '{ print $4 $3 $2 $1 }')))
-				if [ "$COUNTS["$KEY"]" = "" ]; then
-					COUNTS["$KEY"]=0
+			*"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
-	for C in "${!COUNTS[@]}"; do
-		KEY=$C
-		CNT="${COUNTS["$KEY"]}"
-		PRINTCNT
-	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"
 }