gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-30 12:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Merged with mainline 1.6, r279

Browse Source
This commit is contained in:
Andrew Psaltis
2009-02-04 17:13:04 -05:00
parent 00d45d5eec 9fb268d67d
commit bb3be43a3e
19 changed files with 502 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.bzrignore Normal file
View File

@@ -0,0 +1,4 @@
experimental.wpr
install.log
uninstall.log
.bzrignore

18
INSTALL
View File

@@ -1,7 +1,17 @@
Installation of Wicd should be done using your distribution package if one Installation of Wicd should be done using your distribution package if one
exists. If not, the installation is relatively straightforward. exists. If not, the installation is relatively straightforward, but there
are a few dependencies:
1. python (obviously) and pygtk
2. dbus and its glib and python bindings
3. a dhcp client (dhclient, dhcpcd, and pump are supported)
4. wireless-tools (iwlist, iwconfig, etcetera)
5. net-tools (ip, route, etcetera)
6. a graphical sudo application (gksu, kdesu, and ktsuss are supported),
while optional, is strongly recommended
7. urwid (if you want to use the curses client)
8. pm-utils (optional for suspend/resume integration - needs version 1.2.4+)
If you are installing from a subversion pull or beta/rc tarball and you want If you are installing from a bzr pull or beta/rc tarball and you want
the native language translations, first run this: the native language translations, first run this:
python setup.py get_translations python setup.py get_translations
You will not need to do this if you're installing from a release tarball. You will not need to do this if you're installing from a release tarball.
@@ -14,6 +24,10 @@ in Wicd will be placed. Pass "--help" as an option to the following command
for more information, otherwise run it as is to configure Wicd for installation. for more information, otherwise run it as is to configure Wicd for installation.
python setup.py configure python setup.py configure
Note that setup.py will try to determine if and where to install the autostart
desktop file for kde (either kde3 or kde4, but not both) and where to install
the sleep hook for pm-utils.
Finally, do the actual installation. This step will need to be done as Finally, do the actual installation. This step will need to be done as
root or with sudo in most cases: root or with sudo in most cases:
python setup.py install python setup.py install

92
data/wicd.glade
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--Generated with glade3 3.4.5 on Mon Jan 26 10:54:15 2009 --> <!--Generated with glade3 3.4.5 on Sun Feb 1 21:38:09 2009 -->
<glade-interface> <glade-interface>
<widget class="GtkWindow" id="window1"> <widget class="GtkWindow" id="window1">
<property name="width_request">450</property> <property name="width_request">450</property>
@@ -895,7 +895,7 @@ is already active.</property>
<child> <child>
<widget class="GtkTable" id="table2"> <widget class="GtkTable" id="table2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="n_rows">6</property> <property name="n_rows">8</property>
<child> <child>
<widget class="GtkLabel" id="route_flush_label"> <widget class="GtkLabel" id="route_flush_label">
<property name="visible">True</property> <property name="visible">True</property>
@@ -961,7 +961,7 @@ is already active.</property>
<widget class="GtkRadioButton" id="route_flush_radio"> <widget class="GtkRadioButton" id="route_flush_radio">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">route </property> <property name="label" translatable="yes">route</property>
<property name="response_id">0</property> <property name="response_id">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
@@ -1125,6 +1125,92 @@ is already active.</property>
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkLabel" id="sudo_app_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Graphical Sudo Application&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment25">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
<widget class="GtkRadioButton" id="sudo_auto_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Automatic (recommended)</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="gksudo_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">gksudo</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">sudo_auto_radio</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="kdesu_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">kdesu</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">sudo_auto_radio</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="ktsuss_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">ktsuss</property>
<property name="response_id">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">sudo_auto_radio</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
</widget>
</child>
</widget>
<packing>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
</packing>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>

38
in/init=arch=wicd.in
View File

@@ -1,26 +1,39 @@
#!/bin/bash #!/bin/bash
# borrowed from # Arch init script for wicd
# http://repos.archlinux.org/viewvc.cgi/wicd/repos/extra-i686/wicd-daemon?revision=1&view=markup
# and modified for 1.5.0
. /etc/rc.conf . /etc/rc.conf
. /etc/rc.d/functions . /etc/rc.d/functions
WICD_BIN=%SBIN%wicd
if [ -f /var/run/wicd/wicd.pid ]; then
PID="$(cat /var/run/wicd/wicd.pid)"
fi
case "$1" in case "$1" in
start) start)
stat_busy "Starting wicd Daemon" stat_busy "Starting wicd Daemon"
killall wicd &> /dev/null if [ -z "$PID" ]; then
%SBIN%wicd-daemon &> /dev/null $WICD_BIN &> /dev/null
add_daemon wicd fi
stat_done if [ ! -z "$PID" -o $? -gt 0 ]; then
;; stat_fail
else
add_daemon wicd
stat_done
fi
;;
stop) stop)
stat_busy "Stopping wicd Daemon" stat_busy "Stopping wicd Daemon"
killall wicd &> /dev/null [ ! -z "$PID" ] && kill $PID &> /dev/null
rm_daemon wicd if [ $? -gt 0 ]; then
stat_done stat_fail
;; else
rm_daemon wicd
stat_done
fi
;;
restart) restart)
$0 stop $0 stop
sleep 1 sleep 1
@@ -29,5 +42,6 @@ case "$1" in
*) *)
echo "usage: $0 {start|stop|restart}" echo "usage: $0 {start|stop|restart}"
esac esac
exit 0 exit 0

5
in/init=gentoo=wicd.in
View File

@@ -13,12 +13,13 @@ depend() {
start() { start() {
ebegin "Starting wicd daemon" ebegin "Starting wicd daemon"
$WICD_DAEMON &>/dev/null "${WICD_DAEMON}" >/dev/null 2>&1
eend $? eend $?
} }
stop() { stop() {
ebegin "Stopping wicd daemon" ebegin "Stopping wicd daemon"
start-stop-daemon --stop --pidfile "$WICD_PIDFILE" start-stop-daemon --stop --pidfile "${WICD_PIDFILE}"
eend $? eend $?
} }

12
in/scripts=wicd-client.in
View File

@@ -3,15 +3,15 @@ BOLD=$(tput bold)
BLUE=$(tput setaf 4) BLUE=$(tput setaf 4)
NC=$(tput sgr0) NC=$(tput sgr0)
# check_firstrun() # check_firstrun()
if [ ! -d "~/.wicd" ]; then if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "~/.wicd" mkdir -p "$HOME/.wicd"
fi fi
# Make sure the user knows WHEREAREMYFILES ;-) # Make sure the user knows WHEREAREMYFILES ;-)
if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "~/.wicd/WHEREAREMYFILES" ]; then if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
ln -s "%DOCDIR%WHEREAREMYFILES" "~/.wicd/WHEREAREMYFILES" ln -s "%DOCDIR%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
fi fi
if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then
if [ ! -f "~/.wicd/CLIENT_CURSES_WARNING" ]; then if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then
printf "NOTICE: You do not have an X server active on this console, \n" printf "NOTICE: You do not have an X server active on this console, \n"
printf "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n" printf "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n"
printf "Please see the wicd-client and/or wicd-curses manual pages \n" printf "Please see the wicd-client and/or wicd-curses manual pages \n"
@@ -21,7 +21,7 @@ if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then
printf "Press enter to continue... \n" printf "Press enter to continue... \n"
read _junk read _junk
cat >> "~/.wicd/CLIENT_CURSES_WARNING" << EOF cat >> "$HOME/.wicd/CLIENT_CURSES_WARNING" << EOF
The wicd-client script checks for the existence of this file to determine The wicd-client script checks for the existence of this file to determine
whether it should warn the user before launching wicd-curses instead, in whether it should warn the user before launching wicd-curses instead, in
the event of the gui client being launched outside of the X Window environment. the event of the gui client being launched outside of the X Window environment.

12
other/wicd.desktop Executable file → Normal file
View File

@@ -1,12 +1,14 @@
[Desktop Entry] [Desktop Entry]
Categories=Application;Network; Categories=Application;Network;
Encoding=UTF-8 Encoding=UTF-8
Exec=/opt/wicd/gui.py Exec=wicd-client --no-tray
GenericName=Network Manager GenericName=Network Manager
Icon=/opt/wicd/images/wicd.png Icon=wicd-client
Icon[en_US]=/opt/wicd/images/wicd.png Icon[en_US]=wicd-client
Name=Wicd Name=Wicd Network Manager
Name[en_US]=Wicd Name[en_US]=Wicd Network Manager
Comment=Start the Wicd client without system tray icon
Comment[en_US]=Start the Wicd client without system tray icon
Terminal=false Terminal=false
Type=Application Type=Application
Version=1.0 Version=1.0

BIN
other/wicd.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

61
wicd/backends/be-external.py
View File

@@ -6,8 +6,6 @@
This module implements functions to control and obtain information from This module implements functions to control and obtain information from
network interfaces. network interfaces.
def SetDNS() -- Set the DNS servers of the system.
def GetWirelessInterfaces() -- Get the wireless interfaces available.
class Interface() -- Control a network interface. class Interface() -- Control a network interface.
class WiredInterface() -- Control a wired network interface. class WiredInterface() -- Control a wired network interface.
class WirelessInterface() -- Control a wireless network interface. class WirelessInterface() -- Control a wireless network interface.
@@ -31,9 +29,9 @@ class WirelessInterface() -- Control a wireless network interface.
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
import wicd.misc as misc from wicd import misc
import wicd.wnettools as wnettools from wicd import wnettools
from wicd.wnettools import *
import re import re
import os import os
import os.path import os.path
@@ -78,30 +76,6 @@ auth_pattern = re.compile('.*wpa_state=(.*?)\n', re.I | re.M | re.S)
RALINK_DRIVER = 'ralink legacy' RALINK_DRIVER = 'ralink legacy'
def SetDNS(*args, **kargs):
""" Call the wnettools SetDNS method. """
return wnettools.SetDNS(*args, **kargs)
def GetDefaultGateway(*args, **kargs):
""" Call the wnettools GetDefaultGateway method. """
return wnettools.GetDefaultGateway(*args, **kargs)
def StopDHCP(*args, **kargs):
""" Call the wnettools StopDHCP method. """
return wnettools.StopDHCP(*args, **kargs)
def GetWirelessInterfaces(*args, **kargs):
""" Call the wnettools GetWirelessInterfaces method. """
return wnettools.GetWirelessInterfaces(*args, **kargs)
def GetWiredInterfaces(*args, **kargs):
""" Call the wnettools GetWiredInterfaces method. """
return wnettools.GetWiredInterfaces(*args, **kargs)
def IsValidWpaSuppDriver(*args, **kargs):
""" Call the wnettools IsValidWpaSuppDrive method. """
return wnettools.IsValidWpaSuppDriver(*args, **kargs)
def NeedsExternalCalls(*args, **kargs): def NeedsExternalCalls(*args, **kargs):
""" Return True, since this backend using iwconfig/ifconfig. """ """ Return True, since this backend using iwconfig/ifconfig. """
return True return True
@@ -220,13 +194,13 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
except (IOError, ValueError, TypeError): except (IOError, ValueError, TypeError):
print 'Error checking link using /sys/class/net/%s/carrier' % self.iface print 'Error checking link using /sys/class/net/%s/carrier' % self.iface
if self.ETHTOOL_FOUND and self.link_detect != misc.MIITOOL: if self.ethtool_cmd and self.link_detect in [misc.ETHTOOL, misc.AUTO]:
return self._eth_get_plugged_in() return self._eth_get_plugged_in()
elif self.MIITOOL_FOUND: elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]:
return self._mii_get_plugged_in() return self._mii_get_plugged_in()
else: else:
print 'Error: No way of checking for a wired connection. Make ' + \ print ('Error: No way of checking for a wired connection. Make ' +
'sure that either mii-tool or ethtool is installed.' 'sure that either mii-tool or ethtool is installed.')
return False return False
def _eth_get_plugged_in(self): def _eth_get_plugged_in(self):
@@ -236,14 +210,15 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
True if a link is detected, False otherwise. True if a link is detected, False otherwise.
""" """
link_tool = 'ethtool' cmd = "%s %s" % (self.ethtool_cmd, self.iface)
if not self.IsUp(): if not self.IsUp():
print 'Wired Interface is down, putting it up' print 'Wired Interface is down, putting it up'
self.Up() self.Up()
time.sleep(6) time.sleep(6)
tool_data = misc.Run(link_tool + ' ' + self.iface, True) if self.verbose: print cmd
if misc.RunRegex(re.compile('(Link detected: yes)', re.I | re.M | tool_data = misc.Run(cmd, include_stderr=True)
re.S), tool_data) is not None: if misc.RunRegex(re.compile('(Link detected: yes)', re.I | re.M | re.S),
tool_data):
return True return True
else: else:
return False return False
@@ -255,14 +230,16 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
True if a link is detected, False otherwise. True if a link is detected, False otherwise.
""" """
link_tool = 'mii-tool' cmd = "%s %s" % (self.miitool_cmd, self.iface)
tool_data = misc.Run(link_tool + ' ' + self.iface, True) if self.verbose: print cmd
tool_data = misc.Run(cmd, include_stderr=True)
if misc.RunRegex(re.compile('(Invalid argument)', re.I | re.M | re.S), if misc.RunRegex(re.compile('(Invalid argument)', re.I | re.M | re.S),
tool_data) is not None: tool_data) is not None:
print 'Wired Interface is down, putting it up' print 'Wired Interface is down, putting it up'
self.Up() self.Up()
time.sleep(4) time.sleep(4)
tool_data = misc.Run(link_tool + ' ' + self.iface, True) if self.verbose: print cmd
tool_data = misc.Run(cmd, include_stderr=True)
if misc.RunRegex(re.compile('(link ok)', re.I | re.M | re.S), if misc.RunRegex(re.compile('(link ok)', re.I | re.M | re.S),
tool_data) is not None: tool_data) is not None:
@@ -421,14 +398,14 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface):
""" """
# Right now there's no way to do this for these drivers # Right now there's no way to do this for these drivers
if self.wpa_driver == RALINK_DRIVER or not self.WPA_CLI_FOUND: if self.wpa_driver == RALINK_DRIVER or not self.wpa_cli_cmd:
return True return True
MAX_TIME = 35 MAX_TIME = 35
MAX_DISCONNECTED_TIME = 3 MAX_DISCONNECTED_TIME = 3
disconnected_time = 0 disconnected_time = 0
while (time.time() - auth_time) < MAX_TIME: while (time.time() - auth_time) < MAX_TIME:
cmd = 'wpa_cli -i ' + self.iface + ' status' cmd = '%s -i %s status' % (self.wpa_cli_cmd, self.iface)
output = misc.Run(cmd) output = misc.Run(cmd)
result = misc.RunRegex(auth_pattern, output) result = misc.RunRegex(auth_pattern, output)
if self.verbose: if self.verbose:

40
wicd/backends/be-ioctl.py
View File

@@ -6,8 +6,6 @@ This module implements functions to control and obtain information from
network interfaces. It utilizes ioctl calls and python modules to network interfaces. It utilizes ioctl calls and python modules to
obtain this information whenever possible. obtain this information whenever possible.
def SetDNS() -- Set the DNS servers of the system.
def GetWirelessInterfaces() -- Get the wireless interfaces available.
class Interface() -- Control a network interface. class Interface() -- Control a network interface.
class WiredInterface() -- Control a wired network interface. class WiredInterface() -- Control a wired network interface.
class WirelessInterface() -- Control a wireless network interface. class WirelessInterface() -- Control a wireless network interface.
@@ -31,9 +29,10 @@ class WirelessInterface() -- Control a wireless network interface.
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
import wicd.misc as misc from wicd import misc
import wicd.wnettools as wnettools from wicd import wnettools
import wicd.wpath as wpath from wicd import wpath
from wicd.wnettools import *
import iwscan import iwscan
import wpactrl import wpactrl
@@ -82,29 +81,6 @@ SIOCGMIIPHY = 0x8947
SIOCETHTOOL = 0x8946 SIOCETHTOOL = 0x8946
SIOCGIFFLAGS = 0x8913 SIOCGIFFLAGS = 0x8913
def SetDNS(*args, **kargs):
""" Call the wnettools SetDNS method. """
return wnettools.SetDNS(*args, **kargs)
def GetDefaultGateway(*args, **kargs):
""" Call the wnettools GetDefaultGateway method. """
return wnettools.GetDefaultGateway(*args, **kargs)
def StopDHCP(*args, **kargs):
""" Call the wnettools StopDHCP method. """
return wnettools.StopDHCP(*args, **kargs)
def GetWirelessInterfaces(*args, **kargs):
""" Call the wnettools GetWirelessInterfaces method. """
return wnettools.GetWirelessInterfaces(*args, **kargs)
def GetWiredInterfaces(*args, **kargs):
""" Call the wnettools GetWiredInterfaces method. """
return wnettools.GetWiredInterfaces(*args, **kargs)
def IsValidWpaSuppDriver(*args, **kargs):
""" Call the wnettools IsValidWpaSuppDrive method. """
return wnettools.IsValidWpaSuppDriver(*args, **kargs)
def get_iw_ioctl_result(iface, call): def get_iw_ioctl_result(iface, call):
""" Makes the given ioctl call and returns the results. """ Makes the given ioctl call and returns the results.
@@ -215,13 +191,13 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
""" """
if not self.iface: return False if not self.iface: return False
if self.ETHTOOL_FOUND and self.link_detect != misc.MIITOOL: if self.ethtool_cmd and self.link_detect in [misc.ETHTOOL, misc.AUTO]:
return self._eth_get_plugged_in() return self._eth_get_plugged_in()
elif self.MIITOOL_FOUND: elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]:
return self._mii_get_plugged_in() return self._mii_get_plugged_in()
else: else:
print 'Error: No way of checking for a wired connection. Make \ print ('Error: No way of checking for a wired connection. Make' +
sure that either mii-tool or ethtool is installed.' 'sure that either mii-tool or ethtool is installed.')
return False return False
def _eth_get_plugged_in(self): def _eth_get_plugged_in(self):

140
wicd/gui.py
View File

@@ -37,6 +37,7 @@ from dbus import version as dbus_version
from wicd import misc from wicd import misc
from wicd import wpath from wicd import wpath
from wicd import dbusmanager from wicd import dbusmanager
from wicd import prefs
from wicd.misc import noneToString from wicd.misc import noneToString
from wicd.netentry import WiredNetworkEntry, WirelessNetworkEntry from wicd.netentry import WiredNetworkEntry, WirelessNetworkEntry
from wicd.prefs import PreferencesDialog from wicd.prefs import PreferencesDialog
@@ -45,12 +46,6 @@ from wicd.guiutil import error, GreyLabel, LabelEntry, SmallLabel
if __name__ == '__main__': if __name__ == '__main__':
wpath.chdir(__file__) wpath.chdir(__file__)
try:
import pygtk
pygtk.require("2.0")
except:
pass
proxy_obj = daemon = wireless = wired = bus = None proxy_obj = daemon = wireless = wired = bus = None
language = misc.get_language_list_gui() language = misc.get_language_list_gui()
DBUS_AVAIL = False DBUS_AVAIL = False
@@ -71,6 +66,7 @@ def setup_dbus(force=True):
return False return False
else: else:
return False return False
prefs.setup_dbus()
bus = dbusmanager.get_bus() bus = dbusmanager.get_bus()
dbus_ifaces = dbusmanager.get_dbus_ifaces() dbus_ifaces = dbusmanager.get_dbus_ifaces()
daemon = dbus_ifaces['daemon'] daemon = dbus_ifaces['daemon']
@@ -304,8 +300,7 @@ class appGui(object):
def settings_dialog(self, widget, event=None): def settings_dialog(self, widget, event=None):
""" Displays a general settings dialog. """ """ Displays a general settings dialog. """
if not self.pref: if not self.pref:
self.pref = PreferencesDialog(self.wTree, self.pref = PreferencesDialog(self.wTree)
dbusmanager.get_dbus_ifaces())
else: else:
self.pref.load_preferences_diag() self.pref.load_preferences_diag()
if self.pref.run() == 1: if self.pref.run() == 1:
@@ -363,50 +358,62 @@ class appGui(object):
if not self.is_visible or self.refreshing: if not self.is_visible or self.refreshing:
return True return True
fast = not daemon.NeedsExternalCalls() daemon.UpdateState()
wired_connecting = wired.CheckIfWiredConnecting() [state, info] = daemon.GetConnectionStatus()
wireless_connecting = wireless.CheckIfWirelessConnecting()
self.connecting = wired_connecting or wireless_connecting
if self.connecting: if state == misc.WIRED:
if not self.pulse_active: return self.set_wired_state(info)
self.pulse_active = True elif state == misc.WIRELESS:
gobject.timeout_add(100, self.pulse_progress_bar) return self.set_wireless_state(info)
gobject.idle_add(self.network_list.set_sensitive, False) elif state == misc.CONNECTING:
gobject.idle_add(self.status_area.show_all) return self.set_connecting_state(info)
if self.statusID: elif state in (misc.SUSPENDED, misc.NOT_CONNECTED):
gobject.idle_add(self.status_bar.remove, 1, self.statusID) return self.set_not_connected_state(info)
if wireless_connecting:
if not fast:
iwconfig = wireless.GetIwconfig()
else:
iwconfig = ''
gobject.idle_add(self.set_status, wireless.GetCurrentNetwork(iwconfig) + ': ' +
language[str(wireless.CheckWirelessConnectingMessage())])
if wired_connecting:
gobject.idle_add(self.set_status, language['wired_network'] + ': ' +
language[str(wired.CheckWiredConnectingMessage())])
return True
else:
if self.pulse_active:
self.pulse_active = False
gobject.idle_add(self.network_list.set_sensitive, True)
gobject.idle_add(self.status_area.hide_all)
if self.statusID: def set_wired_state(self, info):
gobject.idle_add(self.status_bar.remove, 1, self.statusID) self._set_connected_state()
self.set_status(language['connected_to_wired'].replace('$A', info[0]))
return True
# Determine connection status. def set_wireless_state(self, info):
if self.check_for_wired(wired.GetWiredIP("")): self._set_connected_state()
return True self.set_status(language['connected_to_wireless'].replace
if not fast: ('$A', info[1]).replace
iwconfig = wireless.GetIwconfig() ('$B', daemon.FormatSignalForPrinting(info[2])).replace
else: ('$C', info[0]))
iwconfig = '' return True
if self.check_for_wireless(iwconfig, wireless.GetWirelessIP("")):
return True def set_not_connected_state(self, info):
self.set_status(language['not_connected']) self.connecting = False
return True self.set_status(language['not_connected'])
return True
def _set_connected_state(self):
self.connecting = False
if self.pulse_active:
self.pulse_active = False
gobject.idle_add(self.network_list.set_sensitive, True)
gobject.idle_add(self.status_area.hide_all)
if self.statusID:
gobject.idle_add(self.status_bar.remove, 1, self.statusID)
def set_connecting_state(self, info):
self.connecting = True
if not self.pulse_active:
self.pulse_active = True
gobject.timeout_add(100, self.pulse_progress_bar)
gobject.idle_add(self.network_list.set_sensitive, False)
gobject.idle_add(self.status_area.show_all)
if self.statusID:
gobject.idle_add(self.status_bar.remove, 1, self.statusID)
if info[0] == "wireless":
gobject.idle_add(self.set_status, str(info[1]) + ': ' +
language[str(wireless.CheckWirelessConnectingMessage())])
elif info[0] == "wired":
gobject.idle_add(self.set_status, language['wired_network'] + ': ' +
language[str(wired.CheckWiredConnectingMessage())])
return True
def update_connect_buttons(self, state=None, x=None, force_check=False): 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.
@@ -426,41 +433,6 @@ class appGui(object):
entry.update_connect_button(state, apbssid) entry.update_connect_button(state, apbssid)
self.prev_state = state self.prev_state = state
def check_for_wired(self, wired_ip):
""" Determine if wired is active, and if yes, set the status. """
if wired_ip and wired.CheckPluggedIn():
self.set_status(
language['connected_to_wired'].replace('$A',wired_ip)
)
return True
else:
return False
def check_for_wireless(self, iwconfig, wireless_ip):
""" Determine if wireless is active, and if yes, set the status. """
if not wireless_ip:
return False
network = wireless.GetCurrentNetwork(iwconfig)
if not network:
return False
network = str(network)
if daemon.GetSignalDisplayType() == 0:
strength = wireless.GetCurrentSignalStrength(iwconfig)
else:
strength = wireless.GetCurrentDBMStrength(iwconfig)
if strength is None:
return False
strength = str(strength)
ip = str(wireless_ip)
self.set_status(language['connected_to_wireless'].replace
('$A', network).replace
('$B', daemon.FormatSignalForPrinting(strength)).replace
('$C', wireless_ip))
return True
def set_status(self, msg): def set_status(self, msg):
""" Sets the status bar message for the GUI. """ """ Sets the status bar message for the GUI. """
self.statusID = self.status_bar.push(1, msg) self.statusID = self.status_bar.push(1, msg)

33
wicd/misc.py
View File

@@ -29,26 +29,40 @@ from commands import getoutput
# wicd imports # wicd imports
import wpath import wpath
if __name__ == '__main__': # Connection state constants
wpath.chdir(__file__)
NOT_CONNECTED = 0 NOT_CONNECTED = 0
CONNECTING = 1 CONNECTING = 1
WIRELESS = 2 WIRELESS = 2
WIRED = 3 WIRED = 3
SUSPENDED = 4 SUSPENDED = 4
# Automatic app selection constant
AUTO = 0 AUTO = 0
# DHCP Clients
DHCLIENT = 1 DHCLIENT = 1
DHCPCD = 2 DHCPCD = 2
PUMP = 3 PUMP = 3
# Link detection tools
ETHTOOL = 1 ETHTOOL = 1
MIITOOL = 2 MIITOOL = 2
# Route flushing tools
IP = 1 IP = 1
ROUTE = 2 ROUTE = 2
# Graphical sudo apps
GKSUDO = 1
KDESU = 2
KTSUSS = 3
sudo_dict = {
AUTO : "",
GKSUDO : "gksudo",
KDESU : "kdesu",
KTSUSS: "ktsuss",
}
class WicdError(Exception): class WicdError(Exception):
pass pass
@@ -375,9 +389,9 @@ def detect_desktop_environment():
pass pass
return desktop_environment return desktop_environment
def get_sudo_cmd(msg): def get_sudo_cmd(msg, prog_num=0):
""" Returns a graphical sudo command for generic use. """ """ Returns a graphical sudo command for generic use. """
sudo_prog = choose_sudo_prog() sudo_prog = choose_sudo_prog(prog_num)
if not sudo_prog: return None if not sudo_prog: return None
if re.search("(ktsuss|gksu|gksudo)$", sudo_prog): if re.search("(ktsuss|gksu|gksudo)$", sudo_prog):
msg_flag = "-m" msg_flag = "-m"
@@ -385,8 +399,10 @@ def get_sudo_cmd(msg):
msg_flag = "--caption" msg_flag = "--caption"
return [sudo_prog, msg_flag, msg] return [sudo_prog, msg_flag, msg]
def choose_sudo_prog(): def choose_sudo_prog(prog_num=0):
""" Try to intelligently decide which graphical sudo program to use. """ """ Try to intelligently decide which graphical sudo program to use. """
if prog_num:
return find_path(sudo_dict[prog_num])
desktop_env = detect_desktop_environment() desktop_env = detect_desktop_environment()
env_path = os.environ['PATH'].split(":") env_path = os.environ['PATH'].split(":")
@@ -412,7 +428,10 @@ def find_path(cmd):
the file can not be found. the file can not be found.
""" """
paths = os.getenv("PATH", default="/usr/bin:/usr/local/bin").split(':') paths = os.getenv("PATH").split(':')
if not paths:
paths = ["/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin",
"/sbin", "/bin"]
for path in paths: for path in paths:
if os.path.exists(os.path.join(path, cmd)): if os.path.exists(os.path.join(path, cmd)):
return os.path.join(path, cmd) return os.path.join(path, cmd)

5
wicd/monitor.py
View File

@@ -275,8 +275,9 @@ class ConnectionStatus(object):
return return
# Some checks to keep reconnect retries from going crazy. # Some checks to keep reconnect retries from going crazy.
if self.reconnect_tries > 2 and \ if (self.reconnect_tries > 3 and
(time.time() - self.last_reconnect_time) < 300: (time.time() - self.last_reconnect_time) < 200):
print "Throttling autoreconnect"
return return
self.reconnecting = True self.reconnecting = True

6
wicd/netentry.py
View File

@@ -237,7 +237,8 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
profile = self.prof_name profile = self.prof_name
cmdend = [os.path.join(wpath.lib, "configscript.py"), profile, "wired"] cmdend = [os.path.join(wpath.lib, "configscript.py"), profile, "wired"]
if os.getuid() != 0: if os.getuid() != 0:
cmdbase = misc.get_sudo_cmd(language['scripts_need_pass']) cmdbase = misc.get_sudo_cmd(language['scripts_need_pass'],
prog_num=daemon.GetSudoApp())
if not cmdbase: if not cmdbase:
error(None, language["no_sudo_prog"]) error(None, language["no_sudo_prog"])
return return
@@ -336,7 +337,8 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
cmdend = [os.path.join(wpath.lib, "configscript.py"), cmdend = [os.path.join(wpath.lib, "configscript.py"),
str(self.networkID), "wireless"] str(self.networkID), "wireless"]
if os.getuid() != 0: if os.getuid() != 0:
cmdbase = misc.get_sudo_cmd(language['scripts_need_pass']) cmdbase = misc.get_sudo_cmd(language['scripts_need_pass'],
prog_num=daemon.GetSudoApp())
if not cmdbase: if not cmdbase:
error(None, language["no_sudo_prog"]) error(None, language["no_sudo_prog"])
return return

72
wicd/networking.py
View File

@@ -106,9 +106,33 @@ def get_backend_description_dict():
d[be] = get_backend_description(be) d[be] = get_backend_description(be)
return d return d
def expand_script_macros(script, msg, bssid, essid):
"""Expands any supported macros in a script.
Keyword arguments:
script -- the script to execute.
msg -- the name of the script, %{script} will be expanded to this.
bssid -- the bssid of the network we connect to, defaults to 'wired'.
essid -- the essid of the network we connect to, defaults to 'wired'."""
def repl(match):
macro = match.group(1).lower()
if macro_dict.has_key(macro):
return macro_dict[macro]
print 'Warning: found illegal macro %s in %s script' % (macro, msg)
return match.group()
macro_dict = { 'script' : msg,
'bssid' : bssid,
'essid' : essid }
regex = re.compile(r'%\{([a-zA-Z0-9]+)\}')
expanded = regex.sub(repl, script)
print "Expanded '%s' to '%s'" % (script, expanded)
return expanded
class Controller(object): class Controller(object):
""" Parent class for the different interface types. """ """ Parent class for the different interface types. """
def __init__(self): def __init__(self, debug=False):
""" Initialise the class. """ """ Initialise the class. """
self.global_dns_1 = None self.global_dns_1 = None
self.global_dns_2 = None self.global_dns_2 = None
@@ -117,7 +141,7 @@ class Controller(object):
self.global_search_dom = None self.global_search_dom = None
self._dhcp_client = None self._dhcp_client = None
self._flush_tool = None self._flush_tool = None
self._debug = None self._debug = debug
self._backend = None self._backend = None
self.connecting_thread = None self.connecting_thread = None
self.before_script = None self.before_script = None
@@ -138,8 +162,6 @@ class Controller(object):
self._dhcp_client = value self._dhcp_client = value
if self.iface: if self.iface:
self.iface.DHCP_CLIENT = value self.iface.DHCP_CLIENT = value
self.iface.CheckDHCP()
def get_dhcp_client(self): return self._dhcp_client def get_dhcp_client(self): return self._dhcp_client
dhcp_client = property(get_dhcp_client, set_dhcp_client) dhcp_client = property(get_dhcp_client, set_dhcp_client)
@@ -166,6 +188,7 @@ class Controller(object):
return True return True
def StopDHCP(self): def StopDHCP(self):
""" Stops all running DHCP clients. """
return BACKEND.StopDHCP() return BACKEND.StopDHCP()
def GetIP(self, ifconfig=""): def GetIP(self, ifconfig=""):
@@ -215,31 +238,10 @@ class Controller(object):
""" """
return self.iface.Down() return self.iface.Down()
def expand_script_macros(script, msg, bssid, essid): def AppAvailable(self, app):
"""Expands any supported macros in a script. """ Determine if the given application is installed. """
return self.iface.AppAvailable(app)
Keyword arguments:
script -- the script to execute.
msg -- the name of the script, %{script} will be expanded to this.
bssid -- the bssid of the network we connect to, defaults to 'wired'.
essid -- the essid of the network we connect to, defaults to 'wired'."""
macro_dict = { 'script' : msg,
'bssid' : bssid,
'essid' : essid }
# Define a replacement function, this is done here so that %{script} will be substituted correctly
def repl(match):
macro = match.group( 1 ).lower()
if macro_dict.has_key( macro ):
return macro_dict[macro]
print 'Warning: found illegal macro %s in %s script' % (macro, msg)
return match.group()
regex = re.compile( r'%\{([a-zA-Z0-9]+)\}' )
expanded = regex.sub( repl, script )
print "Expanded '%s' to '%s'" % (script, expanded)
return expanded
class ConnectThread(threading.Thread): class ConnectThread(threading.Thread):
""" A class to perform network connections in a multi-threaded way. """ A class to perform network connections in a multi-threaded way.
@@ -475,9 +477,9 @@ class ConnectThread(threading.Thread):
class Wireless(Controller): class Wireless(Controller):
""" A wrapper for common wireless interface functions. """ """ A wrapper for common wireless interface functions. """
def __init__(self): def __init__(self, debug=False):
""" Initialize the class. """ """ Initialize the class. """
Controller.__init__(self) Controller.__init__(self, debug=debug)
self._wpa_driver = None self._wpa_driver = None
self._wireless_interface = None self._wireless_interface = None
self.wiface = None self.wiface = None
@@ -666,7 +668,11 @@ class Wireless(Controller):
The first available wireless interface. The first available wireless interface.
""" """
return BACKEND.GetWirelessInterfaces() ifaces = BACKEND.GetWirelessInterfaces()
if ifaces:
return ifaces[0]
else:
return None
def GetKillSwitchStatus(self): def GetKillSwitchStatus(self):
""" Get the current status of the Killswitch. """ Get the current status of the Killswitch.
@@ -838,9 +844,9 @@ class WirelessConnectThread(ConnectThread):
class Wired(Controller): class Wired(Controller):
""" A wrapper for common wired interface functions. """ """ A wrapper for common wired interface functions. """
def __init__(self): def __init__(self, debug=False):
""" Initialise the class. """ """ Initialise the class. """
Controller.__init__(self) Controller.__init__(self, debug=debug)
self.wpa_driver = None self.wpa_driver = None
self._link_detect = None self._link_detect = None
self._wired_interface = None self._wired_interface = None

71
wicd/prefs.py
View File

@@ -32,6 +32,7 @@ import gtk.glade
from wicd import misc from wicd import misc
from wicd import wpath from wicd import wpath
from wicd import dbusmanager
from wicd.misc import checkboxTextboxToggle, noneToBlankString from wicd.misc import checkboxTextboxToggle, noneToBlankString
daemon = None daemon = None
@@ -40,17 +41,37 @@ wired = None
language = misc.get_language_list_gui() language = misc.get_language_list_gui()
def setup_dbus():
global daemon, wireless, wired
daemon = dbusmanager.get_interface('daemon')
wireless = dbusmanager.get_interface('wireless')
wired = dbusmanager.get_interface('wired')
class PreferencesDialog(object): class PreferencesDialog(object):
""" Class for handling the wicd preferences dialog window. """ """ Class for handling the wicd preferences dialog window. """
def __init__(self, wTree, dbus): def __init__(self, wTree):
global daemon, wireless, wired setup_dbus()
daemon = dbus['daemon']
wireless = dbus['wireless']
wired = dbus['wired']
self.wTree = wTree self.wTree = wTree
self.prep_settings_diag() self.prep_settings_diag()
self.load_preferences_diag() self.load_preferences_diag()
def _setup_external_app_radios(self, radio_list, get_method, set_method):
""" Generic function for setting up external app radios. """
def set_available(apps):
for app in apps:
app.set_sensitive(daemon.GetAppAvailable(app.get_label()))
# Disable radios for apps that aren't installed.
set_available(radio_list[1:])
selected_app = get_method()
# Make sure the app we want to select is actually available.
if radio_list[selected_app].get_property("sensitive"):
radio_list[selected_app].set_active(True)
else:
# If it isn't, default to Automatic.
set_method(misc.AUTO)
radio_list[misc.AUTO].set_active(True)
def load_preferences_diag(self): def load_preferences_diag(self):
""" Loads data into the preferences Dialog. """ """ Loads data into the preferences Dialog. """
@@ -62,19 +83,24 @@ class PreferencesDialog(object):
dhcp_list = [self.dhcpautoradio, self.dhclientradio, self.dhcpcdradio, dhcp_list = [self.dhcpautoradio, self.dhclientradio, self.dhcpcdradio,
self.pumpradio] self.pumpradio]
dhcp_method = daemon.GetDHCPClient() self._setup_external_app_radios(dhcp_list, daemon.GetDHCPClient,
print 'DHCP method is %s' % daemon.GetDHCPClient() daemon.SetDHCPClient)
dhcp_list[dhcp_method].set_active(True)
wired_link_list = [self.linkautoradio, self.ethtoolradio, wired_link_list = [self.linkautoradio, self.ethtoolradio,
self.miitoolradio] self.miitoolradio]
wired_link_method = daemon.GetLinkDetectionTool() self._setup_external_app_radios(wired_link_list,
wired_link_list[wired_link_method].set_active(True) daemon.GetLinkDetectionTool,
daemon.SetLinkDetectionTool)
flush_list = [self.flushautoradio, self.ipflushradio, flush_list = [self.flushautoradio, self.ipflushradio,
self.routeflushradio] self.routeflushradio]
flush_method = daemon.GetFlushTool() self._setup_external_app_radios(flush_list, daemon.GetFlushTool,
flush_list[flush_method].set_active(True) daemon.SetFlushTool)
sudo_list = [self.sudoautoradio, self.gksudoradio, self.kdesuradio,
self.ktsussradio]
self._setup_external_app_radios(sudo_list, daemon.GetSudoApp,
daemon.SetAudoApp)
auto_conn_meth = daemon.GetWiredAutoConnectMethod() auto_conn_meth = daemon.GetWiredAutoConnectMethod()
if auto_conn_meth == 1: if auto_conn_meth == 1:
@@ -186,6 +212,16 @@ class PreferencesDialog(object):
flush_tool = misc.ROUTE flush_tool = misc.ROUTE
daemon.SetFlushTool(flush_tool) daemon.SetFlushTool(flush_tool)
if self.sudoautoradio.get_active():
sudo_tool = misc.AUTO
elif self.gksudoradio.get_active():
sudo_tool = misc.GKSUDO
elif self.kdesuradio.get_active():
sudo_tool = misc.KDESU
else:
sudo_tool = misc.KTSUSS
daemon.SetSudoApp(sudo_tool)
[width, height] = self.dialog.get_size() [width, height] = self.dialog.get_size()
daemon.WriteWindowSize(width, height, "pref") daemon.WriteWindowSize(width, height, "pref")
@@ -290,6 +326,12 @@ class PreferencesDialog(object):
self.ipflushradio = setup_label("ip_flush_radio") self.ipflushradio = setup_label("ip_flush_radio")
self.routeflushradio = setup_label("route_flush_radio") self.routeflushradio = setup_label("route_flush_radio")
# Graphical Sudo Apps
self.sudoautoradio = setup_label("sudo_auto_radio", "wicd_auto_config")
self.gksudoradio = setup_label("gksudo_radio")
self.kdesuradio = setup_label("kdesu_radio")
self.ktsussradio = setup_label("ktsuss_radio")
# Replacement for the combo box hack # Replacement for the combo box hack
self.wpadrivercombo = build_combobox("pref_wpa_combobox") self.wpadrivercombo = build_combobox("pref_wpa_combobox")
self.wpadrivers = ["wext", "hostap", "madwifi", "atmel", self.wpadrivers = ["wext", "hostap", "madwifi", "atmel",
@@ -317,11 +359,10 @@ class PreferencesDialog(object):
# Load backend combobox # Load backend combobox
self.backends = daemon.GetBackendList() self.backends = daemon.GetBackendList()
self.be_descriptions = daemon.GetBackendDescriptionDict() self.be_descriptions = daemon.GetBackendDescriptionDict()
# "" is included as a hack for DBus limitations, so we remove it.
self.backends.remove("")
for x in self.backends: for x in self.backends:
self.backendcombo.append_text(x) if x:
self.backendcombo.append_text(x)
def be_combo_changed(self, combo): def be_combo_changed(self, combo):
""" Update the description label for the given backend. """ """ Update the description label for the given backend. """

2
wicd/wicd-client.py
View File

@@ -462,7 +462,7 @@ class TrayIcon(object):
gtk.main_iteration() gtk.main_iteration()
if item.state != gtk.STATE_PRELIGHT: if item.state != gtk.STATE_PRELIGHT:
return True return True
wireless.Scan(reply_handler=dummy, error_handler=dummy) wireless.Scan(False)
def populate_network_menu(self, data=None): def populate_network_menu(self, data=None):
""" Populates the network list submenu. """ """ Populates the network list submenu. """

39
wicd/wicd-daemon.py
View File

@@ -79,10 +79,11 @@ class WicdDaemon(dbus.service.Object):
""" Initializes the daemon DBus object. """ """ Initializes the daemon DBus object. """
dbus.service.Object.__init__(self, bus_name=bus_name, dbus.service.Object.__init__(self, bus_name=bus_name,
object_path=object_path) object_path=object_path)
self.wifi = networking.Wireless()
self.wired = networking.Wired()
self.config = ConfigManager(os.path.join(wpath.etc, self.config = ConfigManager(os.path.join(wpath.etc,
"manager-settings.conf")) "manager-settings.conf"))
self._debug_mode = bool(self.config.get("Settings", "debug_mode"))
self.wifi = networking.Wireless(debug=self._debug_mode)
self.wired = networking.Wired(debug=self._debug_mode)
self.wired_bus= WiredDaemon(bus_name, self, wired=self.wired) self.wired_bus= WiredDaemon(bus_name, self, wired=self.wired)
self.wireless_bus = WirelessDaemon(bus_name, self, wifi=self.wifi) self.wireless_bus = WirelessDaemon(bus_name, self, wifi=self.wifi)
self.forced_disconnect = False self.forced_disconnect = False
@@ -99,6 +100,7 @@ class WicdDaemon(dbus.service.Object):
self.dhcp_client = 0 self.dhcp_client = 0
self.link_detect_tool = 0 self.link_detect_tool = 0
self.flush_tool = 0 self.flush_tool = 0
self.sudo_app = 0
# This will speed up the scanning process - if a client doesn't # This will speed up the scanning process - if a client doesn't
# need a fresh scan, just feed them the old one. A fresh scan # need a fresh scan, just feed them the old one. A fresh scan
@@ -273,8 +275,8 @@ class WicdDaemon(dbus.service.Object):
""" Sets if debugging mode is on or off. """ """ Sets if debugging mode is on or off. """
self.config.set("Settings", "debug_mode", debug, write=True) self.config.set("Settings", "debug_mode", debug, write=True)
self.debug_mode = misc.to_bool(debug) self.debug_mode = misc.to_bool(debug)
self.wifi.debug = self.debug_mode self.wifi.debug = debug
self.wired.debug = self.debug_mode self.wired.debug = debug
self.wireless_bus.debug_mode = debug self.wireless_bus.debug_mode = debug
self.wired_bus.debug_mode = debug self.wired_bus.debug_mode = debug
@@ -570,6 +572,11 @@ class WicdDaemon(dbus.service.Object):
""" """
return bool(self.need_profile_chooser) return bool(self.need_profile_chooser)
@dbus.service.method("org.wicd.daemon")
def GetAppAvailable(self, app):
""" Determine if a given application is available."""
return bool(self.wifi.AppAvailable(app) or self.wired.AppAvailable(app))
@dbus.service.method('org.wicd.daemon') @dbus.service.method('org.wicd.daemon')
def GetDHCPClient(self): def GetDHCPClient(self):
""" Returns the current DHCP client constant. """ Returns the current DHCP client constant.
@@ -609,7 +616,7 @@ class WicdDaemon(dbus.service.Object):
""" """
self.link_detect_tool = int(link_tool) self.link_detect_tool = int(link_tool)
self.wired.link_tool = int(link_tool) self.wired.link_detect = int(link_tool)
self.config.set("Settings", "link_detect_tool", link_tool, write=True) self.config.set("Settings", "link_detect_tool", link_tool, write=True)
@dbus.service.method('org.wicd.daemon') @dbus.service.method('org.wicd.daemon')
@@ -631,6 +638,17 @@ class WicdDaemon(dbus.service.Object):
self.wifi.flush_tool = int(flush_tool) self.wifi.flush_tool = int(flush_tool)
self.config.set("Settings", "flush_tool", flush_tool, write=True) self.config.set("Settings", "flush_tool", flush_tool, write=True)
@dbus.service.method('org.wicd.daemon')
def GetSudoApp(self):
""" Get the preferred sudo app. """
return self.sudo_app
@dbus.service.method('org.wicd.daemon')
def SetSudoApp(self, sudo_app):
""" Set the preferred sudo app. """
self.sudo_app = sudo_app
self.config.set("Settings", "sudo_app", sudo_app, write=True)
@dbus.service.method('org.wicd.daemon') @dbus.service.method('org.wicd.daemon')
def WriteWindowSize(self, width, height, win_name): def WriteWindowSize(self, width, height, win_name):
""" Write the desired default window size. """ Write the desired default window size.
@@ -769,6 +787,7 @@ class WicdDaemon(dbus.service.Object):
def ConnectResultsSent(self, result): def ConnectResultsSent(self, result):
print "Sending connection attempt result %s" % result print "Sending connection attempt result %s" % result
@dbus.service.method("org.wicd.daemon")
@dbus.service.signal(dbus_interface="org.wicd.daemon", signature='') @dbus.service.signal(dbus_interface="org.wicd.daemon", signature='')
def UpdateState(self): def UpdateState(self):
pass pass
@@ -814,7 +833,6 @@ class WicdDaemon(dbus.service.Object):
b_wired = self.wired_bus b_wired = self.wired_bus
b_wifi = self.wireless_bus b_wifi = self.wireless_bus
app_conf= self.config app_conf= self.config
verbose = True
# Load the backend. # Load the backend.
be_def = 'external' be_def = 'external'
self.SetBackend(app_conf.get("Settings", "backend", default=be_def)) self.SetBackend(app_conf.get("Settings", "backend", default=be_def))
@@ -845,15 +863,16 @@ class WicdDaemon(dbus.service.Object):
default=True)) default=True))
self.SetDebugMode(app_conf.get("Settings", "debug_mode", default=False)) self.SetDebugMode(app_conf.get("Settings", "debug_mode", default=False))
self.SetWiredAutoConnectMethod(app_conf.get("Settings", self.SetWiredAutoConnectMethod(app_conf.get("Settings",
"wired_connect_mode", "wired_connect_mode",
default=1)) default=1))
self.SetSignalDisplayType(app_conf.get("Settings", self.SetSignalDisplayType(app_conf.get("Settings",
"signal_display_type", "signal_display_type",
default=0)) default=0))
self.SetDHCPClient(app_conf.get("Settings", "dhcp_client", default=0)) self.SetDHCPClient(app_conf.get("Settings", "dhcp_client", default=0))
self.SetLinkDetectionTool(app_conf.get("Settings", "link_detect_tool", self.SetLinkDetectionTool(app_conf.get("Settings", "link_detect_tool",
default=0)) default=0))
self.SetFlushTool(app_conf.get("Settings", "flush_tool", default=0)) self.SetFlushTool(app_conf.get("Settings", "flush_tool", default=0))
self.SetSudoApp(app_conf.get("Settings", "sudo_app", default=0))
self.SetPreferWiredNetwork(app_conf.get("Settings", "prefer_wired", self.SetPreferWiredNetwork(app_conf.get("Settings", "prefer_wired",
default=False)) default=False))
app_conf.write() app_conf.write()

201
wicd/wnettools.py
View File

@@ -38,6 +38,7 @@ from string import maketrans, translate
import wpath import wpath
import misc import misc
from misc import find_path
RALINK_DRIVER = 'ralink legacy' RALINK_DRIVER = 'ralink legacy'
@@ -46,6 +47,9 @@ blacklist_strict = '!"#$%&\'()*+,./:;<=>?@[\\]^`{|}~ '
blacklist_norm = ";`$!*|><&\\" blacklist_norm = ";`$!*|><&\\"
blank_trans = maketrans("", "") blank_trans = maketrans("", "")
__all__ = ["SetDNS", "GetDefaultGateway", "GetWiredInterfaces", "StopDHCP",
"GetWirelessInterfaces", "IsValidWpaSuppDriver", "NeedsExternalCalls"]
def _sanitize_string(string): def _sanitize_string(string):
if string: if string:
return translate(str(string), blank_trans, blacklist_norm) return translate(str(string), blank_trans, blacklist_norm)
@@ -123,7 +127,7 @@ def GetWirelessInterfaces():
ifnames = [iface for iface in os.listdir(dev_dir) if os.path.isdir(dev_dir + iface) ifnames = [iface for iface in os.listdir(dev_dir) if os.path.isdir(dev_dir + iface)
and 'wireless' in os.listdir(dev_dir + iface)] and 'wireless' in os.listdir(dev_dir + iface)]
return bool(ifnames) and ifnames[0] or None return ifnames
def GetWiredInterfaces(): def GetWiredInterfaces():
""" Returns a list of wired interfaces on the system. """ """ Returns a list of wired interfaces on the system. """
@@ -160,11 +164,6 @@ class BaseInterface(object):
self.iface = _sanitize_string_strict(iface) self.iface = _sanitize_string_strict(iface)
self.verbose = verbose self.verbose = verbose
self.DHCP_CLIENT = None self.DHCP_CLIENT = None
self.DHCP_CMD = None
self.DHCP_RELEASE = None
self.MIITOOL_FOUND = False
self.ETHTOOL_FOUND = False
self.IP_FOUND = False
self.flush_tool = None self.flush_tool = None
self.link_detect = None self.link_detect = None
@@ -181,112 +180,79 @@ class BaseInterface(object):
""" """
self.iface = _sanitize_string_strict(str(iface)) self.iface = _sanitize_string_strict(str(iface))
def _find_client_path(self, client): def _find_program_path(self, program):
""" Determines the full path for the given program. """ Determines the full path for the given program.
Searches a hardcoded list of paths for a given program name. Searches for a given program name on the PATH.
Keyword arguments: Keyword arguments:
client -- The name of the program to search for program -- The name of the program to search for
Returns: Returns:
The full path of the program or None The full path of the program or None
""" """
paths = ['/sbin/', '/usr/sbin/', '/bin/', '/usr/bin/', path = find_path(program)
'/usr/local/sbin/', '/usr/local/bin/'] if not path and self.verbose:
for path in paths: print "WARNING: No path found for %s" % program
if os.path.exists("%s%s" % (path, client)): return path
return "%s%s" % (path, client)
if self.verbose:
print "WARNING: No path found for %s" % (client)
return None
def CheckDHCP(self):
""" Check for a valid DHCP client.
Checks for the existence of a supported DHCP client. If one is def _get_dhcp_command(self, flavor=None):
found, the appropriate values for DHCP_CMD, DHCP_RELEASE, and """ Returns the correct DHCP client command.
DHCP_CLIENT are set. If a supported client is not found, a
warning is printed. Given a type of DHCP request (create or release a lease),
this method will build a command to complete the request
using the correct dhcp client, and cli options.
""" """
def get_client_name(cl): def get_client_name(cl):
""" Converts the integer value for a dhcp client to a string. """ """ Converts the integer value for a dhcp client to a string. """
if cl in [misc.DHCLIENT, "dhclient"]: if self.dhclient_cmd and cl in [misc.DHCLIENT, misc.AUTO]:
client = "dhclient" client = "dhclient"
elif cl in [misc.DHCPCD, "dhcpcd"]: cmd = self.dhclient_cmd
elif self.dhcpcd_cmd and cl in [misc.DHCPCD, misc.AUTO]:
client = "dhcpcd" client = "dhcpcd"
else: cmd = self.dhcpcd_cmd
elif self.pump_cmd and cl in [misc.PUMP, misc.AUTO]:
client = "pump" client = "pump"
return client cmd = self.pump_cmd
else:
client = None
cmd = ""
return (client, cmd)
if self.DHCP_CLIENT: connect_dict = {
dhcp_client = get_client_name(self.DHCP_CLIENT) "dhclient" : r"%s %s",
dhcp_path = self._find_client_path(dhcp_client) "pump" : r"%s -i %s",
if not dhcp_path: "dhcpcd" : r"%s %s",
print "WARNING: Could not find selected dhcp client. Wicd " + \ }
" will try to find another supported client." release_dict = {
if not self.DHCP_CLIENT or not dhcp_path: "dhclient" : r"%s -r %s",
dhcp_client = None "pump" : r"%s -r -i %s",
dhcp_path = None "dhcpcd" : r"%s -k %s",
dhcpclients = ["dhclient", "dhcpcd", "pump"] }
for client in dhcpclients: (client_name, cmd) = get_client_name(self.DHCP_CLIENT)
dhcp_path = self._find_client_path(client) if not client_name or not cmd:
if dhcp_path: print "WARNING: Failed to find a valid dhcp client!"
dhcp_client = client return ""
break
if not dhcp_client: if flavor == "connect":
print "WARNING: No supported DHCP Client could be found!" return connect_dict[client_name] % (cmd, self.iface)
return elif flavor == "release":
elif dhcp_client in [misc.DHCLIENT, "dhclient"]: return release_dict[client_name] % (cmd, self.iface)
dhcp_client = misc.DHCLIENT
dhcp_cmd = dhcp_path
dhcp_release = dhcp_cmd + " -r"
elif dhcp_client in [misc.PUMP, "pump"]:
dhcp_client = misc.PUMP
dhcp_cmd = dhcp_path + " -i"
dhcp_release = dhcp_cmd + " -r -i"
elif dhcp_client in [misc.DHCPCD, "dhcpcd"]:
dhcp_client = misc.DHCPCD
dhcp_cmd = dhcp_path
dhcp_release = dhcp_cmd + " -k"
else: else:
dhcp_client = None return str(cmd)
dhcp_cmd = None
dhcp_release = None
self.DHCP_CMD = dhcp_cmd def AppAvailable(self, app):
self.DHCP_RELEASE = dhcp_release """ Return whether a given app is available.
self.DHCP_CLIENT = dhcp_client
def CheckWiredTools(self): Given the name of an executable, determines if it is
""" Check for the existence of ethtool and mii-tool. """ available for use by checking for a defined 'app'_cmd
miitool_path = self._find_client_path("mii-tool") instance variable.
if miitool_path:
self.miitool_cmd = miitool_path
self.MIITOOL_FOUND = True
else:
self.miitool_cmd = None
self.MIITOOL_FOUND = False
ethtool_path = self._find_client_path("ethtool") """
if ethtool_path: return bool(self.__dict__.get("%s_cmd" % app.replace("-", "")))
self.ethtool_cmd = ethtool_path
self.ETHTOOL_FOUND = True
else:
self.ethtool_cmd = None
self.ETHTOOL_FOUND = False
def CheckWirelessTools(self):
""" Check for the existence of wpa_cli """
wpa_cli_path = self._find_client_path("wpa_cli")
if wpa_cli_path:
self.WPA_CLI_FOUND = True
else:
self.WPA_CLI_FOUND = False
print "wpa_cli not found. Authentication will not be validated."
def Check(self): def Check(self):
""" Check that all required tools are available. """ """ Check that all required tools are available. """
@@ -294,14 +260,42 @@ class BaseInterface(object):
self.CheckDHCP() self.CheckDHCP()
self.CheckWiredTools() self.CheckWiredTools()
self.CheckWirelessTools() self.CheckWirelessTools()
self.CheckSudoApplications()
self.CheckRouteFlushTool()
ip_path = self._find_client_path("ip") def CheckDHCP(self):
if ip_path: """ Check for the existence of valid DHCP clients.
self.ip_cmd = ip_path
self.IP_FOUND = True Checks for the existence of a supported DHCP client. If one is
else: found, the appropriate values for DHCP_CMD, DHCP_RELEASE, and
self.ip_cmd = None DHCP_CLIENT are set. If a supported client is not found, a
self.IP_FOUND = False warning is printed.
"""
self.dhclient_cmd = self._find_program_path("dhclient")
self.dhcpcd_cmd = self._find_program_path("dhcpcd")
self.pump_cmd = self._find_program_path("pump")
def CheckWiredTools(self):
""" Check for the existence of ethtool and mii-tool. """
self.miitool_cmd = self._find_program_path("mii-tool")
self.ethtool_cmd = self._find_program_path("ethtool")
def CheckWirelessTools(self):
""" Check for the existence of wpa_cli """
self.wpa_cli_cmd = self._find_program_path("wpa_cli")
if not self.wpa_cli_cmd:
print "wpa_cli not found. Authentication will not be validated."
def CheckRouteFlushTool(self):
""" Check for a route flush tool. """
self.ip_cmd = self._find_program_path("ip")
self.route_cmd = self._find_program_path("route")
def CheckSudoApplications(self):
self.gksudo_cmd = self._find_program_path("gksudo")
self.kdesu_cmd = self._find_program_path("kdesu")
self.ktsuss_cmd = self._find_program_path("ktsuss")
def Up(self): def Up(self):
""" Bring the network interface up. """ Bring the network interface up.
@@ -461,7 +455,8 @@ class BaseInterface(object):
""" """
if not self.iface: return False if not self.iface: return False
cmd = self.DHCP_CMD + " " + self.iface cmd = "%s %s" % (self._get_dhcp_command('connect'), self.iface)
#cmd = self.DHCP_CMD + " " + self.iface
if self.verbose: print cmd if self.verbose: print cmd
pipe = misc.Run(cmd, include_stderr=True, return_pipe=True) pipe = misc.Run(cmd, include_stderr=True, return_pipe=True)
@@ -476,19 +471,23 @@ class BaseInterface(object):
def ReleaseDHCP(self): def ReleaseDHCP(self):
""" Release the DHCP lease for this interface. """ """ Release the DHCP lease for this interface. """
if not self.iface: return False if not self.iface: return False
cmd = self.DHCP_RELEASE + " " + self.iface cmd = "%s %s" % (self._get_dhcp_command("release"), self.iface)
#cmd = self.DHCP_RELEASE + " " + self.iface
if self.verbose: print cmd if self.verbose: print cmd
misc.Run(cmd) misc.Run(cmd)
def FlushRoutes(self): def FlushRoutes(self):
""" Flush all network routes. """ """ Flush all network routes. """
if not self.iface: return False if not self.iface: return False
if self.IP_FOUND and self.flush_tool == misc.IP: if self.ip_cmd and self.flush_tool in [misc.AUTO, misc.IP]:
#cmd = "ip route flush dev " + self.iface #cmd = "ip route flush dev " + self.iface
cmds = ['ip route flush all'] cmds = ['%s route flush all' % self.ip_cmd]
else: elif self.route_cmd and self.flush_tool in [misc.AUTO, misc.ROUTE]:
cmds = ['route del default'] cmds = ['%s del default' % self.route_cmd]
cmds.append('route del dev %s' % self.iface) cmds.append('route del dev %s' % self.iface)
else:
print "No flush command available!"
cmds = []
for cmd in cmds: for cmd in cmds:
if self.verbose: print cmd if self.verbose: print cmd
misc.Run(cmd) misc.Run(cmd)