Update BUILD.gn deps for QNameString & move it to its own file to avo…

…id circular deps in /responders

src/lib/dnssd/minimal_mdns/Logging.cpp

@@ -15,45 +15,13 @@
  *    limitations under the License.
  */
 #include <lib/dnssd/minimal_mdns/Logging.h>
+#include <lib/dnssd/minimal_mdns/core/QNameString.h>
 #include <lib/support/logging/CHIPLogging.h>
 
 namespace mdns {
 namespace Minimal {
 namespace Logging {
 
-QNameString::QNameString(const mdns::Minimal::FullQName & name)
-{
-    for (unsigned i = 0; i < name.nameCount; i++)
-    {
-        if (i != 0)
-        {
-            mBuffer.Add(".");
-        }
-        mBuffer.Add(name.names[i]);
-    }
-}
-
-QNameString::QNameString(mdns::Minimal::SerializedQNameIterator name)
-{
-    bool first = true;
-    while (name.Next())
-    {
-        if (first)
-        {
-            first = false;
-        }
-        else
-        {
-            mBuffer.Add(".");
-        }
-        mBuffer.Add(name.Value());
-    }
-    if (!name.IsValid())
-    {
-        mBuffer.Add("(!INVALID!)");
-    }
-}
-
 namespace {
 
 #if CHIP_PROGRESS_LOGGING

src/lib/dnssd/minimal_mdns/Logging.h

@@ -29,23 +29,6 @@ namespace Minimal {
 /// MinMdns.
 namespace Logging {
 
-// Allows for a FullQName to be represented as a user-readable logging string
-class QNameString
-{
-public:
-    QNameString(const mdns::Minimal::FullQName & name);
-
-    QNameString(mdns::Minimal::SerializedQNameIterator name);
-
-    inline const char * c_str() const { return mBuffer.c_str(); }
-
-    inline bool Fit() const { return mBuffer.Fit(); }
-
-private:
-    static constexpr size_t kMaxQNameLength = 128;
-    chip::StringBuilder<kMaxQNameLength> mBuffer;
-};
-
 #if CHIP_MINMDNS_HIGH_VERBOSITY
 
 void LogSendingQuery(const mdns::Minimal::Query & query);

src/lib/dnssd/minimal_mdns/core/BUILD.gn

@@ -21,6 +21,8 @@ static_library("core") {
     "DnsHeader.h",
     "QName.cpp",
     "QName.h",
+    "QNameString.cpp",
+    "QNameString.h",
     "RecordWriter.cpp",
     "RecordWriter.h",
   ]

src/lib/dnssd/minimal_mdns/core/QNameString.cpp

@@ -0,0 +1,56 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#include <lib/dnssd/minimal_mdns/core/QNameString.h>
+
+namespace mdns {
+namespace Minimal {
+
+QNameString::QNameString(const mdns::Minimal::FullQName & name)
+{
+    for (unsigned i = 0; i < name.nameCount; i++)
+    {
+        if (i != 0)
+        {
+            mBuffer.Add(".");
+        }
+        mBuffer.Add(name.names[i]);
+    }
+}
+
+QNameString::QNameString(mdns::Minimal::SerializedQNameIterator name)
+{
+    bool first = true;
+    while (name.Next())
+    {
+        if (first)
+        {
+            first = false;
+        }
+        else
+        {
+            mBuffer.Add(".");
+        }
+        mBuffer.Add(name.Value());
+    }
+    if (!name.IsValid())
+    {
+        mBuffer.Add("(!INVALID!)");
+    }
+}
+
+} // namespace Minimal
+} // namespace mdns

src/lib/dnssd/minimal_mdns/core/QNameString.h

@@ -0,0 +1,43 @@
+/*
+ *
+ *    Copyright (c) 2022 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <lib/support/StringBuilder.h>
+#include <lib/dnssd/minimal_mdns/core/QName.h>
+
+namespace mdns {
+namespace Minimal {
+
+// Allows for a FullQName to be represented as a user-readable logging string
+class QNameString
+{
+public:
+    QNameString(const mdns::Minimal::FullQName & name);
+
+    QNameString(mdns::Minimal::SerializedQNameIterator name);
+
+    inline const char * c_str() const { return mBuffer.c_str(); }
+
+    inline bool Fit() const { return mBuffer.Fit(); }
+
+private:
+    static constexpr size_t kMaxQNameLength = 128;
+    chip::StringBuilder<kMaxQNameLength> mBuffer;
+};
+
+} // namespace Minimal
+} // namespace mdns

src/lib/dnssd/minimal_mdns/responders/QueryResponder.cpp

@@ -18,7 +18,7 @@
 #include "QueryResponder.h"
 
 #include <lib/dnssd/minimal_mdns/records/Ptr.h>
-#include <lib/dnssd/minimal_mdns/Logging.h>
+#include <lib/dnssd/minimal_mdns/core/QNameString.h>
 
 #include <lib/support/logging/CHIPLogging.h>
 
@@ -57,7 +57,7 @@ QueryResponderSettings QueryResponderBase::AddResponder(RecordResponder * respon
     {
         return QueryResponderSettings();
     }
-    ChipLogDetail(Discovery, "Responding with %s", Logging::QNameString(responder->GetQName()).c_str());
+    ChipLogDetail(Discovery, "Responding with %s", QNameString(responder->GetQName()).c_str());
 
     for (size_t i = 0; i < mResponderInfoSize; i++)
     {