update to current avahi-core API

[catta] / avahi-sharp / ServiceBrowser.cs

diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index d7ae558e8481323e1ffeb3bc577fdee47db99176..5da7ea4b6f40fe87ec3c7b88f1c0eb22d4f255ae 100644 (file)
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /***
   This file is part of avahi.
 
@@ -35,7 +37,7 @@ namespace Avahi
         public string ServiceType;
         public string Name;
 
-        public string Host;
+        public string HostName;
         public IPAddress Address;
         public UInt16 Port;
         public byte[][] Text;
@@ -54,6 +56,7 @@ namespace Avahi
         private Protocol proto;
         private string domain;
         private string type;
+        private ServiceBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
         private ArrayList removeListeners = new ArrayList ();
@@ -111,8 +114,7 @@ namespace Avahi
             this.proto = proto;
             this.domain = domain;
             this.type = type;
-            
-            
+            cb = OnServiceBrowserCallback;
         }
 
         ~ServiceBrowser ()
@@ -127,22 +129,30 @@ namespace Avahi
 
         private void Start ()
         {
-            if (handle != IntPtr.Zero || (addListeners.Count == 0 && removeListeners.Count == 0))
+            if (client.Handle == IntPtr.Zero || handle != IntPtr.Zero ||
+                (addListeners.Count == 0 && removeListeners.Count == 0))
                 return;
 
             IntPtr domainPtr = Utility.StringToPtr (domain);
             IntPtr typePtr = Utility.StringToPtr (type);
-            handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr,
-                                                OnServiceBrowserCallback, IntPtr.Zero);
+
+            lock (client) {
+                handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr,
+                                                    cb, IntPtr.Zero);
+            }
             Utility.Free (domainPtr);
             Utility.Free (typePtr);
         }
 
         private void Stop (bool force)
         {
-            if (handle != IntPtr.Zero && (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
-                avahi_service_browser_free (handle);
-                handle = IntPtr.Zero;
+            if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+                (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
+                
+                lock (client) {
+                    avahi_service_browser_free (handle);
+                    handle = IntPtr.Zero;
+                }
             }
         }
 
@@ -156,7 +166,7 @@ namespace Avahi
             info.Domain = Utility.PtrToString (domain);
             info.ServiceType = Utility.PtrToString (type);
             info.Name = Utility.PtrToString (name);
-            info.Host = null;
+            info.HostName = null;
             info.Address = null;
             info.Port = 0;
             info.Text = null;