fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-sharp / ServiceBrowser.cs

diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index a9c1726c20fa6565f343a38c0c70e51d1d41912b..5c39ad4bb8d457cfb68b7e084c0e5e46917e225b 100644 (file)
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
 
@@ -23,13 +21,14 @@ using System;
 using System.Net;
 using System.Collections;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Avahi
 {
     internal delegate void ServiceBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
                                                    IntPtr name, IntPtr type, IntPtr domain, LookupResultFlags flags,
                                                    IntPtr userdata);
-    
+
     public struct ServiceInfo
     {
         public int NetworkInterface;
@@ -47,8 +46,22 @@ namespace Avahi
         public static ServiceInfo Zero = new ServiceInfo ();
     }
 
-    public delegate void ServiceInfoHandler (object o, ServiceInfo info);
-    
+    public class ServiceInfoArgs : EventArgs
+    {
+        private ServiceInfo service;
+
+        public ServiceInfo Service {
+            get { return service; }
+        }
+
+        public ServiceInfoArgs (ServiceInfo service)
+        {
+            this.service = service;
+        }
+    }
+
+    public delegate void ServiceInfoHandler (object o, ServiceInfoArgs args);
+
     public class ServiceBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
@@ -63,10 +76,10 @@ namespace Avahi
 
         private ArrayList addListeners = new ArrayList ();
         private ArrayList removeListeners = new ArrayList ();
-        
+
         [DllImport ("avahi-client")]
-        private static extern IntPtr avahi_service_browser_new (IntPtr client, int iface, int proto, IntPtr type,
-                                                                IntPtr domain, LookupFlags flags,
+        private static extern IntPtr avahi_service_browser_new (IntPtr client, int iface, int proto, byte[] type,
+                                                                byte[] domain, LookupFlags flags,
                                                                 ServiceBrowserCallback cb,
                                                                 IntPtr userdata);
 
@@ -84,7 +97,7 @@ namespace Avahi
                 Stop (false);
             }
         }
-        
+
         public event ServiceInfoHandler ServiceRemoved
         {
             add {
@@ -105,12 +118,12 @@ namespace Avahi
         public ServiceBrowser (Client client, string type) : this (client, type, client.DomainName)
         {
         }
-        
+
         public ServiceBrowser (Client client, string type, string domain) : this (client, -1, Protocol.Unspecified,
                                                                                   type, domain, LookupFlags.None)
         {
         }
-        
+
         public ServiceBrowser (Client client, int iface, Protocol proto, string type, string domain, LookupFlags flags)
         {
             this.client = client;
@@ -138,22 +151,21 @@ namespace Avahi
                 (addListeners.Count == 0 && removeListeners.Count == 0))
                 return;
 
-            IntPtr domainPtr = Utility.StringToPtr (domain);
-            IntPtr typePtr = Utility.StringToPtr (type);
-
             lock (client) {
-                handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr, flags,
-                                                    cb, IntPtr.Zero);
+                handle = avahi_service_browser_new (client.Handle, iface, (int) proto,
+                                                    Utility.StringToBytes (type), Utility.StringToBytes (domain),
+                                                    flags, cb, IntPtr.Zero);
+
+                if (handle == IntPtr.Zero)
+                    client.ThrowError ();
             }
-            Utility.Free (domainPtr);
-            Utility.Free (typePtr);
         }
 
         private void Stop (bool force)
         {
             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;
@@ -178,21 +190,19 @@ namespace Avahi
             info.Text = null;
             info.Flags = flags;
 
-            infos.Add (info);
-
             switch (bevent) {
             case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (ServiceInfoHandler handler in addListeners)
-                    handler (this, info);
+                    handler (this, new ServiceInfoArgs (info));
 
                 break;
             case BrowserEvent.Removed:
                 infos.Remove (info);
 
                 foreach (ServiceInfoHandler handler in removeListeners)
-                    handler (this, info);
+                    handler (this, new ServiceInfoArgs (info));
 
                 break;
             default: