diff options
| author | kali <kali@leap.se> | 2012-10-18 02:19:03 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-18 02:19:03 +0900 |
| commit | 17896b9f9cbfbca7bc0a0344050dddea8ba61880 (patch) | |
| tree | 47a708e0a77a176c414cee69ce3001f5af5c60dc /src/leap/eip/eipconnection.py | |
| parent | 28dcbfbc6e3a61d47c2a1218bce5d2693c77d04d (diff) | |
| parent | f6e900f024074435349eb778a2d89baed55e1e6c (diff) | |
Merge branch 'develop' into feature/generic-wizard
Diffstat (limited to 'src/leap/eip/eipconnection.py')
| -rw-r--r-- | src/leap/eip/eipconnection.py | 19 |
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): #""" |