bitkeeper revision 1.435 (3f69af50wevcD9qxxa6gtfBJnXEBEw)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

.rootkeys

@@ -144,8 +144,8 @@
 3f1668d4-FUY6Enc7MB3GcwUtfJ5HA tools/misc/mkdevnodes
 3f5ef5a2ir1kVAthS14Dc5QIRCEFWg tools/misc/xen-clone
 3f5ef5a2dTZP0nnsFoeq2jRf3mWDDg tools/misc/xen-clone.README
-3f13d81eQ9Vz-h-6RDGFkNR9CRP95g tools/misc/xen_enable_nat
-3f13d81e6Z6806ihYYUw8GVKNkYnuw tools/misc/xen_enable_nat.README
+3f13d81eQ9Vz-h-6RDGFkNR9CRP95g tools/misc/xen_nat_enable
+3f13d81e6Z6806ihYYUw8GVKNkYnuw tools/misc/xen_nat_enable.README
 3f1668d4F29Jsw0aC0bJEIkOBiagiQ tools/misc/xen_read_console.c
 3ddb79bcbOVHh38VJzc97-JEGD4dJQ xen/Makefile
 3f5ef5a2Qtt8AshYs-KXFFNhKALeIg xen/README

tools/misc/xen_enable_nat

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-run_iptables() {
-    if ! iptables $@ ; then
-	echo "iptables returned error; have you built netfilter?"; exit 1
-    fi
-}
-
-ifconfig eth0:0 169.254.1.0 up
-run_iptables -t filter -F
-run_iptables -t nat -F
-run_iptables -t filter -X
-run_iptables -t nat -X
-run_iptables -t filter -P FORWARD DROP
-run_iptables -t filter -A FORWARD -i eth0 -o eth0 -s 169.254.0.0/16 -j ACCEPT
-run_iptables -t filter -A FORWARD -i eth0 -o eth0 -d 169.254.0.0/16 -m state --state ESTABLISHED,RELATED -j ACCEPT
-run_iptables -t nat -A POSTROUTING -o eth0 -s 169.254.1.0 -j RETURN
-run_iptables -t nat -A POSTROUTING -o eth0 -s 169.254.0.0/16 -j MASQUERADE
-echo 1 > /proc/sys/net/ipv4/ip_forward
-

tools/misc/xen_nat_enable

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+run_iptables() {
+    if ! iptables $@ ; then
+	echo "iptables returned error; have you built netfilter?"; exit 1
+    fi
+}
+
+ifconfig eth0:0 169.254.1.0 up
+run_iptables -t filter -F
+run_iptables -t nat -F
+run_iptables -t filter -X
+run_iptables -t nat -X
+run_iptables -t filter -P FORWARD DROP
+run_iptables -t filter -A FORWARD -i eth0 -o eth0 -s 169.254.0.0/16 -j ACCEPT
+run_iptables -t filter -A FORWARD -i eth0 -o eth0 -d 169.254.0.0/16 -m state --state NEW,ESTABLISHED,RELATED -j ACCEPT
+run_iptables -t nat -A POSTROUTING -o eth0 -s 169.254.1.0 -j RETURN
+run_iptables -t nat -A POSTROUTING -o eth0 -s 169.254.0.0/16 -j MASQUERADE
+echo 1 > /proc/sys/net/ipv4/ip_forward
+
+#set up some port redirects for ssh
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2201 -j DNAT --to 169.254.1.1:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2202 -j DNAT --to 169.254.1.2:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2203 -j DNAT --to 169.254.1.3:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2204 -j DNAT --to 169.254.1.4:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2205 -j DNAT --to 169.254.1.5:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2206 -j DNAT --to 169.254.1.6:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2207 -j DNAT --to 169.254.1.7:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2208 -j DNAT --to 169.254.1.8:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2209 -j DNAT --to 169.254.1.9:22
+run_iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2210 -j DNAT --to 169.254.1.10:22
+
+

tools/misc/xen_read_console.c

@@ -45,7 +45,7 @@ int main(void)
         if ( buf[len-1] != '\n' ) { buf[len] = '\n'; len++; }
         buf[len] = '\0';
 
-        printf("%s", buf);
+        printf("[%d] %s", ntohs(from.sin_port),buf);
 
         fromlen = sizeof(from);
     }