gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 04:48:00 +01:00
Code Issues Projects Releases Wiki Activity

Experimental:

Browse Source 
- Port a ton of changes from the testing branch over.
This commit is contained in:
imdano
2008-07-20 16:34:45 +00:00
parent a91ec23653
commit ab3f0987e0
9 changed files with 264 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
configscript.py
View File

@@ -123,27 +123,28 @@ def get_script_info(network, network_type):
def write_scripts(network, network_type, script_info): def write_scripts(network, network_type, script_info):
""" Writes script info to disk and loads it into the daemon. """ """ Writes script info to disk and loads it into the daemon. """
con = ConfigParser.ConfigParser() con = ConfigParser.ConfigParser()
print "Writing scripts, type", network_type
if network_type == "wired": if network_type == "wired":
con.read(wired_conf) con.read(wired_conf)
if con.has_section(network): if not con.has_section(network):
con.set(network, "beforescript", script_info["pre_entry"]) con.add_section(network)
con.set(network, "afterscript", script_info["post_entry"]) con.set(network, "beforescript", script_info["pre_entry"])
con.set(network, "disconnectscript", con.set(network, "afterscript", script_info["post_entry"])
script_info["disconnect_entry"]) con.set(network, "disconnectscript", script_info["disconnect_entry"])
con.write(open(wired_conf, "w")) con.write(open(wired_conf, "w"))
config.ReadWiredNetworkProfile(network) config.ReadWiredNetworkProfile(network)
config.SaveWiredNetworkProfile(network) config.SaveWiredNetworkProfile(network)
else: else:
bssid = wireless.GetWirelessProperty(int(network), "bssid") bssid = wireless.GetWirelessProperty(int(network), "bssid")
con.read(wireless_conf) con.read(wireless_conf)
if con.has_section(bssid): if not con.has_section(bssid):
con.set(bssid, "beforescript", script_info["pre_entry"]) con.add_section(bssid)
con.set(bssid, "afterscript", script_info["post_entry"]) con.set(bssid, "beforescript", script_info["pre_entry"])
con.set(bssid, "disconnectscript", script_info["disconnect_entry"]) con.set(bssid, "afterscript", script_info["post_entry"])
con.write(open(wireless_conf, "w")) con.set(bssid, "disconnectscript", script_info["disconnect_entry"])
config.ReadWirelessNetworkProfile(int(network)) con.write(open(wireless_conf, "w"))
config.SaveWirelessNetworkProfile(int(network)) config.ReadWirelessNetworkProfile(int(network))
config.SaveWirelessNetworkProfile(int(network))
def main (argv): def main (argv):
""" Runs the script configuration dialog. """ """ Runs the script configuration dialog. """
@@ -186,6 +187,6 @@ def main (argv):
if __name__ == '__main__': if __name__ == '__main__':
if os.getuid() != 0: if os.getuid() != 0:
print "Root priviledges are required to configure scripts. Exiting." print "Root privileges are required to configure scripts. Exiting."
sys.exit(0) sys.exit(0)
main(sys.argv) main(sys.argv)

71
daemon.py
View File

@@ -45,9 +45,11 @@ import signal
import gobject import gobject
import dbus import dbus
import dbus.service import dbus.service
from dbus.mainloop.glib import DBusGMainLoop if getattr(dbus, 'version', (0, 0, 0)) < (0, 80, 0):
if getattr(dbus, 'version', (0, 0, 0)) >= (0, 41, 0):
import dbus.glib import dbus.glib
else:
from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
# wicd specific libraries # wicd specific libraries
import wpath import wpath
@@ -155,8 +157,7 @@ class ConnectionWizard(dbus.service.Object):
# Make a variable that will hold the wired network profile # Make a variable that will hold the wired network profile
self.WiredNetwork = {} self.WiredNetwork = {}
# Kind of hackish way to load the secondary wnettools interface # Kind of hackish way to set correct wnettools interfaces.
# for both wired and wireless connection managers.
self.wifi.liface = self.wired.liface self.wifi.liface = self.wired.liface
self.wired.wiface = self.wifi.wiface self.wired.wiface = self.wifi.wiface
@@ -993,7 +994,7 @@ class ConnectionWizard(dbus.service.Object):
################################# #################################
@dbus.service.method('org.wicd.daemon.config') @dbus.service.method('org.wicd.daemon.config')
def CreateWiredNetworkProfile(self, profilename): def CreateWiredNetworkProfile(self, profilename, default=False):
""" Creates a wired network profile. """ """ Creates a wired network profile. """
profilename = misc.to_unicode(profilename) profilename = misc.to_unicode(profilename)
print "Creating wired profile for " + profilename print "Creating wired profile for " + profilename
@@ -1012,7 +1013,7 @@ class ConnectionWizard(dbus.service.Object):
config.set(profilename, "beforescript", None) config.set(profilename, "beforescript", None)
config.set(profilename, "afterscript", None) config.set(profilename, "afterscript", None)
config.set(profilename, "disconnectscript", None) config.set(profilename, "disconnectscript", None)
config.set(profilename, "default", False) config.set(profilename, "default", default)
config.write(open(self.wired_conf, "w")) config.write(open(self.wired_conf, "w"))
return True return True
@@ -1081,6 +1082,9 @@ class ConnectionWizard(dbus.service.Object):
@dbus.service.method('org.wicd.daemon.config') @dbus.service.method('org.wicd.daemon.config')
def SaveWiredNetworkProfile(self, profilename): def SaveWiredNetworkProfile(self, profilename):
""" Writes a wired network profile to disk. """ """ Writes a wired network profile to disk. """
def write_script_ent(prof, conf, script):
if not conf.has_option(prof, script):
conf.set(prof, script, None)
if profilename == "": if profilename == "":
return "500: Bad Profile name" return "500: Bad Profile name"
profilename = misc.to_unicode(profilename) profilename = misc.to_unicode(profilename)
@@ -1091,6 +1095,10 @@ class ConnectionWizard(dbus.service.Object):
config.add_section(profilename) config.add_section(profilename)
for x in self.WiredNetwork: for x in self.WiredNetwork:
config.set(profilename, x, self.WiredNetwork[x]) config.set(profilename, x, self.WiredNetwork[x])
write_script_ent(profilename, config, "beforescript")
write_script_ent(profilename, config, "afterscript")
write_script_ent(profilename, config, "disconnectscript")
config.write(open(self.wired_conf, "w")) config.write(open(self.wired_conf, "w"))
return "100: Profile Written" return "100: Profile Written"
@@ -1125,6 +1133,10 @@ class ConnectionWizard(dbus.service.Object):
@dbus.service.method('org.wicd.daemon.config') @dbus.service.method('org.wicd.daemon.config')
def SaveWirelessNetworkProfile(self, id): def SaveWirelessNetworkProfile(self, id):
""" Writes a wireless profile to disk. """ """ Writes a wireless profile to disk. """
def write_script_ent(prof, conf, script):
if not conf.has_option(prof, script):
conf.set(prof, script, None)
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
config.read(self.wireless_conf) config.read(self.wireless_conf)
cur_network = self.LastScan[id] cur_network = self.LastScan[id]
@@ -1147,6 +1159,15 @@ class ConnectionWizard(dbus.service.Object):
if cur_network["use_settings_globally"]: if cur_network["use_settings_globally"]:
config.set(essid_key, x, cur_network[x]) config.set(essid_key, x, cur_network[x])
write_script_ent(bssid_key, config, "beforescript")
write_script_ent(bssid_key, config, "afterscript")
write_script_ent(bssid_key, config, "disconnect")
if cur_network["use_settings_globally"]:
write_script_ent(essid_key, config, "beforescript")
write_script_ent(essid_key, config, "afterscript")
write_script_ent(essid_key, config, "disconnect")
config.write(open(self.wireless_conf, "w")) config.write(open(self.wireless_conf, "w"))
@dbus.service.method('org.wicd.daemon.config') @dbus.service.method('org.wicd.daemon.config')
@@ -1419,7 +1440,7 @@ class ConnectionWizard(dbus.service.Object):
print "Wired configuration file not found, creating a default..." print "Wired configuration file not found, creating a default..."
# Create the file and a default profile # Create the file and a default profile
open(self.wired_conf, "w").close() open(self.wired_conf, "w").close()
self.CreateWiredNetworkProfile("wired-default") self.CreateWiredNetworkProfile("wired-default", default=True)
# Hide the files, so the keys aren't exposed. # Hide the files, so the keys aren't exposed.
print "chmoding configuration files 0600..." print "chmoding configuration files 0600..."
@@ -1445,19 +1466,20 @@ Arguments:
\t-s\t--no-scan\tDon't auto-scan/auto-connect. \t-s\t--no-scan\tDon't auto-scan/auto-connect.
\t-f\t--no-daemon\tDon't daemonize (run in foreground). \t-f\t--no-daemon\tDon't daemonize (run in foreground).
\t-e\t--no-stderr\tDon't redirect stderr. \t-e\t--no-stderr\tDon't redirect stderr.
\t-n\t--no-poll\tDon't monitor network status.
\t-o\t--no-stdout\tDon't redirect stdout. \t-o\t--no-stdout\tDon't redirect stdout.
\t-P\t--pidfile path\tCreate a pidfile at the specified path.
\t-h\t--help\t\tPrint this help. \t-h\t--help\t\tPrint this help.
""" """
def daemonize(write_pid, pidfile): def daemonize():
""" Disconnect from the controlling terminal. """ Disconnect from the controlling terminal.
Fork twice, once to disconnect ourselves from the parent terminal and a Fork twice, once to disconnect ourselves from the parent terminal and a
second time to prevent any files we open from becoming our controlling second time to prevent any files we open from becoming our controlling
terminal. terminal.
For more info see http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66012 For more info see:
http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66012
""" """
# Fork the first time to disconnect from the parent terminal and # Fork the first time to disconnect from the parent terminal and
@@ -1479,10 +1501,7 @@ def daemonize(write_pid, pidfile):
try: try:
pid = os.fork() pid = os.fork()
if pid > 0: if pid > 0:
if not write_pid: print "wicd daemon: pid " + str(pid)
print "wicd daemon: pid " + str(pid)
else:
print >> open(pidfile,'wt'), str(pid)
sys.exit(0) sys.exit(0)
except OSError, e: except OSError, e:
print >> sys.stderr, "Fork #2 failed: %d (%s)" % (e.errno, e.strerror) print >> sys.stderr, "Fork #2 failed: %d (%s)" % (e.errno, e.strerror)
@@ -1502,16 +1521,15 @@ def main(argv):
auto_scan = True auto_scan = True
try: try:
opts, args = getopt.getopt(sys.argv[1:], 'feosP:', opts, args = getopt.getopt(sys.argv[1:], 'fenosP:',
['help', 'no-daemon', 'no-stderr', 'no-stdout', 'no-scan', ['help', 'no-daemon', 'no-poll', 'no-stderr', 'no-stdout',
'pidfile:']) 'no-scan''])
except getopt.GetoptError: except getopt.GetoptError:
# Print help information and exit # Print help information and exit
usage() usage()
sys.exit(2) sys.exit(2)
write_pid = False no_poll = False
pid_file = None
for o, a in opts: for o, a in opts:
if o in ('-h', '--help'): if o in ('-h', '--help'):
usage() usage()
@@ -1524,11 +1542,10 @@ def main(argv):
do_daemonize = False do_daemonize = False
if o in ('-s', '--no-scan'): if o in ('-s', '--no-scan'):
auto_scan = False auto_scan = False
if o in ('-P', '--pidfile'): if o in ('-n', '--no-poll'):
write_pid = True no_poll = True
pid_file = a
if do_daemonize: daemonize(write_pid, pid_file) if do_daemonize: daemonize()
if redirect_stderr or redirect_stdout: output = LogWriter() if redirect_stderr or redirect_stdout: output = LogWriter()
if redirect_stdout: sys.stdout = output if redirect_stdout: sys.stdout = output
@@ -1545,11 +1562,10 @@ def main(argv):
obj = ConnectionWizard(d_bus_name, auto_connect=auto_scan) obj = ConnectionWizard(d_bus_name, auto_connect=auto_scan)
gobject.threads_init() gobject.threads_init()
(child_pid, x, x, x) = gobject.spawn_async([wpath.bin + "monitor.py"], if not no_poll:
(child_pid, x, x, x) = gobject.spawn_async([wpath.bin + "monitor.py"],
flags=gobject.SPAWN_CHILD_INHERITS_STDIN) flags=gobject.SPAWN_CHILD_INHERITS_STDIN)
signal.signal(signal.SIGTERM, sigterm_caught)
signal.signal(signal.SIGTERM, sigterm_caught)
# Enter the main loop # Enter the main loop
mainloop = gobject.MainLoop() mainloop = gobject.MainLoop()
@@ -1569,5 +1585,4 @@ if __name__ == '__main__':
print ("Root priviledges are required for the daemon to run properly." + print ("Root priviledges are required for the daemon to run properly." +
" Exiting.") " Exiting.")
sys.exit(1) sys.exit(1)
DBusGMainLoop(set_as_default=True)
main(sys.argv) main(sys.argv)

118
gui.py
View File

@@ -48,29 +48,30 @@ try:
except: except:
pass pass
if getattr(dbus, 'version', (0, 0, 0)) >= (0, 41, 0): if getattr(dbus, 'version', (0, 0, 0)) < (0, 80, 0):
import dbus.glib import dbus.glib
else:
from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
bus = dbus.SystemBus() bus = dbus.SystemBus()
try: proxy_obj, daemon, wireless, wired, vpn_session, config = [None for x in
proxy_obj = bus.get_object("org.wicd.daemon", '/org/wicd/daemon') range(0, 6)]
except dbus.DBusException, e: dbus_ifaces = {}
misc.PromptToStartDaemon()
time.sleep(1)
try:
proxy_obj = bus.get_object("org.wicd.daemon", '/org/wicd/daemon')
daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon')
wireless = dbus.Interface(proxy_obj, 'org.wicd.daemon.wireless')
wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired')
vpn_session = dbus.Interface(proxy_obj, 'org.wicd.daemon.vpn')
config = dbus.Interface(proxy_obj, 'org.wicd.daemon.config')
dbus_ifaces = {"daemon" : daemon, "wireless" : wireless, "wired" : wired,
"vpn_session" : vpn_session, "config" : config}
except:
proxy_obj = None
language = misc.get_language_list_gui() language = misc.get_language_list_gui()
def setup_dbus():
global proxy_obj, daemon, wireless, wired, vpn_session, config, dbus_ifaces
proxy_obj = bus.get_object("org.wicd.daemon", '/org/wicd/daemon')
daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon')
wireless = dbus.Interface(proxy_obj, 'org.wicd.daemon.wireless')
wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired')
vpn_session = dbus.Interface(proxy_obj, 'org.wicd.daemon.vpn')
config = dbus.Interface(proxy_obj, 'org.wicd.daemon.config')
dbus_ifaces = {"daemon" : daemon, "wireless" : wireless, "wired" : wired,
"vpn_session" : vpn_session, "config" : config}
def error(parent, message): def error(parent, message):
""" Shows an error dialog """ """ Shows an error dialog """
dialog = gtk.MessageDialog(parent, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, dialog = gtk.MessageDialog(parent, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR,
@@ -202,6 +203,11 @@ class appGui:
self.windowname = "gtkbench" self.windowname = "gtkbench"
self.wTree = gtk.glade.XML(gladefile) self.wTree = gtk.glade.XML(gladefile)
try:
setup_dbus()
except dbus.DBusException:
pass # wicd.py handles this.
dic = { "refresh_clicked" : self.refresh_networks, dic = { "refresh_clicked" : self.refresh_networks,
"quit_clicked" : self.exit, "quit_clicked" : self.exit,
"disconnect_clicked" : self.disconnect_all, "disconnect_clicked" : self.disconnect_all,
@@ -242,6 +248,7 @@ class appGui:
self.wpadrivercombo = None self.wpadrivercombo = None
self.connecting = False self.connecting = False
self.fast = True # Use ioctl instead of external program calls self.fast = True # Use ioctl instead of external program calls
self.prev_state = None
self.refresh_networks(fresh=False) self.refresh_networks(fresh=False)
self.window.connect('delete_event', self.exit) self.window.connect('delete_event', self.exit)
@@ -317,7 +324,6 @@ class appGui:
def disconnect_all(self, widget=None): def disconnect_all(self, widget=None):
""" Disconnects from any active network. """ """ Disconnects from any active network. """
daemon.Disconnect() daemon.Disconnect()
self.update_connect_buttons()
def about_dialog(self, widget, event=None): def about_dialog(self, widget, event=None):
""" Displays an about dialog. """ """ Displays an about dialog. """
@@ -337,6 +343,18 @@ class appGui:
def settings_dialog(self, widget, event=None): def settings_dialog(self, widget, event=None):
""" Displays a general settings dialog. """ """ Displays a general settings dialog. """
def build_combobox(lbl):
""" Sets up a ComboBox using the given widget name. """
liststore = gtk.ListStore(gobject.TYPE_STRING)
combobox = self.wTree.get_widget(lbl)
combobox.clear()
combobox.set_model(liststore)
cell = gtk.CellRendererText()
combobox.pack_start(cell, True)
combobox.add_attribute(cell, 'text', 0)
return combobox
dialog = self.wTree.get_widget("pref_dialog") dialog = self.wTree.get_widget("pref_dialog")
dialog.set_title(language['preferences']) dialog.set_title(language['preferences'])
size = config.ReadWindowSize("pref") size = config.ReadWindowSize("pref")
@@ -416,23 +434,28 @@ class appGui:
self.set_label("pref_driver_label", language['wpa_supplicant_driver'] + self.set_label("pref_driver_label", language['wpa_supplicant_driver'] +
':') ':')
# Hack to get the combo box we need, which you can't do with glade. # Replacement for the combo box hack
wpa_hbox = self.wTree.get_widget("hbox_wpa") wpadrivercombo = build_combobox("pref_wpa_combobox")
if not self.first_dialog_load:
wpa_hbox.remove(self.wpadrivercombo)
else:
self.first_dialog_load = False
self.wpadrivercombo = gtk.combo_box_new_text()
wpadrivercombo = self.wpadrivercombo # Just to make my life easier
wpa_hbox.pack_end(wpadrivercombo)
wpadrivers = ["hostap", "hermes", "madwifi", "atmel", "wext", # Hack to get the combo box we need, which you can't do with glade.
"ndiswrapper", "broadcom", "ipw", "ralink legacy"] #wpa_hbox = self.wTree.get_widget("hbox_wpa")
#if not self.first_dialog_load:
#wpa_hbox.remove(self.wpadrivercombo)
#else:
#self.first_dialog_load = False
#self.wpadrivercombo = gtk.combo_box_new_text()
#wpadrivercombo = self.wpadrivercombo # Just to make my life easier
#wpa_hbox.pack_end(wpadrivercombo)
wpadrivers = ["wext", "hostap", "madwifi", "atmel", "ndiswrapper",
"ipw", "ralink legacy"]
found = False found = False
def_driver = daemon.GetWPADriver()
for i, x in enumerate(wpadrivers): for i, x in enumerate(wpadrivers):
if x == daemon.GetWPADriver() and not found: if x == def_driver: #and not found:
found = True found = True
user_driver_index = i user_driver_index = i
wpadrivercombo.remove_text(i)
wpadrivercombo.append_text(x) wpadrivercombo.append_text(x)
# Set the active choice here. Doing it before all the items are # Set the active choice here. Doing it before all the items are
@@ -441,7 +464,7 @@ class appGui:
wpadrivercombo.set_active(user_driver_index) wpadrivercombo.set_active(user_driver_index)
else: else:
# Use wext as default, since normally it is the correct driver. # Use wext as default, since normally it is the correct driver.
wpadrivercombo.set_active(4) wpadrivercombo.set_active(0)
self.set_label("pref_wifi_label", language['wireless_interface'] + ':') self.set_label("pref_wifi_label", language['wireless_interface'] + ':')
self.set_label("pref_wired_label", language['wired_interface'] + ':') self.set_label("pref_wired_label", language['wired_interface'] + ':')
@@ -658,7 +681,6 @@ class appGui:
if self.pulse_active: if self.pulse_active:
self.pulse_progress_bar() self.pulse_progress_bar()
self.pulse_active = False self.pulse_active = False
self.update_connect_buttons()
self.network_list.set_sensitive(True) self.network_list.set_sensitive(True)
self.status_area.hide_all() self.status_area.hide_all()
@@ -678,12 +700,18 @@ class appGui:
self.set_status(language['not_connected']) self.set_status(language['not_connected'])
return True return True
def update_connect_buttons(self): def update_connect_buttons(self, state=None, x=None, force_check=False):
""" Updates the connect/disconnect buttons for each network entry. """ """ Updates the connect/disconnect buttons for each network entry. """
apbssid = wireless.GetApBssid() if not state:
for entry in self.network_list: state, x = daemon.GetConnectionStatus()
if hasattr(entry, "update_connect_button"):
entry.update_connect_button(apbssid) if self.prev_state != state or force_check:
print 'we actually update now'
apbssid = wireless.GetApBssid()
for entry in self.network_list:
if hasattr(entry, "update_connect_button"):
entry.update_connect_button(state, apbssid)
self.prev_state = state
def check_for_wired(self, wired_ip): def check_for_wired(self, wired_ip):
""" Determine if wired is active, and if yes, set the status. """ """ Determine if wired is active, and if yes, set the status. """
@@ -730,7 +758,6 @@ class appGui:
rescan. rescan.
""" """
print 'got rescan signal'
if not self.connecting: if not self.connecting:
self.refresh_networks(fresh=False) self.refresh_networks(fresh=False)
@@ -803,6 +830,7 @@ class appGui:
label = gtk.Label(language['no_wireless_networks_found']) label = gtk.Label(language['no_wireless_networks_found'])
self.network_list.pack_start(label) self.network_list.pack_start(label)
label.show() label.show()
self.update_connect_buttons(force_check=True)
self.network_list.set_sensitive(True) self.network_list.set_sensitive(True)
def save_settings(self, nettype, networkid, networkentry): def save_settings(self, nettype, networkid, networkentry):
@@ -855,12 +883,9 @@ class appGui:
not entry.chkbox_global_dns.get_active(): not entry.chkbox_global_dns.get_active():
entry.set_net_prop('use_static_dns', True) entry.set_net_prop('use_static_dns', True)
entry.set_net_prop('use_global_dns', False) entry.set_net_prop('use_global_dns', False)
entry.set_net_prop("dns1", entry.set_net_prop("dns1", noneToString(entry.txt_dns_1.get_text()))
noneToString(entry.txt_dns_1.get_text())) entry.set_net_prop("dns2", noneToString(entry.txt_dns_2.get_text()))
entry.set_net_prop("dns2", entry.set_net_prop("dns3", noneToString(entry.txt_dns_3.get_text()))
noneToString(entry.txt_dns_2.get_text()))
entry.set_net_prop("dns3",
noneToString(entry.txt_dns_3.get_text()))
elif entry.chkbox_static_dns.get_active() and \ elif entry.chkbox_static_dns.get_active() and \
entry.chkbox_global_dns.get_active(): entry.chkbox_global_dns.get_active():
entry.set_net_prop('use_static_dns', True) entry.set_net_prop('use_static_dns', True)
@@ -1073,7 +1098,8 @@ class appGui:
if __name__ == '__main__': if __name__ == '__main__':
if not proxy_obj: if not proxy_obj:
error("Could not connect to wicd's D-Bus interface. Make sure the " + error("Could not connect to wicd's D-Bus interface. Make sure the " +
"daemon is started") "daemon is started. If the error persists, please report the" +
"behavior at wicd.net.")
sys.exit(1) sys.exit(1)
app = appGui(standalone=True) app = appGui(standalone=True)

23
misc.py
View File

@@ -22,7 +22,7 @@ import wpath
import locale import locale
import gettext import gettext
import sys import sys
from subprocess import * from subprocess import Popen, STDOUT, PIPE
import subprocess import subprocess
import commands import commands
@@ -101,7 +101,7 @@ def PromptToStartDaemon():
""" Prompt the user to start the daemon """ """ Prompt the user to start the daemon """
daemonloc = wpath.bin + 'launchdaemon.sh' daemonloc = wpath.bin + 'launchdaemon.sh'
sudo_prog = choose_sudo_prog() sudo_prog = choose_sudo_prog()
if sudo_prog.endswith("gksu"): if sudo_prog.endswith("gksu") or sudo_prog.endswith("ktsuss"):
msg = '--message' msg = '--message'
else: else:
msg = '-- caption' msg = '-- caption'
@@ -123,8 +123,8 @@ def WriteLine(my_file, text):
my_file.write(text + "\n") my_file.write(text + "\n")
def ExecuteScript(script): def ExecuteScript(script):
""" Execute a command """ """ Execute a command and send its output to the bit bucket. """
os.system(script) os.system("%s > /dev/null 2>&1" % script)
def ReadFile(filename): def ReadFile(filename):
""" read in a file and return it's contents as a string """ """ read in a file and return it's contents as a string """
@@ -324,15 +324,16 @@ def detect_desktop_environment():
def choose_sudo_prog(): def choose_sudo_prog():
desktop_env = detect_desktop_environment() desktop_env = detect_desktop_environment()
gk_paths = ["/usr/bin/gksu", "/usr/local/bin/gksu", "/bin/gksu"] env_path = os.environ['PATH'].split(":")
kde_paths = ["/usr/bin/kdesu", "/usr/local/bin/kdesu", "/bin/kdesu",
"/usr/bin/kdesudo", "/usr/local/bin/kdesudo", "/bin/kdesudo"]
if desktop_env == "kde": if desktop_env == "kde":
paths = kde_paths paths = []
paths.extend(gk_paths) for p in env_path:
paths.extend([p + '/kdesu', p + '/kdesudo', p + '/ktsuss'])
else: else:
paths = gk_paths paths = []
paths.extend(kde_paths) for p in env_path:
paths.extend([p + '/gksu', p + '/ktsuss'])
for path in paths: for path in paths:
if os.access(path, os.F_OK): if os.access(path, os.F_OK):
return path return path

9
monitor.py
View File

@@ -27,7 +27,11 @@ when appropriate.
import dbus import dbus
import gobject import gobject
import time import time
from dbus.mainloop.glib import DBusGMainLoop if getattr(dbus, 'version', (0, 0, 0)) < (0, 80, 0):
import dbus.glib
else:
from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
import wpath import wpath
import misc import misc
@@ -37,7 +41,6 @@ misc.RenameProcess("wicd-monitor")
if __name__ == '__main__': if __name__ == '__main__':
wpath.chdir(__file__) wpath.chdir(__file__)
DBusGMainLoop(set_as_default=True)
proxy_obj = dbus.SystemBus().get_object('org.wicd.daemon', '/org/wicd/daemon') proxy_obj = dbus.SystemBus().get_object('org.wicd.daemon', '/org/wicd/daemon')
daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon') daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon')
wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired') wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired')
@@ -61,7 +64,7 @@ class ConnectionStatus():
# This determines if we use ioctl or external programs # This determines if we use ioctl or external programs
self.fast = True self.fast = True
self.iwconfig = '' self.iwconfig = ""
def check_for_wired_connection(self, wired_ip): def check_for_wired_connection(self, wired_ip):
""" Checks for an active wired connection. """ Checks for an active wired connection.

53
netentry.py
View File

@@ -157,7 +157,7 @@ class AdvancedSettingsDialog(gtk.Dialog):
def reset_static_checkboxes(self): def reset_static_checkboxes(self):
# Enable the right stuff # Enable the right stuff
if stringToNone(self.txt_ip.get_text()) is not None: if stringToNone(self.txt_ip.get_text()):
self.chkbox_static_ip.set_active(True) self.chkbox_static_ip.set_active(True)
self.chkbox_static_dns.set_active(True) self.chkbox_static_dns.set_active(True)
self.chkbox_static_dns.set_sensitive(False) self.chkbox_static_dns.set_sensitive(False)
@@ -166,7 +166,7 @@ class AdvancedSettingsDialog(gtk.Dialog):
self.chkbox_static_dns.set_active(False) self.chkbox_static_dns.set_active(False)
self.chkbox_static_dns.set_sensitive(True) self.chkbox_static_dns.set_sensitive(True)
if stringToNone(self.txt_dns_1.get_text()) is not None: if stringToNone(self.txt_dns_1.get_text()):
self.chkbox_static_dns.set_active(True) self.chkbox_static_dns.set_active(True)
else: else:
self.chkbox_static_dns.set_active(False) self.chkbox_static_dns.set_active(False)
@@ -315,6 +315,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
else: else:
self.combo_encryption.set_active(0) self.combo_encryption.set_active(0)
self.change_encrypt_method() self.change_encrypt_method()
self.vbox.pack_start(self.chkbox_global_settings, False, False) self.vbox.pack_start(self.chkbox_global_settings, False, False)
self.vbox.pack_start(self.chkbox_encryption, False, False) self.vbox.pack_start(self.chkbox_encryption, False, False)
self.vbox.pack_start(self.combo_encryption, False, False) self.vbox.pack_start(self.combo_encryption, False, False)
@@ -355,25 +356,33 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
self.txt_netmask.set_text(self.format_entry(networkID,"netmask")) self.txt_netmask.set_text(self.format_entry(networkID,"netmask"))
self.txt_gateway.set_text(self.format_entry(networkID,"gateway")) self.txt_gateway.set_text(self.format_entry(networkID,"gateway"))
if wireless.GetWirelessProperty(networkID,'use_global_dns'): self.chkbox_global_dns.set_active(wireless.GetWirelessProperty(networkID,
self.chkbox_global_dns.set_active(True) 'use_global_dns'))
if wireless.GetWirelessProperty(networkID, "dns1") is not None:
self.txt_dns_1.set_text(self.format_entry(networkID, "dns1")) self.txt_dns_1.set_text(self.format_entry(networkID, "dns1"))
if wireless.GetWirelessProperty(networkID, 'dns2') is not None: self.txt_dns_2.set_text(self.format_entry(networkID, "dns2"))
self.txt_dns_2.set_text(self.format_entry(networkID, "dns2")) self.txt_dns_3.set_text(self.format_entry(networkID, "dns3"))
if wireless.GetWirelessProperty(networkID, 'dns3') is not None:
self.txt_dns_3.set_text(self.format_entry(networkID, "dns3"))
self.reset_static_checkboxes() self.reset_static_checkboxes()
if wireless.GetWirelessProperty(networkID, 'encryption'): self.chkbox_encryption.set_active(wireless.GetWirelessProperty(networkID,
self.chkbox_encryption.set_active(True) 'encryption'))
else: self.chkbox_global_settings.set_active(wireless.GetWirelessProperty(networkID,
self.chkbox_encryption.set_active(False) 'use_settings_globally'))
if wireless.GetWirelessProperty(networkID, 'use_settings_globally'):
self.chkbox_global_settings.set_active(True) activeID = -1 # Set the menu to this item when we are done
user_enctype = wireless.GetWirelessProperty(networkID, "enctype")
for x, enc_type in enumerate(self.encrypt_types):
if enc_type[1] == user_enctype:
activeID = x
self.combo_encryption.set_active(activeID)
if activeID != -1:
self.chkbox_encryption.set_active(True)
self.combo_encryption.set_sensitive(True)
self.vbox_encrypt_info.set_sensitive(True)
else: else:
self.chkbox_global_settings.set_active(False) self.combo_encryption.set_active(0)
self.change_encrypt_method() self.change_encrypt_method()
def format_entry(self, networkid, label): def format_entry(self, networkid, label):
@@ -466,7 +475,7 @@ class NetworkEntry(gtk.HBox):
# Set up the script settings button # Set up the script settings button
self.script_button = gtk.Button() self.script_button = gtk.Button()
self.script_image = gtk.Image() self.script_image = gtk.Image()
self.script_image.set_from_icon_name('execute', 4) self.script_image.set_from_stock(gtk.STOCK_EXECUTE, 4)
self.script_image.set_padding(4, 0) self.script_image.set_padding(4, 0)
self.script_button.set_alignment(.5, .5) self.script_button.set_alignment(.5, .5)
self.script_button.set_image(self.script_image) self.script_button.set_image(self.script_image)
@@ -590,7 +599,6 @@ class WiredNetworkEntry(NetworkEntry):
self.expander.set_expanded(True) self.expander.set_expanded(True)
self.profile_help.show() self.profile_help.show()
self.check_enable() self.check_enable()
self.update_connect_button()
self.wireddis = self.connect("destroy", self.destroy_called) self.wireddis = self.connect("destroy", self.destroy_called)
def destroy_called(self, *args): def destroy_called(self, *args):
@@ -639,9 +647,8 @@ class WiredNetworkEntry(NetworkEntry):
self.advanced_button.set_sensitive(False) self.advanced_button.set_sensitive(False)
self.script_button.set_sensitive(False) self.script_button.set_sensitive(False)
def update_connect_button(self, apbssid=None): def update_connect_button(self, state, apbssid=None):
""" Update the connection/disconnect button for this entry. """ """ Update the connection/disconnect button for this entry. """
state, x = daemon.GetConnectionStatus()
if state == misc.WIRED: if state == misc.WIRED:
self.disconnect_button.show() self.disconnect_button.show()
self.connect_button.hide() self.connect_button.hide()
@@ -791,7 +798,6 @@ class WirelessNetworkEntry(NetworkEntry):
# Show everything # Show everything
self.show_all() self.show_all()
self.advanced_dialog = WirelessSettingsDialog(networkID) self.advanced_dialog = WirelessSettingsDialog(networkID)
self.update_connect_button(wireless.GetApBssid())
self.wifides = self.connect("destroy", self.destroy_called) self.wifides = self.connect("destroy", self.destroy_called)
def _escape(self, val): def _escape(self, val):
@@ -862,9 +868,8 @@ class WirelessNetworkEntry(NetworkEntry):
self.image.set_from_file(wpath.images + signal_img) self.image.set_from_file(wpath.images + signal_img)
self.lbl_strength.set_label(disp_strength + ending) self.lbl_strength.set_label(disp_strength + ending)
def update_connect_button(self, apbssid): def update_connect_button(self, state, apbssid):
""" Update the connection/disconnect button for this entry. """ """ Update the connection/disconnect button for this entry. """
state, x = daemon.GetConnectionStatus()
if state == misc.WIRELESS and apbssid == \ if state == misc.WIRELESS and apbssid == \
wireless.GetWirelessProperty(self.networkID, "bssid"): wireless.GetWirelessProperty(self.networkID, "bssid"):
self.disconnect_button.show() self.disconnect_button.show()

60
networking.py
View File

@@ -316,12 +316,13 @@ class ConnectThread(threading.Thread):
def release_dhcp_clients(self, wiface, liface): def release_dhcp_clients(self, wiface, liface):
""" Release all running dhcp clients. """ """ Release all running dhcp clients. """
print "Releasing DHCP leases..."
wiface.ReleaseDHCP() wiface.ReleaseDHCP()
liface.ReleaseDHCP() liface.ReleaseDHCP()
def stop_dhcp_clients(self, iface): def stop_dhcp_clients(self, iface):
""" Stop and running DHCP clients, as well as wpa_supplicant. """ """ Stop and running DHCP clients, as well as wpa_supplicant. """
print 'Stopping wpa_supplicant, and any dhcp clients' print 'Stopping wpa_supplicant and any DHCP clients'
iface.StopWPA() iface.StopWPA()
wnettools.StopDHCP() wnettools.StopDHCP()
@@ -358,10 +359,12 @@ class Wireless(Controller):
wpa_driver = property(get_wpa_driver, set_wpa_driver) wpa_driver = property(get_wpa_driver, set_wpa_driver)
def LoadInterfaces(self): #def LoadInterfaces(self, dhcp_client, flush_tool):
""" Load the wnettools controls for the wired/wireless interfaces. """ # """ Load the wnettools controls for the wired/wireless interfaces. """
self.wiface = wnettools.WirelessInterface(self.wireless_interface, # #self.wiface = wnettools.WirelessInterface(self.wireless_interface,
self.debug, self.wpa_driver) # # self.debug, self.wpa_driver)
# self.dhcp_client = dhcp_client
# self.flush_tool = flush_tool
def Scan(self, essid=None): def Scan(self, essid=None):
""" Scan for available wireless networks. """ Scan for available wireless networks.
@@ -373,6 +376,22 @@ class Wireless(Controller):
A list of available networks sorted by strength. A list of available networks sorted by strength.
""" """
def comp(x, y):
if x.has_key('quality'):
if x['quality'] > y['quality']:
return 1
elif x['quality'] < y['quality']:
return -1
else:
return 0
else:
if x['strength'] < y['strength']:
return 1
elif x['strength'] > y['strength']:
return -1
else:
return 0
wiface = self.wiface wiface = self.wiface
# Prepare the interface for scanning # Prepare the interface for scanning
@@ -386,8 +405,8 @@ class Wireless(Controller):
wiface.SetEssid(essid) wiface.SetEssid(essid)
aps = wiface.GetNetworks() aps = wiface.GetNetworks()
#print aps aps.sort(cmp=comp, reverse=True)
aps.sort(key=lambda x: x['strength'])
return aps return aps
def Connect(self, network, debug=False): def Connect(self, network, debug=False):
@@ -621,13 +640,14 @@ class WirelessConnectThread(ConnectThread):
wiface = self.wiface wiface = self.wiface
liface = self.liface liface = self.liface
self.is_connecting = True self.is_connecting = True
self.is_fast = True
# Run pre-connection script. # Run pre-connection script.
self.abort_if_needed() self.abort_if_needed()
self.run_script_if_needed(self.before_script, 'pre-connection') self.run_script_if_needed(self.before_script, 'pre-connection')
self.abort_if_needed() self.abort_if_needed()
# Dake down interface and clean up previous connections. # Take down interface and clean up previous connections.
self.put_iface_down(wiface) self.put_iface_down(wiface)
self.abort_if_needed() self.abort_if_needed()
self.release_dhcp_clients(wiface, liface) self.release_dhcp_clients(wiface, liface)
@@ -659,7 +679,8 @@ class WirelessConnectThread(ConnectThread):
# Validate Authentication. # Validate Authentication.
if self.network.get('enctype'): if self.network.get('enctype'):
self.SetStatus('validating_authentication') self.SetStatus('validating_authentication')
if not wiface.ValidateAuthentication(time.time()): if not wiface.ValidateAuthentication(time.time(),
fast=self.is_fast):
self.abort_connection('bad_pass') self.abort_connection('bad_pass')
self.abort_if_needed() self.abort_if_needed()
@@ -676,7 +697,7 @@ class WirelessConnectThread(ConnectThread):
self.SetStatus('done') self.SetStatus('done')
print 'Connecting thread exiting.' print 'Connecting thread exiting.'
if self.debug: if self.debug:
print "IP Address is: " + str(wiface.GetIP(fast=True)) print "IP Address is: " + str(wiface.GetIP(fast=self.is_fast))
self.is_connecting = False self.is_connecting = False
def generate_psk_and_authenticate(self, wiface): def generate_psk_and_authenticate(self, wiface):
@@ -709,6 +730,12 @@ class WirelessConnectThread(ConnectThread):
misc.Run(''.join(['wpa_passphrase "', misc.Run(''.join(['wpa_passphrase "',
self.network['essid'], '" "', self.network['essid'], '" "',
_sanitize(self.network['key']), '"']))) _sanitize(self.network['key']), '"'])))
if not self.network['psk']:
self.network['psk'] = self.network['key']
print 'WARNING: PSK generation failed! Falling back to ' + \
'wireless key.\nPlease report this error to the wicd ' + \
'developers!'
# Generate the wpa_supplicant file... # Generate the wpa_supplicant file...
if self.network.get('enctype'): if self.network.get('enctype'):
self.SetStatus('generating_wpa_config') self.SetStatus('generating_wpa_config')
@@ -735,9 +762,12 @@ class Wired(Controller):
link_detect = property(get_link_detect, set_link_detect) link_detect = property(get_link_detect, set_link_detect)
def LoadInterfaces(self): #def LoadInterfaces(self, dhcp_client, link_tool, flush_tool):
""" Load the wnettools controls for the wired/wireless interfaces. """ # """ Load the wnettools controls for the wired/wireless interfaces. """
self.liface = wnettools.WiredInterface(self.wired_interface, self.debug) # #self.liface = wnettools.WiredInterface(self.wired_interface, self.debug)
# self.dhcp_client = dhcp_client
# self.link_detect = link_tool
# self.flush_tool = flush_tool
def CheckPluggedIn(self, fast=False): def CheckPluggedIn(self, fast=False):
""" Check whether the wired connection is plugged in. """ Check whether the wired connection is plugged in.
@@ -860,6 +890,8 @@ class WiredConnectThread(ConnectThread):
liface = self.liface liface = self.liface
self.is_connecting = True self.is_connecting = True
#TODO pass is_fast in.
self.is_fast = True
# Run pre-connection script. # Run pre-connection script.
self.abort_if_needed() self.abort_if_needed()
@@ -891,5 +923,5 @@ class WiredConnectThread(ConnectThread):
self.SetStatus('done') self.SetStatus('done')
print 'Connecting thread exiting.' print 'Connecting thread exiting.'
if self.debug: if self.debug:
print "IP Address is: " + str(liface.GetIP(fast=True)) print "IP Address is: " + str(liface.GetIP(fast=self.is_fast))
self.is_connecting = False self.is_connecting = False

18
wicd.py
View File

@@ -60,8 +60,11 @@ if not (gtk.gtk_version[0] >= 2 and gtk.gtk_version[1] >= 10):
else: else:
USE_EGG = False USE_EGG = False
if getattr(dbus, 'version', (0, 0, 0)) >= (0, 41, 0): if getattr(dbus, 'version', (0, 0, 0)) < (0, 80, 0):
import dbus.glib import dbus.glib
else:
from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
misc.RenameProcess("wicd") misc.RenameProcess("wicd")
@@ -433,6 +436,8 @@ class TrayIcon:
self.gui_win = gui.appGui() self.gui_win = gui.appGui()
bus.add_signal_receiver(self.gui_win.dbus_refresh_networks, bus.add_signal_receiver(self.gui_win.dbus_refresh_networks,
'SendScanSignal', 'org.wicd.daemon') 'SendScanSignal', 'org.wicd.daemon')
bus.add_signal_receiver(self.gui_win.update_connect_buttons,
'StatusChanged', 'org.wicd.daemon')
elif not self.gui_win.is_visible: elif not self.gui_win.is_visible:
self.gui_win.show_win() self.gui_win.show_win()
else: else:
@@ -555,7 +560,7 @@ def connect_to_dbus():
proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon') proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon')
print 'Success.' print 'Success.'
except dbus.DBusException: except dbus.DBusException:
gui.error("Could not connect to wicd's D-Bus interface. " + gui.error(None, "Could not connect to wicd's D-Bus interface. " +
"Make sure the daemon is started.") "Make sure the daemon is started.")
sys.exit(1) sys.exit(1)
@@ -563,6 +568,7 @@ def connect_to_dbus():
wireless = dbus.Interface(proxy_obj, 'org.wicd.daemon.wireless') wireless = dbus.Interface(proxy_obj, 'org.wicd.daemon.wireless')
wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired') wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired')
config = dbus.Interface(proxy_obj, 'org.wicd.daemon.config') config = dbus.Interface(proxy_obj, 'org.wicd.daemon.config')
return True
def main(argv): def main(argv):
""" The main frontend program. """ The main frontend program.
@@ -590,12 +596,18 @@ def main(argv):
use_tray = False use_tray = False
elif opt in ('-a', '--no-animate'): elif opt in ('-a', '--no-animate'):
animate = False animate = False
else:
usage()
sys.exit(2)
print 'Loading...' print 'Loading...'
connect_to_dbus() connect_to_dbus()
if not use_tray: if not use_tray:
os.spawnlp(os.P_NOWAIT, wpath.bin + 'gui.py') the_gui = gui.appGui()
the_gui.standalone = True
mainloop = gobject.MainLoop()
mainloop.run()
sys.exit(0) sys.exit(0)
# Set up the tray icon GUI and backend # Set up the tray icon GUI and backend

26
wnettools.py
View File

@@ -55,6 +55,7 @@ signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', re.I | re.M | r
mode_pattern = re.compile('.*Mode:(.*?)\n', re.I | re.M | re.S) mode_pattern = re.compile('.*Mode:(.*?)\n', re.I | re.M | re.S)
freq_pattern = re.compile('.*Frequency:(.*?)\n', re.I | re.M | re.S) freq_pattern = re.compile('.*Frequency:(.*?)\n', re.I | re.M | re.S)
ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S) ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S)
bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', re.I | re.M | re.S)
wep_pattern = re.compile('.*Encryption key:(.*?)\n', re.I | re.M | re.S) wep_pattern = re.compile('.*Encryption key:(.*?)\n', re.I | re.M | re.S)
altwpa_pattern = re.compile('(wpa_ie)', re.I | re.M | re.S) altwpa_pattern = re.compile('(wpa_ie)', re.I | re.M | re.S)
@@ -132,6 +133,12 @@ def GetWirelessInterfaces():
re.I | re.M | re.S), output) re.I | re.M | re.S), output)
return iface return iface
def GetWiredInterfaces():
basedir = '/sys/class/net/'
return [iface for iface in os.listdir(basedir) if not 'wireless' \
in os.listdir(basedir + iface) and \
open(basedir + iface + "/type").readlines()[0].strip() == "1"]
def _fast_get_wifi_interfaces(): def _fast_get_wifi_interfaces():
""" Tries to get a wireless interface using /sys/class/net. """ """ Tries to get a wireless interface using /sys/class/net. """
dev_dir = '/sys/class/net/' dev_dir = '/sys/class/net/'
@@ -500,7 +507,7 @@ class Interface(object):
def ReleaseDHCP(self): def ReleaseDHCP(self):
""" Release the DHCP lease for this interface. """ """ Release the DHCP lease for this interface. """
cmd = self.DHCP_RELEASE + " " + self.iface cmd = self.DHCP_RELEASE + " " + self.iface + " 2>/dev/null"
misc.Run(cmd) misc.Run(cmd)
def FlushRoutes(self): def FlushRoutes(self):
@@ -725,6 +732,7 @@ class WirelessInterface(Interface):
""" """
Interface.__init__(self, iface, verbose) Interface.__init__(self, iface, verbose)
self.wpa_driver = wpa_driver self.wpa_driver = wpa_driver
self.scan_iface = None
def SetWpaDriver(self, driver): def SetWpaDriver(self, driver):
""" Sets the wpa_driver. """ """ Sets the wpa_driver. """
@@ -864,7 +872,7 @@ class WirelessInterface(Interface):
except (UnicodeDecodeError, UnicodeEncodeError): except (UnicodeDecodeError, UnicodeEncodeError):
print 'Unicode problem with current network essid, ignoring!!' print 'Unicode problem with current network essid, ignoring!!'
return None return None
if ap['essid'] == '<hidden>': if ap['essid'] in ['<hidden>', ""]:
ap['essid'] = 'Hidden' ap['essid'] = 'Hidden'
ap['hidden'] = True ap['hidden'] = True
else: else:
@@ -1154,12 +1162,20 @@ class WirelessInterface(Interface):
if self.verbose: print cmd if self.verbose: print cmd
misc.Run(cmd) misc.Run(cmd)
def GetBSSID(self, fast=True): def GetBSSID(self, iwconfig=None, fast=True):
""" Get the MAC address for the interface. """ """ Get the MAC address for the interface. """
if fast: if fast:
return self._fast_get_bssid() return self._fast_get_bssid()
else: else:
return "" if not iwconfig:
cmd = 'iwconfig ' + self.iface
if self.verbose: print cmd
output = misc.Run(cmd)
else:
output = iwconfig
bssid = misc.RunRegex(bssid_pattern, output)
return bssid
def _fast_get_bssid(self): def _fast_get_bssid(self):
""" Gets the MAC address for the connected AP using ioctl calls. """ """ Gets the MAC address for the connected AP using ioctl calls. """
@@ -1223,7 +1239,7 @@ class WirelessInterface(Interface):
if self.verbose: if self.verbose:
print "SIOCGIWRANGE failed: " + str(e) print "SIOCGIWRANGE failed: " + str(e)
return None return None
# This defines the iwfreq struct, used to get singal strength. # This defines the iwfreq struct, used to get signal strength.
fmt = "iiihb6ii4B4Bi32i2i2i2i2i3h8h2b2bhi8i2b3h2i2ihB17x" + 32 * "ihbb" fmt = "iiihb6ii4B4Bi32i2i2i2i2i3h8h2b2bhi8i2b3h2i2ihB17x" + 32 * "ihbb"
size = struct.calcsize(fmt) size = struct.calcsize(fmt)
data = buff.tostring() data = buff.tostring()