From e874c2575c1203648e71426cd34f747cbd34b2b4 Mon Sep 17 00:00:00 2001
From: Kevin Rocard <kevinx.rocard@intel.com>
Date: Fri, 25 Apr 2014 15:11:12 +0200
Subject: remote-proccessor detect partial message reception

BZ: 190038

Client disconnection during message reception is normal if no part of the
message as been receive yet.
Client disconnection in the middle of a packet reception is not normal
but was not differentiated from the behaviour described above.

Do not consider client disconnection on first read as an error.
Consider it as an error on the followings.

Change-Id: I34b50ba0af800f9e1fcdb51996b1b2f02a23cb3f
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>
Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>
---
 remote-processor/RemoteProcessorServer.cpp | 43 +++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 16 deletions(-)

(limited to 'remote-processor/RemoteProcessorServer.cpp')

diff --git a/remote-processor/RemoteProcessorServer.cpp b/remote-processor/RemoteProcessorServer.cpp
index 487379e..8c66109 100644
--- a/remote-processor/RemoteProcessorServer.cpp
+++ b/remote-processor/RemoteProcessorServer.cpp
@@ -30,6 +30,7 @@
 #include "RemoteProcessorServer.h"
 #include "ListeningSocket.h"
 #include <iostream>
+#include <memory>
 #include <assert.h>
 #include <poll.h>
 #include <unistd.h>
@@ -147,15 +148,15 @@ void CRemoteProcessorServer::run()
 // New connection
 void CRemoteProcessorServer::handleNewConnection()
 {
-    CSocket* pClientSocket = _pListeningSocket->accept();
+    const auto_ptr<CSocket> clientSocket(_pListeningSocket->accept());
 
-    if (!pClientSocket) {
+    if (clientSocket.get() == NULL) {
 
         return;
     }
 
     // Set timeout
-    pClientSocket->setTimeout(5000);
+    clientSocket->setTimeout(5000);
 
     // Process all incoming requests from the client
     while (true) {
@@ -166,12 +167,18 @@ void CRemoteProcessorServer::handleNewConnection()
 
         string strError;
         ///// Receive command
-        if (!requestMessage.serialize(pClientSocket, false, strError)) {
-
-            if (!pClientSocket->hasPeerDisconnected()) {
-                cout << "Error while receiving message: " << strError << endl;
-            }
-            break;
+        CRequestMessage::Result res;
+        res = requestMessage.serialize(clientSocket.get(), false, strError);
+
+        switch (res) {
+        case CRequestMessage::error:
+            cout << "Error while receiving message: " << strError << endl;
+            // fall through
+        case CRequestMessage::peerDisconnected:
+            // Consider peer disconnection as normal, no log
+            return; // Bail out
+        case CRequestMessage::success:
+            break; // No error, continue
         }
 
         // Actually process the request
@@ -195,13 +202,17 @@ void CRemoteProcessorServer::handleNewConnection()
         CAnswerMessage answerMessage(strResult, bSuccess);
 
         ///// Send answer
-        if (!answerMessage.serialize(pClientSocket, true, strError)) {
-
-            // Bail out
-            cout << "Error while sending message: " << strError << endl;
-            break;
+        res = answerMessage.serialize(clientSocket.get(), true, strError);
+
+        switch (res) {
+        case CRequestMessage::peerDisconnected:
+            // Peer should not disconnect while waiting for an answer
+            // Fall through to log the error and bail out
+        case CRequestMessage::error:
+            cout << "Error while receiving message: " << strError << endl;
+            return; // Bail out
+        case CRequestMessage::success:
+            break; // No error, continue
         }
     }
-    // Remove client socket
-    delete pClientSocket;
 }
-- 
cgit v1.1