mirrors/SingleApplication
1
0
Fork 0
mirror of https://github.com/itay-grudev/SingleApplication.git synced 2025-04-01 01:52:39 +08:00
Code Activity

Refactored slotConnectionEstablished()

Browse Source 
The code is now shorter and easier to understand. Fixed an
uninitialised variable warning as reported in #20.
This commit is contained in:
Itay Grudev 2017-01-24 16:54:53 +00:00
parent 3d178904f0
commit 60d30db837
No known key found for this signature in database
GPG Key ID: 8BA92A8D5F1660F3
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
singleapplication.cpp
View File

@ -264,21 +264,23 @@ void SingleApplicationPrivate::slotConnectionEstablished()
QLocalSocket *socket = server->nextPendingConnection(); QLocalSocket *socket = server->nextPendingConnection();
// Verify that the new connection follows the SingleApplication protocol // Verify that the new connection follows the SingleApplication protocol
char connectionType; char connectionType = '\0'; // Invalid connection
quint32 instanceId; quint32 instanceId;
QByteArray initMsg, tmp; QByteArray initMsg, tmp;
bool invalidConnection = false;
if( socket->waitForReadyRead( 100 ) ) { if( socket->waitForReadyRead( 100 ) ) {
tmp = socket->read( blockServerName.length() ); tmp = socket->read( blockServerName.length() );
// Verify that the socket data start with blockServerName // Verify that the socket data start with blockServerName
if( tmp == blockServerName.toLatin1() ) { if( tmp == blockServerName.toLatin1() ) {
initMsg = tmp; initMsg = tmp;
tmp = socket->read(1);
// Verify that the next charecter is N/S/R (connecion type) // Verify that the next charecter is N/S/R (connecion type)
// Stands for New Instance/Secondary Instance/Reconnect // Stands for New Instance/Secondary Instance/Reconnect
if( tmp == "N" || tmp == "S" || tmp == "R" ) { connectionType = socket->read( 1 )[0];
connectionType = tmp.at(0); switch( connectionType ) {
initMsg += tmp; case 'N':
case 'S':
case 'R':
{
initMsg += connectionType;
tmp = socket->read( sizeof(quint32) ); tmp = socket->read( sizeof(quint32) );
const char * data = tmp.constData(); const char * data = tmp.constData();
instanceId = (quint32)*data; instanceId = (quint32)*data;
@ -289,20 +291,16 @@ void SingleApplicationPrivate::slotConnectionEstablished()
256 256
); );
tmp = socket->read( checksum.length() ); tmp = socket->read( checksum.length() );
if( checksum != tmp ) { if( checksum == tmp )
invalidConnection = true; break; // Otherwise set to invalid connection (next line)
} }
} else { default:
invalidConnection = true; connectionType = '\0'; // Invalid connection
} }
} else {
invalidConnection = true;
} }
} else {
invalidConnection = true;
} }
if( invalidConnection ) { if( connectionType == '\0' ) {
socket->close(); socket->close();
delete socket; delete socket;
return; return;