1 files changed, 30 insertions, 7 deletions
diff --git a/src/leap/base/network.py b/src/leap/base/network.py
index 3891b00a..d841e692 100644
--- a/src/leap/base/network.py
+++ b/src/leap/base/network.py
@@ -3,10 +3,11 @@ from __future__ import (print_function)
 import logging
 import threading
 
-from leap.eip.config import get_eip_gateway
+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
@@ -20,24 +21,34 @@ class NetworkCheckerThread(object):
     connection.
     """
     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.shutdown = threading.Event()
 
-        # XXX get provider_gateway and pass it to checker
-        # see in eip.config for function
-        # #718
+        # 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 = get_eip_gateway())
+            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.")
 
@@ -49,6 +60,7 @@ class NetworkCheckerThread(object):
     #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:
@@ -59,11 +71,15 @@ class NetworkCheckerThread(object):
                 # 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()
@@ -73,11 +89,18 @@ class NetworkCheckerThread(object):
                 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):
-        #we need to wrap the fail callback in a tuple
+        # XXX reimplement using QTimer -- kali
         watcher = launch_thread(
             self._network_checks_thread,
             (fail_callbacks,))