Minor fix in Network

Summary: $title

Reviewed By: enpe

Differential Revision:
D86137498

Privacy Context Container: L1192943

fbshipit-source-id: fb27c614ea23fc43cdeafaede7bb703e37d9548b

Author: janherling

impl/ocean/network/ConnectionOrientedServer.cpp

@@ -128,7 +128,7 @@ bool ConnectionOrientedServer::onScheduler()
 
 	ocean_assert(!buffer_.empty());
 
-	sockaddr_in request;
+	sockaddr_in request = {};
 
 	// handle listen events
 #if (defined(__clang__) && !defined(_MSC_VER)) || defined(__GNUC__)

impl/ocean/network/ConnectionlessClient.cpp

@@ -41,7 +41,7 @@ ConnectionlessClient::SocketResult ConnectionlessClient::send(const Address4& ad
 		return SR_FAILED;
 	}
 
-	sockaddr_in receiver;
+	sockaddr_in receiver = {};
 	receiver.sin_family = AF_INET;
 	receiver.sin_addr.s_addr = address;
 	receiver.sin_port = port;

impl/ocean/network/ConnectionlessServer.cpp

@@ -36,7 +36,7 @@ bool ConnectionlessServer::onScheduler()
 		return false;
 	}
 
-	sockaddr_in senderAddress;
+	sockaddr_in senderAddress = {};
 #if defined(OCEAN_POSIX_AVAILABLE)
 	socklen_t senderAddressSize = sizeof(senderAddress);
 #else
@@ -47,7 +47,7 @@ bool ConnectionlessServer::onScheduler()
 
 	if (size > 0)
 	{
-		receiveCallback_(Address4(senderAddress.sin_port), Port(senderAddress.sin_port), buffer_.data(), size_t(size));
+		receiveCallback_(Address4(senderAddress.sin_addr.s_addr), Port(senderAddress.sin_port), buffer_.data(), size_t(size));
 		return true;
 	}
 

impl/ocean/network/HTTPClient.cpp

@@ -287,7 +287,9 @@ bool HTTPClient::invokeGetRequest(const std::string& uri, Buffer& data, const do
 				if (buffer.size() > responseHeader.length())
 				{
 					if (appendData(responseHeader, responseBuffer, responseBufferPosition, (char*)buffer.data() + responseHeader.length(), buffer.size() - responseHeader.length(), responsePendingChunkSize))
+					{
 						break;
+					}
 				}
 
 				startTimestamp.toNow();
@@ -301,7 +303,7 @@ bool HTTPClient::invokeGetRequest(const std::string& uri, Buffer& data, const do
 
 		Thread::sleep(1);
 	}
-	while (startTimestamp + timeout > Timestamp(true));
+	while (!startTimestamp.hasTimePassed(timeout));
 
 	if (responseHeader.encodingType() == HTTPHeader::ET_GZIP)
 	{
@@ -506,7 +508,9 @@ bool HTTPClient::appendData(const HTTPHeader& header, Buffer& buffer, size_t& bu
 	ocean_assert(header.transferEncodingChunked() || pendingChunkSize == 0);
 
 	if (buffer.empty() && header.contentLength() != 0)
+	{
 		buffer.resize(header.contentLength());
+	}
 
 	size_t iterationSize = 0;
 
@@ -518,7 +522,7 @@ bool HTTPClient::appendData(const HTTPHeader& header, Buffer& buffer, size_t& bu
 			size_t offset = 0;
 			const std::string chungSizeLine = line((const char*)payload, payloadSize, offset);
 
-			unsigned int chunkSize = 0u;
+			uint32_t chunkSize = 0u;
 			if (!hexToNumber(chungSizeLine, chunkSize))
 			{
 				return false;
@@ -608,7 +612,7 @@ std::string HTTPClient::line(const char* data, const size_t size, size_t& offset
 	return std::string(data, size);
 }
 
-bool HTTPClient::hexToNumber(const std::string& hex, unsigned int& value)
+bool HTTPClient::hexToNumber(const std::string& hex, uint32_t& value)
 {
 	value = 0u;
 
@@ -639,8 +643,14 @@ bool HTTPClient::hexToNumber(const std::string& hex, unsigned int& value)
 			return false;
 		}
 
-		ocean_assert(value <= value + (digit << (n * 4u)));
-		value += (digit << (n * 4u));
+		const uint32_t digitValue = digit << (n * 4u);
+
+		if (digitValue > std::numeric_limits<uint32_t>::max() - value)
+		{
+			return false;
+		}
+
+		value += digitValue;
 	}
 
 	return true;

impl/ocean/network/HTTPClient.h

@@ -369,7 +369,7 @@ class OCEAN_NETWORK_EXPORT HTTPClient
 		 * @param value The resulting number
 		 * @return True, if succeeded
 		 */
-		static bool hexToNumber(const std::string& hex, unsigned int& value);
+		static bool hexToNumber(const std::string& hex, uint32_t& value);
 
 		/**
 		 * Returns the HTTP version string for a given version number.

impl/ocean/network/MaintenanceUDPConnector.cpp

@@ -28,7 +28,7 @@ MaintenanceUDPConnector::~MaintenanceUDPConnector()
 	stopThreadExplicitly();
 }
 
-void MaintenanceUDPConnector::configurateAsSender(const Address4& address, Port& port)
+void MaintenanceUDPConnector::configurateAsSender(const Address4& address, const Port& port)
 {
 	ocean_assert(address.isValid() && port.isValid());
 

impl/ocean/network/MaintenanceUDPConnector.h

@@ -81,7 +81,7 @@ class OCEAN_NETWORK_EXPORT MaintenanceUDPConnector :
 		 * @param targetPort The port of the remote host to which the maintenance data will be sent
 		 * @see configurateAsReceiver().
 		 */
-		void configurateAsSender(const Address4& targetAddress, Port& targetPort);
+		void configurateAsSender(const Address4& targetAddress, const Port& targetPort);
 
 		/**
 		 * Configures this connector as receiver.

impl/ocean/network/PackagedConnectionlessClient.cpp

@@ -71,7 +71,7 @@ PackagedConnectionlessClient::SocketResult PackagedConnectionlessClient::send(co
 
 	const size_t maximalPayloadSize = maximalPackageSize_ - packageManagmentHeaderSize();
 
-	sockaddr_in receiver;
+	sockaddr_in receiver = {};
 	receiver.sin_family = AF_INET;
 	receiver.sin_addr.s_addr = address;
 	receiver.sin_port = port;

impl/ocean/network/PackagedConnectionlessServer.cpp

@@ -42,7 +42,7 @@ bool PackagedConnectionlessServer::onScheduler()
 		return false;
 	}
 
-	sockaddr_in senderAddress;
+	sockaddr_in senderAddress = {};
 #if defined(OCEAN_POSIX_AVAILABLE)
 	socklen_t senderAddressSize = sizeof(senderAddress);
 #else

impl/ocean/network/PackagedUDPClient.cpp

@@ -46,7 +46,7 @@ bool PackagedUDPClient::buildSocket(const Address4& localAddress, const Port loc
 		return false;
 	}
 
-	sockaddr_in address;
+	sockaddr_in address = {};
 	address.sin_family = AF_INET;
 	address.sin_addr.s_addr = localAddress.isValid() ? (unsigned int)localAddress : (unsigned int)INADDR_ANY;
 	address.sin_port = localPort;