ServiceResolver.cs: Set the ScopeId field of ServiceInfo.Address to the

[catta] / avahi-sharp / ServiceBrowser.cs

diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index d7ae558e8481323e1ffeb3bc577fdee47db99176..520e339582182ef3d17d951736f512b7ae0ce7dd 100644 (file)
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /***
   This file is part of avahi.
 
@@ -21,11 +23,13 @@ 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, IntPtr userdata);
+                                                   IntPtr name, IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                   IntPtr userdata);
     
     public struct ServiceInfo
     {
@@ -35,17 +39,32 @@ namespace Avahi
         public string ServiceType;
         public string Name;
 
-        public string Host;
+        public string HostName;
         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 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 : IDisposable
+    public class ServiceBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
         private ArrayList infos = new ArrayList ();
@@ -54,13 +73,16 @@ namespace Avahi
         private Protocol proto;
         private string domain;
         private string type;
+        private LookupFlags flags;
+        private ServiceBrowserCallback cb;
 
         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, ServiceBrowserCallback cb,
+        private static extern IntPtr avahi_service_browser_new (IntPtr client, int iface, int proto, byte[] type,
+                                                                byte[] domain, LookupFlags flags,
+                                                                ServiceBrowserCallback cb,
                                                                 IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -100,19 +122,19 @@ 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;
         }
 
         ~ServiceBrowser ()
@@ -127,27 +149,35 @@ 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);
-            Utility.Free (domainPtr);
-            Utility.Free (typePtr);
+            lock (client) {
+                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 ();
+            }
         }
 
         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;
@@ -156,23 +186,30 @@ 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;
+            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 {
+                    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:
+                EmitBrowserEvent (bevent);
+                break;
             }
         }
     }