Make minmdns use a distinct policy for endpoint and IP choices (proje…

…ct-chip#22168) * Use AllInterfacesListenIterator header for minmdns. Removes the minmdns sever implementation for logic regarding interface selection, use the central header for this. * Start adding some policies and a default policy impl * Restyle * Compile in the default minmdns policy * Use policies for IP address iteration * Switch interface iteration for Advertiser_ImplMinimalMdns * Completely remove the use of AllInterfaceListenIterator * Add file to header dependency * make testipresponder initialize memory * Switch address policy to be a virtual base class that can be overrider. Address policy default implementation is optional * Disable ipv4 flag in minmdns example: build flags should control server capabilities * Address review comment: address iterator type filtering happens in the policy * Remove FIXME text in code * Fix TestIPResponder
isiu-apple · Sep 16, 2022 · 102a8bb · 102a8bb
1 parent e730606
commit 102a8bb
Show file tree

Hide file tree

Showing 19 changed files with 464 additions and 364 deletions.
diff --git a/examples/minimal-mdns/AllInterfaceListener.h b/examples/minimal-mdns/AllInterfaceListener.h
diff --git a/examples/minimal-mdns/BUILD.gn b/examples/minimal-mdns/BUILD.gn
@@ -19,7 +19,6 @@ import("${chip_root}/build/chip/tools.gni")
 
 static_library("minimal-mdns-example-common") {
   sources = [
-    "AllInterfaceListener.h",
     "PacketReporter.cpp",
     "PacketReporter.h",
   ]
@@ -53,6 +52,7 @@ executable("minimal-mdns-server") {
     ":minimal-mdns-example-common",
     "${chip_root}/src/lib",
     "${chip_root}/src/lib/dnssd/minimal_mdns",
+    "${chip_root}/src/lib/dnssd/minimal_mdns:default_policy",
     "${chip_root}/src/lib/dnssd/minimal_mdns/responders",
   ]
 

diff --git a/examples/minimal-mdns/client.cpp b/examples/minimal-mdns/client.cpp
@@ -22,6 +22,8 @@
 
 #include <inet/InetInterface.h>
 #include <inet/UDPEndPoint.h>
+#include <lib/dnssd/minimal_mdns/AddressPolicy.h>
+#include <lib/dnssd/minimal_mdns/AddressPolicy_DefaultImpl.h>
 #include <lib/dnssd/minimal_mdns/QueryBuilder.h>
 #include <lib/dnssd/minimal_mdns/Server.h>
 #include <lib/dnssd/minimal_mdns/core/QName.h>
@@ -30,7 +32,6 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <system/SystemPacketBuffer.h>
 
-#include "AllInterfaceListener.h"
 #include "PacketReporter.h"
 
 using namespace chip;
@@ -39,7 +40,6 @@ namespace {
 
 struct Options
 {
-    bool enableIpV4           = false;
     bool unicastAnswers       = true;
     uint32_t runtimeMs        = 500;
     uint16_t querySendPort    = 5353;
@@ -53,9 +53,8 @@ constexpr size_t kMdnsMaxPacketSize = 1'024;
 
 using namespace chip::ArgParser;
 
-constexpr uint16_t kOptionEnableIpV4 = '4';
-constexpr uint16_t kOptionQuery      = 'q';
-constexpr uint16_t kOptionType       = 't';
+constexpr uint16_t kOptionQuery = 'q';
+constexpr uint16_t kOptionType  = 't';
 
 // non-ascii options have no short option version
 constexpr uint16_t kOptionListenPort       = 0x100;
@@ -67,10 +66,6 @@ bool HandleOptions(const char * aProgram, OptionSet * aOptions, int aIdentifier,
 {
     switch (aIdentifier)
     {
-    case kOptionEnableIpV4:
-        gOptions.enableIpV4 = true;
-        return true;
-
     case kOptionListenPort:
         if (!ParseInt(aValue, gOptions.listenPort))
         {
@@ -145,7 +140,6 @@ bool HandleOptions(const char * aProgram, OptionSet * aOptions, int aIdentifier,
 
 OptionDef cmdLineOptionsDef[] = {
     { "listen-port", kArgumentRequired, kOptionListenPort },
-    { "enable-ip-v4", kNoArgument, kOptionEnableIpV4 },
     { "query", kArgumentRequired, kOptionQuery },
     { "type", kArgumentRequired, kOptionType },
     { "query-port", kArgumentRequired, kOptionQueryPort },
@@ -157,9 +151,6 @@ OptionDef cmdLineOptionsDef[] = {
 OptionSet cmdLineOptions = { HandleOptions, cmdLineOptionsDef, "PROGRAM OPTIONS",
                              "  --listen-port <number>\n"
                              "        The port number to listen on\n"
-                             "  -4\n"
-                             "  --enable-ip-v4\n"
-                             "        enable listening on IPv4\n"
                              "  -q\n"
                              "  --query\n"
                              "        The query to send\n"
@@ -324,13 +315,13 @@ int main(int argc, char ** args)
     ReportDelegate reporter;
     CHIP_ERROR err;
 
+    mdns::Minimal::SetDefaultAddressPolicy();
     gMdnsServer.SetDelegate(&reporter);
 
     {
+        auto endpoints = mdns::Minimal::GetAddressPolicy()->GetListenEndpoints();
 
-        MdnsExample::AllInterfaces allInterfaces(gOptions.enableIpV4);
-
-        err = gMdnsServer.Listen(chip::DeviceLayer::UDPEndPointManager(), &allInterfaces, gOptions.listenPort);
+        err = gMdnsServer.Listen(chip::DeviceLayer::UDPEndPointManager(), endpoints.get(), gOptions.listenPort);
         if (err != CHIP_NO_ERROR)
         {
             printf("Server failed to listen on all interfaces: %s\n", chip::ErrorStr(err));

diff --git a/examples/minimal-mdns/server.cpp b/examples/minimal-mdns/server.cpp
@@ -23,6 +23,8 @@
 #include <inet/InetInterface.h>
 #include <inet/UDPEndPoint.h>
 #include <lib/dnssd/ServiceNaming.h>
+#include <lib/dnssd/minimal_mdns/AddressPolicy.h>
+#include <lib/dnssd/minimal_mdns/AddressPolicy_DefaultImpl.h>
 #include <lib/dnssd/minimal_mdns/QueryBuilder.h>
 #include <lib/dnssd/minimal_mdns/ResponseSender.h>
 #include <lib/dnssd/minimal_mdns/Server.h>
@@ -36,7 +38,6 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <system/SystemPacketBuffer.h>
 
-#include "AllInterfaceListener.h"
 #include "PacketReporter.h"
 
 using namespace chip;
@@ -198,6 +199,8 @@ int main(int argc, char ** args)
         return 1;
     }
 
+    mdns::Minimal::SetDefaultAddressPolicy();
+
     printf("Running on port %d using %s...\n", gOptions.listenPort, gOptions.enableIpV4 ? "IPv4 AND IPv6" : "IPv6 ONLY");
 
     mdns::Minimal::QueryResponder<16 /* maxRecords */> queryResponder;
@@ -265,9 +268,9 @@ int main(int argc, char ** args)
     gMdnsServer.SetDelegate(&delegate);
 
     {
-        MdnsExample::AllInterfaces allInterfaces(gOptions.enableIpV4);
+        auto endpoints = mdns::Minimal::GetAddressPolicy()->GetListenEndpoints();
 
-        if (gMdnsServer.Listen(DeviceLayer::UDPEndPointManager(), &allInterfaces, gOptions.listenPort) != CHIP_NO_ERROR)
+        if (gMdnsServer.Listen(DeviceLayer::UDPEndPointManager(), endpoints.get(), gOptions.listenPort) != CHIP_NO_ERROR)
         {
             printf("Server failed to listen on all interfaces\n");
             return 1;