X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=install.sh;h=d77a8b0a66a5dd941fa78fdb39e14488da44e2cd;hb=e63afbe176e13e0b1e3092837807cd5e06886da6;hp=be3ead3d23e9b59f01ea2bd71fa768c2827f9ffd;hpb=130bf4a7a1418ae03a79993fd77ccbdae5f814e7;p=flowspec-xdp

diff --git a/install.sh b/install.sh
index be3ead3..d77a8b0 100755
--- a/install.sh
+++ b/install.sh
@@ -1,11 +1,28 @@
 #!/bin/bash
 set -e
 
-RULES="$(birdc show route table flowspec4)
-$(birdc show route table flowspec6)"
+CLANG_ARGS=""
+XDP_SECTION="xdp_drop"
+if [ "$2" != "" ]; then
+	CLANG_ARGS="-DHAVE_WRAPPER"
+	XDP_SECTION="$3"
+	if [ ! -f "$2" -o "$3" = "" ]; then
+		echo "To use a wrapper C file, call as $0 interface path/to/wrapper.c xdp_section wrapper-clang-args"
+		exit 1
+	fi
+fi
 
-echo "$RULES" | ./genrules.py --8021q=drop-vlan --v6frag=ignore-parse-if-rule --ihl=drop-options
-clang -std=c99 -pedantic -Wall -Wextra -Wno-pointer-arith -Wno-unused-variable -O3 -emit-llvm -c xdp.c -o - | llc -O3 -march=bpf -filetype=obj -o xdp
+RULES="$(birdc show route table flowspec4 primary all)
+$(birdc show route table flowspec6 primary all)"
+
+echo "$RULES" | ./genrules.py --8021q=drop-vlan --v6frag=ignore-parse-if-rule --ihl=parse-options
+clang $CLANG_ARGS -g -std=c99 -pedantic -Wall -Wextra -Wno-pointer-arith -Wno-unused-variable -O3 -emit-llvm -c xdp.c -o xdp.bc
+if [ "$2" != "" ]; then
+	clang $4 -g -std=c99 -pedantic -Wall -Wextra -Wno-pointer-arith -Wno-unused-variable -O3 -emit-llvm -c "$2" -o wrapper.bc
+	llvm-link xdp.bc wrapper.bc | llc -O3 -march=bpf -filetype=obj -o xdp
+else
+	cat xdp.bc | llc -O3 -march=bpf -filetype=obj -o xdp
+fi
 
 echo "Before unload drop count was:"
 ./dropcount.sh || echo "Not loaded"
@@ -13,8 +30,9 @@ echo "Before unload drop count was:"
 ip link set "$1" xdp off
 ip link set "$1" xdpgeneric off
 # Note that sometimes the automated fallback does not work properly so we have to || generic here
-ip link set "$1" xdpoffload obj xdp sec xdp_drop || (
-	echo "Failed to install in NIC, testing in driver..." && ip link set "$1" xdpdrv obj xdp sec xdp_drop || (
-		echo "Failed to install in driver, using generic..." && ip link set "$1" xdpgeneric obj xdp sec xdp_drop
+ip link set "$1" xdpoffload obj xdp sec $XDP_SECTION || (
+	echo "Failed to install in NIC, testing in driver..." && ip link set "$1" xdpdrv obj xdp sec $XDP_SECTION || (
+		echo "Failed to install in driver, using generic..." && ip link set "$1" xdpgeneric obj xdp sec $XDP_SECTION
 	)
 )
+echo "$RULES" | grep "^flow. {" > installed-rules.txt