From: Mitchell E Berger <mitchb@mit.edu>
Date: Tue, 26 Jun 2018 02:21:23 +0000 (-0400)
Subject: Fix XVM's classic networking problem.
X-Git-Tag: 0.4.22^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/refs/heads/mitchb

Fix XVM's classic networking problem.

Kill arpspoof with SIGKILL when we're done with it so it doesn't try
to "clean up" and possibly tell the router that your MAC is all-zeros.
---

diff --git a/debian/changelog b/debian/changelog
index 7506e4c..ea1250e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-remote (0.4.22) precise; urgency=low
+
+  * Kill arpspoof with SIGKILL when we're done with it so it doesn't try
+    to "clean up" and possibly tell the router that your MAC is all-zeros.
+
+ -- Mitchell Berger <mitchb@mit.edu>  Mon, 26 Jun 2018 22:22:00 -0400
+
 invirt-remote (0.4.21) precise; urgency=low
 
   * Add the long-awaited arp remctl
diff --git a/host/usr/sbin/invirt-vmcontrol b/host/usr/sbin/invirt-vmcontrol
index eaac5ac..dff84c3 100755
--- a/host/usr/sbin/invirt-vmcontrol
+++ b/host/usr/sbin/invirt-vmcontrol
@@ -51,9 +51,9 @@ case "$ACTION" in
 	    gw=`echo $script | sed -ne 's/.* gateway=\([0-9\.]*\).*/\1/p'`
 	    oip=`echo $script | sed -ne 's/.* other_ip=\([0-9\.]*\).*/\1/p'`
 	    ogw=`echo $script | sed -ne 's/.* other_gateway=\([0-9\.]*\).*/\1/p'`
-	    timeout 5 /usr/sbin/arpspoof -i $iface -t $gw $ip
+	    timeout -s KILL 5 /usr/sbin/arpspoof -i $iface -t $gw $ip
 	    if [ -n "$oip" ]; then
-		timeout 5 /usr/sbin/arpspoof -i $iface -t $ogw $oip
+		timeout -s KILL 5 /usr/sbin/arpspoof -i $iface -t $ogw $oip
 	    fi
 	done
 	;;