[tor-commits] [torouter/master] Use wlan0 instead of uap0

[hellais at torproject.org]

commit e09646bce65198fdc6dc13ca94b6653059c7ae0b
Author: Arturo Filastò <hellais at torproject.org>
Date:   Tue Aug 23 16:03:21 2011 +0200

    Use wlan0 instead of uap0
---
 .../torouter-web/src/tui/controllers/network.py    |    2 +-
 packages/torouter-web/src/tui/utils/parsing.py     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py
index 690dc3f..6b62da7 100644
--- a/packages/torouter-web/src/tui/controllers/network.py
+++ b/packages/torouter-web/src/tui/controllers/network.py
@@ -81,7 +81,7 @@ class wireless:
     itfc.set_mac(data.mac)
     itfc.wifi['netmask'] = data.netmask
     itfc.wifi['address'] = data.address
-    filecontent = itfc.exclude_output("uap0") + itfc.output(itfc.wifi)
+    filecontent = itfc.exclude_output("wlan0") + itfc.output(itfc.wifi)
     files = [('/etc/network/interfaces', filecontent)]
     fileio.write(files)
     #print itfc.output(itfc.wifi)
diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py
index b4dbaee..4d52c87 100644
--- a/packages/torouter-web/src/tui/utils/parsing.py
+++ b/packages/torouter-web/src/tui/utils/parsing.py
@@ -27,7 +27,7 @@ class interfaces:
   def parse_line(self, line, iface):
     name   = line.split(" ")[0]
     values = " ".join(line.split(" ")[1:]).rstrip()
-    if iface == "uap0":
+    if iface == "wlan0":
       if self.wifi.has_key(name):
         if type(self.wifi[name]) is list:
           self.wifi[name].append(values)
@@ -99,7 +99,7 @@ class interfaces:
 
   # XXX currently works for one pre-up entry, must make it work also for arrays
   def set_mac(self, mac):
-    self.wifi['pre-up'] = 'ifconfig uap0 hw ether ' + mac
+    self.wifi['pre-up'] = 'ifconfig wlan0 hw ether ' + mac
     
 
 class torrc: