diff --git a/src/jceConnection/jcesslclient.cpp b/src/jceConnection/jcesslclient.cpp index a4e2ceb..bdcc197 100644 --- a/src/jceConnection/jcesslclient.cpp +++ b/src/jceConnection/jcesslclient.cpp @@ -205,7 +205,7 @@ void jceSSLClient::setConnected() */ void jceSSLClient::setDisconnected() { - qDebug() << Q_FUNC_INFO << "DISCONNECTED"; + qDebug() << Q_FUNC_INFO << "connection has been DISCONNECTED"; this->setSocketState(QAbstractSocket::SocketState::UnconnectedState); packet.clear(); flag = false; @@ -218,7 +218,7 @@ void jceSSLClient::setDisconnected() */ void jceSSLClient::setEncrypted() { - qDebug() << Q_FUNC_INFO << "ENCRYPTED"; + qDebug() << Q_FUNC_INFO << "connection has been ENCRYPTED"; setReadBufferSize(10000); setSocketOption(QAbstractSocket::KeepAliveOption,true); flag = true; diff --git a/src/jceSettings/jcelogin.cpp b/src/jceSettings/jcelogin.cpp index 145e926..0447cd7 100644 --- a/src/jceSettings/jcelogin.cpp +++ b/src/jceSettings/jcelogin.cpp @@ -31,14 +31,15 @@ void jceLogin::makeConnection() throw (jceStatus) if (this->recieverPage == NULL) this->recieverPage = new QString(); - if (JceConnector->makeConnect(dst_host,dst_port) == false) //couldnt make a connection - throw jceStatus::ERROR_ON_OPEN_SOCKET; - int returnMode; //gets status according to called function of validation step jceStatus status = jceStatus::JCE_NOT_CONNECTED; returnMode = checkConnection(); //checking socket status. is connected? + if (returnMode == false) + if (JceConnector->makeConnect(dst_host,dst_port) == false) //couldnt make a connection + throw jceStatus::ERROR_ON_OPEN_SOCKET; + if (returnMode == true) //connected to host { returnMode = makeFirstVisit(); @@ -292,10 +293,34 @@ QString jceLogin::getPage() void jceLogin::reValidation() { qDebug() << Q_FUNC_INFO << "Revalidating user"; - if (makeFirstVisit()) + if (makeFirstVisit() == true) { - if (makeSecondVisit()) - qDebug() << Q_FUNC_INFO << "Validated"; + if (checkValidation()) + { + if (makeSecondVisit() == true) + qDebug() << Q_FUNC_INFO << "Validated"; + else + qWarning() << Q_FUNC_INFO << "Second visit finished with an error"; + } + else + qDebug() << Q_FUNC_INFO << "checking validation ended with an error"; } + else + { + qDebug() << Q_FUNC_INFO << "Couldnt Validate User"; + } + /* + delete recieverPage; + recieverPage = NULL; + if (this->JceConnector != NULL) + delete JceConnector; + this->recieverPage = new QString(); + this->JceConnector = new jceSSLClient(); + if (makeFirstVisit() == true) + { + if (checkValidation()) + { + if (makeSecondVisit() == true) + */ }