Fix problems in TCP socket communication (python)

AndreiCostinescu · Jun 17, 2021 · d553b84 · d553b84
1 parent 9dc542b
commit d553b84
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/python/comm/comm_data/ImageEncodeData.py b/python/comm/comm_data/ImageEncodeData.py
@@ -135,6 +135,7 @@ def deserialize(self, buffer: Buffer, start: int, forceCopy: bool, verbose: bool
             self.image = cv.imdecode(self.encodedImage, cv.IMREAD_COLOR)
             self.imageHeight = self.image.shape[0]
             self.imageWidth = self.image.shape[1]
+            self.imageType = ImageData.imageCVType(self.image)
             self.imageDeserialized = True
             self.deserializeState = 0
             return True

diff --git a/python/comm/comm_socket/Socket.py b/python/comm/comm_socket/Socket.py
@@ -215,14 +215,14 @@ def _setSocketTimeouts(sock: socket.socket, sendTimeout: int = -1, recvTimeout:
             if os == "Windows":
                 timeval = sendTimeout
             else:
-                timeval = struct.pack('ll', 0, 1000 * sendTimeout)
+                timeval = struct.pack('ll', 0, sendTimeout)
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO, timeval)
             print("Socket send timeout:", sock.getsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO))
         if recvTimeout > 0:
             if os == "Windows":
                 timeval = recvTimeout
             else:
-                timeval = struct.pack('ll', 0, 1000 * recvTimeout)
+                timeval = struct.pack('ll', 0, recvTimeout)
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, timeval)
             print("Socket recv timeout:", sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO))
 
@@ -432,8 +432,10 @@ def performReceive(self, buffer: bytes, expectedHeader: Optional[SerializationHe
             while receiveSize > 0:
                 receiveBuffer = self.socket.recv(receiveSize)
                 receiveAmount = len(receiveBuffer)
+                receiveSize -= receiveAmount
+                self.recvBuffer.buffer = memcpy(self.recvBuffer.buffer, localReceivedBytes, receiveBuffer, 0,
+                                                receiveAmount)
                 localReceivedBytes += receiveAmount
-                self.recvBuffer.buffer += receiveBuffer
                 if receiveAmount <= 0:
                     break
         else:

diff --git a/src/socket/Socket.cpp b/src/socket/Socket.cpp
@@ -639,7 +639,7 @@ bool Socket::performReceive(char *buffer, int &localReceivedBytes, bool &overwri
                         localRetries--;
                     } else {
                         cout << "BREAK BECAUSE OF (TCP) ERROR: receive amount = " << receiveAmount << "; errorCode: "
-                             << errorCode  << "; " << getLastErrorString(errorCode) << endl;
+                             << errorCode << "; " << getLastErrorString(errorCode) << endl;
                         localReceivedBytes = receiveAmount;
                         return true;
                     }