* correct the error handling in EntryGroup

[catta] / avahi-sharp / ServiceBrowser.cs

diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index a96040cbc822770f377722bb3b580f7c567a9735..a9c1726c20fa6565f343a38c0c70e51d1d41912b 100644 (file)
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -27,7 +27,8 @@ using System.Runtime.InteropServices;
 namespace Avahi
 {
     internal delegate void ServiceBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                   IntPtr name, IntPtr type, IntPtr domain, IntPtr userdata);
+                                                   IntPtr name, IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                   IntPtr userdata);
     
     public struct ServiceInfo
     {
@@ -41,13 +42,14 @@ namespace Avahi
         public IPAddress Address;
         public UInt16 Port;
         public byte[][] Text;
+        public LookupResultFlags Flags;
 
         public static ServiceInfo Zero = new ServiceInfo ();
     }
 
     public delegate void ServiceInfoHandler (object o, ServiceInfo info);
     
-    public class ServiceBrowser : IDisposable
+    public class ServiceBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
         private ArrayList infos = new ArrayList ();
@@ -56,6 +58,7 @@ namespace Avahi
         private Protocol proto;
         private string domain;
         private string type;
+        private LookupFlags flags;
         private ServiceBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
@@ -63,7 +66,8 @@ namespace Avahi
         
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_service_browser_new (IntPtr client, int iface, int proto, IntPtr type,
-                                                                IntPtr domain, ServiceBrowserCallback cb,
+                                                                IntPtr domain, LookupFlags flags,
+                                                                ServiceBrowserCallback cb,
                                                                 IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -103,17 +107,18 @@ namespace Avahi
         }
         
         public ServiceBrowser (Client client, string type, string domain) : this (client, -1, Protocol.Unspecified,
-                                                                                  type, domain)
+                                                                                  type, domain, LookupFlags.None)
         {
         }
         
-        public ServiceBrowser (Client client, int iface, Protocol proto, string type, string domain)
+        public ServiceBrowser (Client client, int iface, Protocol proto, string type, string domain, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
             this.type = type;
+            this.flags = flags;
             cb = OnServiceBrowserCallback;
         }
 
@@ -129,27 +134,36 @@ 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,
-                                                cb, IntPtr.Zero);
+
+            lock (client) {
+                handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr, flags,
+                                                    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;
+                }
             }
         }
 
         private void OnServiceBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                               IntPtr name, IntPtr type, IntPtr domain, IntPtr userdata)
+                                               IntPtr name, IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                               IntPtr userdata)
         {
 
             ServiceInfo info;
@@ -162,19 +176,28 @@ namespace Avahi
             info.Address = null;
             info.Port = 0;
             info.Text = null;
+            info.Flags = flags;
 
             infos.Add (info);
-            
-            if (bevent == BrowserEvent.Added) {
+
+            switch (bevent) {
+            case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (ServiceInfoHandler handler in addListeners)
                     handler (this, info);
-            } else {
+
+                break;
+            case BrowserEvent.Removed:
                 infos.Remove (info);
 
                 foreach (ServiceInfoHandler handler in removeListeners)
                     handler (this, info);
+
+                break;
+            default:
+                EmitBrowserEvent (bevent);
+                break;
             }
         }
     }