matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drone now disconnects only if version is incompatible or if any other RPC is received before versionCheck() - for all other errors/failures, drone does not disconnect the connection with client

Browse Source
This commit is contained in:
Srivats P. 2014-07-06 11:26:26 +05:30
parent 9955d31b77
commit 57be4f3ada
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpc/rpcconn.cpp
View File

@ -219,6 +219,7 @@ void RpcConnection::on_clientSock_dataAvail()
::google::protobuf::Message *req, *resp;
PbRpcController *controller;
QString error;
bool disconnect = false;
// Do we have enough bytes for a msg header?
// If yes, peek into the header and get msg length
@ -260,6 +261,7 @@ void RpcConnection::on_clientSock_dataAvail()
qDebug("server(%s): version compatibility check pending",
__FUNCTION__);
error = "version compatibility check pending";
disconnect = true;
goto _error_exit;
}
@ -347,7 +349,8 @@ _error_exit2:
isPending = true;
controller = new PbRpcController(NULL, NULL);
controller->SetFailed(error);
controller->TriggerDisconnect();
if (disconnect)
controller->TriggerDisconnect();
sendRpcReply(controller);
return;
}