class Network:
def __init__(self):
self.ifaces = {}
- self.configuredInterfaces = {}
+ self.configuredInterfaces = []
self.nameservers = []
self.getInterfaces()
self.ethtool_bin = "/usr/sbin/ethtool"
def getInterfaces(self):
devicesPattern = re_compile('[a-z]+[0-9]+')
-
+ self.configuredInterfaces = []
fp = file('/proc/net/dev', 'r')
result = fp.readlines()
fp.close()
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()
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'):
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")
for ifacename, iface in self.ifaces.items():
if iface['up'] == True:
fp.write("auto " + ifacename + "\n")
- if iface['dhcp'] == True:
+ self.configuredInterfaces.append(ifacename)
+ if iface['dhcp'] == True and iface['up'] == True:
fp.write("iface "+ ifacename +" inet dhcp\n")
- if iface['dhcp'] == False:
+ if iface['dhcp'] == False and iface['up'] == True:
fp.write("iface "+ ifacename +" inet static\n")
if iface.has_key('ip'):
print tuple(iface['ip'])
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):
files = listdir(madwifi_dir)
if len(files) >= 1:
self.wlanmodule = 'madwifi'
- elif os_path.exists(rt73_dir):
- files = listdir(rt73_dir)
- if len(files) >= 1:
+ if os_path.exists(rt73_dir):
+ rtfiles = listdir(rt73_dir)
+ if len(rtfiles) == 2:
self.wlanmodule = 'ralink'
- elif os_path.exists(zd1211b_dir):
- files = listdir(zd1211b_dir)
- if len(files) != 0:
+ if os_path.exists(zd1211b_dir):
+ zdfiles = listdir(zd1211b_dir)
+ if len(zdfiles) == 1:
self.wlanmodule = 'zydas'
return self.wlanmodule