X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=dropcount.sh;h=541dd30529e090c6c9fbfc7ef6b1c9c09d85cb94;hb=0ac7dea853a16579072fe9d85cfc791226167491;hp=3cfc4ab922c4bba79a3074104aa34a7560ffaf38;hpb=262b3b5dc1aaa6f46546f653a7fd8dcb3792fa5a;p=flowspec-xdp

diff --git a/dropcount.sh b/dropcount.sh
index 3cfc4ab..541dd30 100755
--- a/dropcount.sh
+++ b/dropcount.sh
@@ -1,29 +1,47 @@
-#!/bin/sh
-KEY=""
+#!/bin/bash
+function PRINTCNT() {
+if [ "$1" != "" ]; then
+	if [ "$1" = "0" ]; then
+		echo -e "$2\t$3\tInvalid packet length"
+	elif [ "$1" = "1" ]; then
+		echo -e "$2\t$3\tInvalid VLAN tag"
+	elif [ "$1" = "2" ]; then
+		echo -e "$2\t$3\tInvalid/rejected IHL IPv4 field"
+	elif [ "$1" = "3" ]; then
+		echo -e "$2\t$3\tRejected IPv6 fragments"
+	else
+		echo -en "$2\t$3\t"
+		cat "$(dirname ${BASH_SOURCE[0]})/installed-rules.txt" | head -n $(( $1 - 3 )) | tail -n1
+	fi
+fi
 CNT=0
-bpftool map dump id "$(bpftool map show | grep drop_cnt_map | awk '{ print $1 }' | tr -d ':')" | 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 "*) ;;
-		*)
-			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"
+}
+MAP_CONTENTS="$(bpftool map show | grep drop_cnt_map | awk '{ print $1 }' | tr -d ':' | while read IF; do
+	bpftool map dump id "$IF"
+done)"
+echo "$MAP_CONTENTS" | {
+	declare -a BYTES
+	declare -a PACKETS
+	KEY=""
+	while read LINE; do
+		case "$LINE" in
+			*"key"*)
+				KEY=$(echo "$LINE" | awk '{ print $2 }' | tr -d ',')
+				if [ "${BYTES["${KEY}"]}" = "" ]; then
+					BYTES["${KEY}"]=0
+					PACKETS["${KEY}"]=0
 				fi
-			fi
-			KEY=$(echo "$LINE" | awk '{ print "0x" $4 $3 $2 $1 }')
-			CNT=0
-			;;
-	esac
-done
+				;;
+			*"bytes"*)
+				BYTES["${KEY}"]=$(( ${BYTES["$KEY"]} + $(echo "$LINE" | awk '{ print $2 }' | tr -d ',') ))
+				;;
+			*"packets"*)
+				PACKETS["$KEY"]=$(( ${PACKETS["$KEY"]} + $(echo "$LINE" | awk '{ print $2 }' | tr -d ',') ))
+				;;
+		esac
+	done
+	echo -e "pkts\tKBytes\tRule"
+	for C in "${!BYTES[@]}"; do
+		PRINTCNT $C "${PACKETS["$C"]}" "$(( ${BYTES["$C"]} / 1000 ))"
+	done
+}