diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index f5106a52ac..d2efbb0fac 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -152,7 +152,7 @@ void ServerList::Clear() _serverEntries.clear(); } -std::vector ServerList::ReadFavourites() +std::vector ServerList::ReadFavourites() const { log_verbose("server_list_read(...)"); std::vector entries; @@ -197,7 +197,7 @@ void ServerList::ReadAndAddFavourites() AddRange(entries); } -void ServerList::WriteFavourites() +void ServerList::WriteFavourites() const { // Save just favourite servers std::vector favouriteServers; @@ -207,7 +207,7 @@ void ServerList::WriteFavourites() WriteFavourites(favouriteServers); } -bool ServerList::WriteFavourites(const std::vector& entries) +bool ServerList::WriteFavourites(const std::vector& entries) const { log_verbose("server_list_write(%d, 0x%p)", entries.size(), entries.data()); @@ -234,7 +234,7 @@ bool ServerList::WriteFavourites(const std::vector& entries) } } -std::future> ServerList::FetchLocalServerListAsync(const INetworkEndpoint& broadcastEndpoint) +std::future> ServerList::FetchLocalServerListAsync(const INetworkEndpoint& broadcastEndpoint) const { auto broadcastAddress = broadcastEndpoint.GetHostname(); return std::async(std::launch::async, [broadcastAddress] { @@ -293,7 +293,7 @@ std::future> ServerList::FetchLocalServerListAsync( }); } -std::future> ServerList::FetchLocalServerListAsync() +std::future> ServerList::FetchLocalServerListAsync() const { return std::async(std::launch::async, [&] { // Get all possible LAN broadcast addresses @@ -325,7 +325,7 @@ std::future> ServerList::FetchLocalServerListAsync( }); } -std::future> ServerList::FetchOnlineServerListAsync() +std::future> ServerList::FetchOnlineServerListAsync() const { # ifdef DISABLE_HTTP return {}; diff --git a/src/openrct2/network/ServerList.h b/src/openrct2/network/ServerList.h index 84e4ca2a33..b0cb5e1bc2 100644 --- a/src/openrct2/network/ServerList.h +++ b/src/openrct2/network/ServerList.h @@ -44,9 +44,9 @@ private: std::vector _serverEntries; void Sort(); - std::vector ReadFavourites(); - bool WriteFavourites(const std::vector& entries); - std::future> FetchLocalServerListAsync(const INetworkEndpoint& broadcastEndpoint); + std::vector ReadFavourites() const; + bool WriteFavourites(const std::vector& entries) const; + std::future> FetchLocalServerListAsync(const INetworkEndpoint& broadcastEndpoint) const; public: ServerListEntry& GetServer(size_t index); @@ -56,10 +56,10 @@ public: void Clear(); void ReadAndAddFavourites(); - void WriteFavourites(); + void WriteFavourites() const; - std::future> FetchLocalServerListAsync(); - std::future> FetchOnlineServerListAsync(); + std::future> FetchLocalServerListAsync() const; + std::future> FetchOnlineServerListAsync() const; uint32_t GetTotalPlayerCount() const; }; diff --git a/src/openrct2/network/Socket.cpp b/src/openrct2/network/Socket.cpp index e0ef79537b..12fed91b78 100644 --- a/src/openrct2/network/Socket.cpp +++ b/src/openrct2/network/Socket.cpp @@ -216,12 +216,12 @@ public: CloseSocket(); } - SOCKET_STATUS GetStatus() override + SOCKET_STATUS GetStatus() const override { return _status; } - const char* GetError() override + const char* GetError() const override { return _error.empty() ? nullptr : _error.c_str(); } @@ -583,12 +583,12 @@ public: CloseSocket(); } - SOCKET_STATUS GetStatus() override + SOCKET_STATUS GetStatus() const override { return _status; } - const char* GetError() override + const char* GetError() const override { return _error.empty() ? nullptr : _error.c_str(); } @@ -739,12 +739,12 @@ private: } // Turn off IPV6_V6ONLY so we can accept both v4 and v6 connections - if (!SetOption(_socket, IPPROTO_IPV6, IPV6_V6ONLY, false)) + if (!SetOption(sock, IPPROTO_IPV6, IPV6_V6ONLY, false)) { log_warning("IPV6_V6ONLY failed. %d", LAST_SOCKET_ERROR()); } - if (!SetOption(_socket, SOL_SOCKET, SO_REUSEADDR, true)) + if (!SetOption(sock, SOL_SOCKET, SO_REUSEADDR, true)) { log_warning("SO_REUSEADDR failed. %d", LAST_SOCKET_ERROR()); } diff --git a/src/openrct2/network/Socket.h b/src/openrct2/network/Socket.h index 87d563cf23..601168b31b 100644 --- a/src/openrct2/network/Socket.h +++ b/src/openrct2/network/Socket.h @@ -52,8 +52,8 @@ interface ITcpSocket public: virtual ~ITcpSocket() = default; - virtual SOCKET_STATUS GetStatus() abstract; - virtual const char* GetError() abstract; + virtual SOCKET_STATUS GetStatus() const abstract; + virtual const char* GetError() const abstract; virtual const char* GetHostName() const abstract; virtual void Listen(uint16_t port) abstract; @@ -78,8 +78,8 @@ interface IUdpSocket public: virtual ~IUdpSocket() = default; - virtual SOCKET_STATUS GetStatus() abstract; - virtual const char* GetError() abstract; + virtual SOCKET_STATUS GetStatus() const abstract; + virtual const char* GetError() const abstract; virtual const char* GetHostName() const abstract; virtual void Listen(uint16_t port) abstract;