Changeset 95 for trunk/packages

Timestamp:

Aug 26, 2007, 6:58:22 PM (17 years ago)

Author:

hartmans

svk:copy_cache_prev:

93

Message:

• Add qemu-ifup script that depends on the device model script and invokes vif-sipbroute. As a consequence, we don't really support bridged hvms any more. It's not clear how to get enough information out of qemu to do this.
• Call arpspoof with 18.181.0.1's address. This is unfortunate in two ways. First, if we renumber we'll need to update the script. Second, it is possible that someone on 18.181 besides the router may have an address cached. Unfortunately, it doesn't work right if we don't send the spoofed arp directly to the router.

Location:

trunk/packages/sipb-xen-dom0/sipb-xen-dom0

Files:

• debian/changelog (modified) (1 diff)
• files/etc/xen/scripts/qemu-ifup (added)
• files/etc/xen/scripts/vif-sipbroute (modified) (4 diffs)

trunk/packages/sipb-xen-dom0/sipb-xen-dom0/debian/changelog

@@ +1 @@
+sipb-xen-dom0 (2.2) unstable; urgency=low
+
+  * Add qemu-ifup script that depends on the device model script and
+    invokes vif-sipbroute.    As a consequence, we don't really support
+    bridged hvms any more.  It's not clear how to get enough information
+    out of qemu to do this.
+  * Call arpspoof with 18.181.0.1's address.  This is unfortunate in two
+    ways.  First, if we renumber we'll need to update the script.  Second,
+    it is possible that someone on 18.181 besides the router may have an
+    address cached.  Unfortunately, it doesn't work right if we don't
+    send the spoofed arp directly to the router.
+
+ -- Sam Hartman <hartmans@debian.org>  Sun, 26 Aug 2007 18:57:17 -0400
+
 sipb-xen-dom0 (2.1) unstable; urgency=low
 

trunk/packages/sipb-xen-dom0/sipb-xen-dom0/files/etc/xen/scripts/vif-sipbroute

@@ -1 +1 @@
 #!/bin/bash
+
 
 
@@ -25 +26 @@
 # Note that the v6 support is kind of broken because there's not really a way to populate the v6 prefix
 # This script will set up proxy arp  for any ip addresses that are being routed
+# type read to determine if the device is ioemu
 
 #============================================================================
@@ -32 +34 @@
 
 main_ip=$(dom0_ip)
+dev=${dev:-${vif}}
 
 case "$command" in
     online)
-        ifconfig ${vif} ${main_ip} netmask 255.255.255.255 up
-        echo 1 >/proc/sys/net/ipv4/conf/${vif}/proxy_arp
-        echo 1 >/proc/sys/net/ipv4/conf/${vif}/rp_filter 
+        ifconfig ${dev} ${main_ip} netmask 255.255.255.255 up
+        echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp
+        echo 1 >/proc/sys/net/ipv4/conf/${dev}/rp_filter 
         ipcmd='add'
         cmdprefix=''
@@ -53 +56 @@
 v6prefix=${v6prefix:-}
 v6prefix=$(xenstore_read_default "$XENBUS_PATH/v6prefix" "$v6prefix")
-
-if [ "${ip}" ] ; then
+vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
+if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
+    if [ "${ip}" ] ; then
     # If we've been given a list of IP addresses, then add routes from dom0 to
     # the guest using those addresses.
-    for addr in ${ip} ; do
-      ${cmdprefix} ip route ${ipcmd} ${addr} dev ${vif} src ${main_ip}
-      arpspoof -i eth0 ${addr}&
-      sleep 5
-      kill %arpspoof
-    done 
+        for addr in ${ip} ; do
+            ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} src ${main_ip}
+            arpspoof -i eth0 -t 18.181.0.1 ${addr}&
+            sleep 5
+            kill %arpspoof
+        done 
+    fi
+
+    if [ x${v6prefix} != x ] ; then
+        sed -e "s/@interface@/${dev}/" -e "s+@prefix@+${v6prefix}+" /etc/xen/radvd.conf.template >/var/run/radvd.conf.${vif}
+        ${cmdprefix} ip -6 addr  ${ipcmd}  fe80::/64 scope link  dev ${dev} 
+        if [ $1 = online ] ; then
+            radvd  -u radvd -C /var/run/radvd.conf.${vif} -p /var/run/radvd/radvd.pid.${vif}
+        fi
+        ${cmdprefix} ip -6 route ${ipcmd} ${v6prefix} dev ${dev} 
+    fi
 fi
-
-if [ x${v6prefix} != x ] ; then
-    sed -e "s/@interface@/${vif}/" -e "s+@prefix@+${v6prefix}+" /etc/xen/radvd.conf.template >/var/run/radvd.conf.${vif}
-    ${cmdprefix} ip -6 addr  ${ipcmd}  fe80::/64 scope link  dev ${vif} 
-    if [ $1 = online ] ; then
-        radvd  -u radvd -C /var/run/radvd.conf.${vif} -p /var/run/radvd/radvd.pid.${vif}
-    fi
-    ${cmdprefix} ip -6 route ${ipcmd} ${v6prefix} dev ${vif} 
-    fi
 
 handle_iptable