aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo Filastò <hellais@torproject.org>2011-08-26 00:53:44 +0200
committerArturo Filastò <hellais@torproject.org>2011-08-26 00:53:44 +0200
commit9ac2c7a00186e1b0daf527cadf94b1f104fc3e14 (patch)
tree59ac9c36252aaaf50ad1b71f6d6df161a7e1c945
parent2da67986a68571789172cc1f469f2d010d8128de (diff)
downloadtorouter-9ac2c7a00186e1b0daf527cadf94b1f104fc3e14.zip
torouter-9ac2c7a00186e1b0daf527cadf94b1f104fc3e14.tar.gz
Change back to uap0
-rw-r--r--packages/torouter-prep/configs/dnsmasq.conf2
-rw-r--r--packages/torouter-prep/configs/interfaces8
-rwxr-xr-xpackages/torouter-prep/configs/tor-wireless-firewall.sh2
-rw-r--r--packages/torouter-prep/configs/udhcpd.conf2
-rw-r--r--packages/torouter-web/src/tui/config.py2
5 files changed, 8 insertions, 8 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..ef3071a 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
@@ -18,12 +18,12 @@ iface eth1 inet static
network 10.23.42.0
broadcast 10.23.42.255
post-up echo 1 > /proc/sys/net/ipv4/ip_forward
- # this must happen after have brought up wlan0 because it clears the nat tables
+ # this must happen after have brought up uap0 because it clears the nat tables
post-up iptables -t nat -A POSTROUTING -s 10.23.42.0/24 -o eth0 -j MASQUERADE
post-up /etc/init.d/dnsmasq restart
# The magic Tor wireless network
-iface wlan0 inet static
+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"