summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Touceda <chiiph@leap.se>2013-06-19 15:35:39 -0300
committerTomas Touceda <chiiph@leap.se>2013-06-19 15:35:39 -0300
commit071119352a04698cf5dfaba0ae9c3827e016fb94 (patch)
tree17cf046493bb445bd696333c5ec69e89ea7bbdb1
parent5da08919eee9f8f1579e90016e11b0a55ec323af (diff)
parent9a725220c393f28c3be5bb0f894b9eb7cf9af2ad (diff)
Merge remote-tracking branch 'kali/bug/minor-ui-fixes-osx' into develop
-rw-r--r--src/leap/gui/statuspanel.py4
-rw-r--r--src/leap/services/eip/vpnlaunchers.py3
-rw-r--r--src/leap/services/eip/vpnprocess.py2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/leap/gui/statuspanel.py b/src/leap/gui/statuspanel.py
index 19f84d4c..62a22725 100644
--- a/src/leap/gui/statuspanel.py
+++ b/src/leap/gui/statuspanel.py
@@ -177,11 +177,11 @@ class StatusPanelWidget(QtGui.QWidget):
Updates the download/upload labels based on the data provided
by the VPN thread
"""
- upload = float(data[VPNManager.TUNTAP_WRITE_KEY])
+ upload = float(data[VPNManager.TUNTAP_WRITE_KEY] or "0")
upload = upload / 1000.0
upload_str = "%12.2f Kb" % (upload,)
self.ui.lblUpload.setText(upload_str)
- download = float(data[VPNManager.TUNTAP_READ_KEY])
+ download = float(data[VPNManager.TUNTAP_READ_KEY] or "0")
download = download / 1000.0
download_str = "%12.2f Kb" % (download,)
self.ui.lblDownload.setText(download_str)
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py
index af77c146..ef73ed94 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/services/eip/vpnlaunchers.py
@@ -478,7 +478,8 @@ class DarwinVPNLauncher(VPNLauncher):
gateway_selector = VPNGatewaySelector(eipconfig)
gateways = gateway_selector.get_gateways()
- logger.debug("Using gateways ips: {}".format(', '.join(gateways)))
+ logger.debug("Using gateways ips: {gw}".format(
+ gw=', '.join(gateways)))
for gw in gateways:
args += ['--remote', gw, '1194', 'udp']
diff --git a/src/leap/services/eip/vpnprocess.py b/src/leap/services/eip/vpnprocess.py
index f3443533..4b558160 100644
--- a/src/leap/services/eip/vpnprocess.py
+++ b/src/leap/services/eip/vpnprocess.py
@@ -288,7 +288,7 @@ class VPNManager(object):
self._tn.write("quit\n")
self._tn.read_all()
self._tn.get_socket().close()
- del self._tn
+ self._tn = None
def _connect_management(self, socket_host, socket_port):
"""