when Avahi is registering, there is no need to reset, also can try dns resolve.

Author: tianfeng-yang

src/lib/dnssd/Discovery_ImplPlatform.cpp

@@ -631,7 +631,8 @@ CHIP_ERROR DiscoveryImplPlatform::ResolveNodeId(const PeerId & peerId)
 {
     // Resolve requests can only be issued once DNSSD is initialized and there is
     // no caching currently
-    VerifyOrReturnError(mState == State::kInitialized, CHIP_ERROR_INCORRECT_STATE);
+    // When the DNSSD is kInitializing, can also try to resolve.
+    VerifyOrReturnError(mState != State::kUninitialized, CHIP_ERROR_INCORRECT_STATE);
 
     ChipLogProgress(Discovery, "Resolving " ChipLogFormatX64 ":" ChipLogFormatX64 " ...",
                     ChipLogValueX64(peerId.GetCompressedFabricId()), ChipLogValueX64(peerId.GetNodeId()));

src/platform/Linux/DnssdImpl.cpp

@@ -386,10 +386,15 @@ void MdnsAvahi::HandleClientState(AvahiClient * client, AvahiClientState state)
         mErrorCallback(mAsyncReturnContext, CHIP_ERROR_INTERNAL);
         break;
     case AVAHI_CLIENT_S_COLLISION:
-    case AVAHI_CLIENT_S_REGISTERING:
-        ChipLogProgress(DeviceLayer, "Avahi re-register required");
+        ChipLogProgress(DeviceLayer, "Avahi collision, force to reset");
         StopPublish();
         mErrorCallback(mAsyncReturnContext, CHIP_ERROR_FORCED_RESET);
+        // Should restart the resolve service of the host.
+        break;
+    case AVAHI_CLIENT_S_REGISTERING:
+        // now is registering, we should just StopPublish() without reset
+        ChipLogProgress(DeviceLayer, "Avahi registering");
+        StopPublish();
         break;
     case AVAHI_CLIENT_CONNECTING:
         ChipLogProgress(DeviceLayer, "Avahi connecting");