summaryrefslogtreecommitdiff
path: root/src/leap/eip
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-17 05:54:16 +0900
committerkali <kali@leap.se>2013-01-17 05:55:01 +0900
commitd6c8cb0f12e8924820c296a8114a7899f61e5180 (patch)
tree203eee2a5cd90c12187007ba0a4bdd48243abd7d /src/leap/eip
parent68af5b2f807ac8acd9525d46d37cfd2a28a06b47 (diff)
(osx) detect which interface is traffic going thru
Diffstat (limited to 'src/leap/eip')
-rw-r--r--src/leap/eip/checks.py1
-rw-r--r--src/leap/eip/config.py2
-rw-r--r--src/leap/eip/openvpnconnection.py3
3 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py
index 9fb13c74..0d07ef08 100644
--- a/src/leap/eip/checks.py
+++ b/src/leap/eip/checks.py
@@ -187,7 +187,6 @@ class ProviderCertChecker(object):
def check_new_cert_needed(self, skip_download=False, verify=True):
# XXX add autocacert
- logger.debug('is new cert needed?')
if not self.is_cert_valid(do_raise=False):
logger.debug('cert needed: true')
self.download_new_client_cert(
diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py
index 6a19633d..a60d7ed5 100644
--- a/src/leap/eip/config.py
+++ b/src/leap/eip/config.py
@@ -253,7 +253,7 @@ def build_ovpn_options(daemon=False, socket_path=None, **kwargs):
#if daemon is True:
#opts.append('--daemon')
- logger.debug('vpn options: %s', opts)
+ logger.debug('vpn options: %s', ' '.join(opts))
return opts
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py
index a36d99de..e5169465 100644
--- a/src/leap/eip/openvpnconnection.py
+++ b/src/leap/eip/openvpnconnection.py
@@ -6,6 +6,7 @@ import logging
import os
import psutil
import shutil
+import select
import socket
from functools import partial
@@ -103,6 +104,8 @@ class OpenVPNManagement(object):
return []
except socket.error as exc:
logger.debug('socket error: %s' % exc.message)
+ except select.error as exc:
+ logger.debug('select error: %s' % exc.message)
def _send_short_command(self, cmd):
"""