Split networking code into its own target (melonDS-emu#2091)

.gitattributes

@@ -0,0 +1,18 @@
+# Vendored Dependencies
+src/frontend/glad/**                         linguist-vendored
+src/frontend/qt_sdl/gif-h/**                 linguist-vendored
+src/frontend/qt_sdl/toml/**                  linguist-vendored
+src/net/libslirp/**                          linguist-vendored
+src/net/pcap/**                              linguist-vendored
+src/sha1/**                                  linguist-vendored
+src/teakra/**                                linguist-vendored
+src/tiny-AES-c/**                            linguist-vendored
+src/xxhash/**                                linguist-vendored
+
+# A handful of custom files embedded in the vendored dependencies
+
+## Ad-hoc CMakeLists.txt for melonDS
+!src/net/libslirp/src/CMakeLists.txt         -linguist-vendored
+
+## glib stub
+!src/net/libslirp/src/glib/**                -linguist-vendored

src/Platform.h

@@ -256,6 +256,9 @@ Semaphore* Semaphore_Create();
 void Semaphore_Free(Semaphore* sema);
 void Semaphore_Reset(Semaphore* sema);
 void Semaphore_Wait(Semaphore* sema);
+/// Waits for the semaphore to be signaled, or until the timeout (in milliseconds) expires.
+/// If the timeout is 0, then don't wait; return immediately if the semaphore is not signaled.
+bool Semaphore_TryWait(Semaphore* sema, int timeout_ms = 0);
 void Semaphore_Post(Semaphore* sema, int count = 1);
 
 struct Mutex;

src/frontend/qt_sdl/CMakeLists.txt

@@ -31,11 +31,6 @@ set(SOURCES_QT_SDL
     ROMInfoDialog.cpp
     RAMInfoDialog.cpp
     TitleManagerDialog.cpp
-    PacketDispatcher.cpp
-    Net.cpp
-    Net_PCap.cpp
-    Net_Slirp.cpp
-    LocalMP.cpp
     OSD_shaders.h
     font.h
     Platform.cpp
@@ -93,16 +88,11 @@ add_compile_definitions(ARCHIVE_SUPPORT_ENABLED)
 
 add_executable(melonDS ${SOURCES_QT_SDL})
 
-option(USE_SYSTEM_LIBSLIRP "Use system libslirp instead of the bundled version" OFF)
-if (USE_SYSTEM_LIBSLIRP)
-    pkg_check_modules(Slirp REQUIRED IMPORTED_TARGET slirp)
-    target_link_libraries(melonDS PRIVATE PkgConfig::Slirp)
-else()
-    add_subdirectory("../libslirp"
-            "${CMAKE_BINARY_DIR}/libslirp"
-            EXCLUDE_FROM_ALL)
-    target_link_libraries(melonDS PRIVATE slirp)
-endif()
+add_subdirectory("../../net"
+        "${CMAKE_BINARY_DIR}/net"
+)
+
+target_link_libraries(melonDS PRIVATE net-utils)
 
 if (WIN32)
     target_link_libraries(melonDS PUBLIC opengl32)

src/frontend/qt_sdl/Platform.cpp

@@ -351,6 +351,14 @@ void Semaphore_Wait(Semaphore* sema)
     ((QSemaphore*) sema)->acquire();
 }
 
+bool Semaphore_TryWait(Semaphore* sema, int timeout_ms)
+{
+    if (!timeout_ms)
+        return ((QSemaphore*)sema)->tryAcquire(1);
+
+    return ((QSemaphore*)sema)->tryAcquire(1, timeout_ms);
+}
+
 void Semaphore_Post(Semaphore* sema, int count)
 {
     ((QSemaphore*) sema)->release(count);

src/frontend/qt_sdl/WifiSettingsDialog.cpp

@@ -25,6 +25,7 @@
 #include "main.h"
 
 #include "Net.h"
+#include "Net_PCap.h"
 
 #include "WifiSettingsDialog.h"
 #include "ui_WifiSettingsDialog.h"
@@ -109,7 +110,10 @@ void WifiSettingsDialog::done(int r)
     }
 
     Net_PCap::DeInit();
-    Net::Init();
+    Config::Table cfg = Config::GetGlobalTable();
+    bool direct = cfg.GetBool("LAN.DirectMode");
+    std::string devicename = cfg.GetString("LAN.Device");
+    Net::Init(direct, devicename.c_str());
 
     QDialog::done(r);
 

src/frontend/qt_sdl/main.cpp

@@ -274,7 +274,12 @@ int main(int argc, char** argv)
     }
 
     LocalMP::Init();
-    Net::Init();
+    {
+        Config::Table cfg = Config::GetGlobalTable();
+        bool direct = cfg.GetBool("LAN.DirectMode");
+        std::string devicename = cfg.GetString("LAN.Device");
+        Net::Init(direct, devicename.c_str());
+    }
 
     createEmuInstance();
 

src/net/CMakeLists.txt

@@ -0,0 +1,20 @@
+add_library(net-utils STATIC
+    Net.cpp
+    Net_PCap.cpp
+    Net_Slirp.cpp
+    PacketDispatcher.cpp
+    LocalMP.cpp
+)
+
+target_include_directories(net-utils PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(net-utils PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
+
+
+option(USE_SYSTEM_LIBSLIRP "Use system libslirp instead of the bundled version" OFF)
+if (USE_SYSTEM_LIBSLIRP)
+    pkg_check_modules(Slirp REQUIRED IMPORTED_TARGET slirp)
+    target_link_libraries(net-utils PRIVATE PkgConfig::Slirp)
+else()
+    add_subdirectory(libslirp EXCLUDE_FROM_ALL)
+    target_link_libraries(net-utils PRIVATE slirp)
+endif()