Fix/better handling of no-stats-tracking rules

[flowspec-xdp] / dropcount.sh

diff --git a/dropcount.sh b/dropcount.sh
index 9864be80aa1be6a68eaa0ba71a8ff7eb040d4a29..5f15b5e6ab087f7e6cea34a2a686934aa0d7388f 100755 (executable)
--- a/dropcount.sh
+++ b/dropcount.sh
@@ -1,37 +1,47 @@
 #!/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"
+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 "$KEY: $CNT"
+               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 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
+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\(,\)*$'
+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
+                               ;;
+                       *"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
+}