[ntcore] Various cleanups

ntcore/CMakeLists.txt

@@ -7,9 +7,11 @@ file(
     GLOB ntcore_native_src
     src/main/native/cpp/*.cpp
     src/generated/main/native/cpp/*.cpp
+    src/main/native/cpp/local/*.cpp
     src/main/native/cpp/net/*.cpp
     src/main/native/cpp/net3/*.cpp
     src/main/native/cpp/networktables/*.cpp
+    src/main/native/cpp/server/*.cpp
     src/main/native/cpp/tables/*.cpp
 )
 add_library(ntcore ${ntcore_native_src})

ntcore/src/main/native/cpp/HandleMap.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <concepts>
 #include <memory>
 #include <utility>
 
@@ -13,8 +14,13 @@
 
 namespace nt {
 
+template <typename T>
+concept HandleType = requires {
+  { T::kType } -> std::convertible_to<NT_Handle>;
+};
+
 // Utility wrapper class for our UidVectors
-template <typename T, size_t Size>
+template <HandleType T, size_t Size>
 class HandleMap : public wpi::UidVector<std::unique_ptr<T>, Size> {
  public:
   template <typename... Args>

ntcore/src/main/native/cpp/InstanceImpl.cpp

@@ -102,18 +102,20 @@ void InstanceImpl::StopLocal() {
 
 void InstanceImpl::StartServer(std::string_view persistFilename,
                                std::string_view listenAddress,
-                               unsigned int port3, unsigned int port4) {
+                               unsigned int port3, unsigned int port4,
+                               bool dedicated) {
   std::scoped_lock lock{m_mutex};
   if (networkMode != NT_NET_MODE_NONE) {
     return;
   }
   m_networkServer = std::make_shared<NetworkServer>(
       persistFilename, listenAddress, port3, port4, localStorage,
-      connectionList, logger, [this] {
+      connectionList, logger, dedicated, [this] {
         std::scoped_lock lock{m_mutex};
         networkMode &= ~NT_NET_MODE_STARTING;
       });
-  networkMode = NT_NET_MODE_SERVER | NT_NET_MODE_STARTING;
+  networkMode = (dedicated ? NT_NET_MODE_SERVER_ONLY : NT_NET_MODE_SERVER) |
+                NT_NET_MODE_STARTING;
   listenerStorage.NotifyTimeSync({}, NT_EVENT_TIMESYNC, 0, 0, true);
   m_serverTimeOffset = 0;
   m_rtt2 = 0;

ntcore/src/main/native/cpp/InstanceImpl.h

@@ -46,7 +46,7 @@ class InstanceImpl {
   void StopLocal();
   void StartServer(std::string_view persistFilename,
                    std::string_view listenAddress, unsigned int port3,
-                   unsigned int port4);
+                   unsigned int port4, bool dedicated);
   void StopServer();
   void StartClient3(std::string_view identity);
   void StartClient4(std::string_view identity);