src/UDP_Protocol.cpp

@@ -26,10 +26,7 @@ UDPProtocol::UDPProtocol(std::string ip, int port) :
 	srvaddr.sin_family = AF_INET; // IPv4
 	srvaddr.sin_addr.s_addr = inet_addr(ip.c_str());
 	srvaddr.sin_port = htons(this->port);
-	struct timeval timeout;
-	timeout.tv_sec = 5;
-	timeout.tv_usec = 0;
-	setsockopt(srv_sock, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
+
 }
 
 UDPProtocol::~UDPProtocol() {
@@ -42,7 +39,8 @@ int UDPProtocol::receiveAtLeastHeaderSizeBytes(uint8_t *buff, int headerSize,
 	socklen_t len = sizeof(cliaddr);
 	while (bytercv < headerSize) {
 		int rcv = recvfrom(srv_sock, &buff[bytercv], packetSize + 1, // +1 to recognized if there are more bytes than expected
-		MSG_WAITFORONE, (struct sockaddr*) &cliaddr, &len);
+		0, (struct sockaddr*) &cliaddr, &len);
+
 		bytercv += rcv;
 		if (rcv < 0) {
 			return -1;
@@ -132,9 +130,15 @@ int UDPProtocol::connectToClient() {
 
 	// Set timeout to the socket
 	struct timeval tv;
-	tv.tv_sec = std::numeric_limits<time_t>::max();
+	tv.tv_sec = 1;
 	tv.tv_usec = 0;
-	setsockopt(srv_sock, SOL_SOCKET, SO_RCVTIMEO, (const char*) &tv, sizeof tv);
+	if (setsockopt(srv_sock, SOL_SOCKET, SO_RCVTIMEO, (const char*) &tv,
+			sizeof tv) < 0) {
+		time_t now = time(nullptr);
+		std::cerr << "[" << std::put_time(localtime(&now), "%Y-%m-%d %H:%M:%S")
+				<< "]\t[UDP Receiver]\t" << "Error setting timeout to socket" << std::endl;
+		return -1;
+	}
 
 	// Bind the socket with the server address
 	if (bind(srv_sock, (const struct sockaddr*) &srvaddr, sizeof(srvaddr))