TDE
/
kvpnc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvpnc
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix unintended rename of many various *klist*

Browse Source
pull/1/head
Slávek Banko 11 years ago
parent e469cf99a7
commit 810c0bcbd0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

16
src/kvpnc.cpp
Unescape View File

@ -13992,7 +13992,7 @@ void KVpnc::readFromStderr_ipsecwhack()
} }
} }
void KVpnc::readFromStdout_ipsecwhactdelisten() void KVpnc::readFromStdout_ipsecwhacklisten()
{ {
if ( IpsecWhackListenProcess == 0 || IpsecGotError ) if ( IpsecWhackListenProcess == 0 || IpsecGotError )
return; return;
@ -14142,7 +14142,7 @@ void KVpnc::readFromStdout_ipsecwhactdelisten()
} }
} }
void KVpnc::readFromStderr_ipsecwhactdelisten() void KVpnc::readFromStderr_ipsecwhacklisten()
{ {
bool abort = false; bool abort = false;
if ( IpsecWhackListenProcess ==0 || IpsecGotError ) if ( IpsecWhackListenProcess ==0 || IpsecGotError )
@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhactdelisten()
else else
{ {
// we have to give some time to sleep and try again... // we have to give some time to sleep and try again...
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
IpsecWhackListenProcess->tryTerminate(); IpsecWhackListenProcess->tryTerminate();
sleep ( 2 ); sleep ( 2 );
if ( IpsecWhackListenProcess->isRunning() ) if ( IpsecWhackListenProcess->isRunning() )
@ -21416,13 +21416,13 @@ void KVpnc::ipsecStarted()
IpsecWhackListenProcess->addArgument ( "whack" ); IpsecWhackListenProcess->addArgument ( "whack" );
IpsecWhackListenProcess->addArgument ( "--listen" ); IpsecWhackListenProcess->addArgument ( "--listen" );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
if ( !IpsecWhackListenProcess->start ( env ) ) if ( !IpsecWhackListenProcess->start ( env ) )
{ {
disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
delete IpsecWhackListenProcess; delete IpsecWhackListenProcess;
IpsecWhackListenProcess=0L; IpsecWhackListenProcess=0L;
KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) ); KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) );

4
src/kvpnc.h
Unescape View File

@ -381,8 +381,8 @@ private slots:
void readFromStderr_ipsec(); void readFromStderr_ipsec();
void readFromStdout_ipsecwhack(); void readFromStdout_ipsecwhack();
void readFromStderr_ipsecwhack(); void readFromStderr_ipsecwhack();
void readFromStdout_ipsecwhactdelisten(); void readFromStdout_ipsecwhacklisten();
void readFromStderr_ipsecwhactdelisten(); void readFromStderr_ipsecwhacklisten();
void readFromStdout_ipsecwhackstatus(); void readFromStdout_ipsecwhackstatus();
void readFromStderr_ipsecwhackstatus(); void readFromStderr_ipsecwhackstatus();
void readFromStdout_ipsecwhackdelete(); void readFromStdout_ipsecwhackdelete();

Write Preview
Loading…
Cancel
Save