X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f06af856d2a0210bf7931f800ecb7ad13fbf659a..cab018779de4f2f01e0fe651e71112754ebd0ef8:/lib/python/Components/Network.py diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index 3abfc34c..cde6b7ef 100644 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -1,4 +1,4 @@ -from os import system, popen +from os import system, popen, path as os_path, listdir from re import compile as re_compile from socket import * from enigma import eConsoleAppContainer @@ -6,7 +6,7 @@ from enigma import eConsoleAppContainer class Network: def __init__(self): self.ifaces = {} - self.configuredInterfaces = {} + self.configuredInterfaces = [] self.nameservers = [] self.getInterfaces() self.ethtool_bin = "/usr/sbin/ethtool" @@ -14,13 +14,15 @@ class Network: def getInterfaces(self): devicesPattern = re_compile('[a-z]+[0-9]+') - + self.configuredInterfaces = [] fp = file('/proc/net/dev', 'r') result = fp.readlines() fp.close() for line in result: try: device = devicesPattern.search(line).group() + if device == 'wifi0': + continue self.ifaces[device] = self.getDataForInterface(device) # Show only UP Interfaces in E2 #if self.getAdapterAttribute(device, 'up') is False: @@ -61,7 +63,7 @@ class Network: ipPattern = re_compile(ipRegexp) upPattern = re_compile('UP ') macPattern = re_compile('[0-9]{2}\:[0-9]{2}\:[0-9]{2}\:[0-9]{2}\:[0-9]{2}\:[0-9]{2}') - + fp = popen("ifconfig " + iface) result = fp.readlines() fp.close() @@ -80,6 +82,8 @@ class Network: data['bcast'] = self.convertIP(bcast) if up is not None: data['up'] = True + if iface is not 'lo': + self.configuredInterfaces.append(iface) if mac is not None: data['mac'] = mac if not data.has_key('ip'): @@ -100,6 +104,7 @@ class Network: return data def writeNetworkConfig(self): + self.configuredInterfaces = [] fp = file('/etc/network/interfaces', 'w') fp.write("# automatically generated by enigma 2\n# do NOT change manually!\n\n") fp.write("auto lo\n") @@ -107,19 +112,20 @@ class Network: for ifacename, iface in self.ifaces.items(): if iface['up'] == True: fp.write("auto " + ifacename + "\n") - if iface['dhcp'] == True: - fp.write("iface "+ ifacename +" inet dhcp\n") - if iface['dhcp'] == False: - fp.write("iface "+ ifacename +" inet static\n") - if iface.has_key('ip'): - print tuple(iface['ip']) - fp.write(" address %d.%d.%d.%d\n" % tuple(iface['ip'])) - fp.write(" netmask %d.%d.%d.%d\n" % tuple(iface['netmask'])) - if iface.has_key('gateway'): - fp.write(" gateway %d.%d.%d.%d\n" % tuple(iface['gateway'])) - if iface.has_key("configStrings"): - fp.write("\n" + iface["configStrings"] + "\n") - fp.write("\n") + self.configuredInterfaces.append(ifacename) + if iface['dhcp'] == True and iface['up'] == True: + fp.write("iface "+ ifacename +" inet dhcp\n") + if iface['dhcp'] == False and iface['up'] == True: + fp.write("iface "+ ifacename +" inet static\n") + if iface.has_key('ip'): + print tuple(iface['ip']) + fp.write(" address %d.%d.%d.%d\n" % tuple(iface['ip'])) + fp.write(" netmask %d.%d.%d.%d\n" % tuple(iface['netmask'])) + if iface.has_key('gateway'): + fp.write(" gateway %d.%d.%d.%d\n" % tuple(iface['gateway'])) + if iface.has_key("configStrings"): + fp.write("\n" + iface["configStrings"] + "\n") + fp.write("\n") fp.close() self.writeNameserverConfig() @@ -159,7 +165,7 @@ class Network: if (split[0] == "gateway"): ifaces[currif]["gateway"] = map(int, split[1].split('.')) - self.configuredInterfaces = ifaces + #self.configuredInterfaces = ifaces print "read interfaces:", ifaces for ifacename, iface in ifaces.items(): if self.ifaces.has_key(ifacename): @@ -267,7 +273,7 @@ class Network: fp.write("iface wlan0 inet dhcp\n") if mode == 'wlan-mpci': fp.write("auto ath0\n") - fp.write("iface eth0 inet dhcp\n") + fp.write("iface ath0 inet dhcp\n") if mode == 'lan': fp.write("auto eth0\n") fp.write("iface eth0 inet dhcp\n") @@ -292,20 +298,10 @@ class Network: self.getInterfaces() def checkNetworkState(self): - ok_counter = 0 - ret1=system("ping -c 1 www.dream-multimedia-tv.de") - if ret1 != 0: - ok_counter = ok_counter + 1 - ret2=system("ping -c 1 www.heise.de") - if ret2 != 0: - ok_counter = ok_counter + 1 - ret3=system("ping -c 1 www.google.de") - if ret2 != 0: - ok_counter = ok_counter + 1 - if ok_counter <= 2: - return True - else: - return False + # www.dream-multimedia-tv.de, www.heise.de, www.google.de + return system("ping -c 1 82.149.226.170") == 0 or \ + system("ping -c 1 193.99.144.85") == 0 or \ + system("ping -c 1 209.85.135.103") == 0 def restartNetwork(self): iNetwork.deactivateNetworkConfig() @@ -332,39 +328,31 @@ class Network: return True else: return False - + def checkDNSLookup(self): - ok_counter = 0 - ret1=system("nslookup www.dream-multimedia-tv.de") - if ret1 != 0: - ok_counter = ok_counter + 1 - ret2=system("nslookup www.heise.de") - if ret2 != 0: - ok_counter = ok_counter + 1 - ret3=system("nslookup www.google.de") - if ret2 != 0: - ok_counter = ok_counter + 1 - if ok_counter <= 2: - return True - else: - return False - + return system("nslookup www.dream-multimedia-tv.de") == 0 or \ + system("nslookup www.heise.de") == 0 or \ + system("nslookup www.google.de") + def deactivateInterface(self,iface): system("ifconfig " + iface + " down") - + def detectWlanModule(self): self.wlanmodule = None rt73_dir = "/sys/bus/usb/drivers/rt73/" zd1211b_dir = "/sys/bus/usb/drivers/zd1211b/" - if os_path.exists(rt73_dir): - files = [] - files = listdir(rt73_dir) + madwifi_dir = "/sys/bus/pci/drivers/ath_pci/" + if os_path.exists(madwifi_dir): + files = listdir(madwifi_dir) if len(files) >= 1: + self.wlanmodule = 'madwifi' + if os_path.exists(rt73_dir): + rtfiles = listdir(rt73_dir) + if len(rtfiles) == 2: self.wlanmodule = 'ralink' if os_path.exists(zd1211b_dir): - files = [] - files = listdir(zd1211b_dir) - if len(files) != 0: + zdfiles = listdir(zd1211b_dir) + if len(zdfiles) == 1: self.wlanmodule = 'zydas' return self.wlanmodule