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/eip/eipconnection.py     |  6 +++++-
 src/leap/eip/openvpnconnection.py | 26 +++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'src/leap/eip')

diff --git a/src/leap/eip/eipconnection.py b/src/leap/eip/eipconnection.py
index 540e7558..20b45e36 100644
--- a/src/leap/eip/eipconnection.py
+++ b/src/leap/eip/eipconnection.py
@@ -27,6 +27,8 @@ class StatusMixIn(object):
     # Should separate EIPConnectionStatus (self.status)
     # from the OpenVPN state/status command and parsing.
 
+    ERR_CONNREFUSED = False
+
     def connection_state(self):
         """
         returns the current connection state
@@ -49,7 +51,9 @@ class StatusMixIn(object):
             state = self.get_connection_state()
         except eip_exceptions.ConnectionRefusedError:
             # connection refused. might be not ready yet.
-            logger.warning('connection refused')
+            if not self.ERR_CONNREFUSED:
+                logger.warning('connection refused')
+                self.ERR_CONNREFUSED = True
             return
         if not state:
             #logger.debug('no state')
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py
index 233b9da3..a36d99de 100644
--- a/src/leap/eip/openvpnconnection.py
+++ b/src/leap/eip/openvpnconnection.py
@@ -92,14 +92,17 @@ class OpenVPNManagement(object):
             logger.error('socket error')
             self._close_management_socket(announce=False)
             return []
-        buf = self.tn.read_until(b"END", 2)
-        self._seek_to_eof()
-        blist = buf.split('\r\n')
-        if blist[-1].startswith('END'):
-            del blist[-1]
-            return blist
-        else:
-            return []
+        try:
+            buf = self.tn.read_until(b"END", 2)
+            self._seek_to_eof()
+            blist = buf.split('\r\n')
+            if blist[-1].startswith('END'):
+                del blist[-1]
+                return blist
+            else:
+                return []
+        except socket.error as exc:
+            logger.debug('socket error: %s' % exc.message)
 
     def _send_short_command(self, cmd):
         """
@@ -329,12 +332,12 @@ to be triggered for each one of them.
         #use _only_ signal_maps instead
 
         logger.debug('_launch_openvpn called')
-        logger.debug('watcher_cb: %s' % self.watcher_cb)
         if self.watcher_cb is not None:
             linewrite_callback = self.watcher_cb
         else:
             #XXX get logger instead
-            linewrite_callback = lambda line: logger.debug('watcher: %s' % line)
+            linewrite_callback = lambda line: logger.debug(
+                    'watcher: %s' % line)
 
         # the partial is not
         # being applied now because we're not observing the process
@@ -342,7 +345,8 @@ to be triggered for each one of them.
         # here since it will be handy for observing patterns in the
         # thru-the-manager updates (with regex)
         observers = (linewrite_callback,
-                     partial(lambda con_status, line: linewrite_callback, self.status))
+                     partial(lambda con_status,
+                             line: linewrite_callback, self.status))
         subp, watcher = spawn_and_watch_process(
             self.command,
             self.args,
-- 
cgit v1.2.3