From 1e65babbd91a128171b8b012ccfd017dab3b717f Mon Sep 17 00:00:00 2001 From: Dario Freddi Date: Tue, 3 Mar 2009 11:40:34 +0100 Subject: [PATCH] Removing placeholders, and fixing issues pointed out by Dan --- wicd/backends/be-ioctl.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/wicd/backends/be-ioctl.py b/wicd/backends/be-ioctl.py index bce0986..3d03c64 100644 --- a/wicd/backends/be-ioctl.py +++ b/wicd/backends/be-ioctl.py @@ -485,27 +485,26 @@ class WirelessInterface(Interface, wnettools.BaseWirelessInterface): """ Get the current bitrate for the interface. """ if not self.iface: return "" data = (self.iface + '\0' * 32)[:32] - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) fmt = "ihbb" size = struct.calcsize(fmt) try: - data = fcntl.ioctl(s, 0x8B21, ifreq)[16:]  # 0x8B21 is SIOCGIWRATE in /usr/include/linux/wireless.h + result = fcntl.ioctl(self.sock.fileno(), SIOCGIWRATE, data)[16:] except IOError, e: if self.verbose: - print "SIOCGIWAP failed: " + str(e) + print "SIOCGIWRATE failed: " + str(e) return "" - f, e, x, x = struct.unpack(fmt, data[:size]) + f, e, x, x = struct.unpack(fmt, result[:size]) return (f / 1000000) + ' Mb/s' - def GetOperationalMode(self, iwconfig=None): + #def GetOperationalMode(self, iwconfig=None): """ Get the MAC address for the interface. """ # TODO: implement me - return '' + # return '' - def GetAvailableAuthMethods(self, iwlistauth=None): + #def GetAvailableAuthMethods(self, iwlistauth=None): """ Get the MAC address for the interface. """ # TODO: Implement me - return '' + # return '' def GetSignalStrength(self, iwconfig=None): """ Get the signal strength of the current network.