from re import compile as re_compile
from socket import *
from enigma import eConsoleAppContainer
+from Components.Console import Console
class Network:
def __init__(self):
self.ifaces = {}
- self.configuredInterfaces = []
+ self.configuredInterfaces = []
self.nameservers = []
- self.getInterfaces()
self.ethtool_bin = "/usr/sbin/ethtool"
self.container = eConsoleAppContainer()
+ self.Console = Console()
+ self.getInterfaces()
def getInterfaces(self):
devicesPattern = re_compile('[a-z]+[0-9]+')
device = devicesPattern.search(line).group()
if device == 'wifi0':
continue
- self.ifaces[device] = self.getDataForInterface(device)
+ self.getDataForInterface(device)
# Show only UP Interfaces in E2
#if self.getAdapterAttribute(device, 'up') is False:
# del self.ifaces[device]
except AttributeError:
pass
- print "self.ifaces:", self.ifaces
- self.loadNetworkConfig()
+ #print "self.ifaces:", self.ifaces
#self.writeNetworkConfig()
#print ord(' ')
#for line in result:
return ip
def getDataForInterface(self, iface):
- #ipRegexp = '[0-9]{1,2,3}\.[0-9]{1,2,3}\.[0-9]{1,2,3}\.[0-9]{1,2,3}'
+ cmd = "ifconfig " + iface
+ self.Console.ePopen(cmd, self.ifconfigFinished, iface)
+
+ def ifconfigFinished(self, result, retval, iface):
+ data = { 'up': False, 'dhcp': False, 'preup' : False, 'postdown' : False }
ipRegexp = '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'
ipLinePattern = re_compile('inet addr:' + ipRegexp)
netmaskLinePattern = re_compile('Mask:' + ipRegexp)
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 = { 'up': False, 'dhcp': False }
- for line in result:
+
+ for line in result.splitlines():
ip = self.regExpMatch(ipPattern, self.regExpMatch(ipLinePattern, line))
netmask = self.regExpMatch(ipPattern, self.regExpMatch(netmaskLinePattern, line))
bcast = self.regExpMatch(ipPattern, self.regExpMatch(bcastLinePattern, line))
data['mac'] = mac
if not data.has_key('ip'):
data['dhcp'] = True
- data['ip'] = [192, 168, 1, 2]
- data['netmask'] = [255, 255, 255, 0]
- data['gateway'] = [192, 168, 1, 1]
+ data['ip'] = [0, 0, 0, 0]
+ data['netmask'] = [0, 0, 0, 0]
+ data['gateway'] = [0, 0, 0, 0]
- fp = popen("route -n | grep " + iface)
- result = fp.readlines()
- fp.close()
- for line in result:
+ cmd = "route -n | grep " + iface
+ self.Console.ePopen(cmd,self.routeFinished,[iface,data,ipPattern])
+
+ def routeFinished(self, result, retval, extra_args):
+ (iface, data, ipPattern) = extra_args
+
+ for line in result.splitlines():
print line[0:7]
if line[0:7] == "0.0.0.0":
gateway = self.regExpMatch(ipPattern, line[16:31])
if gateway is not None:
data['gateway'] = self.convertIP(gateway)
- return data
+ self.ifaces[iface] = data
+ if len(self.Console.appContainers) == 0:
+ self.loadNetworkConfig()
def writeNetworkConfig(self):
self.configuredInterfaces = []
if iface['up'] == True:
fp.write("auto " + ifacename + "\n")
self.configuredInterfaces.append(ifacename)
- if iface['dhcp'] == True and iface['up'] == True:
+ if iface['dhcp'] == True:
fp.write("iface "+ ifacename +" inet dhcp\n")
- if iface['dhcp'] == False and iface['up'] == True:
+ if iface['dhcp'] == False:
fp.write("iface "+ ifacename +" inet static\n")
if iface.has_key('ip'):
print tuple(iface['ip'])
fp.write(" gateway %d.%d.%d.%d\n" % tuple(iface['gateway']))
if iface.has_key("configStrings"):
fp.write("\n" + iface["configStrings"] + "\n")
+ if iface["preup"] is not False and not iface.has_key("configStrings"):
+ fp.write(iface["preup"])
+ fp.write(iface["postdown"])
fp.write("\n")
fp.close()
self.writeNameserverConfig()
if (currif != ""):
if (split[0] == "address"):
ifaces[currif]["address"] = map(int, split[1].split('.'))
+ if self.ifaces[currif].has_key("ip"):
+ if self.ifaces[currif]["ip"] != ifaces[currif]["address"] and ifaces[currif]["dhcp"] == False:
+ self.ifaces[currif]["ip"] = map(int, split[1].split('.'))
if (split[0] == "netmask"):
ifaces[currif]["netmask"] = map(int, split[1].split('.'))
+ if self.ifaces[currif].has_key("netmask"):
+ if self.ifaces[currif]["netmask"] != ifaces[currif]["netmask"] and ifaces[currif]["dhcp"] == False:
+ self.ifaces[currif]["netmask"] = map(int, split[1].split('.'))
if (split[0] == "gateway"):
ifaces[currif]["gateway"] = map(int, split[1].split('.'))
-
- #self.configuredInterfaces = ifaces
+ if self.ifaces[currif].has_key("gateway"):
+ if self.ifaces[currif]["gateway"] != ifaces[currif]["gateway"] and ifaces[currif]["dhcp"] == False:
+ self.ifaces[currif]["gateway"] = map(int, split[1].split('.'))
+ if (split[0] == "pre-up"):
+ if self.ifaces[currif].has_key("preup"):
+ self.ifaces[currif]["preup"] = i
+ if (split[0] == "post-down"):
+ if self.ifaces[currif].has_key("postdown"):
+ self.ifaces[currif]["postdown"] = i
+
print "read interfaces:", ifaces
for ifacename, iface in ifaces.items():
if self.ifaces.has_key(ifacename):
self.ifaces[ifacename]["dhcp"] = iface["dhcp"]
-
print "self.ifaces after loading:", self.ifaces
def loadNameserverConfig(self):
self.container.appClosed.get().remove(self.cmdFinished)
self.container.dataAvail.get().remove(self.dataAvail)
+ def stopContainer(self):
+ self.container.kill()
+
+ def ContainerRunning(self):
+ return self.container.running()
+
def checkforInterface(self,iface):
if self.getAdapterAttribute(iface, 'up') is True:
return True
git.cweiske.de / enigma2.git / blobdiff