Merge branch 'master' into Linux

Author: cerebrate

Arkane.Zeroconf/Providers/Bonjour/ServiceBrowser.cs

@@ -12,6 +12,7 @@
 using System.Collections.Generic ;
 using System.Diagnostics ;
 using System.Runtime.InteropServices ;
+using System.Threading ;
 using System.Threading.Tasks ;
 
 #endregion
@@ -31,6 +32,7 @@ public class ServiceBrowser : IServiceBrowser, IDisposable
 
     private readonly Native.DNSServiceBrowseReply            browseReplyHandler ;
     private readonly Dictionary <string, IResolvableService> serviceTable = new() ;
+    private readonly SemaphoreSlim serviceTableSemaphore = new(1, 1) ;
 
     private AddressProtocol address_protocol ;
     private string          domain ;
@@ -55,11 +57,16 @@ public void Browse (uint interfaceIndex, AddressProtocol addressProtocol, string
 
     public IEnumerator <IResolvableService> GetEnumerator ()
     {
-        lock (this)
+        serviceTableSemaphore.Wait();
+        try
         {
             foreach (var service in this.serviceTable.Values)
                 yield return service ;
         }
+        finally
+        {
+            serviceTableSemaphore.Release();
+        }
     }
 
     IEnumerator IEnumerable.GetEnumerator () => this.GetEnumerator () ;
@@ -153,23 +160,29 @@ private void OnBrowseReply (ServiceRef   sdRef,
 
         if ((flags & ServiceFlags.Add) != 0)
         {
-            lock (this.serviceTable)
+            serviceTableSemaphore.Wait();
+            try
+            {
+                this.serviceTable[name] = service;
+            }
+            finally
             {
-                if (this.serviceTable.ContainsKey (name))
-                    this.serviceTable[name] = service ;
-                else
-                    this.serviceTable.Add (name, service) ;
+                serviceTableSemaphore.Release();
             }
 
             var handler = this.ServiceAdded ;
             handler?.Invoke (this, args) ;
         }
         else
         {
-            lock (this.serviceTable)
+            serviceTableSemaphore.Wait();
+            try
+            {
+                this.serviceTable.Remove (name) ;
+            }
+            finally
             {
-                if (this.serviceTable.ContainsKey (name))
-                    this.serviceTable.Remove (name) ;
+                serviceTableSemaphore.Release();
             }
 
             var handler = this.ServiceRemoved ;