Fix crash caused by improper SASL initialization

2 files changed, 50 insertions, 34 deletions

diff --git a/clients/tde/src/part/fpgaprogram/part.cpp b/clients/tde/src/part/fpgaprogram/part.cpp
index b51c39a..0464c8b 100644
--- a/clients/tde/src/part/fpgaprogram/part.cpp
+++ b/clients/tde/src/part/fpgaprogram/part.cpp
@@ -79,6 +79,8 @@ FPGAProgramPart::FPGAProgramPart(TQWidget *parentWidget, const char *widgetName,
 
 	// Create timers
 	m_updateTimer = new TQTimer(this);
+	m_connectionTimer = new TQTimer(this);
+	connect(m_connectionTimer, SIGNAL(timeout()), this, SLOT(finishConnectingToServer()));
 
 	// Create widgets
 	m_base = new FPGAProgramBase(widget());
@@ -154,6 +156,8 @@ bool FPGAProgramPart::closeURL() {
 }
 
 void FPGAProgramPart::disconnectFromServer() {
+	m_connectionTimer->stop();
+	m_updateTimer->stop();
 	if (m_socket) {
 		m_socket->clearPendingData();
 		m_socket->close();
@@ -220,45 +224,56 @@ void FPGAProgramPart::finishConnectingToServer() {
 			case 2:
 				// Connection established!
 				// Read magic number and proto version from server
-				TQDataStream ds(m_socket);
-				TQ_UINT32 magicnum;
-				TQ_UINT32 protover;
-				ds >> magicnum;
-				ds >> protover;
-				printf("[DEBUG] Got magic number %d and protocol version %d\n\r", magicnum, protover); fflush(stdout);
-
-				// Request connection to backend server
-				TQString response;
-				ds << TQString("SERV");
-				ds << TQString(CLIENT_LIBRARY);
-				ds >> response;
-printf("[RAJA DEBUG 400.0] Got '%s' from the server\n\r", response.ascii()); fflush(stdout);
-				if (response == "OK") {
+				m_socket->processPendingData();
+				if (m_socket->bytesAvailable() > 0) {
+					TQDataStream ds(m_socket);
+					TQ_UINT32 magicnum;
+					TQ_UINT32 protover;
+					ds >> magicnum;
+					ds >> protover;
+					printf("[DEBUG] Got magic number %d and protocol version %d\n\r", magicnum, protover); fflush(stdout);
+
+					// Request connection to backend server
+					ds << TQString("SERV");
+					ds << TQString(CLIENT_LIBRARY);
 					connToServerState = 3;
-					connToServerConnecting = false;
-					connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
-					connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
-					m_tickerState = 0;
-					m_commHandlerState = 0;
-					m_commHandlerMode = 0;
-					m_updateTimer->start(FPGA_COMM_TIMEOUT_MS, FALSE);
-					processLockouts();
-					mainEventLoop();
-					return;
 				}
-				else {
-					TQStringList errorStrings = textForServerError(response);
-					connToServerState = -1;
-					connToServerConnecting = false;
-					disconnectFromServer();
-					KMessageBox::error(0, errorStrings[0], errorStrings[1]);
-					close();
-					return;
+				break;
+			case 3:
+				// Read response from server
+				m_socket->processPendingData();
+				if (m_socket->bytesAvailable() > 0) {
+					TQDataStream ds(m_socket);
+					TQString response;
+					ds >> response;
+printf("[RAJA DEBUG 400.0] Got '%s' from the server\n\r", response.ascii()); fflush(stdout);
+					if (response == "OK") {
+						connToServerState = 4;
+						connToServerConnecting = false;
+						connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+						connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+						m_tickerState = 0;
+						m_commHandlerState = 0;
+						m_commHandlerMode = 0;
+						m_updateTimer->start(FPGA_COMM_TIMEOUT_MS, FALSE);
+						processLockouts();
+						mainEventLoop();
+						return;
+					}
+					else {
+						TQStringList errorStrings = textForServerError(response);
+						connToServerState = -1;
+						connToServerConnecting = false;
+						disconnectFromServer();
+						KMessageBox::error(0, errorStrings[0], errorStrings[1]);
+						close();
+						return;
+					}
 				}
 				break;
 		}
 
-		TQTimer::singleShot(0, this, SLOT(finishConnectingToServer()));
+		m_connectionTimer->start(100, TRUE);
 	}
 }
 
@@ -277,7 +292,7 @@ int FPGAProgramPart::connectToServer(TQString server) {
 	// Finish connecting when appropriate
 	connToServerState = 0;
 	connToServerConnecting = true;
-	TQTimer::singleShot(0, this, SLOT(finishConnectingToServer()));
+	m_connectionTimer->start(100, TRUE);
 
 	return 0;
 }
diff --git a/clients/tde/src/part/fpgaprogram/part.h b/clients/tde/src/part/fpgaprogram/part.h
index f254cbc..5becdde 100644
--- a/clients/tde/src/part/fpgaprogram/part.h
+++ b/clients/tde/src/part/fpgaprogram/part.h
@@ -79,6 +79,7 @@ namespace RemoteLab
 			TDEKerberosClientSocket* m_socket;
 			FPGAProgramBase* m_base;
 			TQMutex* m_connectionMutex;
+			TQTimer* m_connectionTimer;
 			TQTimer* m_updateTimer;
 
 			bool connToServerConnecting;