refactor(main): move map_port to network

src/main.cpp

@@ -23,6 +23,7 @@
 #include "httpcommon.h"
 #include "logging.h"
 #include "main.h"
+#include "network.h"
 #include "nvhttp.h"
 #include "platform/common.h"
 #include "process.h"
@@ -811,28 +812,3 @@ write_file(const char *path, const std::string_view &contents) {
 
   return 0;
 }
-
-/**
- * @brief Map a specified port based on the base port.
- * @param port The port to map as a difference from the base port.
- * @return `std:uint16_t` : The mapped port number.
- *
- * EXAMPLES:
- * ```cpp
- * std::uint16_t mapped_port = map_port(1);
- * ```
- */
-std::uint16_t
-map_port(int port) {
-  // calculate the port from the config port
-  auto mapped_port = (std::uint16_t)((int) config::sunshine.port + port);
-
-  // Ensure port is in the range of 1024-65535
-  if (mapped_port < 1024 || mapped_port > 65535) {
-    BOOST_LOG(warning) << "Port out of range: "sv << mapped_port;
-  }
-
-  // TODO: Ensure port is not already in use by another application
-
-  return mapped_port;
-}

src/main.h

@@ -30,8 +30,6 @@ std::string
 read_file(const char *path);
 int
 write_file(const char *path, const std::string_view &contents);
-std::uint16_t
-map_port(int port);
 void
 launch_ui();
 void

src/network.cpp

@@ -2,13 +2,39 @@
  * @file src/network.cpp
  * @brief todo
  */
-#include "network.h"
 #include "config.h"
+#include "logging.h"
+#include "network.h"
 #include "utility.h"
 #include <algorithm>
 
 using namespace std::literals;
 
+/**
+ * @brief Map a specified port based on the base port.
+ * @param port The port to map as a difference from the base port.
+ * @return `std:uint16_t` : The mapped port number.
+ *
+ * EXAMPLES:
+ * ```cpp
+ * std::uint16_t mapped_port = map_port(1);
+ * ```
+ */
+std::uint16_t
+map_port(int port) {
+  // calculate the port from the config port
+  auto mapped_port = (std::uint16_t)((int) config::sunshine.port + port);
+
+  // Ensure port is in the range of 1024-65535
+  if (mapped_port < 1024 || mapped_port > 65535) {
+    BOOST_LOG(warning) << "Port out of range: "sv << mapped_port;
+  }
+
+  // TODO: Ensure port is not already in use by another application
+
+  return mapped_port;
+}
+
 namespace ip = boost::asio::ip;
 
 namespace net {

src/network.h

@@ -12,6 +12,10 @@
 
 #include "utility.h"
 
+// functions
+std::uint16_t
+map_port(int port);
+
 namespace net {
   void
   free_host(ENetHost *host);

src/platform/linux/publish.cpp

@@ -9,6 +9,7 @@
 #include "misc.h"
 #include "src/logging.h"
 #include "src/main.h"
+#include "src/network.h"
 #include "src/nvhttp.h"
 #include "src/platform/common.h"
 #include "src/utility.h"

src/platform/macos/publish.cpp

@@ -9,6 +9,7 @@
 #include "misc.h"
 #include "src/logging.h"
 #include "src/main.h"
+#include "src/network.h"
 #include "src/nvhttp.h"
 #include "src/platform/common.h"
 #include "src/utility.h"