fix(windows): Fixed broadcast hostnames not being used.

Skyost · Jan 9, 2024 · 57c8c9a · 57c8c9a
1 parent 808aade
commit 57c8c9a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/packages/bonsoir_windows/windows/bonsoir_broadcast.cpp b/packages/bonsoir_windows/windows/bonsoir_broadcast.cpp
@@ -35,16 +35,10 @@ namespace bonsoir_windows {
     propertyKeys.push_back(nullptr);
     propertyValues.push_back(nullptr);
 
-    PIP4_ADDRESS ipAddress = nullptr;
-    if (servicePtr->host.has_value() && isValidIPv4(servicePtr->host.value())) {
-      DWORD ip = std::stoul(servicePtr->host.value());
-      ipAddress = &ip;
-    }
-
-    auto computerHost = (getComputerName() + L".local");
+    std::wstring host = servicePtr->host.has_value() ? toUtf16(servicePtr->host.value()) : (getComputerName() + L".local");
     PDNS_SERVICE_INSTANCE serviceInstance = DnsServiceConstructInstance(
       toUtf16(servicePtr->name + "." + servicePtr->type + ".local").c_str(),
-      computerHost.c_str(),
+      host.c_str(),
       nullptr,
       nullptr,
       static_cast<WORD>(servicePtr->port),

diff --git a/packages/bonsoir_windows/windows/utilities.cpp b/packages/bonsoir_windows/windows/utilities.cpp
@@ -73,9 +73,4 @@ namespace bonsoir_windows {
     }
     return &computerName[0];
   }
-
-  bool isValidIPv4(const std::string &ipAddress) {
-    const std::regex ipv4Regex(R"(\b(?:\d{1,3}\.){3}\d{1,3}\b)");
-    return std::regex_match(ipAddress, ipv4Regex);
-  }
 }  // namespace bonsoir_windows
diff --git a/packages/bonsoir_windows/windows/utilities.h b/packages/bonsoir_windows/windows/utilities.h
@@ -9,6 +9,4 @@ namespace bonsoir_windows {
   std::tuple<std::string, std::string> parseBonjourFqdn(const std::string fqdn);
 
   std::wstring getComputerName();
-
-  bool isValidIPv4(const std::string &ipAddress);
 }  // namespace bonsoir_windows