fix detection whether an interface has a routable address assigned on BSD. Patch...

[catta] / avahi-sharp / ServiceBrowser.cs

diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index a9c1726c20fa6565f343a38c0c70e51d1d41912b..520e339582182ef3d17d951736f512b7ae0ce7dd 100644 (file)
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -23,6 +23,7 @@ using System;
 using System.Net;
 using System.Collections;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Avahi
 {
@@ -47,7 +48,21 @@ 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
     {
@@ -65,8 +80,8 @@ namespace Avahi
         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);
 
@@ -138,15 +153,14 @@ 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)
@@ -178,21 +192,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: