git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5513ae
)
extend ping test, fix configuredInterface list
author
Felix Domke
<tmbinc@elitedvb.net>
Tue, 3 Jun 2008 23:11:53 +0000
(23:11 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Tue, 3 Jun 2008 23:11:53 +0000
(23:11 +0000)
lib/python/Components/Network.py
patch
|
blob
|
history
diff --git
a/lib/python/Components/Network.py
b/lib/python/Components/Network.py
index 3d114c1c85dfc8a47f3e81e73c203a496f053f1c..1c2b54e87591bca8d51d1a912ed76dd920ec28f4 100644
(file)
--- a/
lib/python/Components/Network.py
+++ b/
lib/python/Components/Network.py
@@
-6,6
+6,7
@@
from enigma import eTimer, eConsoleAppContainer
class Network:
def __init__(self):
self.ifaces = {}
class Network:
def __init__(self):
self.ifaces = {}
+ self.configuredInterfaces = {}
self.nameservers = []
self.getInterfaces()
self.ethtool_bin = "/usr/sbin/ethtool"
self.nameservers = []
self.getInterfaces()
self.ethtool_bin = "/usr/sbin/ethtool"
@@
-159,7
+160,8
@@
class Network:
ifaces[currif]["netmask"] = map(int, split[1].split('.'))
if (split[0] == "gateway"):
ifaces[currif]["gateway"] = map(int, split[1].split('.'))
ifaces[currif]["netmask"] = map(int, split[1].split('.'))
if (split[0] == "gateway"):
ifaces[currif]["gateway"] = map(int, split[1].split('.'))
-
+
+ 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):
@@
-281,8
+283,17
@@
class Network:
os.system("ifconfig wlan0 down")
def checkNetworkState(self):
os.system("ifconfig wlan0 down")
def checkNetworkState(self):
- ret=os.system("ping -c 1 www.dream-multimedia-tv.de")
- if ret == 0:
+ ok_counter = 0
+ ret1=os.system("ping -c 1 www.dream-multimedia-tv.de")
+ if ret1 != 0:
+ ok_counter = ok_counter + 1
+ ret2=os.system("ping -c 1 www.heise.de")
+ if ret2 != 0:
+ ok_counter = ok_counter + 1
+ ret3=os.system("ping -c 1 www.google.de")
+ if ret2 != 0:
+ ok_counter = ok_counter + 1
+ if ok_counter == 0:
return True
else:
return False
return True
else:
return False