summaryrefslogtreecommitdiff
path: root/src/leap/eip/eipconnection.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-10-18 02:15:39 +0900
committerkali <kali@leap.se>2012-10-18 02:15:39 +0900
commitf6e900f024074435349eb778a2d89baed55e1e6c (patch)
tree0c15d2ad81bc90d656c96e262ce62ad03ef9702f /src/leap/eip/eipconnection.py
parentf38e0eaf6aa23d06e7418bbb88a639f67888dc17 (diff)
parenta6c587edad293996e4015876d7e59432d6a4e8ea (diff)
Merge branch 'feature/detect_and_stop_vpn' into develop
Diffstat (limited to 'src/leap/eip/eipconnection.py')
-rw-r--r--src/leap/eip/eipconnection.py19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/leap/eip/eipconnection.py b/src/leap/eip/eipconnection.py
index fea830f3..f0e7861e 100644
--- a/src/leap/eip/eipconnection.py
+++ b/src/leap/eip/eipconnection.py
@@ -91,7 +91,8 @@ class EIPConnection(OpenVPNConnection):
"""
disconnects client
"""
- self._disconnect()
+ self.cleanup()
+ logger.debug("disconnect: clicked.")
self.status.change_to(self.status.DISCONNECTED)
def shutdown(self):
@@ -141,14 +142,14 @@ class EIPConnection(OpenVPNConnection):
# private methods
#
- def _disconnect(self):
- """
- private method for disconnecting
- """
- if self.subp is not None:
- logger.debug('disconnecting...')
- self.subp.terminate()
- self.subp = None
+ #def _disconnect(self):
+ # """
+ # private method for disconnecting
+ # """
+ # if self.subp is not None:
+ # logger.debug('disconnecting...')
+ # self.subp.terminate()
+ # self.subp = None
#def _is_alive(self):
#"""