break
return self.remoteRootFS
+ def isBlacklisted(self, iface):
+ return iface in ('lo', 'wifi0', 'wmaster0', 'sys0')
+
def getInterfaces(self, callback = None):
self.configuredInterfaces = []
- for device in listdir('/sys/class/net'):
- if not device in ('lo','wifi0', 'wmaster0'):
- self.getAddrInet(device, callback)
+ for device in self.getInstalledAdapters():
+ self.getAddrInet(device, callback)
# helper function
def regExpMatch(self, pattern, string):
try:
return pattern.search(string).group()
except AttributeError:
- None
+ return None
# helper function to convert ips from a sring to a list of ints
def convertIP(self, ip):
def IPaddrFinished(self, result, retval, extra_args):
(iface, callback ) = extra_args
- data = { 'up': False, 'dhcp': False, 'preup' : False, 'predown' : False }
+ data = { 'up': False, 'dhcp': False, 'preup' : False, 'predown' : False, 'dns-nameservers' : False }
globalIPpattern = re_compile("scope global")
ipRegexp = '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'
netRegexp = '[0-9]{1,2}'
for line in result.splitlines():
split = line.strip().split(' ',2)
- if (split[1][:-1] == iface):
+ if (split[1][:-1] == iface) or (split[1][:-1] == (iface + '@sys0')):
up = self.regExpMatch(upPattern, split[2])
mac = self.regExpMatch(macPattern, self.regExpMatch(macLinePattern, split[2]))
if up is not None:
print line[0:7]
if line[0:7] == "0.0.0.0":
gateway = self.regExpMatch(ipPattern, line[16:31])
- if gateway is not None:
+ if gateway:
data['gateway'] = self.convertIP(gateway)
self.ifaces[iface] = data
fp.write(iface["preup"])
if iface["predown"] is not False and not iface.has_key("configStrings"):
fp.write(iface["predown"])
+ if iface["dns-nameservers"] is not False and len(iface["dns-nameservers"])>0:
+ fp.write("%s" % (iface["dns-nameservers"]))
fp.write("\n")
fp.close()
self.configuredNetworkAdapters = self.configuredInterfaces
- self.writeNameserverConfig()
+# self.writeNameserverConfig()
def writeNameserverConfig(self):
fp = file('/etc/resolv.conf', 'w')
if (split[0] in ("pre-down","post-down")):
if self.ifaces[currif].has_key("predown"):
self.ifaces[currif]["predown"] = i
+ if (split[0] == "dns-nameservers"):
+ if self.ifaces[currif].has_key("dns-nameservers"):
+ self.ifaces[currif]["dns-nameservers"] = i
for ifacename, iface in ifaces.items():
if self.ifaces.has_key(ifacename):
for line in resolv:
if self.regExpMatch(nameserverPattern, line) is not None:
ip = self.regExpMatch(ipPattern, line)
- if ip is not None:
+ if ip:
self.nameservers.append(self.convertIP(ip))
print "nameservers:", self.nameservers
def getInstalledAdapters(self):
- return [x for x in listdir('/sys/class/net') if not x in ('lo','wifi0', 'wmaster0')]
+ return [x for x in listdir('/sys/class/net') if not self.isBlacklisted(x)]
def getConfiguredAdapters(self):
return self.configuredNetworkAdapters
def getFriendlyAdapterName(self, x):
if x in self.friendlyNames.keys():
return self.friendlyNames.get(x, x)
- else:
- self.friendlyNames[x] = self.getFriendlyAdapterNaming(x)
- return self.friendlyNames.get(x, x) # when we have no friendly name, use adapter name
+ self.friendlyNames[x] = self.getFriendlyAdapterNaming(x)
+ return self.friendlyNames.get(x, x) # when we have no friendly name, use adapter name
def getFriendlyAdapterNaming(self, iface):
- if iface.startswith('eth'):
- if iface not in self.lan_interfaces and len(self.lan_interfaces) == 0:
- self.lan_interfaces.append(iface)
- return _("LAN connection")
- elif iface not in self.lan_interfaces and len(self.lan_interfaces) >= 1:
- self.lan_interfaces.append(iface)
- return _("LAN connection") + " " + str(len(self.lan_interfaces))
+ name = None
+ if self.isWirelessInterface(iface):
+ if iface not in self.wlan_interfaces:
+ name = _("WLAN connection")
+ if len(self.wlan_interfaces):
+ name += " " + str(len(self.wlan_interfaces)+1)
+ self.wlan_interfaces.append(iface)
else:
- if iface not in self.wlan_interfaces and len(self.wlan_interfaces) == 0:
- self.wlan_interfaces.append(iface)
- return _("WLAN connection")
- elif iface not in self.wlan_interfaces and len(self.wlan_interfaces) >= 1:
- self.wlan_interfaces.append(iface)
- return _("WLAN connection") + " " + str(len(self.wlan_interfaces))
+ if iface not in self.lan_interfaces:
+ name = _("LAN connection")
+ if len(self.lan_interfaces):
+ name += " " + str(len(self.lan_interfaces)+1)
+ self.lan_interfaces.append(iface)
+ return name
+ def useWlCommand(self, iface):
+ return iface and os_path.exists("/tmp/bcm/%s" % iface)
+
def getFriendlyAdapterDescription(self, iface):
if not self.isWirelessInterface(iface):
return _('Ethernet network interface')
moduledir = self.getWlanModuleDir(iface)
- if os_path.isdir(moduledir):
+ if moduledir:
name = os_path.basename(os_path.realpath(moduledir))
- if name in ('ath_pci','ath5k'):
+ if name in ('ath_pci', 'ath5k'):
name = 'Atheros'
- elif name in ('rt73','rt73usb','rt3070sta'):
+ elif name in ('rt73','rt73usb','rt3070sta', 'rt5370sta'):
name = 'Ralink'
elif name == 'zd1211b':
name = 'Zydas'
- elif name == 'r871x_usb_drv':
+ elif name in ('r871x_usb_drv', 'rtw_usb_drv'):
name = 'Realtek'
+ elif self.isRalinkModule(iface):
+ name = 'Ralink'
+ elif self.useWlCommand(iface):
+ name = 'BroadCom'
else:
name = _('Unknown')
return name + ' ' + _('wireless network interface')
+ def isRalinkModule(self, iface):
+ import os
+# check vendor ID for lagacy driver
+ vendorID = "148f" # ralink vendor ID
+ idVendorPath = "/sys/class/net/%s/device/idVendor" % iface
+ if os.access(idVendorPath, os.R_OK):
+ if open(idVendorPath, "r").read().strip() == vendorID:
+ return True
+
+# check sys driver path for kernel driver
+ ralinkKmod = "rt2800usb" # ralink kernel driver name
+ driverPath = "/sys/class/net/%s/device/driver/" % iface
+ if os.path.exists(driverPath):
+ driverName = os.path.basename(os_path.realpath(driverPath))
+ if driverName == ralinkKmod:
+ return True
+ return False
+
def getAdapterName(self, iface):
return iface
callback(True,mode)
def checkNetworkState(self,statecallback):
- # www.dream-multimedia-tv.de, www.heise.de, www.google.de
self.NetworkState = 0
- cmd1 = "ping -c 1 82.149.226.170"
- cmd2 = "ping -c 1 193.99.144.85"
- cmd3 = "ping -c 1 209.85.135.103"
self.PingConsole = Console()
- self.PingConsole.ePopen(cmd1, self.checkNetworkStateFinished,statecallback)
- self.PingConsole.ePopen(cmd2, self.checkNetworkStateFinished,statecallback)
- self.PingConsole.ePopen(cmd3, self.checkNetworkStateFinished,statecallback)
+ for testserver in ("www.heise.de", "www.google.de", "de.yahoo.com"):
+ self.PingConsole.ePopen("ping -c 1 %s" % testserver, self.checkNetworkStateFinished,statecallback)
def checkNetworkStateFinished(self, result, retval,extra_args):
(statecallback) = extra_args
def buildCommands(iface):
commands.append("ifdown " + iface)
commands.append("ip addr flush dev " + iface)
- # HACK: wpa_supplicant sometimes doesn't quit properly on SIGTERM
+ #wpa_supplicant sometimes doesn't quit properly on SIGTERM
if os_path.exists('/var/run/wpa_supplicant/'+ iface):
commands.append("wpa_cli -i" + iface + " terminate")
callback(True)
return
buildCommands(ifaces)
- self.deactivateInterfaceConsole.eBatch(commands, self.deactivateInterfaceFinished, callback, debug=True)
+ self.deactivateInterfaceConsole.eBatch(commands, self.deactivateInterfaceFinished, [ifaces,callback], debug=True)
def deactivateInterfaceFinished(self,extra_args):
- callback = extra_args
+ (ifaces, callback) = extra_args
+ def checkCommandResult(iface):
+ if self.deactivateInterfaceConsole and self.deactivateInterfaceConsole.appResults.has_key("ifdown " + iface):
+ result = str(self.deactivateInterfaceConsole.appResults.get("ifdown " + iface)).strip("\n")
+ if result == "ifdown: interface " + iface + " not configured":
+ return False
+ else:
+ return True
+ #ifdown sometimes can't get the interface down.
+ if isinstance(ifaces, (list, tuple)):
+ for iface in ifaces:
+ if checkCommandResult(iface) is False:
+ Console().ePopen(("ifconfig " + iface + " down" ))
+ else:
+ if checkCommandResult(ifaces) is False:
+ Console().ePopen(("ifconfig " + ifaces + " down" ))
+
if self.deactivateInterfaceConsole:
if len(self.deactivateInterfaceConsole.appContainers) == 0:
if callback is not None:
callback(True)
def activateInterface(self,iface,callback = None):
+ if self.config_ready:
+ self.config_ready = False
+ self.msgPlugins()
if iface == 'eth0' and self.onRemoteRootFS():
if callback is not None:
callback(True)
self.activateInterfaceConsole = Console()
commands = []
commands.append("ifup " + iface)
- self.deactivateInterfaceConsole.eBatch(commands, self.activateInterfaceFinished, callback, debug=True)
+ self.activateInterfaceConsole.eBatch(commands, self.activateInterfaceFinished, callback, debug=True)
def activateInterfaceFinished(self,extra_args):
callback = extra_args
return '/sys/class/net/' + iface
def isWirelessInterface(self, iface):
+ if iface in self.wlan_interfaces:
+ return True
+
if os_path.isdir(self.sysfsPath(iface) + '/wireless'):
return True
- else:
- ifaces = file('/proc/net/wireless').read().strip()
- if iface in ifaces:
- return True
- else:
- return False
+
+ # r871x_usb_drv on kernel 2.6.12 is not identifiable over /sys/class/net/'ifacename'/wireless so look also inside /proc/net/wireless
+ device = re_compile('[a-z]{2,}[0-9]*:')
+ ifnames = []
+ fp = open('/proc/net/wireless', 'r')
+ for line in fp:
+ try:
+ ifnames.append(device.search(line).group()[:-1])
+ except AttributeError:
+ pass
+ if iface in ifnames:
+ return True
+
+ return False
def getWlanModuleDir(self, iface = None):
devicedir = self.sysfsPath(iface) + '/device'
+ if not os_path.exists(devicedir):
+ return None
+
moduledir = devicedir + '/driver/module'
- if not os_path.isdir(moduledir):
- tmpfiles = listdir(devicedir)
- moduledir_found = False
- for x in tmpfiles:
- if x.startswith("1-"):
- moduledir_found = True
- moduledir = devicedir + '/' + x + '/driver/module'
- if not moduledir_found:
- moduledir_found = True
- if os_path.isdir(devicedir + '/driver'):
- moduledir = devicedir + '/driver'
-
- return moduledir
+ if os_path.isdir(moduledir):
+ return moduledir
+
+ # identification is not possible over default moduledir
+ for x in listdir(devicedir):
+ # rt3070 on kernel 2.6.18 registers wireless devices as usb_device (e.g. 1-1.3:1.0) and identification is only possible over /sys/class/net/'ifacename'/device/1-xxx
+ if x.startswith("1-"):
+ moduledir = devicedir + '/' + x + '/driver/module'
+ if os_path.isdir(moduledir):
+ return moduledir
+ # rt73, zd1211b, r871x_usb_drv on kernel 2.6.12 can be identified over /sys/class/net/'ifacename'/device/driver, so look also here
+ moduledir = devicedir + '/driver'
+ if os_path.isdir(moduledir):
+ return moduledir
+
+ return None
def detectWlanModule(self, iface = None):
if not self.isWirelessInterface(iface):
return 'nl80211'
moduledir = self.getWlanModuleDir(iface)
- if os_path.isdir(moduledir):
+ if moduledir:
module = os_path.basename(os_path.realpath(moduledir))
if module in ('ath_pci','ath5k'):
return 'madwifi'
if self.config_ready is not None:
for p in plugins.getPlugins(PluginDescriptor.WHERE_NETWORKCONFIG_READ):
p(reason=self.config_ready)
-
+
+ def getInterfacesNameserverList(self, iface):
+ result = []
+ nameservers = self.getAdapterAttribute(iface, "dns-nameservers")
+ if nameservers:
+ ipRegexp = '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'
+ ipPattern = re_compile(ipRegexp)
+ for x in nameservers.split()[1:]:
+ ip = self.regExpMatch(ipPattern, x)
+ if ip:
+ result.append( [ int(n) for n in ip.split('.') ] )
+ return result
+
iNetwork = Network()
def InitNetwork():
projects / vuplus_dvbapp / blobdiff