From 3fd7b55de96484e02accb991fb2c0c3ce0aa9883 Mon Sep 17 00:00:00 2001 From: antialias Date: Tue, 25 Sep 2012 17:37:48 -0400 Subject: First check for threaded network checks. TODO: tests. --- src/leap/base/network.py | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/leap/base/network.py (limited to 'src/leap/base/network.py') diff --git a/src/leap/base/network.py b/src/leap/base/network.py new file mode 100644 index 00000000..58f903e1 --- /dev/null +++ b/src/leap/base/network.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +from __future__ import (print_function) + +from leap.base.checks import LeapNetworkChecker +from leap.base.constants import ROUTE_CHECK_INTERVAL +from leap.util.coroutines import (launch_thread, process_events) + +from time import sleep + +class NetworkChecker(object): + """ + Manages network checking thread that makes sure we have a working network + connection. + """ + def __init__(self, *args, **kwargs): + self.status_signals = kwargs.pop('status_signals', None) + self.watcher_cb = kwargs.pop('status_signals', None) + + def start(self): + self._launch_recurrent_network_checks((self.watcher_cb,)) + + def stop(self): + raise NotImplementedError + + def run_checks(self): + pass + + #private methods + + #here all the observers in fail_callbacks expect one positional argument, + #which is exception so we can try by passing a lambda with logger to + #check it works. + def _network_checks_thread(self, fail_callbacks): + print('fail_callbacks: %s' % fail_callbacks) + print(len(fail_callbacks)) + observer_dict = dict((( + observer, process_events(observer)) for observer in fail_callbacks)) + netchecker = LeapNetworkChecker() + while True: + try: + netchecker.check_internet_connection() + sleep(ROUTE_CHECK_INTERVAL) + except Exception as exc: + for obs in observer_dict: + observer_dict[obs].send(exc) + + + def _launch_recurrent_network_checks(fail_callbacks): + print(type(fail_callbacks)) + watcher = launch_thread( + network_checks_thread, + (fail_callbacks,)) + return watcher + + -- cgit v1.2.3 From 58344bb28c1c0f25ed37624ff487cc8f24821d52 Mon Sep 17 00:00:00 2001 From: antialias Date: Fri, 28 Sep 2012 18:16:47 -0400 Subject: Functionality to shutdown network checker when openvpn is stopped. But thread not being successfully killed. --- src/leap/base/network.py | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) (limited to 'src/leap/base/network.py') diff --git a/src/leap/base/network.py b/src/leap/base/network.py index 58f903e1..a1e7c880 100644 --- a/src/leap/base/network.py +++ b/src/leap/base/network.py @@ -1,12 +1,18 @@ # -*- coding: utf-8 -*- from __future__ import (print_function) +import logging +import threading from leap.base.checks import LeapNetworkChecker from leap.base.constants import ROUTE_CHECK_INTERVAL -from leap.util.coroutines import (launch_thread, process_events) +from leap.base.exceptions import TunnelNotDefaultRouteError +from leap.util.coroutines import (launch_thread_no_daemon, process_events) from time import sleep +logger = logging.getLogger(name=__name__) + + class NetworkChecker(object): """ Manages network checking thread that makes sure we have a working network @@ -15,12 +21,17 @@ class NetworkChecker(object): def __init__(self, *args, **kwargs): self.status_signals = kwargs.pop('status_signals', None) self.watcher_cb = kwargs.pop('status_signals', None) + self.excp_logger = lambda exc: logger.error("%s", exc.message) + self.checker = LeapNetworkChecker() def start(self): - self._launch_recurrent_network_checks((self.watcher_cb,)) + self.process_handle = self._launch_recurrent_network_checks((self.excp_logger,)) def stop(self): - raise NotImplementedError + #TODO: Thread still not being stopped when openvpn is stopped. + logger.debug("stopping network checker...") + self.process_handle._Thread__stop() + logger.debug("network checked stopped.") def run_checks(self): pass @@ -31,24 +42,31 @@ class NetworkChecker(object): #which is exception so we can try by passing a lambda with logger to #check it works. def _network_checks_thread(self, fail_callbacks): - print('fail_callbacks: %s' % fail_callbacks) - print(len(fail_callbacks)) + #TODO: replace this with waiting for a signal from openvpn + while True: + try: + self.checker.check_tunnel_default_interface() + break + except TunnelNotDefaultRouteError: + sleep(1) + observer_dict = dict((( observer, process_events(observer)) for observer in fail_callbacks)) - netchecker = LeapNetworkChecker() while True: try: - netchecker.check_internet_connection() + self.checker.check_tunnel_default_interface() + self.checker.check_internet_connection() sleep(ROUTE_CHECK_INTERVAL) except Exception as exc: for obs in observer_dict: observer_dict[obs].send(exc) + sleep(ROUTE_CHECK_INTERVAL) - def _launch_recurrent_network_checks(fail_callbacks): - print(type(fail_callbacks)) - watcher = launch_thread( - network_checks_thread, + def _launch_recurrent_network_checks(self, fail_callbacks): + #we need to wrap the fail callback in a turple + watcher = launch_thread_no_daemon( + self._network_checks_thread, (fail_callbacks,)) return watcher -- cgit v1.2.3 From c75b27484a999f70a6e28e521f236cf2d403edd1 Mon Sep 17 00:00:00 2001 From: antialias Date: Mon, 1 Oct 2012 11:02:40 -0400 Subject: Checker starting and stopping correctly. --- src/leap/base/network.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/leap/base/network.py') diff --git a/src/leap/base/network.py b/src/leap/base/network.py index a1e7c880..92fb7635 100644 --- a/src/leap/base/network.py +++ b/src/leap/base/network.py @@ -6,7 +6,7 @@ import threading from leap.base.checks import LeapNetworkChecker from leap.base.constants import ROUTE_CHECK_INTERVAL from leap.base.exceptions import TunnelNotDefaultRouteError -from leap.util.coroutines import (launch_thread_no_daemon, process_events) +from leap.util.coroutines import (launch_thread, process_events) from time import sleep @@ -22,6 +22,7 @@ class NetworkChecker(object): self.status_signals = kwargs.pop('status_signals', None) self.watcher_cb = kwargs.pop('status_signals', None) self.excp_logger = lambda exc: logger.error("%s", exc.message) + self.shutdown = threading.Event() self.checker = LeapNetworkChecker() def start(self): @@ -29,8 +30,7 @@ class NetworkChecker(object): def stop(self): #TODO: Thread still not being stopped when openvpn is stopped. - logger.debug("stopping network checker...") - self.process_handle._Thread__stop() + self.shutdown.set() logger.debug("network checked stopped.") def run_checks(self): @@ -52,7 +52,7 @@ class NetworkChecker(object): observer_dict = dict((( observer, process_events(observer)) for observer in fail_callbacks)) - while True: + while not self.shutdown.is_set(): try: self.checker.check_tunnel_default_interface() self.checker.check_internet_connection() @@ -61,11 +61,12 @@ class NetworkChecker(object): for obs in observer_dict: observer_dict[obs].send(exc) sleep(ROUTE_CHECK_INTERVAL) - + #reset event + self.shutdown.clear() def _launch_recurrent_network_checks(self, fail_callbacks): #we need to wrap the fail callback in a turple - watcher = launch_thread_no_daemon( + watcher = launch_thread( self._network_checks_thread, (fail_callbacks,)) return watcher -- cgit v1.2.3 From 95ce59c8833cb2ba951630080cdbc1e6d756a666 Mon Sep 17 00:00:00 2001 From: antialias Date: Mon, 1 Oct 2012 15:10:55 -0400 Subject: Still some QT related problems. Hand off to kali to fix. --- src/leap/base/network.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/leap/base/network.py') diff --git a/src/leap/base/network.py b/src/leap/base/network.py index 92fb7635..159e9b21 100644 --- a/src/leap/base/network.py +++ b/src/leap/base/network.py @@ -21,15 +21,15 @@ class NetworkChecker(object): def __init__(self, *args, **kwargs): self.status_signals = kwargs.pop('status_signals', None) self.watcher_cb = kwargs.pop('status_signals', None) - self.excp_logger = lambda exc: logger.error("%s", exc.message) + self.error_cb = kwargs.pop('error_cb', + lambda exc: logger.error("%s", exc.message)) self.shutdown = threading.Event() self.checker = LeapNetworkChecker() def start(self): - self.process_handle = self._launch_recurrent_network_checks((self.excp_logger,)) + self.process_handle = self._launch_recurrent_network_checks((self.error_cb,)) def stop(self): - #TODO: Thread still not being stopped when openvpn is stopped. self.shutdown.set() logger.debug("network checked stopped.") @@ -70,5 +70,3 @@ class NetworkChecker(object): self._network_checks_thread, (fail_callbacks,)) return watcher - - -- cgit v1.2.3 From 31c0afa5eb9bc7566ca39099520e8adc7b531e22 Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 5 Oct 2012 20:15:12 +0900 Subject: pep8 --- src/leap/base/network.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/leap/base/network.py') diff --git a/src/leap/base/network.py b/src/leap/base/network.py index 159e9b21..4a90f2f4 100644 --- a/src/leap/base/network.py +++ b/src/leap/base/network.py @@ -21,13 +21,15 @@ class NetworkChecker(object): def __init__(self, *args, **kwargs): self.status_signals = kwargs.pop('status_signals', None) self.watcher_cb = kwargs.pop('status_signals', None) - self.error_cb = kwargs.pop('error_cb', - lambda exc: logger.error("%s", exc.message)) + self.error_cb = kwargs.pop( + 'error_cb', + lambda exc: logger.error("%s", exc.message)) self.shutdown = threading.Event() self.checker = LeapNetworkChecker() def start(self): - self.process_handle = self._launch_recurrent_network_checks((self.error_cb,)) + self.process_handle = self._launch_recurrent_network_checks( + (self.error_cb,)) def stop(self): self.shutdown.set() @@ -51,7 +53,8 @@ class NetworkChecker(object): sleep(1) observer_dict = dict((( - observer, process_events(observer)) for observer in fail_callbacks)) + observer, + process_events(observer)) for observer in fail_callbacks)) while not self.shutdown.is_set(): try: self.checker.check_tunnel_default_interface() @@ -65,7 +68,7 @@ class NetworkChecker(object): self.shutdown.clear() def _launch_recurrent_network_checks(self, fail_callbacks): - #we need to wrap the fail callback in a turple + #we need to wrap the fail callback in a tuple watcher = launch_thread( self._network_checks_thread, (fail_callbacks,)) -- cgit v1.2.3 From 1cbf954d9eda71cabfa58811c09bc63cfe9465d5 Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 5 Oct 2012 21:21:22 +0900 Subject: add comments to netchecks --- src/leap/base/network.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/leap/base/network.py') diff --git a/src/leap/base/network.py b/src/leap/base/network.py index 4a90f2f4..e90139c4 100644 --- a/src/leap/base/network.py +++ b/src/leap/base/network.py @@ -13,18 +13,22 @@ from time import sleep logger = logging.getLogger(name=__name__) -class NetworkChecker(object): +class NetworkCheckerThread(object): """ Manages network checking thread that makes sure we have a working network connection. """ def __init__(self, *args, **kwargs): self.status_signals = kwargs.pop('status_signals', None) - self.watcher_cb = kwargs.pop('status_signals', None) + #self.watcher_cb = kwargs.pop('status_signals', None) self.error_cb = kwargs.pop( 'error_cb', lambda exc: logger.error("%s", exc.message)) self.shutdown = threading.Event() + + # XXX get provider_gateway and pass it to checker + # see in eip.config for function + # #718 self.checker = LeapNetworkChecker() def start(self): @@ -50,9 +54,10 @@ class NetworkChecker(object): self.checker.check_tunnel_default_interface() break except TunnelNotDefaultRouteError: + # XXX ??? why do we sleep here??? sleep(1) - observer_dict = dict((( + fail_observer_dict = dict((( observer, process_events(observer)) for observer in fail_callbacks)) while not self.shutdown.is_set(): @@ -61,8 +66,8 @@ class NetworkChecker(object): self.checker.check_internet_connection() sleep(ROUTE_CHECK_INTERVAL) except Exception as exc: - for obs in observer_dict: - observer_dict[obs].send(exc) + for obs in fail_observer_dict: + fail_observer_dict[obs].send(exc) sleep(ROUTE_CHECK_INTERVAL) #reset event self.shutdown.clear() -- cgit v1.2.3