Adapt to new protobuf version and fix number conversions

Author: wawanbreton

conandata.yml

@@ -1 +1 @@
-version: "5.11.0"
+version: "5.11.1"

conanfile.py

@@ -93,7 +93,7 @@ def layout(self):
     def requirements(self):
         super().requirements()
 
-        self.requires("protobuf/3.21.12", transitive_headers=True, transitive_libs=True)
+        self.requires("protobuf/6.33.5", transitive_headers=True, transitive_libs=True)
 
     def validate(self):
         super().validate()
@@ -115,7 +115,6 @@ def validate(self):
 
     def build_requirements(self):
         self.test_requires("standardprojectsettings/[>=0.2.0]")
-        self.tool_requires("protobuf/3.21.12")
 
     def generate(self):
         tc = CMakeToolchain(self)

include/Arcus/Socket.h

@@ -91,15 +91,15 @@ class Socket
      * \param address The IP address to connect to.
      * \param port The port to connect to.
      */
-    virtual void connect(const std::string& address, int port);
+    virtual void connect(const std::string& address, uint16_t port);
 
     /**
      * Listen for connections on an address and port.
      *
      * \param address The IP address to listen on.
      * \param port The port to listen on.
      */
-    virtual void listen(const std::string& address, int port);
+    virtual void listen(const std::string& address, uint16_t port);
 
     /**
      * Close the connection and stop handling any messages.

src/MessageTypeStore.cpp

@@ -19,10 +19,10 @@ using namespace Arcus;
  * of std::hash differs between compilers, we need to make sure we use the same
  * implementation everywhere.
  */
-uint32_t hash(const std::string& input)
+uint32_t hash(const std::string_view& input)
 {
-    const char* data = input.c_str();
-    uint32_t length = input.size();
+    const char* data = input.data();
+    size_t length = input.size();
     uint32_t result = static_cast<uint32_t>(2166136261UL);
     for (; length; --length)
     {
@@ -39,7 +39,8 @@ class ErrorCollector : public google::protobuf::compiler::MultiFileErrorCollecto
     {
     }
 
-    void AddError(const std::string& filename, int line, int column, const std::string& message) override
+    void RecordError(absl::string_view filename, int line, int column,
+                           absl::string_view message) override
     {
         _stream << "[" << filename << " (" << line << "," << column << ")] " << message << std::endl;
         _error_count++;

src/PlatformSocket.cpp

@@ -42,7 +42,7 @@ void initializeWSA()
 #endif
 
 // Create a sockaddr_in structure from an address and port.
-sockaddr_in createAddress(const std::string& address, int port)
+sockaddr_in createAddress(const std::string& address, uint16_t port)
 {
     sockaddr_in a;
     a.sin_family = AF_INET;
@@ -72,14 +72,14 @@ bool Arcus::Private::PlatformSocket::create()
     return _socket_id != -1;
 }
 
-bool Arcus::Private::PlatformSocket::connect(const std::string& address, int port)
+bool Arcus::Private::PlatformSocket::connect(const std::string& address, uint16_t port)
 {
     auto address_data = createAddress(address, port);
     int result = ::connect(_socket_id, reinterpret_cast<sockaddr*>(&address_data), sizeof(address_data));
     return result == 0;
 }
 
-bool Arcus::Private::PlatformSocket::bind(const std::string& address, int port)
+bool Arcus::Private::PlatformSocket::bind(const std::string& address, uint16_t port)
 {
     auto address_data = createAddress(address, port);
     int result = ::bind(_socket_id, reinterpret_cast<sockaddr*>(&address_data), sizeof(address_data));

src/PlatformSocket_p.h

@@ -50,7 +50,7 @@ class PlatformSocket
      *
      * \return true if the connection was successful, false if not.
      */
-    bool connect(const std::string& address, int port);
+    bool connect(const std::string& address, uint16_t port);
     /**
      * Bind the socket to an address and port.
      *
@@ -59,7 +59,7 @@ class PlatformSocket
      *
      * \return true if successful, false if not.
      */
-    bool bind(const std::string& address, int port);
+    bool bind(const std::string& address, uint16_t port);
     /**
      * Mark the socket as listening for new connections.
      *

src/Socket.cpp

@@ -113,7 +113,7 @@ void Socket::removeListener(SocketListener* listener)
     d->listeners.erase(itr);
 }
 
-void Socket::connect(const std::string& address, int port)
+void Socket::connect(const std::string& address, uint16_t port)
 {
     if (d->state != SocketState::Initial || d->thread != nullptr)
     {
@@ -146,7 +146,7 @@ void Socket::reset()
     clearError();
 }
 
-void Socket::listen(const std::string& address, int port)
+void Socket::listen(const std::string& address, uint16_t port)
 {
     if (d->state != SocketState::Initial || d->thread != nullptr)
     {

src/Socket_p.h

@@ -86,7 +86,7 @@ class Socket::Private
     bool received_close;
 
     std::string address;
-    uint port;
+    uint16_t port;
 
     std::thread* thread;
 
@@ -346,8 +346,8 @@ void Socket::Private::sendMessage(const MessagePtr& message)
         return;
     }
 
-    const uint32_t message_size = message->ByteSizeLong();
-    if (platform_socket.writeUInt32(message_size) == -1)
+    const size_t message_size = message->ByteSizeLong();
+    if (platform_socket.writeUInt32(static_cast<uint32_t>(message_size)) == -1)
     {
         error(ErrorCode::SendFailedError, "Could not send message size");
         return;
@@ -373,7 +373,7 @@ void Socket::Private::sendMessage(const MessagePtr& message)
 // Handle receiving data until we have a proper message.
 void Socket::Private::receiveNextMessage()
 {
-    int result = 0;
+    socket_size result = 0;
 
     if (! current_message)
     {
@@ -397,9 +397,9 @@ void Socket::Private::receiveNextMessage()
             return;
         }
 
-        int signature = (header & 0xffff0000) >> 16;
-        int major_version = (header & 0x0000ff00) >> 8;
-        int minor_version = header & 0x000000ff;
+        uint32_t signature = (header & 0xffff0000) >> 16;
+        uint32_t major_version = (header & 0x0000ff00) >> 8;
+        uint32_t minor_version = header & 0x000000ff;
 
         if (signature != ARCUS_SIGNATURE)
         {
@@ -496,7 +496,7 @@ void Socket::Private::receiveNextMessage()
         }
         else
         {
-            current_message->received_size = current_message->received_size + result;
+            current_message->received_size = current_message->received_size + static_cast<uint32_t>(result);
 
             DEBUG("Received " + std::to_string(result) + " bytes data");
 
@@ -532,7 +532,7 @@ void Socket::Private::handleMessage(const std::shared_ptr<WireMessage>& wire_mes
 
     MessagePtr message = message_types.createMessage(wire_message->type);
 
-    google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size);
+    google::protobuf::io::ArrayInputStream array(wire_message->data, static_cast<int>(wire_message->size));
     google::protobuf::io::CodedInputStream stream(&array);
     stream.SetTotalBytesLimit(message_size_maximum);
     if (! message->ParseFromCodedStream(&stream))
@@ -563,7 +563,7 @@ void Socket::Private::checkConnectionState()
 
     if (diff.count() > keep_alive_rate)
     {
-        int32_t keepalive = 0;
+        constexpr uint32_t keepalive = 0;
         if (platform_socket.writeUInt32(keepalive) == -1)
         {
             error(ErrorCode::ConnectionResetError, "Connection reset by peer");