git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make menu text translatable
[enigma2.git]
/
lib
/
python
/
Components
/
Network.py
diff --git
a/lib/python/Components/Network.py
b/lib/python/Components/Network.py
index b5b8e20113a164c02d8366ebd91c256168e8a4c8..cde6b7efcb0bde424f0c952ab7b4ecf576b1b705 100644
(file)
--- a/
lib/python/Components/Network.py
+++ b/
lib/python/Components/Network.py
@@
-6,7
+6,7
@@
from enigma import eConsoleAppContainer
class Network:
def __init__(self):
self.ifaces = {}
class Network:
def __init__(self):
self.ifaces = {}
- self.configuredInterfaces =
{}
+ self.configuredInterfaces =
[]
self.nameservers = []
self.getInterfaces()
self.ethtool_bin = "/usr/sbin/ethtool"
self.nameservers = []
self.getInterfaces()
self.ethtool_bin = "/usr/sbin/ethtool"
@@
-14,7
+14,7
@@
class Network:
def getInterfaces(self):
devicesPattern = re_compile('[a-z]+[0-9]+')
def getInterfaces(self):
devicesPattern = re_compile('[a-z]+[0-9]+')
-
+ self.configuredInterfaces = []
fp = file('/proc/net/dev', 'r')
result = fp.readlines()
fp.close()
fp = file('/proc/net/dev', 'r')
result = fp.readlines()
fp.close()
@@
-63,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}')
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()
fp = popen("ifconfig " + iface)
result = fp.readlines()
fp.close()
@@
-82,6
+82,8
@@
class Network:
data['bcast'] = self.convertIP(bcast)
if up is not None:
data['up'] = True
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'):
if mac is not None:
data['mac'] = mac
if not data.has_key('ip'):
@@
-102,6
+104,7
@@
class Network:
return data
def writeNetworkConfig(self):
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")
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")
@@
-109,9
+112,10
@@
class Network:
for ifacename, iface in self.ifaces.items():
if iface['up'] == True:
fp.write("auto " + ifacename + "\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")
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'])
fp.write("iface "+ ifacename +" inet static\n")
if iface.has_key('ip'):
print tuple(iface['ip'])
@@
-161,7
+165,7
@@
class Network:
if (split[0] == "gateway"):
ifaces[currif]["gateway"] = map(int, split[1].split('.'))
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):
print "read interfaces:", ifaces
for ifacename, iface in ifaces.items():
if self.ifaces.has_key(ifacename):
@@
-342,13
+346,13
@@
class Network:
files = listdir(madwifi_dir)
if len(files) >= 1:
self.wlanmodule = 'madwifi'
files = listdir(madwifi_dir)
if len(files) >= 1:
self.wlanmodule = 'madwifi'
-
el
if os_path.exists(rt73_dir):
- files = listdir(rt73_dir)
- if len(
files) >= 1
:
+ if os_path.exists(rt73_dir):
+
rt
files = listdir(rt73_dir)
+ if len(
rtfiles) == 2
:
self.wlanmodule = 'ralink'
self.wlanmodule = 'ralink'
-
el
if os_path.exists(zd1211b_dir):
- files = listdir(zd1211b_dir)
- if len(
files) != 0
:
+ if os_path.exists(zd1211b_dir):
+
zd
files = listdir(zd1211b_dir)
+ if len(
zdfiles) == 1
:
self.wlanmodule = 'zydas'
return self.wlanmodule
self.wlanmodule = 'zydas'
return self.wlanmodule