Use wifidog -a for mock ARP table

Also bump number of clients up to 40.

Update README.

Author: mhaas

contrib/load-tester/README.md

@@ -11,3 +11,16 @@
 Once you think the script has run long enough, kill run.sh and look at
 valgrind.log. You have to clean up after the script yourself, e.g. kill
 mock\_auth.py separately and run **./generate_interfaces.sh stop**
+
+### Note on ARP tables ###
+
+Although generate\_interfaces.sh will add random MAC addresses
+to the virtual interfaces, these will not show up in the local
+ARP table. The ARP table only lists remote systems. Even with the
+**publish** flag set, the ARP table entry will list an all-zero MAC
+address. For this reason, the script generates a fake ARP table
+and passes it to wifidog with the **-a** switch.
+
+The macvlan type virtual interface used by generate\_interfaces.sh
+is still useful if you load-test a remote wifidog instance. In this case,
+the remote ARP table will (hopefully) be populated correctly.

contrib/load-tester/generate_interfaces.sh

@@ -7,17 +7,18 @@ PREFIX="mac"
 # don't touch resolv.conf
 DHCP="dhcpcd --waitip -C resolv.conf"
 #DHCP="dhclient -v"
-
 NET="10.0.10."
+ARPTABLE="/tmp/arp"
 
+COUNT=$2
 
 function start() {
-    echo "IP address       HW type     Flags       HW address            Mask     Device" > /tmp/arp
+    echo "IP address       HW type     Flags       HW address            Mask     Device" > $ARPTABLE
     # Add internal address for GW
     sudo ip link add internal0 link $IF type macvlan mode bridge || exit 1
     sudo ip addr add ${NET}254 dev internal0
     sudo ip link set internal0 up || exit 2
-    for i in `seq 0 9`; do
+    for i in `seq 0 $COUNT`; do
         echo "Add link $i"
         # sudo ip link add virtual0 link eth0 type macvlan mode bridge
         sudo ip link add ${PREFIX}${i} link $IF type macvlan mode bridge || exit 1
@@ -32,13 +33,13 @@ function start() {
         # when using DHCP, the interface would immediately
         # go down?
         #sudo $DHCP ${PREFIX}${i} || exit 3
-        echo " ${NET}$(($i + 1))     0x1         0x2         $MAC     *        ${PREFIX}${i}" >> /tmp/arp
+        echo " ${NET}$(($i + 1))     0x1         0x2         $MAC     *        ${PREFIX}${i}" >> $ARPTABLE
     done
 }
 
 function stop() {
     sudo ip link del internal0 2>/dev/null || true
-    for i in `seq 0 9`; do
+    for i in `seq 0 $COUNT`; do
         echo "Deleting link $i"
         sudo ip link del ${PREFIX}${i} 2>/dev/null || true
     done

contrib/load-tester/run.sh

@@ -1,24 +1,25 @@
 #!/bin/bash
 
+COUNT=40
 
 echo "Make sure to configure GatewayInterface in wifidog_mock.conf"
 
-./generate_interfaces.sh start || exit 1
+./generate_interfaces.sh start $COUNT || exit 1
 
 ./mock_auth.py &
 
 # trace-children is necessary because of the libtool wrapper -.-
 #sudo valgrind --leak-check=full --trace-children=yes --trace-children-skip=/bin/sh \
 #    --log-file=valgrind.log ../../src/wifidog -d 7 -f -c wifidog-mock.conf 2> wifidog.log &
 
-../../src/wifidog -d 7 -f -c wifidog-mock.conf 2> wifidog.log &
+../../src/wifidog -d 7 -f -c wifidog-mock.conf -a /tmp/arp 2> wifidog.log &
 
 IF=`grep GatewayInterface wifidog-mock.conf | cut -f 2 -d ' '`
 
 echo "Waiting for wifidog to come up"
 
 sleep 10
-./fire_requests.py $IF mac 9
+./fire_requests.py $IF mac $COUNT
 
 #./generate_interfaces.sh stop