Check answers for records also

Author: ImUrX

vrc-oscquery-lib/Zeroconf/MeaModDiscovery.cs

@@ -23,12 +23,12 @@ public class MeaModDiscovery : IDiscovery
 
         public void Dispose()
         {
-            if (_discovery != null)
-            {
-                foreach (var profile in _profiles.Keys.ToArray())
-                    Unadvertise(profile);
-
-                _discovery.Dispose();
+            if (_discovery != null)
+            {
+                foreach (var profile in _profiles.Keys.ToArray())
+                    Unadvertise(profile);
+
+                _discovery.Dispose();
             }
             _mdns?.Stop();
         }
@@ -63,8 +63,8 @@ public void RefreshServices()
         public event Action<OSCQueryServiceProfile> OnOscServiceAdded;
         public event Action<OSCQueryServiceProfile> OnOscQueryServiceAdded;
         public event Action<string> OnOscServiceRemoved;
-        public event Action<string> OnOscQueryServiceRemoved;
-
+        public event Action<string> OnOscQueryServiceRemoved;
+
         private Dictionary<OSCQueryServiceProfile, ServiceProfile> _profiles = new Dictionary<OSCQueryServiceProfile, ServiceProfile>();
         public void Advertise(OSCQueryServiceProfile profile)
         {
@@ -107,12 +107,12 @@ private void OnRemoteServiceInfo(object sender, MessageEventArgs eventArgs)
                 {
                     try
                     {
-                        foreach (SRVRecord record in response.AdditionalRecords.OfType<SRVRecord>())
+                        foreach (SRVRecord record in response.AdditionalRecords.OfType<SRVRecord>().Concat(response.Answers.OfType<SRVRecord>()))
                         {
                             if (record.TTL == TimeSpan.Zero)
-                                RemoveMatchedService(record);
-                            else
-                                AddMatchedService(response, record);
+                                RemoveMatchedService(record);
+                            else
+                                AddMatchedService(response, record);
                         }
                     }
                     catch (Exception)
@@ -136,7 +136,7 @@ private void AddMatchedService(Message response, SRVRecord srvRecord)
             var instanceName = domainName[0];
 
             var serviceName = string.Join(".", domainName.Skip(1));
-            var ips = response.AdditionalRecords.OfType<ARecord>().Select(r => r.Address);
+            var ips = response.AdditionalRecords.OfType<ARecord>().Concat(response.Answers.OfType<ARecord>()).Select(r => r.Address);
 
             var ipAddressList = ips.ToList();
             var profile = new ServiceProfile(instanceName, serviceName, srvRecord.Port, ipAddressList);
@@ -165,8 +165,8 @@ private void AddMatchedService(Message response, SRVRecord srvRecord)
             }
         }
 
-        private void RemoveMatchedService(SRVRecord srvRecord)
-        {
+        private void RemoveMatchedService(SRVRecord srvRecord)
+        {
             var domainName = srvRecord.Name.Labels;
             var instanceName = domainName[0];
             var serviceName = string.Join(".", domainName.Skip(1));