Merge branch 'master' of kau.toke.dk:test-scripts

set_delay.sh

 #!/bin/bash
 
-exit 0
+#exit 0
 
 DELAY="$1"
 die()
@@ -22,8 +22,7 @@ else
 
     DELAY_IF=$[$DELAY/2]
 
-    for IFACE in $IFACES; do
-        tc qdisc del dev $IFACE root 2>/dev/null
-        tc qdisc add dev $IFACE root netem delay ${DELAY_IF}ms || exit 1
+    for PIPE in 110 111; do
+	ipfw pipe $PIPE config delay ${DELAY_IF}ms
     done
 fi

setup-netem.sh

@@ -13,7 +13,7 @@ MODULE=/usr/local/lib/ipfw_mod.ko
 
 [ "$IFACE" == "eth1" ] || exit 0
 
-grep -q ipfw_mode /proc/modules || insmod "$MODULE"
+grep -q ipfw_mod /proc/modules || insmod "$MODULE"
 
 ipfw -f  pipe flush
 ipfw -f flush