build: update Link SFML usage to SFML 3.x APIs

Make some changes for the SFML Network library for the 3.x APIs.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>

cmake/Options.cmake

@@ -71,18 +71,13 @@ find_package(PkgConfig)
 if(TRANSLATIONS_ONLY)
     set(ENABLE_LINK_DEFAULT OFF)
 else()
-    find_package(SFML 2.4 COMPONENTS network system)
+    find_package(SFML 3.0 COMPONENTS network system)
     set(ENABLE_LINK_DEFAULT OFF)
     if(SFML_FOUND)
         set(ENABLE_LINK_DEFAULT ON)
     endif()
 endif()
-option(ENABLE_LINK "Enable GBA linking functionality (BROKEN)" ${ENABLE_LINK_DEFAULT})
+option(ENABLE_LINK "Enable GBA linking functionality" ${ENABLE_LINK_DEFAULT})
-
-if(ENABLE_LINK)
-    # Always disable link for now as SFML 2 is broken and we don't have a replacement yet.
-    set(ENABLE_LINK OFF CACHE BOOL "Enable GBA linking functionality (BROKEN)" FORCE)
-endif()
 
 # FFMpeg
 set(FFMPEG_DEFAULT OFF)

src/core/gba/gbaLink.cpp

@@ -41,17 +41,22 @@
 #define snprintf _snprintf
 #endif
 
+#ifdef UPDATE_REG
+#undef UPDATE_REG
+#endif
 #define UPDATE_REG(address, value) WRITE16LE(((uint16_t*)&g_ioMem[address]), value)
 
 static int vbaid = 0;
 const char* MakeInstanceFilename(const char* Input)
 {
-    if (vbaid == 0)
+    if (vbaid == 0) {
         return Input;
+    }
 
     static char* result = NULL;
-    if (result != NULL)
+    if (result != NULL) {
         free(result);
+    }
 
     result = (char*)malloc(strlen(Input) + 3);
     char* p = strrchr((char*)Input, '.');
@@ -270,7 +275,7 @@ class RFUServer {
 
 public:
     sf::TcpSocket tcpsocket[5];
-    sf::IpAddress udpaddr[5];
+    sf::IpAddress udpaddr[5] = { sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0} };
     RFUServer(void);
     sf::Packet& Serialize(sf::Packet& packet, int slave);
     void DeSerialize(sf::Packet& packet, int slave);
@@ -283,7 +288,7 @@ class RFUClient {
     int numbytes;
 
 public:
-    sf::IpAddress serveraddr;
+    sf::IpAddress serveraddr{0};
     unsigned short serverport;
     bool transferring;
     RFUClient(void);
@@ -392,7 +397,7 @@ enum {
 typedef struct {
     sf::TcpSocket tcpsocket;
     sf::TcpListener tcplistener;
-    int numslaves;
+    uint16_t numslaves;
     int connectedSlaves;
     int type;
     bool server;
@@ -412,7 +417,7 @@ class CableServer {
 
 public:
     sf::TcpSocket tcpsocket[4];
-    sf::IpAddress udpaddr[4];
+    sf::IpAddress udpaddr[4] = { sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0}, sf::IpAddress{0} };
     CableServer(void);
     void Send(void);
     void Recv(void);
@@ -430,7 +435,7 @@ class CableClient {
     int numbytes;
 
 public:
-    sf::IpAddress serveraddr;
+    sf::IpAddress serveraddr{0};
     unsigned short serverport;
     bool transferring;
     CableClient(void);
@@ -520,33 +525,47 @@ LinkMode GetLinkMode()
         return LINK_DISCONNECTED;
 }
 
-void GetLinkServerHost(char* const host, size_t size)
+bool GetLinkServerHost(char* const host, size_t size)
 {
-    if (host == NULL || size == 0)
+    if (host == NULL || size == 0) {
-        return;
+        return false;
+    }
 
     host[0] = '\0';
 
-    if (linkDriver && linkDriver->mode == LINK_GAMECUBE_DOLPHIN)
+    if (linkDriver && linkDriver->mode == LINK_GAMECUBE_DOLPHIN) {
         strncpy(host, joybusHostAddr.toString().c_str(), size);
-    else if (lanlink.server) {
+    } else if (lanlink.server) {
-        if (IP_LINK_BIND_ADDRESS == "*")
+        if (IP_LINK_BIND_ADDRESS == "*") {
-            strncpy(host, sf::IpAddress::getLocalAddress().toString().c_str(), size);
+            if (sf::IpAddress::getLocalAddress()) {
-        else
+                strncpy(host, sf::IpAddress::getLocalAddress().value().toString().c_str(), size);
+            } else {
+                return false;
+            }
+        } else {
             strncpy(host, IP_LINK_BIND_ADDRESS.c_str(), size);
+        }
     }
-    else
+    else {
         strncpy(host, lc.serveraddr.toString().c_str(), size);
+    }
+
+    return true;
 }
 
 bool SetLinkServerHost(const char* host)
 {
-    sf::IpAddress addr = sf::IpAddress(host);
+    sf::IpAddress addr{0};
 
+    auto resolved = sf::IpAddress::resolve(host);
+    if (!resolved) {
+        return false;
+    }
+    addr = resolved.value();
     lc.serveraddr = addr;
     joybusHostAddr = addr;
 
-    return addr != sf::IpAddress::None;
+    return true;
 }
 
 int GetLinkPlayerId()
@@ -1044,11 +1063,13 @@ static ConnectionState InitSocket()
 {
     linkid = 0;
 
-    for (int i = 0; i < 4; i++)
+    for (int i = 0; i < 4; i++) {
         cable_data[i] = 0xffff;
+    }
 
-    for (int i = 0; i < 4; i++)
+    for (int i = 0; i < 4; i++) {
         cable_gb_data[i] = 0xff;
+    }
 
     if (lanlink.server) {
         lanlink.connectedSlaves = 0;
@@ -1057,26 +1078,33 @@ static ConnectionState InitSocket()
 
         // too bad Listen() doesn't take an address as well
         // then again, old code used INADDR_ANY anyway
-        sf::IpAddress bind_ip = IP_LINK_BIND_ADDRESS == "*" ? sf::IpAddress::Any : IP_LINK_BIND_ADDRESS;
+        sf::IpAddress bind_ip{0};
 
-        if (lanlink.tcplistener.listen(IP_LINK_PORT, bind_ip) == sf::Socket::Error)
+        if (IP_LINK_BIND_ADDRESS != "*") {
+            auto resolved = sf::IpAddress::resolve(IP_LINK_BIND_ADDRESS);
+            if (resolved) {
+                bind_ip = resolved.value();
+            } else {
+                return LINK_ERROR;
+            }
+        }
+
+        if (lanlink.tcplistener.listen(IP_LINK_PORT, bind_ip) == sf::Socket::Status::Error) {
             // Note: old code closed socket & retried once on bind failure
             return LINK_ERROR; // FIXME: error code?
-        else
+        } else {
             return LINK_NEEDS_UPDATE;
+        }
     } else {
         lc.serverport = IP_LINK_PORT;
 
-        if (lc.serveraddr == sf::IpAddress::None) {
+        lanlink.tcpsocket.setBlocking(false);
+        sf::Socket::Status status = lanlink.tcpsocket.connect(lc.serveraddr, lc.serverport);
+
+        if (status == sf::Socket::Status::Error || status == sf::Socket::Status::Disconnected) {
             return LINK_ERROR;
         } else {
-            lanlink.tcpsocket.setBlocking(false);
+            return LINK_NEEDS_UPDATE;
-            sf::Socket::Status status = lanlink.tcpsocket.connect(lc.serveraddr, lc.serverport);
-
-            if (status == sf::Socket::Error || status == sf::Socket::Disconnected)
-                return LINK_ERROR;
-            else
-                return LINK_NEEDS_UPDATE;
         }
     }
 }
@@ -1090,11 +1118,11 @@ static ConnectionState ConnectUpdateSocket(char* const message, size_t size)
         fdset.add(lanlink.tcplistener);
 
         if (fdset.wait(sf::milliseconds(150))) {
-            int nextSlave = lanlink.connectedSlaves + 1;
+            uint16_t nextSlave = lanlink.connectedSlaves + 1;
 
             sf::Socket::Status st = lanlink.tcplistener.accept(ls.tcpsocket[nextSlave]);
 
-            if (st == sf::Socket::Error) {
+            if (st == sf::Socket::Status::Error) {
                 for (int j = 1; j < nextSlave; j++)
                     ls.tcpsocket[j].disconnect();
 
@@ -1102,8 +1130,7 @@ static ConnectionState ConnectUpdateSocket(char* const message, size_t size)
                 newState = LINK_ERROR;
             } else {
                 sf::Packet packet;
-                packet << static_cast<sf::Uint16>(nextSlave)
+                packet << nextSlave << lanlink.numslaves;
-                       << static_cast<sf::Uint16>(lanlink.numslaves);
 
                 ls.tcpsocket[nextSlave].send(packet);
 
@@ -1129,13 +1156,13 @@ static ConnectionState ConnectUpdateSocket(char* const message, size_t size)
         sf::Packet packet;
         sf::Socket::Status status = lanlink.tcpsocket.receive(packet);
 
-        if (status == sf::Socket::Error || status == sf::Socket::Disconnected) {
+        if (status == sf::Socket::Status::Error || status == sf::Socket::Status::Disconnected) {
             snprintf(message, size, N_("Network error."));
             newState = LINK_ERROR;
-        } else if (status == sf::Socket::Done) {
+        } else if (status == sf::Socket::Status::Done) {
 
             if (linkid == 0) {
-                sf::Uint16 receivedId, receivedSlaves;
+                uint16_t receivedId, receivedSlaves;
                 packet >> receivedId >> receivedSlaves;
 
                 if (packet) {
@@ -1540,7 +1567,7 @@ void RFUServer::Recv(void)
             sf::Packet packet;
             tcpsocket[i + 1].setBlocking(false);
             sf::Socket::Status status = tcpsocket[i + 1].receive(packet);
-            if (status == sf::Socket::Disconnected) {
+            if (status == sf::Socket::Status::Disconnected) {
                 char message[30];
                 sprintf(message, _("Player %d disconnected."), i + 1);
                 systemScreenMessage(message);
@@ -1650,7 +1677,7 @@ void RFUClient::Recv(void)
     }
     sf::Packet packet;
     sf::Socket::Status status = lanlink.tcpsocket.receive(packet);
-    if (status == sf::Socket::Disconnected) {
+    if (status == sf::Socket::Status::Disconnected) {
         systemScreenMessage(_("Server disconnected."));
         CloseLink();
         return;
@@ -1671,7 +1698,7 @@ static ConnectionState ConnectUpdateRFUSocket(char* const message, size_t size)
 
             sf::Socket::Status st = lanlink.tcplistener.accept(rfu_server.tcpsocket[nextSlave]);
 
-            if (st == sf::Socket::Error) {
+            if (st == sf::Socket::Status::Error) {
                 for (int j = 1; j < nextSlave; j++)
                     rfu_server.tcpsocket[j].disconnect();
 
@@ -1679,8 +1706,7 @@ static ConnectionState ConnectUpdateRFUSocket(char* const message, size_t size)
                 newState = LINK_ERROR;
             } else {
                 sf::Packet packet;
-                packet << static_cast<sf::Uint16>(nextSlave)
+                packet << nextSlave << lanlink.numslaves;
-                       << static_cast<sf::Uint16>(lanlink.numslaves);
 
                 rfu_server.tcpsocket[nextSlave].send(packet);
 
@@ -1707,13 +1733,13 @@ static ConnectionState ConnectUpdateRFUSocket(char* const message, size_t size)
         lanlink.tcpsocket.setBlocking(false);
         sf::Socket::Status status = lanlink.tcpsocket.receive(packet);
 
-        if (status == sf::Socket::Error || status == sf::Socket::Disconnected) {
+        if (status == sf::Socket::Status::Error || status == sf::Socket::Status::Disconnected) {
             snprintf(message, size, N_("Network error."));
             newState = LINK_ERROR;
-        } else if (status == sf::Socket::Done) {
+        } else if (status == sf::Socket::Status::Done) {
 
             if (linkid == 0) {
-                sf::Uint16 receivedId, receivedSlaves;
+                uint16_t receivedId, receivedSlaves;
                 packet >> receivedId >> receivedSlaves;
 
                 if (packet) {

src/core/gba/gbaLink.h

@@ -86,8 +86,9 @@ extern bool SetLinkServerHost(const char* host);
  * If in lan client mode, returns the IP adress of the host to connect to
  * If in gamecube mode, returns the IP adress of the dolphin host
  *
+ * @return false on error
  */
-extern void GetLinkServerHost(char* const host, size_t size);
+extern bool GetLinkServerHost(char* const host, size_t size);
 
 /**
  * Set the value in milliseconds of the timeout after which a connection is

src/core/gba/internal/gbaSockClient.cpp

@@ -8,10 +8,7 @@
 
 GBASockClient::GBASockClient(sf::IpAddress _server_addr)
 {
-    if (_server_addr == sf::IpAddress::None)
+    server_addr = _server_addr;
-        server_addr = sf::IpAddress::getPublicAddress();
-    else
-        server_addr = _server_addr;
 
     client.connect(server_addr, 0xd6ba);
     client.setBlocking(false);
@@ -44,8 +41,9 @@ void GBASockClient::Send(std::vector<char> data)
 // Returns cmd for convenience
 char GBASockClient::ReceiveCmd(char* data_in, bool block)
 {
-    if (IsDisconnected())
+    if (IsDisconnected()) {
         return data_in[0];
+    }
 
     std::size_t num_received = 0;
     if (block || clock_sync == 0) {
@@ -53,8 +51,9 @@ char GBASockClient::ReceiveCmd(char* data_in, bool block)
         Selector.add(client);
         Selector.wait(sf::seconds(6));
     }
-    if (client.receive(data_in, 5, num_received) == sf::Socket::Disconnected)
+    if (client.receive(data_in, 5, num_received) == sf::Socket::Status::Disconnected) {
         Disconnect();
+    }
 
     return data_in[0];
 }
@@ -67,13 +66,15 @@ void GBASockClient::ReceiveClock(bool block)
 
     char sync_ticks[4] = { 0, 0, 0, 0 };
     std::size_t num_received = 0;
-    if (clock_client.receive(sync_ticks, 4, num_received) == sf::Socket::Disconnected)
+    if (clock_client.receive(sync_ticks, 4, num_received) == sf::Socket::Status::Disconnected) {
         Disconnect();
+    }
 
     if (num_received == 4) {
         clock_sync_ticks = 0;
-        for (int i = 0; i < 4; i++)
+        for (int i = 0; i < 4; i++) {
             clock_sync_ticks |= (uint8_t)(sync_ticks[i]) << ((3 - i) * 8);
+        }
         clock_sync += clock_sync_ticks;
     }
 }

src/core/gba/internal/gbaSockClient.h

@@ -24,7 +24,7 @@ public:
     bool IsDisconnected();
 
 private:
-    sf::IpAddress server_addr;
+    sf::IpAddress server_addr{0};
     sf::TcpSocket client;
     sf::TcpSocket clock_client;
 

src/wx/guiinit.cpp

@@ -142,7 +142,10 @@ public:
 
         if (server) {
             char host[length];
-            GetLinkServerHost(host, length);
+            if (!GetLinkServerHost(host, length)) {
+                wxMessageBox(_("You must enter a valid host name"),
+                    _("Host name invalid"), wxICON_ERROR | wxOK);
+            }
             title.Printf(_("Waiting for clients..."));
             connmsg.Printf(_("Server IP address is: %s\n"), wxString(host, wxConvLibc).c_str());
         } else {