[tor-commits] [torouter/master] uap0 and not wlan0

[ioerror at torproject.org]

commit acb8da4edf611c2199bbf6d3b26eeec0f69f1b56
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Fri Aug 26 00:55:27 2011 +0200

    uap0 and not wlan0
---
 packages/torouter-prep/configs/dnsmasq.conf        |    2 +-
 packages/torouter-prep/configs/interfaces          |    7 ++++---
 .../torouter-prep/configs/tor-wireless-firewall.sh |    2 +-
 packages/torouter-prep/configs/udhcpd.conf         |    2 +-
 packages/torouter-web/src/tui/config.py            |    2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/torouter-prep/configs/dnsmasq.conf b/packages/torouter-prep/configs/dnsmasq.conf
index cc6477d..2711486 100644
--- a/packages/torouter-prep/configs/dnsmasq.conf
+++ b/packages/torouter-prep/configs/dnsmasq.conf
@@ -83,7 +83,7 @@ no-poll
 # interface (eg eth0) here.
 # Repeat the line for more than one interface.
 interface=eth1
-interface=wlan0
+interface=uap0
 # Or you can specify which interface _not_ to listen on
 except-interface=eth0
 except-interface=lo
diff --git a/packages/torouter-prep/configs/interfaces b/packages/torouter-prep/configs/interfaces
index d1b9ba3..fbd5213 100644
--- a/packages/torouter-prep/configs/interfaces
+++ b/packages/torouter-prep/configs/interfaces
@@ -8,8 +8,8 @@ iface lo inet loopback
 # The primary network interface
 auto eth0
 iface eth0 inet dhcp
-	post-up ifup wlan0
-	post-down ifdown wlan0
+	post-up ifup uap0
+	post-down ifdown uap0
 
 auto eth1
 iface eth1 inet static
@@ -23,7 +23,8 @@ iface eth1 inet static
 	post-up /etc/init.d/dnsmasq restart
 
 # The magic Tor wireless network
-iface wlan0 inet static
+auto uap0
+iface uap0 inet static
         address 172.16.23.1
 	netmask 255.255.255.0
 	network 172.16.23.0
diff --git a/packages/torouter-prep/configs/tor-wireless-firewall.sh b/packages/torouter-prep/configs/tor-wireless-firewall.sh
index bdb2587..4310e7b 100755
--- a/packages/torouter-prep/configs/tor-wireless-firewall.sh
+++ b/packages/torouter-prep/configs/tor-wireless-firewall.sh
@@ -7,7 +7,7 @@ NON_TOR="10.0.2.0/24 10.23.42.0/24 172.16.23.0/24"
 TRANS_PORT="9040"
 
 # your internal interface
-INT_IF="wlan0"
+INT_IF="uap0"
 
 iptables -F
 iptables -t nat -F
diff --git a/packages/torouter-prep/configs/udhcpd.conf b/packages/torouter-prep/configs/udhcpd.conf
index db88e38..04160aa 100644
--- a/packages/torouter-prep/configs/udhcpd.conf
+++ b/packages/torouter-prep/configs/udhcpd.conf
@@ -5,7 +5,7 @@ start		172.16.23.10
 end		172.16.23.254
 
 # The interface that udhcpd will use
-interface	wlan0
+interface	uap0
 
 # The maximim number of leases (includes addressesd reserved
 # by OFFER's, DECLINE's, and ARP conficts
diff --git a/packages/torouter-web/src/tui/config.py b/packages/torouter-web/src/tui/config.py
index 69ea54d..989c102 100644
--- a/packages/torouter-web/src/tui/config.py
+++ b/packages/torouter-web/src/tui/config.py
@@ -12,7 +12,7 @@ globals = {}
 authinfo = ("test", "test")
 
 # Network devices
-network_devices = ('wlan0', 'eth0', 'eth1')
+network_devices = ('uap0', 'eth0', 'eth1')
 
 #interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces"
 #torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc"