From 555210630659018785fdb9d2318081a76b49fb4c Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 31 Jan 2013 05:26:18 +0900
Subject: actually merge the release/v0.2.0 branch!

My life has been a lie until this moment...
I had done:
git merge -s ours release/v0.2.0
to avoid deleting the debian folder...
but that left the src untouched...

Now I just rm'd the src folder and did a
git checkout release/v0.2.0 src/
... and merge happy! :)
---
 src/leap/base/network.py | 107 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 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..d841e692
--- /dev/null
+++ b/src/leap/base/network.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+from __future__ import (print_function)
+import logging
+import threading
+
+from leap.eip import config as eipconfig
+from leap.base.checks import LeapNetworkChecker
+from leap.base.constants import ROUTE_CHECK_INTERVAL
+from leap.base.exceptions import TunnelNotDefaultRouteError
+from leap.util.misc import null_check
+from leap.util.coroutines import (launch_thread, process_events)
+
+from time import sleep
+
+logger = logging.getLogger(name=__name__)
+
+
+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.error_cb = kwargs.pop(
+            'error_cb',
+            lambda exc: logger.error("%s", exc.message))
+        self.shutdown = threading.Event()
+
+        # XXX get provider passed here
+        provider = kwargs.pop('provider', None)
+        null_check(provider, 'provider')
+
+        eipconf = eipconfig.EIPConfig(domain=provider)
+        eipconf.load()
+        eipserviceconf = eipconfig.EIPServiceConfig(domain=provider)
+        eipserviceconf.load()
+
+        gw = eipconfig.get_eip_gateway(
+            eipconfig=eipconf,
+            eipserviceconfig=eipserviceconf)
+        self.checker = LeapNetworkChecker(
+            provider_gw=gw)
+
+    def start(self):
+        self.process_handle = self._launch_recurrent_network_checks(
+            (self.error_cb,))
+
+    def stop(self):
+        self.process_handle.join(timeout=0.1)
+        self.shutdown.set()
+        logger.debug("network checked stopped.")
+
+    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):
+        #TODO: replace this with waiting for a signal from openvpn
+        while True:
+            try:
+                self.checker.check_tunnel_default_interface()
+                break
+            except TunnelNotDefaultRouteError:
+                # XXX ??? why do we sleep here???
+                # aa: If the openvpn isn't up and running yet,
+                # let's give it a moment to breath.
+                #logger.error('NOT DEFAULT ROUTE!----')
+                # Instead of this, we should flag when the
+                # iface IS SUPPOSED to be up imo. -- kali
+                sleep(1)
+
+        fail_observer_dict = dict(((
+            observer,
+            process_events(observer)) for observer in fail_callbacks))
+
+        while not self.shutdown.is_set():
+            try:
+                self.checker.check_tunnel_default_interface()
+                self.checker.check_internet_connection()
+                sleep(ROUTE_CHECK_INTERVAL)
+            except Exception as exc:
+                for obs in fail_observer_dict:
+                    fail_observer_dict[obs].send(exc)
+                sleep(ROUTE_CHECK_INTERVAL)
+
+        #reset event
+        # I see a problem with this. You cannot stop it, it
+        # resets itself forever. -- kali
+
+        # XXX use QTimer for the recurrent triggers,
+        # and ditch the sleeps.
+        logger.debug('resetting event')
+        self.shutdown.clear()
+
+    def _launch_recurrent_network_checks(self, fail_callbacks):
+        # XXX reimplement using QTimer -- kali
+        watcher = launch_thread(
+            self._network_checks_thread,
+            (fail_callbacks,))
+        return watcher
-- 
cgit v1.2.3