diff options
author | Jacob Appelbaum <jacob@appelbaum.net> | 2011-08-19 15:09:45 +0200 |
---|---|---|
committer | Jacob Appelbaum <jacob@appelbaum.net> | 2011-08-19 15:09:45 +0200 |
commit | 254d2d3f6d1dfc01481ae4158302aae306bef793 (patch) | |
tree | 909f1798e9218eec51fe2689b61c5e397a16b588 /packages/torouter-web/src/tui/utils/configuration.py | |
parent | d891a6dc8241809863eb53794d9028f75ac5362b (diff) | |
parent | 21472ffb02bb44782d232ce5efe79042c8cb27c6 (diff) | |
download | torouter-254d2d3f6d1dfc01481ae4158302aae306bef793.tar.gz torouter-254d2d3f6d1dfc01481ae4158302aae306bef793.zip |
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
Diffstat (limited to 'packages/torouter-web/src/tui/utils/configuration.py')
-rw-r--r-- | packages/torouter-web/src/tui/utils/configuration.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/torouter-web/src/tui/utils/configuration.py b/packages/torouter-web/src/tui/utils/configuration.py index 88bbc05..7133443 100644 --- a/packages/torouter-web/src/tui/utils/configuration.py +++ b/packages/torouter-web/src/tui/utils/configuration.py @@ -1,5 +1,5 @@ import web -import config +from tui import config def get(name): conf = {} @@ -8,6 +8,7 @@ def get(name): if name == "wireless": conf['essid'] = "Torouter" conf['encryption'] = "WPA2" + conf['mac'] = "00:66:66:66:66:66" conf['key'] = "ljdasjkbcuBH12389Ba" return conf elif name == "firewall": @@ -43,6 +44,8 @@ def get_form(name): return web.form.Form( web.form.Textbox(name='essid', description='Wireless ESSID', value=c['essid']), + web.form.Textbox(name='mac', + description='Wireless MAC address', value=c['mac']), web.form.Dropdown(name='enctype', args=['WPA2', 'WPA', 'WEP (not reccomended)', 'open'], description='Wireless encryption scheme', value=c['encryption']), web.form.Password(name='key', |