Replace bridge with NAT forwarding

Remove unnecessary netdown.sh

Signed-off-by: Aiden Woodruff <aiden@aidenw.net>

2 files changed, 27 insertions, 15 deletions

diff --git a/netdown.sh b/netdown.sh
deleted file mode 100755
index da8b49e..0000000
--- a/netdown.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-brctl delbr br-wjail
-ip netns del gitbot
diff --git a/netup.sh b/netup.sh
index 56dd0f2..8b42697 100755
--- a/netup.sh
+++ b/netup.sh
@@ -1,23 +1,39 @@
 #!/bin/sh
 
-if ! [ -f /srv/gitbot/wjail.pid ]; then
+if [ "$(id -u)" -ne 0 ]; then
+echo "You are not root."
+exit 1
+fi
+
+pidfile=/srv/gitbot/wjail.pid
+
+if ! [ -f "$pidfile" ]; then
 echo "wjail not running."
 exit 1
 fi
 
-PID=$(cat /srv/gitbot/wjail.pid)
+PID="$(cat "$pidfile")"
 
+# Attach iproute2 netns
 ip netns attach gitbot $PID
+
+# Add veth devices
 ip link add veth-wjail type veth peer veth0 netns gitbot
-ifconfig veth-wjail 10.1.1.1/24 up
-ip netns exec gitbot ifconfig veth0 10.1.1.2/24 up
 
-# Bridge veth-wjail to eth0
-brctl addbr br-wjail
-brctl addif br-wjail veth-wjail
-brctl addif br-wjail eth0
+# Assign ip addresses
+ip addr add 10.1.1.1/24 dev veth-wjail
+ip netns exec gitbot ip addr add 10.1.1.2/24 dev veth0
 
 # Bring interfaces up
-ifconfig br-wjail up
-ifconfig eth0 up
-ifconfig veth-wjail
+ip link set veth-wjail up
+ip netns exec gitbot ip link set veth0 up
+
+# Assign default gateway
+ip netns exec gitbot route add default gw 10.1.1.1
+
+# Enable IP forwarding
+echo 1 > /proc/sys/net/ipv4/ip_forward
+
+# Add NAT forwarding rule
+iptables -t nat -A POSTROUTING -s 10.1.1.2/16 -j MASQUERADE
+