From 348eb0852d6f1b8b2b72baba8a236bc30a6f2a4e Mon Sep 17 00:00:00 2001
From: antialias <antialias@leap.se>
Date: Fri, 16 Nov 2012 17:38:46 -0800
Subject: reads and searches for strings from openvpn logs via the management
 interface.

---
 src/leap/baseapp/eip.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/leap/baseapp')

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 41f4c541..f18a62e7 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -174,6 +174,10 @@ class EIPConductorAppMixin(object):
             self.tun_read_bytes.setText(tun_read)
             self.tun_write_bytes.setText(tun_write)
 
+        # connection information via management interface
+        log = self.conductor.get_log()
+        self.network_checker.parse_log(log)
+
     @QtCore.pyqtSlot()
     def start_or_stopVPN(self):
         """
-- 
cgit v1.2.3


From 14f433c16de60753d122d5946df68e8e82285ca3 Mon Sep 17 00:00:00 2001
From: antialias <antialias@leap.se>
Date: Mon, 19 Nov 2012 16:16:01 -0800
Subject: implemented abstracted layer with matching and passed callback. tests
 as well.

---
 src/leap/baseapp/eip.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/leap/baseapp')

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index f18a62e7..4fcbee3f 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -9,6 +9,7 @@ from leap.baseapp.dialogs import ErrorDialog
 from leap.baseapp import constants
 from leap.eip import exceptions as eip_exceptions
 from leap.eip.eipconnection import EIPConnection
+from leap.base.checks import EVENT_CONNECT_REFUSED
 
 logger = logging.getLogger(name=__name__)
 
@@ -176,7 +177,8 @@ class EIPConductorAppMixin(object):
 
         # connection information via management interface
         log = self.conductor.get_log()
-        self.network_checker.parse_log(log)
+        error_matrix = [(EVENT_CONNECT_REFUSED, (self.start_or_stopVPN, ))]
+        self.network_checker.checker.parse_log_and_react(log, error_matrix)
 
     @QtCore.pyqtSlot()
     def start_or_stopVPN(self):
-- 
cgit v1.2.3


From bf39c45eddc62733fdb72b4f46cdb81ec649cb30 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 16 Jan 2013 00:58:22 +0900
Subject: handle loss of tun iface

trigger only one dialog and disconnect.
additional cleanup of log handling.
---
 src/leap/baseapp/log.py     |  6 ++++--
 src/leap/baseapp/network.py | 24 +++++++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'src/leap/baseapp')

diff --git a/src/leap/baseapp/log.py b/src/leap/baseapp/log.py
index 95cfc918..e6a767fb 100644
--- a/src/leap/baseapp/log.py
+++ b/src/leap/baseapp/log.py
@@ -11,6 +11,7 @@ class LogPaneMixin(object):
     a simple log pane
     that writes new lines as they come
     """
+    EXCLUDES = ('MANAGEMENT',)
 
     def createLogBrowser(self):
         """
@@ -60,6 +61,7 @@ class LogPaneMixin(object):
         simple slot: writes new line to logger Pane.
         """
         msg = line[:-1]
-        if self.debugmode:
+        if self.debugmode and all(map(lambda w: w not in msg,
+                                      LogPaneMixin.EXCLUDES)):
             self.logbrowser.append(msg)
-        vpnlogger.info(msg)
+            vpnlogger.info(msg)
diff --git a/src/leap/baseapp/network.py b/src/leap/baseapp/network.py
index a33265e5..a67f6340 100644
--- a/src/leap/baseapp/network.py
+++ b/src/leap/baseapp/network.py
@@ -17,6 +17,8 @@ class NetworkCheckerAppMixin(object):
     initialize an instance of the Network Checker,
     which gathers error and passes them on.
     """
+    ERR_NETERR = False
+
     def __init__(self, *args, **kwargs):
         provider = kwargs.pop('provider', None)
         if provider:
@@ -41,11 +43,19 @@ class NetworkCheckerAppMixin(object):
         slot that receives a network exceptions
         and raises a user error message
         """
-        logger.debug('handling network exception')
-        logger.error(exc.message)
-        dialog = ErrorDialog(parent=self)
+        # FIXME this should not HANDLE anything after
+        # the network check thread has been stopped.
 
-        if exc.critical:
-            dialog.criticalMessage(exc.usermessage, "network error")
-        else:
-            dialog.warningMessage(exc.usermessage, "network error")
+        logger.debug('handling network exception')
+        if not self.ERR_NETERR:
+            self.ERR_NETERR = True
+
+            logger.error(exc.message)
+            dialog = ErrorDialog(parent=self)
+            if exc.critical:
+                dialog.criticalMessage(exc.usermessage, "network error")
+            else:
+                dialog.warningMessage(exc.usermessage, "network error")
+
+            self.start_or_stopVPN()
+            self.network_checker.stop()
-- 
cgit v1.2.3