diff options
Diffstat (limited to 'src/kvpnc.cpp')
| -rw-r--r-- | src/kvpnc.cpp | 940 |
1 files changed, 470 insertions, 470 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index a0fa577..1307aba 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -280,8 +280,8 @@ KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : TDEMainWi } else { - DeleteSessionAction->setEnabled ( FALSE ); - ConnectAction->setEnabled ( FALSE ); + DeleteSessionAction->setEnabled ( false ); + ConnectAction->setEnabled ( false ); GlobalConfig->currentProfile = 0; } } @@ -428,7 +428,7 @@ void KVpnc::initView() connect ( mw->SessionCombo, TQ_SIGNAL ( activated ( const TQString & ) ), this, TQ_SLOT ( sessionToggled ( const TQString& ) ) ); - mw->SessionCombo->setEnabled ( FALSE ); + mw->SessionCombo->setEnabled ( false ); statusColorLabel = new TQLabel ( this ); disconnectedStatusPixmap = new TQPixmap ( 15, 15 ); @@ -488,9 +488,9 @@ void KVpnc::slotSettings() if ( GlobalConfig->AccountList->isEmpty() ) { // GlobalConfig->currentProfile = 0L; - mw->SessionCombo->setEnabled ( FALSE ); + mw->SessionCombo->setEnabled ( false ); ConnectAction->setEnabled ( false ); - mw->buttonConnect->setEnabled ( FALSE ); + mw->buttonConnect->setEnabled ( false ); mw->SessionCombo->clear(); } else @@ -2360,7 +2360,7 @@ void KVpnc::connectClicked() disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); - timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE ); + timer.start ( GlobalConfig->tryConnectTimeout * 1000, false ); } } } @@ -2856,7 +2856,7 @@ void KVpnc::connectClicked() } disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); - timer.start ( GlobalConfig->tryConnectTimeout * 1000, FALSE ); + timer.start ( GlobalConfig->tryConnectTimeout * 1000, false ); } else { @@ -3733,7 +3733,7 @@ void KVpnc::connectClicked() // iptables need the right interface (eth0:1 => eth0) TQString tmpInterface2 = ""; - int pointPos = tmpInterface.find ( ':', 0, FALSE ); + int pointPos = tmpInterface.find ( ':', 0, false ); if ( pointPos > 1 ) { tmpInterface2 = tmpInterface.left ( pointPos ); @@ -4984,7 +4984,7 @@ void KVpnc::connectClicked() if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) { TQString LocalID = GlobalConfig->currentProfile->getSpecialLocalID(); -// if (!LocalID.find( "@", 0 , FALSE ) > -1) +// if (!LocalID.find( "@", 0 , false ) > -1) // LocalID="@"+LocalID; if ( IpsecToolInfo->Version.contains ( "Openswan" , false ) ) { @@ -5060,7 +5060,7 @@ void KVpnc::connectClicked() // iptables need the right interface (eth0:1 => eth0) TQString tmpInterface2 = ""; - int pointPos = tmpInterface.find ( ':', 0, FALSE ); + int pointPos = tmpInterface.find ( ':', 0, false ); if ( pointPos > 1 ) { tmpInterface2 = tmpInterface.left ( pointPos ); @@ -6170,7 +6170,7 @@ void KVpnc::connectClicked() //connect ( PptpProcess, TQ_SIGNAL( processExited () ), this, TQ_SLOT( pppdStarted() ) ); // connect( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotConnectTimedOut() ) ); - // timer.start( tryConnectTimeout * 1000, FALSE ); + // timer.start( tryConnectTimeout * 1000, false ); //connect ( PptpProcess, TQ_SIGNAL ( processExited() ), this, TQ_SLOT ( pptpProcessExited() ) ); @@ -6667,14 +6667,14 @@ void KVpnc::connectClicked() int OpenvpnMinor = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",0,0 ).toInt(); TQString OpenvpnExtra=""; int OpenvpnExtraVer=0; - if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).find ( "_", 0, FALSE ) > -1 ) + if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).find ( "_", 0, false ) > -1 ) { - if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "beta", 0, FALSE ) > -1 ) + if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "beta", 0, false ) > -1 ) { OpenvpnExtra = "beta"; OpenvpnExtraVer = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).section ( "beta",1,1 ).toInt(); } - if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "rc", 0, FALSE ) > -1 ) + if ( OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).find ( "rc", 0, false ) > -1 ) { OpenvpnExtra = "rc"; OpenvpnExtraVer = OpenvpnToolInfo->Version.section ( ".",1,1 ).section ( "_",1,1 ).section ( "rc",1,1 ).toInt(); @@ -8782,7 +8782,7 @@ void KVpnc::disconnectClicked() { // iptables need the right interface (eth0:1 => eth0) TQString tmpInterface2 = ""; - int pointPos = tmpInterface.find ( ':', 0, FALSE ); + int pointPos = tmpInterface.find ( ':', 0, false ); if ( pointPos > 1 ) { tmpInterface2 = tmpInterface.left ( pointPos ); @@ -9884,7 +9884,7 @@ void KVpnc::disconnectClicked() { // iptables need the right interface (eth0:1 => eth0) TQString tmpInterface2 = ""; - int pointPos = tmpInterface.find ( ':', 0, FALSE ); + int pointPos = tmpInterface.find ( ':', 0, false ); if ( pointPos > 1 ) { tmpInterface2 = tmpInterface.left ( pointPos ); @@ -11473,7 +11473,7 @@ void KVpnc::readOutputFrom_vpnc() /* TMP !!!! */ // requesting group password - if ( ProcessMsg_connect.find ( "Enter IPSec secret", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Enter IPSec secret", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Group password requested, send it..." ), GlobalConfig->debug ); @@ -11494,7 +11494,7 @@ void KVpnc::readOutputFrom_vpnc() } // requesting password - else if ( ProcessMsg_connect.find ( "password for", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "password for", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "User password requested, send it..." ), GlobalConfig->debug ); @@ -11512,7 +11512,7 @@ void KVpnc::readOutputFrom_vpnc() //"Enter Username and Password" // requesting gatway - else if ( ProcessMsg_connect.find ( "Enter IPSec gateway address", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Enter IPSec gateway address", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec gateway address requested, send it..." ), GlobalConfig->debug ); @@ -11524,7 +11524,7 @@ void KVpnc::readOutputFrom_vpnc() // requesting IPSec ID //Enter IPSec ID for - else if ( ProcessMsg_connect.find ( "Enter IPSec ID", 0, FALSE ) > -1 || ProcessMsg_connect.find ( "Enter IPSec ID for", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Enter IPSec ID", 0, false ) > -1 || ProcessMsg_connect.find ( "Enter IPSec ID for", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "IPSec ID requested, send it..." ), GlobalConfig->debug ); @@ -11534,7 +11534,7 @@ void KVpnc::readOutputFrom_vpnc() } // requesting username - else if ( ( ProcessMsg_connect.find ( "Enter username for", 0, FALSE ) > -1 ) && !ProcessMsg_connect.find ( "Enter Username and Password", 0, FALSE ) > -1 ) + else if ( ( ProcessMsg_connect.find ( "Enter username for", 0, false ) > -1 ) && !ProcessMsg_connect.find ( "Enter Username and Password", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Username requested, send it..." ), GlobalConfig->debug ); @@ -11551,7 +11551,7 @@ void KVpnc::readOutputFrom_vpnc() } // using interface tun0 - else if ( ProcessMsg_connect.find ( "using interface", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "using interface", 0, false ) > -1 ) { VpncDevice = ProcessMsg_connect.section ( ' ', 2, 2 ); // using interface tun0 -> tun0 if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -11559,7 +11559,7 @@ void KVpnc::readOutputFrom_vpnc() } //got address 194.95.192.28 - else if ( ProcessMsg_connect.find ( "got address", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "got address", 0, false ) > -1 ) { // "got address 194.95.192.28" => "194.95.192.28" // TunnelInterfaceIP = ProcessMsg_connect.section ( '\n', 1, 1 ); @@ -11571,13 +11571,13 @@ void KVpnc::readOutputFrom_vpnc() } bool connectSuccess = false; - if ( ProcessMsg_connect.find ( "started in background", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "started in background", 0, false ) > -1 ) connectSuccess = true; - else if ( ProcessMsg_connect.find ( "started in foreground", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "started in foreground", 0, false ) > -1 ) connectSuccess = true; - else if ( ProcessMsg_connect.find ( "tun0", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "tun0", 0, false ) > -1 ) GlobalConfig->appendLogEntry ( i18n ( "line: %1" ).arg ( ProcessMsg_connect ), GlobalConfig->debug ); @@ -11593,7 +11593,7 @@ void KVpnc::readOutputFrom_vpnc() disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); connectSuccess = false; @@ -11625,7 +11625,7 @@ void KVpnc::readOutputFrom_vpnc() // this->GlobalConfig->appendLogEntry ( TQString ( "[vpnc err] " + ProcessMsg_connect ) , GlobalConfig->error); - if ( ProcessMsg_connect.find ( "AUTHENTICATION_FAILED", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "AUTHENTICATION_FAILED", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11639,7 +11639,7 @@ void KVpnc::readOutputFrom_vpnc() } // quick mode response rejected: (ISAKMP_N_INVALID_PAYLOAD_TYPE)(1) - if ( ProcessMsg_connect.find ( "quick mode response rejected:", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "quick mode response rejected:", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11653,7 +11653,7 @@ void KVpnc::readOutputFrom_vpnc() connectClicked(); } - if ( ProcessMsg_connect.find ( "authentication unsuccessful", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "authentication unsuccessful", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11669,7 +11669,7 @@ void KVpnc::readOutputFrom_vpnc() } // no ip for gateway - if ( ProcessMsg_connect.find ( "vpnc: unknown host `<Replace with your gateway IP address>' ", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "vpnc: unknown host `<Replace with your gateway IP address>' ", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11680,7 +11680,7 @@ void KVpnc::readOutputFrom_vpnc() } // no answer - if ( ProcessMsg_connect.find ( "no response from target", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "no response from target", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11691,7 +11691,7 @@ void KVpnc::readOutputFrom_vpnc() } // initalizing tunnel interface failed - if ( ProcessMsg_connect.find ( "can't initialise tunnel interface", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "can't initialise tunnel interface", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11703,7 +11703,7 @@ void KVpnc::readOutputFrom_vpnc() } // /dev/net/tun doesnt exist - if ( ProcessMsg_connect.find ( "can't open /dev/net/tun", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "can't open /dev/net/tun", 0, false ) > -1 ) { if ( doContinue ) { @@ -11714,7 +11714,7 @@ void KVpnc::readOutputFrom_vpnc() } // host unknown - if ( ProcessMsg_connect.find ( "unknown host" , 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "unknown host" , 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11725,7 +11725,7 @@ void KVpnc::readOutputFrom_vpnc() } //socket creation failed - if ( ProcessMsg_connect.find ( "making socket", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "making socket", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11735,7 +11735,7 @@ void KVpnc::readOutputFrom_vpnc() abort = true; } - if ( ProcessMsg_connect.find ( "receiving packet: Connection refused", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "receiving packet: Connection refused", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11746,7 +11746,7 @@ void KVpnc::readOutputFrom_vpnc() } // binding to port failed - if ( ProcessMsg_connect.find ( "binding to port", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Address already in use", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "binding to port", 0 , false ) > -1 || ProcessMsg_connect.find ( "Address already in use", 0 , false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11909,7 +11909,7 @@ void KVpnc::readOutputFrom_vpnc() } // binding to port 500: Address already in use - // if ( ProcessMsg_connect.find( "Address already in use", 0 , FALSE ) > -1 ) + // if ( ProcessMsg_connect.find( "Address already in use", 0 , false ) > -1 ) // { //int PortToListen = ProcessMsg_connect.section(' ',3,3).section(':',0,0).toInt(); // binding to port 500: Address already in use -> 500 @@ -11986,7 +11986,7 @@ void KVpnc::readOutputFrom_vpnc() // } - if ( ProcessMsg_connect.find ( "Network is unreachable", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Network is unreachable", 0 , false ) > -1 ) { timer.stop(); connectCounter=0; @@ -11997,7 +11997,7 @@ void KVpnc::readOutputFrom_vpnc() } - if ( ProcessMsg_connect.find ( "response was invalid",0 , FALSE ) > -1 && ProcessMsg_connect.find ( "ISAKMP_N_INVALID_EXCHANGE_TYPE", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "response was invalid",0 , false ) > -1 && ProcessMsg_connect.find ( "ISAKMP_N_INVALID_EXCHANGE_TYPE", 0, false ) > -1 ) { timer.stop(); connectCounter=0; @@ -12008,7 +12008,7 @@ void KVpnc::readOutputFrom_vpnc() doContinue = false; } - if ( ProcessMsg_connect.find ( "vpnc found running", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "vpnc found running", 0 , false ) > -1 ) { //KMessageBox::sorry( this, i18n( "vpnc is already running, kill it manually" ) ); //terminateConnection ( VpncProcess ); @@ -12023,7 +12023,7 @@ void KVpnc::readOutputFrom_vpnc() connectClicked(); } - if ( ProcessMsg_connect.find ( "Passcode for VPN", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Passcode for VPN", 0, false ) > -1 ) { if ( GlobalConfig->currentProfile->getUseXauthInteractive() ) { @@ -12048,7 +12048,7 @@ void KVpnc::readOutputFrom_vpnc() } } - if ( ProcessMsg_connect.find ( "Connect Banner", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Connect Banner", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnc] " + i18n ( "Connect banner recieved" ), GlobalConfig->debug ); @@ -12092,17 +12092,17 @@ void KVpnc::readOutputFrom_ciscovpnc() GlobalConfig->appendLogEntry ( TQString ( "[vpnclient raw]: " ) +ProcessMsg_connect , GlobalConfig->debug ); - if ( ProcessMsg_connect.find ( "illegal read", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "illegal read", 0 , false ) > -1 ) { } - else if ( ProcessMsg_connect.find ( "The profile specified could not be read.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "The profile specified could not be read.", 0 , false ) > -1 ) { KMessageBox::error ( 0,i18n ( "Profile missing. Please contact the KVpnc author." ),i18n ( "Profile missing" ) ); GlobalConfig->appendLogEntry ( i18n ( "Profile file missing. Please contact the KVpnc author." ),GlobalConfig->error ); abort=true; } - else if ( ProcessMsg_connect.find ( "Secure VPN Connection terminated locally by the Client", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Secure VPN Connection terminated locally by the Client", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Secure VPN connection terminated locally by the client." ),GlobalConfig->error ); terminatedByClient=true; @@ -12112,7 +12112,7 @@ void KVpnc::readOutputFrom_ciscovpnc() } // binding to port failed - if ( ProcessMsg_connect.find ( "bind: Address already in use", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "bind: Address already in use", 0 , false ) > -1 ) { // if ( GlobalConfig->KvpncDebugLevel > 0 ) // GlobalConfig->appendLogEntry( i18n( "Binding to port failed. Another vpnc is running, terminate it and try reconnect ." ), GlobalConfig->debug ); @@ -12134,7 +12134,7 @@ void KVpnc::readOutputFrom_ciscovpnc() abort = true; } - if ( ProcessMsg_connect.find ( "Reason: Failed to establish a VPN connection.", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Reason: Failed to establish a VPN connection.", 0 , false ) > -1 ) { if ( terminatedByClient ) { @@ -12144,19 +12144,19 @@ void KVpnc::readOutputFrom_ciscovpnc() } } - if ( ProcessMsg_connect.find ( "The VPN sub-system is busy or has failed.", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "The VPN sub-system is busy or has failed.", 0, false ) > -1 ) { abort = true; } - else if ( ProcessMsg_connect.find ( "Reason: Remote peer is no longer responding.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Reason: Remote peer is no longer responding.", 0 , false ) > -1 ) { KMessageBox::error ( 0,i18n ( "Timeout while connecting to %1." ).arg ( GlobalConfig->currentProfile->getGateway(),i18n ( "Connection terminated" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Timeout while connecting to %1." ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->error ); abort=true; } - if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "There is already an instance of %1 running!" ).arg ( "vpnclient" ) ); GlobalConfig->appendLogEntry ( i18n ( "There is already an instance of %1 running!" ).arg ( "vpnclient" ) , GlobalConfig->error ); @@ -12164,7 +12164,7 @@ void KVpnc::readOutputFrom_ciscovpnc() } // requesting username - if ( ProcessMsg_connect.find ( "Username [", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Username [", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Username requested, send it...\n" ), GlobalConfig->debug ); @@ -12180,7 +12180,7 @@ void KVpnc::readOutputFrom_ciscovpnc() } // requesting password - if ( ProcessMsg_connect.find ( "Password [", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Password [", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -12199,7 +12199,7 @@ void KVpnc::readOutputFrom_ciscovpnc() CiscoVpncProcess->writeToStdin ( UserPassStr ); CiscoVpncProcess->writeToStdin ( "\n" ); } - if ( ProcessMsg_connect.find ( "Authenticating user.", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Authenticating user.", 0, false ) > -1 ) { if ( GlobalConfig->AuthRetryCount > 1 ) { @@ -12219,13 +12219,13 @@ void KVpnc::readOutputFrom_ciscovpnc() GlobalConfig->AuthRetryCount++; } } - if ( ProcessMsg_connect.find ( "Save Password (Y/N)", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Save Password (Y/N)", 0, false ) > -1 ) { CiscoVpncProcess->writeToStdin ( "Y" ); CiscoVpncProcess->writeToStdin ( "\n" ); } - if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Reason: A connection is already in the process of being established.", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Reason: A connection is already in the process of being established." ) ); GlobalConfig->appendLogEntry ( i18n ( "Reason: A connection is already in the process of being established." ) , GlobalConfig->error ); @@ -12233,7 +12233,7 @@ void KVpnc::readOutputFrom_ciscovpnc() } // requesting certificate password - if ( ProcessMsg_connect.find ( "Enter Certificate password:",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Enter Certificate password:",0,false ) > -1 ) { if ( GlobalConfig->VpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[vpnclient] " + i18n ( "Certificate password requested, send it...\n" ), GlobalConfig->debug ); @@ -12315,7 +12315,7 @@ void KVpnc::readOutputFrom_ciscovpnc() } } - if ( ProcessMsg_connect.find ( "Reason: User authentication failed.", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Reason: User authentication failed.", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error ); @@ -12327,10 +12327,10 @@ void KVpnc::readOutputFrom_ciscovpnc() connectClicked(); } - if ( ProcessMsg_connect.find ( "Your VPN connection is secure.", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Your VPN connection is secure.", 0, false ) > -1 ) connectSuccess = true; - if ( ProcessMsg_connect.find ( "Client address: ", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Client address: ", 0, false ) > -1 ) { // NetworkInterface iface ( GlobalConfig, parent ); // TunnelInterfaceIP = iface.getInterfaceIP ( CiscoVpncDevice ); @@ -12342,28 +12342,28 @@ void KVpnc::readOutputFrom_ciscovpnc() } - if ( ProcessMsg_connect.find ( "VPN tunnel information:",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "VPN tunnel information:",0,false ) > -1 ) { // Client address: 192.168.201.59 } - if ( ProcessMsg_connect.find ( "Local LAN Access is disabled",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Local LAN Access is disabled",0,false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Local LAN access is disabled (forced by server). This means you cant access to your local LAN." ), KVpncConfig::info ); } - if ( ProcessMsg_connect.find ( "Local LAN Access is enabled",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Local LAN Access is enabled",0,false ) > -1 ) { // GlobalConfig->appendLogEntry ( i18n ( "Local LAN access is enabled." ).arg ( PrivKeyPassStr ), KVpncConfig::info ); } - if ( ProcessMsg_connect.find ( "Encryption:",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Encryption:",0,false ) > -1 ) { TQString Encryption = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace(); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Encrypion algorithm used: %1" ).arg ( Encryption ),GlobalConfig->debug ); } - if ( ProcessMsg_connect.find ( "Authentication:",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Authentication:",0,false ) > -1 ) { TQString Authentication = ProcessMsg_connect.section ( ':',1,1 ).stripWhiteSpace(); if ( GlobalConfig->KvpncDebugLevel > 2 ) @@ -12383,7 +12383,7 @@ void KVpnc::readOutputFrom_ciscovpnc() disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); connectSuccess = false; GlobalConfig->AuthRetryCount=0; @@ -12470,16 +12470,16 @@ void KVpnc::readFromStdout_racoon() // // if ( GlobalConfig->KvpncDebugLevel > 0 ) // // mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect ); // - // if ( ProcessMsg_connect.find( "time=", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "time=", 0, false ) > -1 ) { // GlobalConfig->appendLogEntry( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); - // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, FALSE ) > -1 ) { + // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, false ) > -1 ) { // GlobalConfig->appendLogEntry( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); // } else { - // if ( ProcessMsg_connect.find( "failed to bind", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "failed to bind", 0, false ) > -1 ) { // KMessageBox::error( this, i18n( "Binding interface failed!" ) ); // GlobalConfig->appendLogEntry( i18n( "Binding interface failed!" ) , GlobalConfig->error ); // } - // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, false ) > -1 ) { // KMessageBox::error( this, i18n( "Destination host is unreachable!" ) ); // GlobalConfig->appendLogEntry( i18n( "Destination host is unreachable!" ) , GlobalConfig->error ); // } @@ -12494,14 +12494,14 @@ void KVpnc::readFromStdout_racoon() -// if (ProcessMsg_connect.find ( "ERROR: ", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , FALSE ) > -1 ) +// if (ProcessMsg_connect.find ( "ERROR: ", 0 , false ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , false ) > -1 ) // { // KMessageBox::error( this, i18n( "Algorithm mismatched, please select another one." ) ); // GlobalConfig->appendLogEntry ( i18n ( "[racoon err]: algorithm mismatched, please select another one." ) , GlobalConfig->error ); // abort = true; // } - if ( ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "STATE: phase1 up", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , false ) > -1 || ProcessMsg_connect.find ( "STATE: phase1 up", 0 , false ) > -1 ) { if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::racoon ) { @@ -12521,7 +12521,7 @@ void KVpnc::readFromStdout_racoon() } doPingKickupTunnel(); } - else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , false ) > -1 ) { racoon_tunnel_state++; if ( racoon_tunnel_state== 2 ) @@ -12552,7 +12552,7 @@ void KVpnc::readFromStdout_racoon() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); doIptablesRacoon(); @@ -12573,7 +12573,7 @@ void KVpnc::readFromStdout_racoon() } } - else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , false ) > -1 ) { //KMessageBox::error ( this, i18n ( "Phase1 expired, shutting down tunnel..." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase1 expired, shutting down tunnel..." ) , GlobalConfig->info ); @@ -12581,16 +12581,16 @@ void KVpnc::readFromStdout_racoon() } // if ( pingtest ) { // // mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect ); - // if ( ProcessMsg_connect.find( "time=", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "time=", 0, false ) > -1 ) { // GlobalConfig->appendLogEntry( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); - // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, FALSE ) > -1 ) { + // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, false ) > -1 ) { // GlobalConfig->appendLogEntry( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); // } else { - // if ( ProcessMsg_connect.find( "failed to bind", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "failed to bind", 0, false ) > -1 ) { // KMessageBox::error( this, i18n( "Binding interface failed!" ) ); // GlobalConfig->appendLogEntry( i18n( "Binding interface failed!" ) , GlobalConfig->error ); // } - // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, false ) > -1 ) { // KMessageBox::error( this, i18n( "Destination host is unreachable!" ) ); // GlobalConfig->appendLogEntry( i18n( "Destination host is unreachable!" ) , GlobalConfig->error ); // } @@ -12598,7 +12598,7 @@ void KVpnc::readFromStdout_racoon() // } // binding to port failed - if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1 ) { if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) @@ -12743,7 +12743,7 @@ void KVpnc::readFromStderr_racoon() // binding to port failed - if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1 ) { if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) @@ -12861,97 +12861,97 @@ void KVpnc::readFromStderr_racoon() } } - else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Bad proposal from peer reported." ) ); GlobalConfig->appendLogEntry ( i18n ( "Bad proposal from peer reported, aborting." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: fatal BAD-PROPOSAL-SYNTAX", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Bad proposal from peer reported." ) ); GlobalConfig->appendLogEntry ( i18n ( "Bad proposal from peer reported, aborting." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "The pre shared key couldn't not found, check PSK settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "PSK is missing, aborting." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "failed to process packet" ) ); GlobalConfig->appendLogEntry ( i18n ( "failed to process packet" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: reject the packet, received unexpecting payload type 0" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "ERROR: unknown notify message, no phase2 handle found. " ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: unknown notify message, no phase2 handle found. " ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: phase2 negotiation failed due to time up waiting for phase1" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "ERROR: the peer's certificate is not verified" ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: the peer's certificate is not verified" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , false ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "ERROR: fatal parse failure" ) ); KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Wrong file permission. Aborting." ) ); GlobalConfig->appendLogEntry ( i18n ( "Wrong file permission. Aborting." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , false ) > -1 ) { racoon_tunnel_state++; if ( racoon_tunnel_state== 1 ) @@ -12992,7 +12992,7 @@ void KVpnc::readFromStderr_racoon() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); doIptablesRacoon(); @@ -13013,33 +13013,33 @@ void KVpnc::readFromStderr_racoon() } } - else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[racoon err] " + i18n ( "setting route failed: route still exists" ), GlobalConfig->error ); } - else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[racoon err] " + i18n ( "deleting route failed: route dont exists" ), GlobalConfig->error ); } - else if ( ProcessMsg_connect.find ( "fatal parse failure", 0, FALSE ) > -1 || ProcessMsg_connect.find ( "failed to parse configuration file", 0, FALSE ) > -1 || ProcessMsg_connect.find ( "fatal parse failure", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "fatal parse failure", 0, false ) > -1 || ProcessMsg_connect.find ( "failed to parse configuration file", 0, false ) > -1 || ProcessMsg_connect.find ( "fatal parse failure", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "racoon" ) ); GlobalConfig->appendLogEntry ( i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "racoon" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: ", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: ", 0 , false ) > -1 && ProcessMsg_connect.find ( "algorithm mismatched", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Algorithm mismatched, please select another one." ) ); GlobalConfig->appendLogEntry ( i18n ( "[racoon err]: algorithm mismatched, please select another one." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , false ) > -1 ) { //KMessageBox::error ( this, i18n ( "racoonctl: Peer not responding" ) ); GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Peer not responding" ) , GlobalConfig->error ); @@ -13047,16 +13047,16 @@ void KVpnc::readFromStderr_racoon() } // if ( pingtest ) { // // mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect ); - // if ( ProcessMsg_connect.find( "time=", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "time=", 0, false ) > -1 ) { // GlobalConfig->appendLogEntry( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); - // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, FALSE ) > -1 ) { + // } else if ( ProcessMsg_connect.find( "100 % packet loss", 0, false ) > -1 ) { // GlobalConfig->appendLogEntry( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); // } else { - // if ( ProcessMsg_connect.find( "failed to bind", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "failed to bind", 0, false ) > -1 ) { // KMessageBox::error( this, i18n( "Binding interface failed!" ) ); // GlobalConfig->appendLogEntry( i18n( "Binding interface failed!" ) , GlobalConfig->error ); // } - // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, FALSE ) > -1 ) { + // if ( ProcessMsg_connect.find( "Destination Host Unreachable", 0, false ) > -1 ) { // KMessageBox::error( this, i18n( "Destination host is unreachable!" ) ); // GlobalConfig->appendLogEntry( i18n( "Destination host is unreachable!" ) , GlobalConfig->error ); // } @@ -13095,7 +13095,7 @@ void KVpnc::readFromStderr_racoon_helper() bool wrong_algo=false; - if ( ProcessMsg_connect.find ( "libipsec: syntax error while parsing", 0, FALSE ) > -1 && !wrong_algo ) + if ( ProcessMsg_connect.find ( "libipsec: syntax error while parsing", 0, false ) > -1 && !wrong_algo ) { KMessageBox::error ( this, i18n ( "Error in generated configuration file for \%1\", please contact KVpnc team." ).arg ( "setkey" ) ); GlobalConfig->appendLogEntry ( i18n ( "libipsec has found syntax error while parsing." ) , GlobalConfig->error ); @@ -13141,18 +13141,18 @@ void KVpnc::readFromStdout_ipsec() // if ( GlobalConfig->KvpncDebugLevel > 0 ) // mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect ); - if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); } - else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 ) { NormalMsg = false; GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); } else { - if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 ) { NormalMsg = false; KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) ); @@ -13163,7 +13163,7 @@ void KVpnc::readFromStdout_ipsec() else { // FATAL ERROR: - if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, false ) > -1 ) { TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); @@ -13183,7 +13183,7 @@ void KVpnc::readFromStdout_ipsec() IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "error fetching interface information: Device not found", 0, false ) > -1 ) { TQString interfacemissing = ProcessMsg_connect.section(" ", 1,1).replace(':', ""); KMessageBox::error ( this, i18n ( "Specified network device (%1) does not exist. Please specifiy an existing device or default at settings." ).arg(interfacemissing) ); @@ -13192,7 +13192,7 @@ void KVpnc::readFromStdout_ipsec() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "apparently already active", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ipsec_setup: Openswan IPsec apparently already active, start aborted", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "apparently already active", 0 , false ) > -1 || ProcessMsg_connect.find ( "ipsec_setup: Openswan IPsec apparently already active, start aborted", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) ); GlobalConfig->appendLogEntry ( i18n ( "Openswan seems still running, restart it." ) , GlobalConfig->info ); @@ -13204,7 +13204,7 @@ void KVpnc::readFromStdout_ipsec() ipsecStarted(); } - else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "No default route found, nessesary for %1!" ).arg ( IpsecType ) , GlobalConfig->error ); @@ -13253,7 +13253,7 @@ void KVpnc::readFromStderr_ipsec() ProcessMsg_connect = IpsecStartProcess->readLineStderr(); // TQString ProcessMsg_connect = TQString( IpsecStartProcess->readStderr() ); - if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ( "FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, false ) > -1 ) { TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); @@ -13272,7 +13272,7 @@ void KVpnc::readFromStderr_ipsec() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) , GlobalConfig->error ); @@ -13280,31 +13280,31 @@ void KVpnc::readFromStderr_ipsec() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "SIOCADDRT: File exists", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ipsec err] "+i18n ( "setting route failed: route still exists" ), GlobalConfig->error ); // abort=true; } - else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "SIOCDELRT: File exists", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "deleting route failed: route dont exists" ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "we only support version 2", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "we only support version 2", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "only version 2.x is supported " ), GlobalConfig->error ); abort = true; IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "error loading RSA private key file", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "error loading RSA private key file", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "RSA private key file could not be loaded." ), GlobalConfig->error ); abort = true; IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "unable to start strongSwan -- fatal errors in config", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "unable to start strongSwan -- fatal errors in config", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Unable to start strongSwan -- fatal errors in config. Please contact the KVpnc author." ) ); GlobalConfig->appendLogEntry ( "[ipsec err] " + i18n ( "Unable to start strongSwan -- fatal errors in config. Please contact the KVpnc author." ), GlobalConfig->error ); @@ -13312,11 +13312,11 @@ void KVpnc::readFromStderr_ipsec() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "Starting strongSwan", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Starting strongSwan", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ipsec] " + ProcessMsg_connect, GlobalConfig->info ); } - else if ( ProcessMsg_connect.find ( "apparently already active", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Openswan IPsec apparently already active, start aborted", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "apparently already active", 0 , false ) > -1 || ProcessMsg_connect.find ( "Openswan IPsec apparently already active, start aborted", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) ); GlobalConfig->appendLogEntry ( i18n ( "Openswan seems still running, restart it." ) , GlobalConfig->error ); @@ -13330,22 +13330,22 @@ void KVpnc::readFromStderr_ipsec() else if ( pingtest ) { // mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect ); - if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); } - else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); } else { - if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Binding interface failed!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error ); } - if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error ); @@ -13379,7 +13379,7 @@ void KVpnc::readFromStdout_ipsecwhack() bool ErrorMsg = false; bool abort = false; - if ( ProcessMsg_connect.find ( "encountered fatal error in state STATE_XAUTH", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "encountered fatal error in state STATE_XAUTH", 0 , false ) > -1 ) { // xauth failed openswan ErrorMsg=true; @@ -13390,7 +13390,7 @@ void KVpnc::readFromStdout_ipsecwhack() disconnectClicked(); connectClicked(); } - else if ( ProcessMsg_connect.find ( "extended authentication failed", 0 , FALSE ) > -1 || ( GlobalConfig->WaitingForXauth==true && ProcessMsg_connect.find ( "expected ISAKMP_CFG_SET, got ISAKMP_CFG_REQUEST", 0 , FALSE ) > -1 ) ) + else if ( ProcessMsg_connect.find ( "extended authentication failed", 0 , false ) > -1 || ( GlobalConfig->WaitingForXauth==true && ProcessMsg_connect.find ( "expected ISAKMP_CFG_SET, got ISAKMP_CFG_REQUEST", 0 , false ) > -1 ) ) { // xauth failed strongswan KMessageBox::error ( this, i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "XAUTH" ) ) ); @@ -13400,14 +13400,14 @@ void KVpnc::readFromStdout_ipsecwhack() disconnectClicked(); connectClicked(); } - else if ( ProcessMsg_connect.find ( "Can't authenticate: no preshared key found", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Can't authenticate: no preshared key found", 0 , false ) > -1 ) { ErrorMsg=true; abort=true; KMessageBox::error ( this, i18n ( "Preshared key not found for connection." ) ); GlobalConfig->appendLogEntry ( i18n ( "Preshared key not found for connection." ) , GlobalConfig->error ); } - else if ( ProcessMsg_connect.find ( "prompt for Username:", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "prompt for Username:", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "XAUTH username requested, send it..." ) , GlobalConfig->debug ); @@ -13417,7 +13417,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackProcess->writeToStdin ( GlobalConfig->TmpUsername+"\n" ); } - else if ( ProcessMsg_connect.find ( "prompt for Password:", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "prompt for Password:", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "XAUTH password requested, send it..." ) , GlobalConfig->debug ); @@ -13426,7 +13426,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackProcess->writeToStdin ( GlobalConfig->TmpPassword+"\n" ); } - else if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , false ) > -1 ) { // strongswan after ipsec whack --listen /* disconnect ( IpsecWhackProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readFromStdout_ipsecwhack() ) ); @@ -13461,7 +13461,7 @@ void KVpnc::readFromStdout_ipsecwhack() GlobalConfig->appendLogEntry ( i18n ( "\"%1\" started." ).arg ( GlobalConfig->pathToIpsec+" whack --name "+GlobalConfig->currentProfile->getName() +" --initiate" ), GlobalConfig->debug ); } } - else if ( ProcessMsg_connect.find ( "added connection", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "added connection", 0 , false ) > -1 ) { // XAUTH if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) @@ -13508,15 +13508,15 @@ void KVpnc::readFromStdout_ipsecwhack() } } - else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Authentication succeded." ) , GlobalConfig->info ); } - else if ( ProcessMsg_connect.find ( "parsing XAUTH status", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "parsing XAUTH status", 0 , false ) > -1 ) { GlobalConfig->WaitingForXauth=true; } - else if ( ProcessMsg_connect.find ( "added connection", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "added connection", 0 , false ) > -1 ) { // XAUTH if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::freeswan && GlobalConfig->currentProfile->getAuthWithUsernameAndPassword() ) @@ -13563,7 +13563,7 @@ void KVpnc::readFromStdout_ipsecwhack() } } - else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , false ) > -1 ) { if (IpsecPhase2Up) @@ -13589,15 +13589,15 @@ void KVpnc::readFromStdout_ipsecwhack() } } - else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , false ) > -1 ) { ipsecPhase2Established(); } - else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "XAUTH: Successfully Authenticated", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Authentication succeded." ) , GlobalConfig->info ); } - else if ( ProcessMsg_connect.find ( "apparently already active", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "apparently already active", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Openswan seems still running, restart it." ) ); GlobalConfig->appendLogEntry ( i18n ( "Openswan seems still running, restart it." ) , GlobalConfig->info ); @@ -13608,7 +13608,7 @@ void KVpnc::readFromStdout_ipsecwhack() if ( !IpsecGotError) ipsecStarted(); } - else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "No default route found, nessesary for %1!" ).arg ( IpsecType ) , GlobalConfig->error ); @@ -13617,7 +13617,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13629,7 +13629,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13641,7 +13641,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13653,7 +13653,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13665,7 +13665,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13677,7 +13677,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Private key could not be found. Please check certificate settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "Private key could not be found. Please check certificate settings." ) , GlobalConfig->error ); @@ -13685,7 +13685,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , false ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) , GlobalConfig->error ); @@ -13693,13 +13693,13 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , false ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) ); GlobalConfig->appendLogEntry ( i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , false ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , false ) > -1 ) { TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 ); TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 ); @@ -13725,7 +13725,7 @@ void KVpnc::readFromStdout_ipsecwhack() } } } - else if ( ProcessMsg_connect.find ( "no connection named", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "no connection named", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Connection not found. This seems like the configuration is invalid or too fast connect/disconnect." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection not found. This seems like the configuration is invalid or too fast connect/disconnect." ) , GlobalConfig->error ); @@ -13733,7 +13733,7 @@ void KVpnc::readFromStdout_ipsecwhack() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "deleting state (STATE_QUICK_I1)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "deleting state (STATE_QUICK_I1)", 0 , false ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I3)", 0 , false ) > -1 || ProcessMsg_connect.find ( "deleting state (STATE_MAIN_I2)", 0 , false ) > -1 ) { //KMessageBox::error ( this, i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 was deleted. Disconnecting." ).arg ( IpsecType ) , GlobalConfig->error ); @@ -13784,7 +13784,7 @@ void KVpnc::readFromStderr_ipsecwhack() GlobalConfig->appendLogEntry ( "[ipsec whack err] " + ProcessMsg_connect, GlobalConfig->error ); // // binding to port failed -// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 ) +// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 ) // { // if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_ipsec ) @@ -13851,7 +13851,7 @@ void KVpnc::readFromStderr_ipsecwhack() // } - if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ( "Address already in use", 0, false ) > -1 ) { TQString NameAndPid = Utils ( GlobalConfig ).getNameAndPidOfProgramListen ( 500 ); GlobalConfig->appendLogEntry ( i18n ( "NameAndPid: %1" ).arg ( NameAndPid ) , GlobalConfig->debug ); @@ -13869,14 +13869,14 @@ void KVpnc::readFromStderr_ipsecwhack() abort = true; } - else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "no default route, %defaultroute cannot cope!!!", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "No default route found, nesessary for %1!" ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "No default route found, nessesary for %1!" ).arg ( IpsecType ) , GlobalConfig->error ); abort = true; ErrorMsg = true; } - else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ignoring informational payload, type NO_PROPOSAL_CHOSEN", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13886,7 +13886,7 @@ void KVpnc::readFromStderr_ipsecwhack() stopContinue = true; } } - else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "perhaps peer likes no proposal", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13896,7 +13896,7 @@ void KVpnc::readFromStderr_ipsecwhack() stopContinue = true; } } - else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "INVALID_ID_INFORMATION", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13908,7 +13908,7 @@ void KVpnc::readFromStderr_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "cannot initiate connection with ID wildcards", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13920,7 +13920,7 @@ void KVpnc::readFromStderr_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Can not opportunistically initiate", 0 , false ) > -1 ) { if ( !stopContinue ) { @@ -13932,7 +13932,7 @@ void KVpnc::readFromStderr_ipsecwhack() IpsecWhackStatusTimer.stop(); } } - else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "unable to locate my private key", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Private key could not be found. Please check certificate settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "Private key could not be found. Please check certificate settings." ) , GlobalConfig->error ); @@ -13940,7 +13940,7 @@ void KVpnc::readFromStderr_ipsecwhack() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "SMARTCARD support is deactivated in pluto/Makefile", 0 , false ) > -1 || ProcessMsg_connect.find ( "Smartcard not supported", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) ); GlobalConfig->appendLogEntry ( i18n ( "SMARTCARD support is deactivated. Please enable smartcard support in %1 package" ).arg ( IpsecType ) , GlobalConfig->error ); @@ -13948,13 +13948,13 @@ void KVpnc::readFromStderr_ipsecwhack() IpsecGotError = true; IpsecWhackStatusTimer.stop(); } - else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Unsupported card", 0 , false ) > -1 && ProcessMsg_connect.find ( "pkcs15", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) ); GlobalConfig->appendLogEntry ( i18n ( "Unsupported card found. Please use a smartcard with openct support. This is a Openswan limitation, sorry." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , FALSE ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "we require peer to have ID", 0 , false ) > -1 && ProcessMsg_connect.find ( "but peer declares", 0 , false ) > -1 ) { TQString PeerID = ProcessMsg_connect.section ( '\'', 3, 3 ); TQString OurID = ProcessMsg_connect.section ( '\'', 1, 1 ); @@ -14008,13 +14008,13 @@ void KVpnc::readFromStdout_ipsecwhacklisten() if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + ProcessMsg_connect, GlobalConfig->debug ); - if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + i18n ( "Listen was successful." ), GlobalConfig->debug ); start_ipsec_initiate(); } - else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , false ) > -1 ) { timer.stop(); @@ -14048,7 +14048,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten() doPingKickupTunnel(); } - else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , false ) > -1 ) { timer.stop(); IpsecWhackStatusTimer.stop(); @@ -14095,7 +14095,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); @@ -14155,7 +14155,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten() // GlobalConfig->appendLogEntry ( "[ipsec whack listen err] " + ProcessMsg_connect, GlobalConfig->error ); - if ( ProcessMsg_connect.find ( "Pluto is not running", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Pluto is not running", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ipsec whack listen " + i18n ( "Waiting for pluto" ), GlobalConfig->debug ); if ( connectCounter > 25 ) @@ -14183,7 +14183,7 @@ void KVpnc::readFromStderr_ipsecwhacklisten() } return; } - if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "listening for IKE messages", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( "[ipsec whack listen] " + i18n ( "Listen was successful." ), GlobalConfig->debug ); @@ -14226,10 +14226,10 @@ void KVpnc::readFromStdout_ipsecwhackstatus() if ( GlobalConfig->KvpncDebugLevel > 5 ) GlobalConfig->appendLogEntry ( "[ipsec whack status] " + ProcessMsg_connect, GlobalConfig->debug ); - if ( ProcessMsg_connect.find ( TQString ( GlobalConfig->currentProfile->getName() ), 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( TQString ( GlobalConfig->currentProfile->getName() ), 0, false ) > -1 ) { - if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ISAKMP SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "transition from state STATE_QUICK_I1 to state STATE_QUICK_I2", 0 , false ) > -1 ) { timer.stop(); @@ -14265,7 +14265,7 @@ void KVpnc::readFromStdout_ipsecwhackstatus() doPingKickupTunnel(); } - else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "IPsec SA established", 0 , false ) > -1 ) { ipsecPhase2Established(); } @@ -14308,7 +14308,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus() ProcessMsg_connect = IpsecWhackStatusProcess->readLineStderr(); // TQString ProcessMsg_connect = TQString( IpsecWhackStatusProcess->readStderr() ); -// if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1|| ProcessMsg_connect.find ("FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, FALSE ) > -1 ) +// if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1|| ProcessMsg_connect.find ("FATAL ERROR: bind() failed in find_raw_ifaces(). Errno 98: Address already in use", 0, false ) > -1 ) // { // // } @@ -14321,7 +14321,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus() GlobalConfig->appendLogEntry ( "[ipsec whack status err] " + ProcessMsg_connect, GlobalConfig->error ); - if ( ProcessMsg_connect.find ( "Pluto is not running", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Pluto is not running", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "ipsec daemon is not running, restarting it..." ), GlobalConfig->info ); startStopIpsec ( true ); @@ -14336,7 +14336,7 @@ void KVpnc::readFromStderr_ipsecwhackstatus() { GlobalConfig->appendLogEntry ( "[ipsec whack status err] " + ProcessMsg_connect, GlobalConfig->error ); - if ( ProcessMsg_connect.find ( "Pluto is not running", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Pluto is not running", 0, false ) > -1 ) { if ( !IpsecStartingInProgress ) { @@ -14424,7 +14424,7 @@ void KVpnc::readFromStdout_tail_racoon() bool abort = false; bool error_found = false; - if ( ProcessMsg_connect.find ( "ERROR", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ERROR", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( "[racoon tail err] " + ProcessMsg_connect, GlobalConfig->error ); } @@ -14432,13 +14432,13 @@ void KVpnc::readFromStdout_tail_racoon() { if ( GlobalConfig->KvpncDebugLevel > 3 ) { - if ( ProcessMsg_connect.find ( "ERROR", 0 , FALSE ) == -1 ) + if ( ProcessMsg_connect.find ( "ERROR", 0 , false ) == -1 ) GlobalConfig->appendLogEntry ( "[racoon tail] " + ProcessMsg_connect, GlobalConfig->debug ); } } // // binding to port failed -// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1) +// if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1) // { // // if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) @@ -14558,117 +14558,117 @@ void KVpnc::readFromStdout_tail_racoon() // // } - if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ERROR: failed to bind to address", 0 , false ) > -1 || ProcessMsg_connect.find ( "ERROR: no address could be bound.", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error ); abort=true; } - else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: couldn't find the pskey for", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "The pre shared key couldn't not found, check PSK settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "PSK is missing, aborting." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: failed to process packet.", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "failed to process packet" ) ); GlobalConfig->appendLogEntry ( i18n ( "failed to process packet" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed.", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: delete phase1 handle.", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: reject the packet, received unexpecting payload type 0", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: reject the packet, received unexpecting payload type 0" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: unknown notify message", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "ERROR: unknown notify message, no phase2 handle found. " ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: unknown notify message, no phase2 handle found. " ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: phase2 negotiation failed due to time up waiting for phase1", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: phase2 negotiation failed due to time up waiting for phase1" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: the peer's certificate is not verified", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "ERROR: the peer's certificate is not verified" ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: the peer's certificate is not verified" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: no configuration found for", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: no configuration found for", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "ERROR: no configuration found" ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: no configuration found" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: no peer's CERT payload found.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: no peer's CERT payload found.", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "ERROR: no peer's CERT payload found." ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: no peer's CERT payload found." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: failed to get subjectAltName", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: failed to get subjectAltName", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "ERROR: failed to get subjectAltName" ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: failed to get subjectAltName" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: such a cert type isn't supported:", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: such a cert type isn't supported:", 0 , false ) > -1 ) { ////KMessageBox::error( this, i18n( "ERROR: such a cert type isn't supported:" ) ); //GlobalConfig->appendLogEntry ( i18n ( "ERROR: such a cert type isn't supported:" ) , GlobalConfig->error ); // //abort = true; } - else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ignore information because ISAKMP-SAhas not been established yet.", 0 , false ) > -1 || ProcessMsg_connect.find ( "ignore information because ISAKMP-SA has not been established yet.", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "ERROR: fatal parse failure" ) ); KMessageBox::error ( this, i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 2 negotiation of IPSec connection has been failed. Please check encryption and hash algorithm." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "has weak file permission", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Wrong file permission. Aborting." ) ); GlobalConfig->appendLogEntry ( i18n ( "Wrong file permission. Aborting." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: fatal INVALID-ID-INFORMATION", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: fatal INVALID-ID-INFORMATION", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Peer refused ID settings. Please verify the local ID in racoon and remote network in Network - General settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "Peer refused ID settings. Please verify the local ID in racoon and remote network in Network - General settings." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "STATE: phase1 up", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "STATE: phase1 up", 0 , false ) > -1 || ProcessMsg_connect.find ( "ISAKMP-SA established", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Phase1 is now up." ) , GlobalConfig->debug ); @@ -14680,13 +14680,13 @@ void KVpnc::readFromStdout_tail_racoon() doAddRemoveVirtualIp("add"); } } - else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "STATE: phase1 down", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase1 negotiation failed due to time up." ) ); GlobalConfig->appendLogEntry ( i18n ( "ERROR: phase1 negotiation failed due to time up." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "IPsec-SA established", 0 , false ) > -1 || ProcessMsg_connect.find ( "STATE: upscript finished", 0 , false ) > -1 ) { racoon_tunnel_state++; if ( racoon_tunnel_state == 1 ) @@ -14857,7 +14857,7 @@ void KVpnc::readFromStdout_tail_racoon() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); @@ -14884,32 +14884,32 @@ void KVpnc::readFromStdout_tail_racoon() } } - else if ( ProcessMsg_connect.find ( "ISAKMP-SA expired", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ISAKMP-SA expired", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 3 ) GlobalConfig->appendLogEntry ( i18n ( "Phase1 expired" ) , GlobalConfig->debug ); abort = false; } - else if ( ProcessMsg_connect.find ( "Reading configuration from", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Reading configuration from", 0 , false ) > -1 ) { // GlobalConfig->appendLogEntry ( i18n ( "Reading configuration from got" ) , GlobalConfig->debug ); // sleep(3); // racoonStarted(); } - else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: none message must be encrypted", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) ); GlobalConfig->appendLogEntry ( i18n ( "Phase 1 negotiation of IPSec connection has been failed. Please check encryption of phase 1 and hash algorithm." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: fatal NO-PROPOSAL-CHOSEN", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: fatal NO-PROPOSAL-CHOSEN", 0 , false ) > -1 ) { if (!error_found) KMessageBox::error ( this, i18n ( "Wrong connection parameters used. Please verify the connection settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "Peer reported that we use wrong connection parameters." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , false ) > -1 ) { if (!error_found) KMessageBox::error ( this, i18n ( "Phase1 negotiation failed due to time up." ) ); @@ -14939,7 +14939,7 @@ void KVpnc::readFromStderr_tail_racoon() { GlobalConfig->appendLogEntry ( "[racoon tail err] " + ProcessMsg_connect, GlobalConfig->error ); } - if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ERROR: phase1 negotiation failed due to time up.", 0 , false ) > -1 ) { if (!error_found) KMessageBox::error ( this, i18n ( "Phase1 negotiation failed due to time up." ) ); @@ -14967,11 +14967,11 @@ void KVpnc::readFromStdout_racoonctl() { GlobalConfig->appendLogEntry ( "[racoonctl] " + ProcessMsg_connect, GlobalConfig->debug ); } - if ( ProcessMsg_connect.find ( "ERROR", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ERROR", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( "[racoonctl err] " + ProcessMsg_connect, GlobalConfig->error ); } - if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Racoon seem not running!" ) ); @@ -15008,19 +15008,19 @@ void KVpnc::readFromStdout_racoonctl() // abort =true; } - else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , false ) > -1 ) { //KMessageBox::error ( this, i18n ( "racoonctl: Cannot send combuf" ) ); GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Cannot send combuf" ) , GlobalConfig->error ); abort =true; } - else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Error: Peer not responding", 0 , false ) > -1 ) { //KMessageBox::error ( this, i18n ( "racoonctl: Peer not responding" ) ); GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Peer not responding" ) , GlobalConfig->error ); abort =true; } - if ( ProcessMsg_connect.find ( "Password:", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Password:", 0 , false ) > -1 ) { if ( GlobalConfig->VpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[racoonctl] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug ); @@ -15038,13 +15038,13 @@ void KVpnc::readFromStdout_racoonctl() RacoonctlProcess->writeToStdin ( UserPassStr ); RacoonctlProcess->writeToStdin ( "\n" ); } - else if ( ProcessMsg_connect.find ( "VPN connexion terminated", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "VPN connexion terminated", 0 , false ) > -1 ) { //KMessageBox::error ( this, i18n ( "VPN connexion terminated" ) ); GlobalConfig->appendLogEntry ( i18n ( "VPN connexion terminated" ) , GlobalConfig->debug ); abort =false; } - else if ( ProcessMsg_connect.find ( "VPN connexion established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "VPN connexion established", 0 , false ) > -1 ) { // racoonctl tells it but its only phase1 => useless // if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) @@ -15062,7 +15062,7 @@ void KVpnc::readFromStdout_racoonctl() // GlobalConfig->status = GlobalConfig->connected; // // connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); -// durationTimer.start ( 1000, FALSE ); +// durationTimer.start ( 1000, false ); // setGuiStatus ( connected ); // // setFirewallAfterConnect(); @@ -15097,19 +15097,19 @@ void KVpnc::readFromStderr_racoonctl() // if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[racoonctl err] " + ProcessMsg_connect, GlobalConfig->error ); - if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "send: Bad file descriptor", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Racoon seem not running!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Racoon seem not running!" ) , GlobalConfig->error ); // abort =true; } - else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "racoonctl: Cannot send combuf", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "racoonctl: Cannot send combuf" ) ); GlobalConfig->appendLogEntry ( i18n ( "racoonctl: Cannot send combuf" ) , GlobalConfig->error ); // abort =true; } - if ( ProcessMsg_connect.find ( "Password:", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Password:", 0 , false ) > -1 ) { if ( GlobalConfig->VpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( "[racoonctl err] " + i18n ( "User password requested, send it...\n" ), GlobalConfig->debug ); @@ -15153,39 +15153,39 @@ void KVpnc::readFromStdout_pptp() bool allowReconnect = false; - if ( ProcessMsg_connect.find ( "could not find module", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "could not find module", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Module not found." ) ); GlobalConfig->appendLogEntry ( i18n ( "Module not found." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "Connection has been terminated." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection has been terminated." ), GlobalConfig->info ); abort = true; allowReconnect = true; } - else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Modem hung up", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , false ) > -1 || ProcessMsg_connect.find ( "Modem hung up", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Remote modem has hung up. Connection was terminated." ) ); GlobalConfig->appendLogEntry ( i18n ( "Remote modem has hung up. Connection was terminated." ) , GlobalConfig->error ); abort = true; allowReconnect = true; } - else if ( ProcessMsg_connect.find ( "connect: Connection refused", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "connect: Connection refused", 0 , false ) > -1 ) { KMessageBox::error(this, i18n("Connection has been refused. Terminate.")); GlobalConfig->appendLogEntry(i18n("Connection has been refused. Terminate.") , GlobalConfig->error); abort = true; } - else if ( ProcessMsg_connect.find ( "No route to host", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "No route to host", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "No route to host." ) ); GlobalConfig->appendLogEntry ( i18n ( "No route to host." ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Authentication failure", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "MS-CHAP authentication failed:", 0 , FALSE ) > -1) + else if ( ProcessMsg_connect.find ( "Authentication failure", 0 , false ) > -1 || ProcessMsg_connect.find ( "MS-CHAP authentication failed:", 0 , false ) > -1) { timer.stop(); connectCounter=0; @@ -15197,7 +15197,7 @@ void KVpnc::readFromStdout_pptp() GlobalConfig->haveUserData = false; connectClicked(); } - else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , false ) > -1 ) { timer.stop(); connectCounter=0; @@ -15210,26 +15210,26 @@ void KVpnc::readFromStdout_pptp() GlobalConfig->haveUserData = false; connectClicked(); } - else if ( ProcessMsg_connect.find ( "EAP: peer reports authentication failure", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "EAP: peer reports authentication failure", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "The peer refused to authenticate (it wants EAP). Please check username, password and EAP settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "The peer refused to authenticate (it wants EAP). Please check username, password and EAP settings." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Call manager exited with error", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Call manager exited with error", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "Call manager exited with a error." ) ); GlobalConfig->appendLogEntry ( i18n ( "Call manager exited with error." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Input/output error", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Input/output error", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "Input/output error" ) ); GlobalConfig->appendLogEntry ( i18n ( "Input/output error" ) , GlobalConfig->error ); abort = true; allowReconnect = true; } - else if ( ProcessMsg_connect.find ( "Using interface", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Using interface", 0 , false ) > -1 ) { PppdDevice = ProcessMsg_connect.right ( ProcessMsg_connect.length() - 16 ); if ( GlobalConfig->PppdDebugLevel > 0 ) @@ -15245,21 +15245,21 @@ void KVpnc::readFromStdout_pptp() abort = false; } - else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Sending data has failed. Connection was terminated." ) ); GlobalConfig->appendLogEntry ( i18n ( "Sending data has failed. Connection was terminated." ) , GlobalConfig->error ); abort = true; allowReconnect = true; } - else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Modem hangup", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Remote modem has hung up. Connection was terminated." ) ); GlobalConfig->appendLogEntry ( i18n ( "Remote modem has hung up. Connection was terminated." ) , GlobalConfig->error ); abort = true; allowReconnect = true; } - else if ( ProcessMsg_connect.find ( "primary DNS address", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "primary DNS address", 0 , false ) > -1 ) { // example: primary DNS address 132.210.*.2 secondary DNS address 132.210.**.2 bool got2dns = false; @@ -15285,19 +15285,19 @@ void KVpnc::readFromStdout_pptp() } abort = false; } - else if ( ProcessMsg_connect.find ( "CHAP authentication succeeded", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "CHAP authentication succeeded", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "CHAP authentication succeeded.\n" ), GlobalConfig->debug ); abort = false; } - else if ( ProcessMsg_connect.find ( "MPPE 128-bit stateless compression enabled", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "MPPE 128-bit stateless compression enabled", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "MPPE 128-bit stateless compression enabled.\n" ), GlobalConfig->debug ); abort = false; } - else if ( ProcessMsg_connect.find ( "local", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "local", 0 , false ) > -1 ) { // if (GlobalConfig->KvpncDebugLevel > 0) // GlobalConfig->appendLogEntry ( i18n( "adr: %1\n" ).arg( ProcessMsg_connect), GlobalConfig->debug); @@ -15306,14 +15306,14 @@ void KVpnc::readFromStdout_pptp() GlobalConfig->appendLogEntry ( i18n ( "Tunnel IP address: %1\n" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug ); abort = false; } - else if ( ProcessMsg_connect.find ( "Loopback detected", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Loopback detected", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Loopback detected. Reconnecting." ) ); GlobalConfig->appendLogEntry ( i18n ( "Loopback detected. Reconnecting." ) , GlobalConfig->error ); abort = true; connectClicked(); } - else if ( ProcessMsg_connect.find ( "remote IP address", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "remote IP address", 0, false ) > -1 ) connectSuccess = true; // success @@ -15326,7 +15326,7 @@ void KVpnc::readFromStdout_pptp() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); connectSuccess = false; @@ -15828,19 +15828,19 @@ void KVpnc::readFromStderr_pptp() bool allowReconnect = false; bool error_found=false; - if ( ProcessMsg_connect.find ( "DNS address", 0, FALSE ) || ProcessMsg_connect.find ( "Script /etc/ppp/ip-up started", 0, FALSE ) ) + if ( ProcessMsg_connect.find ( "DNS address", 0, false ) || ProcessMsg_connect.find ( "Script /etc/ppp/ip-up started", 0, false ) ) GlobalConfig->appendLogEntry ( "[pppd] " + ProcessMsg_connect, GlobalConfig->debug ); else GlobalConfig->appendLogEntry ( "[pppd err] " + ProcessMsg_connect, GlobalConfig->error ); - if ( ProcessMsg_connect.find ( "authentication failed", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "authentication failed", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Authentication has been failed." ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication has been failed." ) , GlobalConfig->error ); abort = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "MPPE required but not available", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "MPPE required but not available", 0 , false ) > -1 ) { if ( error_found==false ) KMessageBox::error ( this, i18n ( "MPPE required but not available" ) ); @@ -15848,7 +15848,7 @@ void KVpnc::readFromStderr_pptp() abort = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "peer refused to authenticate", 0 , false ) > -1 ) { if ( error_found==false ) KMessageBox::error ( this, i18n ( "The peer refused to authenticate." ) ); @@ -15856,7 +15856,7 @@ void KVpnc::readFromStderr_pptp() abort = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "could not find module", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "could not find module", 0 , false ) > -1 ) { if ( error_found==false ) KMessageBox::error ( this, i18n ( "Module not found." ) ); @@ -15864,7 +15864,7 @@ void KVpnc::readFromStderr_pptp() abort = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , false ) > -1 ) { //if (error_found==false) // KMessageBox::error( this, i18n( "Connection has been terminated." ) ); @@ -15873,7 +15873,7 @@ void KVpnc::readFromStderr_pptp() allowReconnect = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "tcflush failed: Bad file descriptor", 0 , false ) > -1 ) { if ( error_found==false ) KMessageBox::error ( this, i18n ( "Sending data has failed. Connection was terminated." ) ); @@ -15882,7 +15882,7 @@ void KVpnc::readFromStderr_pptp() allowReconnect = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "MPPE required, but kernel has no support", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "MPPE required, but kernel has no support", 0 , false ) > -1 ) { if ( error_found==false ) KMessageBox::error ( this, i18n ( "MPPE required, but kernel has no support. Please use a kernel with mppe support." ) ); @@ -15890,7 +15890,7 @@ void KVpnc::readFromStderr_pptp() abort = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "unrecognized option 'mppe'", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "unrecognized option 'mppe'", 0 , false ) > -1 ) { if ( error_found==false ) KMessageBox::error ( this, i18n ( "MPPE required, but pppd has no MPPE support. Please install a pppd with MPPE support." ) ); @@ -15898,7 +15898,7 @@ void KVpnc::readFromStderr_pptp() abort = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "Input/output error", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Input/output error", 0 , false ) > -1 ) { //if (error_found==false) //KMessageBox::error( this, i18n( "Input/output error" ) ); @@ -15907,7 +15907,7 @@ void KVpnc::readFromStderr_pptp() allowReconnect = true; error_found=true; } - else if ( ProcessMsg_connect.find ( "local IP address", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "local IP address", 0 , false ) > -1 ) { TunnelInterfaceIP = ProcessMsg_connect.simplifyWhiteSpace().section ( ' ', 3, 3 ); if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -15915,7 +15915,7 @@ void KVpnc::readFromStderr_pptp() abort = false; error_found=true; } - else if ( ProcessMsg_connect.find ( "No auth is possible sent", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "No auth is possible sent", 0 , false ) > -1 ) { if ( error_found==false ) KMessageBox::error ( this, i18n ( "No password was send. Please check if there is a password set in user settings." ) ); @@ -15982,7 +15982,7 @@ void KVpnc::readOutput_openvpn() // } - if ( ProcessMsg.find ( "refused", 0 , FALSE ) > -1 && !stderr ) + if ( ProcessMsg.find ( "refused", 0 , false ) > -1 && !stderr ) GlobalConfig->appendLogEntry ( "[openvpn] " + ProcessMsg, GlobalConfig->error ); else if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -15990,19 +15990,19 @@ void KVpnc::readOutput_openvpn() bool abort = false; - if ( ProcessMsg.find ( "Connection timed out", 0 , FALSE ) > -1 ) + if ( ProcessMsg.find ( "Connection timed out", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Connection has been timed out. Terminate." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection has been timed out. Terminate." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "[ECONNREFUSED]: Connection refused", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "[ECONNREFUSED]: Connection refused", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Connection has been refused. Terminate." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection has been refused. Terminate." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "AUTH: Received AUTH_FAILED", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "AUTH: Received AUTH_FAILED", 0, false ) > -1 ) { AuthRetry = true; GlobalConfig->haveUserData = false; @@ -16013,7 +16013,7 @@ void KVpnc::readOutput_openvpn() GlobalConfig->appendLogEntry ( i18n ( "Authentication failed (%1)!" ).arg ( i18n ( "user password" ) ) , GlobalConfig->error ); // abort=true; } - else if ( ProcessMsg.find ( "ERROR: could not read Auth username/password from management interface", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "ERROR: could not read Auth username/password from management interface", 0, false ) > -1 ) { ; disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); @@ -16023,7 +16023,7 @@ void KVpnc::readOutput_openvpn() GlobalConfig->appendLogEntry ( i18n ( "Username and password could not read from management interface!" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "ERROR: could not read eToken token username/password/ok from management interface", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "ERROR: could not read eToken token username/password/ok from management interface", 0, false ) > -1 ) { disconnect ( OpenvpnProcess, TQ_SIGNAL ( readyReadStdout() ), this, TQ_SLOT ( readOutput_openvpn() ) ); // disconnect( OpenvpnProcess, TQ_SIGNAL( readyReadStderr() ), this, TQ_SLOT( readOutput_openvpn() ) ); @@ -16032,7 +16032,7 @@ void KVpnc::readOutput_openvpn() GlobalConfig->appendLogEntry ( i18n ( "eToken password could not read from management interface!" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Insufficient key material or header text not found", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Insufficient key material or header text not found", 0, false ) > -1 ) { AuthRetry = true; GlobalConfig->haveUserData = false; @@ -16043,20 +16043,20 @@ void KVpnc::readOutput_openvpn() GlobalConfig->appendLogEntry ( i18n ( "Insufficient key material or header text not found!" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "not found", 0, FALSE ) > -1 && ProcessMsg.find ( "Message hash algorithm", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "not found", 0, false ) > -1 && ProcessMsg.find ( "Message hash algorithm", 0, false ) > -1 ) { TQString hash_algo= ProcessMsg.section ( "'",1,1 ); KMessageBox::error ( this, i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) ); GlobalConfig->appendLogEntry ( i18n ( "Hash algorithm \"%1\"not found! Please choose another one." ).arg ( hash_algo ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Cannot load private key file", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Cannot load private key file", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "Auth username is empty." ) ); GlobalConfig->appendLogEntry ( i18n ( "Private key file could not loaded!" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tun', remote='dev-type tap'", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tun', remote='dev-type tap'", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tun" ).arg( "tap" ) ); // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tun" ).arg( "tap" ) , GlobalConfig->error ); @@ -16068,7 +16068,7 @@ void KVpnc::readOutput_openvpn() disconnectClicked(); connectClicked(); } - else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tap', remote='dev-type tun'", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "'dev-type' is used inconsistently, local='dev-type tap', remote='dev-type tun'", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "Local network type is %1 but remote network type is %2. This must be fixed.\nGo to OpenVPN settings and change it to %2." ).arg( "tap" ).arg( "tun" ) ); // GlobalConfig->appendLogEntry( i18n( "Local network type is %1 but remote network type is %2. This must be fixed." ).arg( "tap" ).arg( "tun" ), GlobalConfig->error ); @@ -16080,23 +16080,23 @@ void KVpnc::readOutput_openvpn() disconnectClicked(); connectClicked(); } - else if ( ProcessMsg.find ( "connect to " + TQString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + TQString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "connect to " + TQString ( GlobalConfig->currentProfile->getHttpProxy() + ":" + TQString().setNum ( GlobalConfig->currentProfile->getHttpProxyPort() ) + " failed" ), 0, false ) > -1 ) { - // else if ( ProcessMsg.find( "Connection refused", 0, FALSE ) > -1 ) { - // if ( ProcessMsg.find( "failed", 0, FALSE ) > -1 ) { + // else if ( ProcessMsg.find( "Connection refused", 0, false ) > -1 ) { + // if ( ProcessMsg.find( "failed", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Connection to HTTP proxy (%1:%2) failed!" ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error ); KMessageBox::error ( this, i18n ( "Connection to HTTP proxy (%1:%2) failed!" ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) ); abort = true; // } } - else if ( ProcessMsg.find ( "SIGTERM[soft,init_instance] received", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "SIGTERM[soft,init_instance] received", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Connection was rejected (wrong HTTP proxy auth data?)." ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error ); KMessageBox::error ( this, i18n ( "Connection was rejected (wrong HTTP proxy auth data?)." ) ); abort = true; } - else if ( ProcessMsg.find ( "MANAGEMENT: Cannot bind TCP socket", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "MANAGEMENT: Cannot bind TCP socket", 0, false ) > -1 ) { // GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ).arg ( GlobalConfig->currentProfile->getHttpProxy() ).arg ( GlobalConfig->currentProfile->getHttpProxyPort() ) , GlobalConfig->error ); @@ -16117,7 +16117,7 @@ void KVpnc::readOutput_openvpn() abort = true; } - else if ( ProcessMsg.find ( TQString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( TQString ( "MANAGEMENT: Socket bind failed on local address 127.0.0.1:"+TQString().setNum ( GlobalConfig->OpenvpnManagementPort ) +": Address already in use" ), 0, false ) > -1 ) { // GlobalConfig->appendLogEntry ( i18n ( "The management port cant bind, please try again later." ) ) , GlobalConfig->error ); @@ -16141,20 +16141,20 @@ void KVpnc::readOutput_openvpn() abort = true; // managementhandler->closeConnection(); } - else if ( ProcessMsg.find ( "TLS key negotiation failed to occur within 60 seconds", 0 , FALSE ) > -1 || ProcessMsg.find ( "TLS Error: TLS handshake failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "TLS key negotiation failed to occur within 60 seconds", 0 , false ) > -1 || ProcessMsg.find ( "TLS Error: TLS handshake failed", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "TLS key negotiation failed to occur within 60 seconds" ) ); GlobalConfig->appendLogEntry ( i18n ( "Port binding failed" ) , GlobalConfig->error ); abort=true; } /* - else if ( ProcessMsg.find( "authentication failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find( "authentication failed", 0 , false ) > -1 ) { KMessageBox::error( this, i18n( "Authentication has been failed." ) ); abort = true; } */ - else if ( ProcessMsg.find ( "Enter Private Key Password", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Enter Private Key Password", 0, false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -16217,7 +16217,7 @@ void KVpnc::readOutput_openvpn() return ; } } - else if ( ProcessMsg.find ( "Enter Auth Username", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Enter Auth Username", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "User name requested, send it...\n" ), GlobalConfig->debug ); @@ -16236,7 +16236,7 @@ void KVpnc::readOutput_openvpn() return ; } - else if ( ProcessMsg.find ( "Enter Auth Password:", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Enter Auth Password:", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "User password requested, send it...\n" ), GlobalConfig->debug ); @@ -16254,48 +16254,48 @@ void KVpnc::readOutput_openvpn() } } - else if ( ProcessMsg.find ( "Cannot resolve host address", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Cannot resolve host address", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Host could not be resolved." ) ); GlobalConfig->appendLogEntry ( i18n ( "Host could not be resolved." ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "could not find module", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "could not find module", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Module not found." ) ); GlobalConfig->appendLogEntry ( i18n ( "Module not found." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Socket bind failed on local address", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Socket bind failed on local address", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Binding to socket on local address failed." ) ); GlobalConfig->appendLogEntry ( i18n ( "Binding to socket on local address failed." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "No route to host", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "No route to host", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "No route to host found." ) ); GlobalConfig->appendLogEntry ( i18n ( "No route to host found." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Connection terminated", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Connection terminated", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "Connection has been terminated." ) ); abort = true; } - else if ( ProcessMsg.find ( "Cannot open file key file", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Cannot open file key file", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Cannot open the preshared key file." ) ); GlobalConfig->appendLogEntry ( i18n ( "Cannot open the preshared key file." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Authenticate/Decrypt packet error: cipher final failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Authenticate/Decrypt packet error: cipher final failed", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Authentication has been failed because decryption failure. Please check OpenVPN settings." ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication has been failed because decryption failure. Please check OpenVPN settings." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "'auth' is used inconsistently", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "'auth' is used inconsistently", 0 , false ) > -1 ) { TQString LocalAuth = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); TQString PeerAuth = ProcessMsg.section ( '=', 2, 2 ).section ( ' ', 1, 1 ).remove ( "'" ); @@ -16310,7 +16310,7 @@ void KVpnc::readOutput_openvpn() disconnectClicked(); connectClicked(); } - else if ( ProcessMsg.find ( "WARNING: 'cipher' is used inconsistently", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "WARNING: 'cipher' is used inconsistently", 0 , false ) > -1 ) { // example: WARNING: 'cipher' is used inconsistently, local='cipher BF-CBC', remote='cipher AES-128-CBC' TQString LocalCipher = ProcessMsg.section ( '=', 1, 1 ).section ( ',', 0, 0 ).section ( ' ', 1, 1 ).remove ( "'" ); @@ -16326,7 +16326,7 @@ void KVpnc::readOutput_openvpn() disconnectClicked(); connectClicked(); } - else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]", 0 , false ) > -1 ) { // KMessageBox::error( this, i18n( "OpenVPN configuration error. Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]" ) ); // GlobalConfig->appendLogEntry( i18n( "OpenVPN configuration error. Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]" ), GlobalConfig->error ); @@ -16334,81 +16334,81 @@ void KVpnc::readOutput_openvpn() GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Unrecognized option or missing parameter(s) in [PUSH-OPTIONS]" ), GlobalConfig->info ); abort = false; } - else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Options error: Unrecognized option or missing parameter", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "OpenVPN configuration error. Unrecognized option or missing parameter" ) ); GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Unrecognized option or missing parameter" ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Options error: Parameter", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Options error: Parameter", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ) ); GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Options error: --auth-user-pass requires --pull", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Options error: --auth-user-pass requires --pull", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ) ); GlobalConfig->appendLogEntry ( i18n ( "OpenVPN configuration error. Wrong parameter in config file. Please contact the KVpnc author." ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "TCP connection established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "TCP connection established", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( "[openvpn]: "+i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ), GlobalConfig->info ); } - else if ( ProcessMsg.find ( "UDP connection established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "UDP connection established", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( "[openvpn]: "+i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ),GlobalConfig->info ); } - // else if ( ProcessMsg.find( "Options error", 0 , FALSE ) > -1 ) + // else if ( ProcessMsg.find( "Options error", 0 , false ) > -1 ) // { // KMessageBox::error( this, i18n( "OpenVPN configuration error." ) ); // GlobalConfig->appendLogEntry( i18n( "OpenVPN configuration error." ), GlobalConfig->error ); // GlobalConfig->currentProfile->setDoReconnectAfterConnectionLost( false ); // abort = true; // } - else if ( ProcessMsg.find ( "refused", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "refused", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "Connection to OpenVPN server was refused." ) ); abort = false; } - else if ( ProcessMsg.find ( "Connection timed out", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Connection timed out", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Connection has been timed out. Terminate." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection has been timed out. Terminate." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Cannot load certificate file", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Cannot load certificate file", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Certificate file (%1) could not be load. Please check path of it." ).arg ( GlobalConfig->currentProfile->getX509Certificate() ) ); GlobalConfig->appendLogEntry ( i18n ( "Certificate file (%1) could not be load. Please check path of it." ).arg ( GlobalConfig->currentProfile->getX509Certificate() ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "ifconfig failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "ifconfig failed", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "ifconfig has been failed." ) ); GlobalConfig->appendLogEntry ( i18n ( "ifconfig has been failed." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Auth username is empty", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Auth username is empty", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "Auth username is empty." ) ); GlobalConfig->appendLogEntry ( i18n ( "Auth username is empty." ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Cannot load private key file", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Cannot load private key file", 0 , false ) > -1 ) { //KMessageBox::error( this, i18n( "Auth username is empty." ) ); GlobalConfig->appendLogEntry ( i18n ( "Private key file could not loaded!" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "Need 'token-insertion-request' confirmation MSG:Please insert SLOT", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Need 'token-insertion-request' confirmation MSG:Please insert SLOT", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Need token to be insert. Please insert token in SLOT...." ) ); GlobalConfig->appendLogEntry ( i18n ( "Need token to be insert. Please insert token in SLOT...." ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg.find ( "process exiting", 0 , FALSE ) > -1 ) + else if ( ProcessMsg.find ( "process exiting", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "%1 is shutting down." ).arg ( "openvpn" ), GlobalConfig->debug ); @@ -16416,11 +16416,11 @@ void KVpnc::readOutput_openvpn() connectionEnded(); setGuiStatus ( disconnected ); } - else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "Initialization Sequence Completed", 0, false ) > -1 ) { connectSuccess = true; } - else if ( ProcessMsg.find ( "TUN/TAP device", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "TUN/TAP device", 0, false ) > -1 ) { // TUN/TAP device tun0 opened NetworkDevice = ProcessMsg.section ( ' ', -2, -2 ); // tun0 @@ -16434,7 +16434,7 @@ void KVpnc::readOutput_openvpn() NetworkInterface iface ( GlobalConfig, parent ); TunnelInterfaceIP = iface.getInterfaceIP ( OpenvpnDevice ); } - else if ( ProcessMsg.find ( "ifconfig ", 0, FALSE ) > -1 ) + else if ( ProcessMsg.find ( "ifconfig ", 0, false ) > -1 ) { TunnelInterfaceIP = ProcessMsg.section ( ' ', -4, -4 ); // ip GlobalConfig->appendLogEntry ( i18n ( "Tunnel interface IP: %1\n" ).arg ( TunnelInterfaceIP ), GlobalConfig->debug ); @@ -16452,7 +16452,7 @@ void KVpnc::readOutput_openvpn() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); connectSuccess = false; @@ -16539,7 +16539,7 @@ void KVpnc::processStdout_l2tpd() bool abort = false; bool connectSuccess = false; - if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , false ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , false ) > -1 ) { bool kill_l2tpd=true; @@ -16632,19 +16632,19 @@ void KVpnc::processStdout_l2tpd() } } } - else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , false ) > -1 ) { ErrorMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , false ) > -1 ) { ErrorMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "unrecognized option", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "unrecognized option", 0 , false ) > -1 ) { ErrorMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "unknown option in generated config file, please report to maintainer." ) ) , GlobalConfig->error ); @@ -16822,7 +16822,7 @@ void KVpnc::processStdout_l2tpd() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); @@ -16884,46 +16884,46 @@ void KVpnc::processStderr_l2tpd() // GlobalConfig->appendLogEntry ( TQString( "[l2tpd err] " + ProcessMsg_connect ) , GlobalConfig->error ); - if ( ProcessMsg_connect.find ( "Maximum retries exceeded for tunnel", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Maximum retries exceeded for tunnel", 0 , false ) > -1 ) { ErrorMsg=true; if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Maximum retries of L2TP connect try exceeded for tunnel, waiting a moment..." ) ) , GlobalConfig->debug ); // abort=true; } - else if ( ProcessMsg_connect.find ( "l2tp_call:Connecting to host", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "l2tp_call:Connecting to host", 0 , false ) > -1 ) { NormalMsg=true; if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "l2tp_call:Connecting to host" ) ) , GlobalConfig->debug ); // abort=true; } - else if ( ProcessMsg_connect.find ( "maximum retries exceeded.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "maximum retries exceeded.", 0 , false ) > -1 ) { ErrorMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Maximum of L2TP connect retries exceeded, giving up." ) ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection closed to", 0 , false ) > -1 ) { ErrorMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Connection was closed." ) ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "pppd exited for call", 0 , false ) > -1 ) { ErrorMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "pppd exited for call" ) ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Unable to load config file", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Unable to load config file", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ) ); GlobalConfig->appendLogEntry ( TQString ( "[l2tpd err] " + i18n ( "Error in generated config file for l2tpd, please report to maintainer." ) ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , false ) > -1 || ProcessMsg_connect.find ( "Unable to bind socket: Address already in use", 0 , false ) > -1 ) { ErrorMsg=true; bool kill_l2tpd=true; @@ -17018,13 +17018,13 @@ void KVpnc::processStderr_l2tpd() } } // control_finish: Connection established to 192.168.10.222, 1701. Local: 55406, Remote: 37911. - else if ( ProcessMsg_connect.find ( "Connection established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection established", 0 , false ) > -1 ) { NormalMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); abort = false; } - else if ( ProcessMsg_connect.find ( "Call established", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Call established", 0 , false ) > -1 ) { NormalMsg=true; GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "Low level connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->info ); @@ -17038,22 +17038,22 @@ void KVpnc::processStderr_l2tpd() disconnect ( &L2tpWaitForPppUpTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkL2tpPppUp() ) ); connect ( &L2tpWaitForPppUpTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkL2tpPppUp() ) ); - L2tpWaitForPppUpTimer.start ( 1000, FALSE ); + L2tpWaitForPppUpTimer.start ( 1000, false ); } - else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , false ) > -1 ) { NormalMsg=true; if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "%1 is connecting to host %2..." ).arg ( "l2tpd" ).arg ( GlobalConfig->currentProfile->getGateway() ),GlobalConfig->debug ); } - else if ( ProcessMsg_connect.find ( "Listening on IP address", 0 , FALSE ) > -1 - || ProcessMsg_connect.find ( "Calling on tunnel", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Listening on IP address", 0 , false ) > -1 + || ProcessMsg_connect.find ( "Calling on tunnel", 0 , false ) > -1 ) { NormalMsg=true; abort = false; } - else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , FALSE ) > -1 ) + else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , false ) > -1 ) { NormalMsg=true; // cid is greather than 0 @@ -17065,7 +17065,7 @@ void KVpnc::processStderr_l2tpd() connectSuccess = true; } } - else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connecting to host", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( TQString ( "[l2tpd] " + i18n ( "L2TP connection to %1 established." ).arg ( GlobalConfig->currentProfile->getGateway() ) ) , GlobalConfig->success ); abort = false; @@ -17086,7 +17086,7 @@ void KVpnc::processStderr_l2tpd() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); @@ -17281,16 +17281,16 @@ void KVpnc::readFromStdout_openl2tp() } else { - if ( ProcessMsg_connect.find ( "FUNC:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , FALSE ) < 0 ) + if ( ProcessMsg_connect.find ( "FUNC:", 0 , false ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , false ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , false ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , false ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , false ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , false ) < 0 ) GlobalConfig->appendLogEntry ( "[openl2tp] " + ProcessMsg_connect, GlobalConfig->debug ); } - if ( ProcessMsg_connect.find ( "address", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "address", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Got IP address" ), GlobalConfig->debug ); - if ( ProcessMsg_connect.find ( "local", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "local", 0 , false ) > -1 ) { TunnelInterfaceIP = ProcessMsg_connect.section ( ' ',4,4 ); if ( !TunnelInterfaceIP.isEmpty() ) @@ -17299,33 +17299,33 @@ void KVpnc::readFromStdout_openl2tp() connectSuccess=true; } } - else if ( ProcessMsg_connect.find ( "event ICRP_ACCEPT in state WAITREPLY", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "event ICRP_ACCEPT in state WAITREPLY", 0 , false ) > -1 ) { // short before low level connection up } - else if ( ProcessMsg_connect.find ( "starting UNIX pppd", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "starting UNIX pppd", 0 , false ) > -1 ) { // low level connection sure up } - else if ( ProcessMsg_connect.find ( "state change: WAITCTLREPLY --> ESTABLISHED", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "state change: WAITCTLREPLY --> ESTABLISHED", 0 , false ) > -1 ) { // low level connection up } - else if ( ProcessMsg_connect.find ( "Using interface", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Using interface", 0 , false ) > -1 ) { L2tpPppDevice = ProcessMsg_connect.section ( ' ',2,2 ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "Tunnel device: %1\n" ).arg ( L2tpPppDevice ), GlobalConfig->debug ); } - else if ( ProcessMsg_connect.find ( "authentication succeeded:", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "authentication succeeded:", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 0 ) GlobalConfig->appendLogEntry ( i18n ( "Authentication succeeded." ), GlobalConfig->debug ); abort = false; // connectSuccess=true; } - else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection terminated.", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Connection has been terminated." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection has been terminated." ), GlobalConfig->info ); @@ -17342,7 +17342,7 @@ void KVpnc::readFromStdout_openl2tp() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); @@ -17385,13 +17385,13 @@ void KVpnc::readFromStderr_openl2tp() GlobalConfig->appendLogEntry ( "[openl2tp err] " + ProcessMsg_connect, GlobalConfig->error ); - if ( ProcessMsg_connect.find ( "parse error", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "parse error", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "openl2tpd" ) ); GlobalConfig->appendLogEntry ( i18n ( "Error in generated configuration file for \"%1\", please contact KVpnc team." ).arg ( "openl2tpd" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "File /var/run/openl2tpd.pid already exists", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "File /var/run/openl2tpd.pid already exists", 0 , false ) > -1 ) { KMessageBox::error ( this, i18n ( "Lock file of %1 still exists. Please remove it if %2 is not running." ).arg ( "openl2tpd" ).arg ( "openl2tpd" ) ); GlobalConfig->appendLogEntry ( i18n ( "Lock file of %1 still exists." ).arg ( "openl2tpd" ) , GlobalConfig->error ); @@ -17426,7 +17426,7 @@ void KVpnc::readFromStdout_startstopOpenl2tp() } else { - if ( ProcessMsg_connect.find ( "FUNC:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , FALSE ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , FALSE ) < 0 ) + if ( ProcessMsg_connect.find ( "FUNC:", 0 , false ) < 0 && ProcessMsg_connect.find ( "FSM:", 0 , false ) < 0 && ProcessMsg_connect.find ( "AVP:", 0 , false ) < 0 && ProcessMsg_connect.find ( "PROTO:", 0 , false ) < 0 && ProcessMsg_connect.find ( "XPRT:", 0 , false ) < 0 && ProcessMsg_connect.find ( "DATA:", 0 , false ) < 0 ) GlobalConfig->appendLogEntry ( "[openl2tp] " + ProcessMsg_connect, GlobalConfig->debug ); } @@ -17484,19 +17484,19 @@ void KVpnc::readFromStdout_vtun() /* - if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "init_network: Unable to bind socket. Terminating", 0 , false ) > -1 ) { }*/ - if ( ProcessMsg_connect.find ( "Connection refused(111)",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Connection refused(111)",0,false ) > -1 ) { KMessageBox::error ( this, i18n ( "Connection refused." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection refused." ),GlobalConfig->error ); abort=true; ErrorMsg=true; } - else if ( ProcessMsg_connect.find ( " Exit ",0,FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( " Exit ",0,false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "%1 has been exited." ),GlobalConfig->error ); abort=true; @@ -17524,7 +17524,7 @@ void KVpnc::readFromStdout_vtun() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); @@ -17581,55 +17581,55 @@ void KVpnc::readFromStderr_vtun() bool abort = false; bool connectSuccess = false; - if ( ProcessMsg_connect.find ( "Session ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "opened",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Session ",0,false ) > -1 && ProcessMsg_connect.find ( "opened",0,false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Session opened." ),GlobalConfig->debug ); } - if ( ProcessMsg_connect.find ( "compression ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "initialized",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "compression ",0,false ) > -1 && ProcessMsg_connect.find ( "initialized",0,false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Compression initialized." ),GlobalConfig->debug ); } - if ( ProcessMsg_connect.find ( "UDP ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "initialized",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "UDP ",0,false ) > -1 && ProcessMsg_connect.find ( "initialized",0,false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "UDP initialized." ),GlobalConfig->debug ); } - if ( ProcessMsg_connect.find ( "encryption ",0,FALSE ) > -1 && ProcessMsg_connect.find ( "initialized",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "encryption ",0,false ) > -1 && ProcessMsg_connect.find ( "initialized",0,false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Encryption initialized." ),GlobalConfig->debug ); // FIXME only if encryption is activated (always!?) - connectSuccess=TRUE; + connectSuccess=true; } - if ( ProcessMsg_connect.find ( "Connection refused(111)",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Connection refused(111)",0,false ) > -1 ) { KMessageBox::error ( this, i18n ( "Connection refused." ) ); GlobalConfig->appendLogEntry ( i18n ( "Connection refused." ),GlobalConfig->error ); abort=true; ErrorMsg=true; } -// // if ( ProcessMsg_connect.find(" Exit ",0,FALSE) > -1 ) +// // if ( ProcessMsg_connect.find(" Exit ",0,false) > -1 ) // // { // // GlobalConfig->appendLogEntry(i18n("%1 has been exited.").arg("vtund"),GlobalConfig->error); // // abort=true; // // ErrorMsg=true; // // } - if ( ProcessMsg_connect.find ( "Connection denied by ",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Connection denied by ",0,false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Connection denied. Password wrong?" ),GlobalConfig->error ); abort=true; ErrorMsg=true; } - if ( ProcessMsg_connect.find ( "Connection closed by other side",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Connection closed by other side",0,false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "Connection was closed by the remote host. Please check your settings." ),GlobalConfig->error ); abort=true; ErrorMsg=true; } - if ( ProcessMsg_connect.find ( "syntax error",0,FALSE ) > -1 || ProcessMsg_connect.find ( "No hosts defined",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "syntax error",0,false ) > -1 || ProcessMsg_connect.find ( "No hosts defined",0,false ) > -1 ) { KMessageBox::error ( this, i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ) ); GlobalConfig->appendLogEntry ( i18n ( "Syntax error in config detected. Please report that to the KVpnc maintainer." ),GlobalConfig->error ); @@ -17637,7 +17637,7 @@ void KVpnc::readFromStderr_vtun() ErrorMsg=true; } - if ( ProcessMsg_connect.find ( "allocate pseudo tty",0,FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "allocate pseudo tty",0,false ) > -1 ) { KMessageBox::error ( this, i18n ( "Can't allocate pseudo tty.\nPlease check that your kernel has LEGACY PTY=y or recompile patched vtun. You can get the patch for UNIX98 PTS here: %1" ).arg ( TQString ( "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=451931" ) ) ); GlobalConfig->appendLogEntry ( i18n ( "Can't allocate pseudo tty." ),GlobalConfig->error ); @@ -17645,7 +17645,7 @@ void KVpnc::readFromStderr_vtun() ErrorMsg=true; } -// else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , FALSE ) > -1 ) +// else if ( GlobalConfig->status != GlobalConfig->connected && ProcessMsg_connect.find ( "check_control: control, cid =", 0 , false ) > -1 ) // { // NormalMsg=true; // // cid is greather than 0 @@ -17671,7 +17671,7 @@ void KVpnc::readFromStderr_vtun() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); connectSuccess = false; @@ -17739,48 +17739,48 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen ) bool abort = false; bool connectSuccess=false; - if ( ProcessMsg_connect.find ( "ssh_is_up", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "ssh_is_up", 0 , false ) > -1 ) { GlobalConfig->appendLogEntry ( i18n ( "SSH tunnel is now up" ) , GlobalConfig->info ); connectSuccess=true; } - if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Remote host identification has changed!" ) ) ; GlobalConfig->appendLogEntry ( i18n ( "Remote host identification has changed!" ) , GlobalConfig->error ); abort=false; } - else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Host key verification failed" ) ); GlobalConfig->appendLogEntry ( i18n ( "Host key verification failed" ) , GlobalConfig->error ); abort=true; } - else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) ); GlobalConfig->appendLogEntry ( i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( ": No route to host", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( ": No route to host", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) ); GlobalConfig->appendLogEntry ( i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , false ) > -1 ) { ErrorMsg=false; // KMessageBox::error ( this, i18n ( "Authentication succeeded" ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication succeeded" ) , GlobalConfig->info ); // abort = true; } - else if ( ProcessMsg_connect.find ( "Permission denied", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Permission denied", 0 , false ) > -1 ) { ErrorMsg = true; timer.stop(); KMessageBox::error(this, i18n("Permission denied.")); @@ -17794,27 +17794,27 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen ) GlobalConfig->haveUserData = false; connectClicked(); } - else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Remote: Failed to open the tunnel device." ) ); GlobalConfig->appendLogEntry ( i18n ( "Remote: Failed to open the tunnel device." ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Action administratively prohibited" ) ); GlobalConfig->appendLogEntry ( i18n ( "Action administratively prohibited" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Connection established.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection established.", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) ); GlobalConfig->appendLogEntry ( i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->info ); } - else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "No more authentication methods to try." ) ); @@ -17840,7 +17840,7 @@ void KVpnc::readFromStdout_ssh ( TDEProcess *, char *buffer, int buflen ) disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); connectSuccess = false; @@ -18152,61 +18152,61 @@ void KVpnc::readFromStderr_ssh ( TDEProcess *, char *buffer, int buflen ) bool ErrorMsg = false; bool abort = false; - if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "REMOTE HOST IDENTIFICATION HAS CHANGED!", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Remote host identification has changed!" ) ) ; GlobalConfig->appendLogEntry ( i18n ( "Remote host identification has changed!" ) , GlobalConfig->error ); abort=false; } - else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Host key verification failed", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Host key verification failed" ) ); GlobalConfig->appendLogEntry ( i18n ( "Host key verification failed" ) , GlobalConfig->error ); abort=true; } - else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "has changed and you have requested strict checking", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) ); GlobalConfig->appendLogEntry ( i18n ( "Hostkey for %1 has changed and you have requested strict checking" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( ": No route to host", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( ": No route to host", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) ); GlobalConfig->appendLogEntry ( i18n ( "No route to host %1" ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Authentication succeeded", 0 , false ) > -1 ) { ErrorMsg=false; // KMessageBox::error ( this, i18n ( "Authentication succeeded" ) ); GlobalConfig->appendLogEntry ( i18n ( "Authentication succeeded" ) , GlobalConfig->info ); // abort = true; } - else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Remote: Failed to open the tunnel device.", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Remote: Failed to open the tunnel device." ) ); GlobalConfig->appendLogEntry ( i18n ( "Remote: Failed to open the tunnel device." ), GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "open failed: administratively prohibited: open failed", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "Action administratively prohibited" ) ); GlobalConfig->appendLogEntry ( i18n ( "Action administratively prohibited" ) , GlobalConfig->error ); abort = true; } - else if ( ProcessMsg_connect.find ( "Connection established.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Connection established.", 0 , false ) > -1 ) { // KMessageBox::error ( this, i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) ); GlobalConfig->appendLogEntry ( i18n ( "Low level connection to host %1 established." ).arg ( GlobalConfig->TmpGatewayIP ) , GlobalConfig->info ); } - else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "No more authentication methods to try.", 0 , false ) > -1 ) { ErrorMsg=true; KMessageBox::error ( this, i18n ( "No more authentication methods to try." ) ); @@ -18237,24 +18237,24 @@ void KVpnc::readFromStdout_ping() //mw->DebugOutput->append( "raw out (pingtest): " + ProcessMsg_connect ); - if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); KNotifyClient::event ( topLevelWidget() ->winId(), "ping success", i18n ( "Ping was successful." ) ); } - else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); KNotifyClient::event ( topLevelWidget() ->winId(), "ping failed", i18n ( "Ping has failed." ) ); } else { - if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Binding interface failed!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error ); } - else if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Destination host is unreachable!" ) , GlobalConfig->error ); @@ -18273,22 +18273,22 @@ void KVpnc::readFromStderr_ping() ProcessMsg_connect = TQString ( PingProcess->readStderr() ); //mw->DebugOutput->append( "raw err (pingtest): " + ProcessMsg_connect ); - if ( ProcessMsg_connect.find ( "time=", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "time=", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping] " + ProcessMsg_connect, GlobalConfig->success ); } - else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, FALSE ) > -1 ) + else if ( ProcessMsg_connect.find ( "100 % packet loss", 0, false ) > -1 ) { GlobalConfig->appendLogEntry ( "[ping err] " + ProcessMsg_connect, GlobalConfig->error ); } else { - if ( ProcessMsg_connect.find ( "failed to bind", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "failed to bind", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Binding interface failed!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Binding interface failed!" ) , GlobalConfig->error ); } - if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, FALSE ) > -1 ) + if ( ProcessMsg_connect.find ( "Destination Host Unreachable", 0, false ) > -1 ) { KMessageBox::error ( this, i18n ( "Destination host is unreachable!" ) ); GlobalConfig->appendLogEntry ( i18n ( "Destination host is unreachable!" ) , GlobalConfig->error ); @@ -18363,7 +18363,7 @@ void KVpnc::readFromStdout_connectionStatusCheck() { TQString msg = TQString ( ConnectionStatusCheckProcess->readStdout() ); - if ( msg.find ( "PING ok.", 0 , FALSE ) > -1 ) + if ( msg.find ( "PING ok.", 0 , false ) > -1 ) { /* Connection alive */ if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -18378,7 +18378,7 @@ void KVpnc::readFromStdout_connectionStatusCheck() } } } - if ( msg.find ( "PING failed!", 0 , FALSE ) > -1 ) + if ( msg.find ( "PING failed!", 0 , false ) > -1 ) { /* Connection dead?! */ if ( GlobalConfig->KvpncDebugLevel > 0 ) @@ -18422,14 +18422,14 @@ void KVpnc::readFromStderr_connectionStatusCheck() { TQString msg = TQString ( ConnectionStatusCheckProcess->readStderr() ); - // if ( msg.find( "PING ok.", 0 , FALSE ) > -1 ) + // if ( msg.find( "PING ok.", 0 , false ) > -1 ) // { // /* Connection alive */ // if (GlobalConfig->KvpncDebugLevel > 0) // GlobalConfig->appendLogEntry ( i18n("Ping to %1 within %2 checks every %3s was ok.").arg(GlobalConfig->currentProfile->getGateway()).arg(GlobalConfig->currentProfile->getConnectionStatusCheckSuccessCount()).arg(GlobalConfig->currentProfile->getConnectionStatusInterval()), GlobalConfig->debug ); // // } - // if ( msg.find( "PING failed!", 0 , FALSE ) > -1 ) + // if ( msg.find( "PING failed!", 0 , false ) > -1 ) // { // /* Connection dead?! */ // if (GlobalConfig->KvpncDebugLevel > 0) @@ -18544,14 +18544,14 @@ void KVpnc::readCiscoVpncTestProcessOutput() if ( msg == "" ) return ; - if ( msg.find ( "The VPN module is not loaded.", 0 , FALSE ) > -1 ) + if ( msg.find ( "The VPN module is not loaded.", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Virtual interface of cisco client is not present" ), GlobalConfig->debug ); ciscoVpncRunning = false; return; } - else if ( msg.find ( "cisco_ipsec", 0 , FALSE ) > -1 ) + else if ( msg.find ( "cisco_ipsec", 0 , false ) > -1 ) { if ( GlobalConfig->KvpncDebugLevel > 1 ) GlobalConfig->appendLogEntry ( i18n ( "Virtual interface of cisco client is present" ), GlobalConfig->debug ); @@ -18756,12 +18756,12 @@ void KVpnc::newSessionClicked() profileAddedOrDeleted(); mw->SessionCombo->setCurrentText (newName ); - mw->SessionCombo->setEnabled ( TRUE ); - DeleteSessionAction->setEnabled ( TRUE ); - SaveSessionAction->setEnabled ( TRUE ); - ImportSessionAction->setEnabled ( TRUE ); - ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); + DeleteSessionAction->setEnabled ( true ); + SaveSessionAction->setEnabled ( true ); + ImportSessionAction->setEnabled ( true ); + ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); sessionToggled ( newdlg.getName() ); @@ -18784,8 +18784,8 @@ void KVpnc::newSessionClicked() mw->SessionCombo->insertItem ( it->getName() ); } GlobalConfig->currentProfile = GlobalConfig->AccountList->first(); - mw->SessionCombo->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); this->sessionToggled ( GlobalConfig->currentProfile->getName() ); } @@ -18882,10 +18882,10 @@ void KVpnc::deleteSessionClicked() if ( GlobalConfig->AccountList->isEmpty() ) { GlobalConfig->currentProfile = 0L; - mw->SessionCombo->setEnabled ( FALSE ); - ConnectAction->setEnabled ( FALSE ); - mw->buttonConnect->setEnabled ( FALSE ); - DeleteSessionAction->setEnabled ( FALSE ); + mw->SessionCombo->setEnabled ( false ); + ConnectAction->setEnabled ( false ); + mw->buttonConnect->setEnabled ( false ); + DeleteSessionAction->setEnabled ( false ); GlobalConfig->lastProfile = ""; } else @@ -18898,8 +18898,8 @@ void KVpnc::deleteSessionClicked() } GlobalConfig->currentProfile = GlobalConfig->AccountList->first(); GlobalConfig->lastProfile = GlobalConfig->AccountList->first()->getName(); - mw->SessionCombo->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); this->sessionToggled ( GlobalConfig->currentProfile->getName() ); } @@ -18972,7 +18972,7 @@ void KVpnc::renameSessionClicked () GlobalConfig->removeEntry ( Oldname ); if ( !mw->SessionCombo->isEnabled() ) - mw->SessionCombo->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); this->ConnectAction->setEnabled ( true ); sessionToggled ( GlobalConfig->currentProfile->getName() ); @@ -18999,16 +18999,16 @@ void KVpnc::sessionToggled ( const TQString& Name ) // mw->DebugOutput->append( "sessionToggled" ); if ( Name.isEmpty() || GlobalConfig->AccountList->isEmpty() ) { - this->DeleteSessionAction->setEnabled ( FALSE ); - // this->advancedSessionAction->setEnabled ( FALSE ); - this->SaveSessionAction->setEnabled ( FALSE ); + this->DeleteSessionAction->setEnabled ( false ); + // this->advancedSessionAction->setEnabled ( false ); + this->SaveSessionAction->setEnabled ( false ); return; } else { - this->DeleteSessionAction->setEnabled ( TRUE ); - // this->advancedSessionAction->setEnabled ( TRUE ); - this->SaveSessionAction->setEnabled ( TRUE ); + this->DeleteSessionAction->setEnabled ( true ); + // this->advancedSessionAction->setEnabled ( true ); + this->SaveSessionAction->setEnabled ( true ); VpnAccountData * it; GlobalConfig->currentProfile = GlobalConfig->AccountList->first(); for ( it = GlobalConfig->AccountList->first(); it; it = GlobalConfig->AccountList->next() ) @@ -19035,7 +19035,7 @@ void KVpnc::sessionToggled ( const TQString& Name ) TQString TunnelDeviceType=it->getTunnelDeviceType(); - this->ExportOpenvpnProfileAction->setEnabled ( FALSE ); + this->ExportOpenvpnProfileAction->setEnabled ( false ); TQString type = ""; // visible name TQString bin = ""; // executable name @@ -19183,7 +19183,7 @@ void KVpnc::sessionToggled ( const TQString& Name ) ProfileInfo += "<tr><td>"+i18n("Username:")+"</td><td>"+Username+"</td></tr>"; ProfileInfo += "<tr><td>"+i18n("Tunnel device type:")+"</td><td>"+TunnelDeviceType+"</td></tr>"; - this->ExportOpenvpnProfileAction->setEnabled ( TRUE ); + this->ExportOpenvpnProfileAction->setEnabled ( true ); } else if ( GlobalConfig->currentProfile->getConnectionType() == VpnAccountData::l2tpd_racoon ) { @@ -19344,8 +19344,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) if ( !GlobalConfig->currentProfile->getUseSmartcard() ) { // program is installed - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) is available, connect will be enabled." ).arg ( bin ), KVpncConfig::info ); @@ -19355,15 +19355,15 @@ void KVpnc::sessionToggled ( const TQString& Name ) { if ( UseSmartcardOk == false ) { - this->ConnectAction->setEnabled ( FALSE ); - mw->buttonConnect->setEnabled ( FALSE ); + this->ConnectAction->setEnabled ( false ); + mw->buttonConnect->setEnabled ( false ); GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error ); TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" ); } else { - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) and helper program (%2) is available, connect will be enabled." ).arg ( bin ).arg ( "pkcs11-tool" ), KVpncConfig::info ); TypeRequirementStatus = i18n ( "Daemon (%1) and helper program (%2) not available").arg ( "pkcs11-tool" ).arg("pkcs11-tool"); @@ -19372,8 +19372,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) } else { - this->ConnectAction->setEnabled ( FALSE ); - mw->buttonConnect->setEnabled ( FALSE ); + this->ConnectAction->setEnabled ( false ); + mw->buttonConnect->setEnabled ( false ); GlobalConfig->appendLogEntry ( i18n ( "The required daemon (%1) isn't available, connect will be disabled." ).arg ( bin ), KVpncConfig::error ); TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg(bin); } @@ -19403,8 +19403,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "racoon" ).arg ( "l2tpd" ), KVpncConfig::info ); TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "l2tpd" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else if ( racoon_and_xl2tpd_available ) { @@ -19414,8 +19414,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "xl2tpd" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else if ( racoon_and_l2tpd_available==false && racoon_and_xl2tpd_available==false ) { @@ -19433,8 +19433,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "racoon" ).arg ( "openl2tp" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } } } @@ -19475,8 +19475,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "l2tpd" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else if ( ipsec_and_xl2tpd_available ) { @@ -19486,8 +19486,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "xl2tpd" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else if ( ipsec_and_l2tpd_available==false && ipsec_and_xl2tpd_available==false ) { @@ -19505,8 +19505,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg ( "openl2tp" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else if ( ipsec_and_openl2tp_available==false ) { @@ -19521,15 +19521,15 @@ void KVpnc::sessionToggled ( const TQString& Name ) { if ( UseSmartcardOk == false ) { - this->ConnectAction->setEnabled ( FALSE ); - mw->buttonConnect->setEnabled ( FALSE ); + this->ConnectAction->setEnabled ( false ); + mw->buttonConnect->setEnabled ( false ); GlobalConfig->appendLogEntry ( i18n ( "The required helper program (%1) isn't available, connect will be disabled." ).arg ( "pkcs11-tool" ), KVpncConfig::error ); TypeRequirementStatus = i18n ( "Daemon (%1) not available").arg ( "pkcs11-tool" ); } else { - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); if ( GlobalConfig->KvpncDebugLevel > 2 ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) and helper program (%3) is available, connect will be enabled." ).arg ( "ipsec" ).arg ( TQString(deamon) ).arg ( "pkcs11-tool" ), KVpncConfig::info ); TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ipsec" ).arg(deamon).arg ( "pkcs11-tool" ); @@ -19558,8 +19558,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) GlobalConfig->appendLogEntry ( i18n ( "The required daemons (%1 and %2) are available, connect will be enabled." ).arg ( "pppd" ).arg ( "pptp" ), KVpncConfig::info ); TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "pppd" ).arg ( "pptp" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else @@ -19587,8 +19587,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "ksshaskpass" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else if ( ssh_and_gnomeaskpass_available ) @@ -19599,8 +19599,8 @@ void KVpnc::sessionToggled ( const TQString& Name ) TypeRequirementStatus = i18n ( "Daemons (%1 and %2) available").arg ( "ssh" ).arg ( "gnome-ssh-askpass" ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); } else @@ -20103,7 +20103,7 @@ void KVpnc::importKvpncSettingsClicked() mw->SessionCombo->insertItem ( GlobalConfig->AccountList->at ( i ) ->getName() ); } if ( !mw->SessionCombo->isEnabled() ) - mw->SessionCombo->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); this->ConnectAction->setEnabled ( true ); mw->SessionCombo->setCurrentText ( RetName ); @@ -20190,7 +20190,7 @@ void KVpnc::importProfileClicked ( TQString file ) mw->SessionCombo->setCurrentText ( account->getName() ); if ( !mw->SessionCombo->isEnabled() ) - mw->SessionCombo->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); this->ConnectAction->setEnabled ( true ); sessionToggled ( account->getName() ); @@ -20300,7 +20300,7 @@ void KVpnc::importOpenvpnProfileClicked ( TQString file ) mw->SessionCombo->setCurrentText ( account->getName() ); if ( !mw->SessionCombo->isEnabled() ) - mw->SessionCombo->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); this->ConnectAction->setEnabled ( true ); sessionToggled ( account->getName() ); @@ -20359,7 +20359,7 @@ void KVpnc::importIpsecProfileClicked () mw->SessionCombo->insertItem ( GlobalConfig->AccountList->at ( i ) ->getName() ); } if ( !mw->SessionCombo->isEnabled() ) - mw->SessionCombo->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); this->ConnectAction->setEnabled ( true ); @@ -20398,7 +20398,7 @@ void KVpnc::importFritzboxProfileClicked () mw->SessionCombo->insertItem ( GlobalConfig->AccountList->at ( i ) ->getName() ); } if ( !mw->SessionCombo->isEnabled() ) - mw->SessionCombo->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); this->ConnectAction->setEnabled ( true ); @@ -20731,7 +20731,7 @@ void KVpnc::doRacoon() // GlobalConfig->status = GlobalConfig->disconnected; // timer.stop(); // connect( &durationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDurationEvent() ) ); - // durationTimer.start( 1000, FALSE ); + // durationTimer.start( 1000, false ); } } else @@ -21206,7 +21206,7 @@ void KVpnc::vpncStarted() // GlobalConfig->appendLogEntry ( i18n( "\"%1\" started." ).arg("vpnc-connect"),GlobalConfig->info ); // // // connect( &timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotConnectTimedOut() ) ); - // // timer.start( tryConnectTimeout * 1000, FALSE ); + // // timer.start( tryConnectTimeout * 1000, false ); // // // // mw->buttonConnect->setEnabled( false ); // @@ -21336,7 +21336,7 @@ void KVpnc::racoonStarted() // GlobalConfig->status = GlobalConfig->connected; // // connect( &durationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDurationEvent() ) ); - // durationTimer.start( 1000, FALSE ); + // durationTimer.start( 1000, false ); // setGuiStatus( connected ); // // setFirewallAfterConnect(); @@ -21483,13 +21483,13 @@ void KVpnc::checkIpsecWhackStatus() disconnect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); connect ( &timer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotConnectTimedOut() ) ); // FIXME make connect timeout value in GUI available - timer.start ( 2000 * 1000, FALSE ); + timer.start ( 2000 * 1000, false ); } if ( !IpsecWhackStatusTimer.isActive() ) { disconnect ( &IpsecWhackStatusTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkIpsecWhackStatus() ) ); connect ( &IpsecWhackStatusTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( checkIpsecWhackStatus() ) ); - IpsecWhackStatusTimer.start ( 5 * 1000, FALSE ); + IpsecWhackStatusTimer.start ( 5 * 1000, false ); } } } @@ -21708,7 +21708,7 @@ void KVpnc::ipsecPhase2Established() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); @@ -22522,13 +22522,13 @@ void KVpnc::profileAddedOrDeleted() if ( !GlobalConfig->AccountList->isEmpty() ) { - this->DeleteSessionAction->setEnabled ( TRUE ); - // this->advancedSessionAction->setEnabled ( TRUE ); - this->SaveSessionAction->setEnabled ( TRUE ); - this->ImportSessionAction->setEnabled ( TRUE ); + this->DeleteSessionAction->setEnabled ( true ); + // this->advancedSessionAction->setEnabled ( true ); + this->SaveSessionAction->setEnabled ( true ); + this->ImportSessionAction->setEnabled ( true ); - this->ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + this->ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); mw->SessionCombo->clear(); QuickConnectMenu->clear(); @@ -22550,13 +22550,13 @@ void KVpnc::profileAddedOrDeleted() } else { - this->DeleteSessionAction->setEnabled ( FALSE ); - // this->advancedSessionAction->setEnabled ( FALSE ); - this->SaveSessionAction->setEnabled ( FALSE ); - this->ImportSessionAction->setEnabled ( TRUE ); + this->DeleteSessionAction->setEnabled ( false ); + // this->advancedSessionAction->setEnabled ( false ); + this->SaveSessionAction->setEnabled ( false ); + this->ImportSessionAction->setEnabled ( true ); - this->ConnectAction->setEnabled ( FALSE ); - mw->buttonConnect->setEnabled ( FALSE ); + this->ConnectAction->setEnabled ( false ); + mw->buttonConnect->setEnabled ( false ); } } @@ -23444,7 +23444,7 @@ void KVpnc::showNewProfileWizardClicked() setProfile ( account->getName() ); if ( !mw->SessionCombo->isEnabled() ) - mw->SessionCombo->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); this->ConnectAction->setEnabled ( true ); mw->SessionCombo->setCurrentText ( account->getName() ); @@ -23459,12 +23459,12 @@ void KVpnc::showNewProfileWizardClicked() // std::cout << "show profilemanager" << std::endl; - mw->SessionCombo->setEnabled ( TRUE ); - DeleteSessionAction->setEnabled ( TRUE ); - SaveSessionAction->setEnabled ( TRUE ); - ImportSessionAction->setEnabled ( TRUE ); - ConnectAction->setEnabled ( TRUE ); - mw->buttonConnect->setEnabled ( TRUE ); + mw->SessionCombo->setEnabled ( true ); + DeleteSessionAction->setEnabled ( true ); + SaveSessionAction->setEnabled ( true ); + ImportSessionAction->setEnabled ( true ); + ConnectAction->setEnabled ( true ); + mw->buttonConnect->setEnabled ( true ); slotStatusMsg ( i18n ( "Profile \"%1\" added." ).arg ( mw->SessionCombo->currentText() ), ID_FLASH_MSG ); GlobalConfig->appendLogEntry ( i18n ( "Profile \"%1\" added." ).arg ( mw->SessionCombo->currentText() ) , GlobalConfig->info ); @@ -24598,7 +24598,7 @@ void KVpnc::checkL2tpPppUp() disconnect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); connect ( &durationTimer, TQ_SIGNAL ( timeout() ), this, TQ_SLOT ( slotDurationEvent() ) ); - durationTimer.start ( 1000, FALSE ); + durationTimer.start ( 1000, false ); setGuiStatus ( connected ); |