git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/bug_112_enable_extensions_manager'
[enigma2.git]
/
lib
/
python
/
Components
/
Network.py
diff --git
a/lib/python/Components/Network.py
b/lib/python/Components/Network.py
index 31a90282c3d1e35279850ced51625eeae7c717a8..bd10d9c3e2360da293c93e077100259bca3b04dd 100755
(executable)
--- a/
lib/python/Components/Network.py
+++ b/
lib/python/Components/Network.py
@@
-24,6
+24,7
@@
class Network:
self.activateConsole = Console()
self.resetNetworkConsole = Console()
self.DnsConsole = Console()
self.activateConsole = Console()
self.resetNetworkConsole = Console()
self.DnsConsole = Console()
+ self.PingConsole = Console()
self.config_ready = None
self.getInterfaces()
self.config_ready = None
self.getInterfaces()
@@
-46,7
+47,7
@@
class Network:
for line in result:
try:
device = devicesPattern.search(line).group()
for line in result:
try:
device = devicesPattern.search(line).group()
- if device
== 'wifi0'
:
+ if device
in ('wifi0', 'wmaster0')
:
continue
self.getDataForInterface(device, callback)
except AttributeError:
continue
self.getDataForInterface(device, callback)
except AttributeError:
@@
-475,10
+476,17
@@
class Network:
def getLinkStateFinished(self, result, retval,extra_args):
(callback) = extra_args
def getLinkStateFinished(self, result, retval,extra_args):
(callback) = extra_args
+
if self.LinkConsole is not None:
if len(self.LinkConsole.appContainers) == 0:
callback(result)
if self.LinkConsole is not None:
if len(self.LinkConsole.appContainers) == 0:
callback(result)
+ def stopPingConsole(self):
+ if self.PingConsole is not None:
+ if len(self.PingConsole.appContainers):
+ for name in self.PingConsole.appContainers.keys():
+ self.PingConsole.kill(name)
+
def stopLinkStateConsole(self):
if self.LinkConsole is not None:
if len(self.LinkConsole.appContainers):
def stopLinkStateConsole(self):
if self.LinkConsole is not None:
if len(self.LinkConsole.appContainers):