X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FServiceTypeBrowser.cs;h=e1356d00a4623cf1a2ddae808972273e6bebcafb;hb=94366b4c8e1e4c6b92353cf194cb972086f44a4a;hp=0334b963f097a1e0c5b77843b9d4ea6250d49f3a;hpb=ba12decc4413dedf22c06545d1ec5938efa8954a;p=catta

diff --git a/avahi-sharp/ServiceTypeBrowser.cs b/avahi-sharp/ServiceTypeBrowser.cs
index 0334b96..e1356d0 100644
--- a/avahi-sharp/ServiceTypeBrowser.cs
+++ b/avahi-sharp/ServiceTypeBrowser.cs
@@ -1,23 +1,60 @@
+/***
+  This file is part of avahi.
+
+  avahi is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+
+  avahi is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+  Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with avahi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Avahi
 {
     internal delegate void ServiceTypeBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                       IntPtr type, IntPtr domain, IntPtr userdata);
-    
+                                                       IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                       IntPtr userdata);
+
     public struct ServiceTypeInfo
     {
         public int NetworkInterface;
         public Protocol Protocol;
         public string Domain;
         public string ServiceType;
+        public LookupResultFlags Flags;
     }
 
-    public delegate void ServiceTypeInfoHandler (object o, ServiceTypeInfo info);
-    
-    public class ServiceTypeBrowser : IDisposable
+    public class ServiceTypeInfoArgs : EventArgs
+    {
+        private ServiceTypeInfo type;
+
+        public ServiceTypeInfo ServiceType
+        {
+            get { return type; }
+        }
+
+        public ServiceTypeInfoArgs (ServiceTypeInfo type)
+        {
+            this.type = type;
+        }
+    }
+
+    public delegate void ServiceTypeInfoHandler (object o, ServiceTypeInfoArgs args);
+
+    public class ServiceTypeBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
         private ArrayList infos = new ArrayList ();
@@ -25,13 +62,16 @@ namespace Avahi
         private int iface;
         private Protocol proto;
         private string domain;
+        private LookupFlags flags;
+        private ServiceTypeBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
         private ArrayList removeListeners = new ArrayList ();
-        
+
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_service_type_browser_new (IntPtr client, int iface, int proto,
-                                                                     IntPtr domain, ServiceTypeBrowserCallback cb,
+                                                                     byte[] domain, LookupFlags flags,
+                                                                     ServiceTypeBrowserCallback cb,
                                                                      IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -48,7 +88,7 @@ namespace Avahi
                 Stop (false);
             }
         }
-        
+
         public event ServiceTypeInfoHandler ServiceTypeRemoved
         {
             add {
@@ -70,16 +110,19 @@ namespace Avahi
         {
         }
 
-        public ServiceTypeBrowser (Client client, string domain) : this (client, -1, Protocol.Unspecified, domain)
+        public ServiceTypeBrowser (Client client, string domain) : this (client, -1, Protocol.Unspecified,
+                                                                         domain, LookupFlags.None)
         {
         }
-        
-        public ServiceTypeBrowser (Client client, int iface, Protocol proto, string domain)
+
+        public ServiceTypeBrowser (Client client, int iface, Protocol proto, string domain, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
+            this.flags = flags;
+            cb = OnServiceTypeBrowserCallback;
         }
 
         ~ServiceTypeBrowser ()
@@ -94,25 +137,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);
-            handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr,
-                                                     OnServiceTypeBrowserCallback, IntPtr.Zero);
-            Utility.Free (domainPtr);
+            lock (client) {
+                handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto,
+                                                         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_type_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_type_browser_free (handle);
+                    handle = IntPtr.Zero;
+                }
             }
         }
 
         private void OnServiceTypeBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                   IntPtr type, IntPtr domain, IntPtr userdata)
+                                                   IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                   IntPtr userdata)
         {
 
             ServiceTypeInfo info;
@@ -120,19 +173,24 @@ namespace Avahi
             info.Protocol = proto;
             info.Domain = Utility.PtrToString (domain);
             info.ServiceType = Utility.PtrToString (type);
+            info.Flags = flags;
 
-            infos.Add (info);
-            
-            if (bevent == BrowserEvent.Added) {
+            switch (bevent) {
+            case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (ServiceTypeInfoHandler handler in addListeners)
-                    handler (this, info);
-            } else {
+                    handler (this, new ServiceTypeInfoArgs (info));
+                break;
+            case BrowserEvent.Removed:
                 infos.Remove (info);
 
                 foreach (ServiceTypeInfoHandler handler in removeListeners)
-                    handler (this, info);
+                    handler (this, new ServiceTypeInfoArgs (info));
+                break;
+            default:
+                EmitBrowserEvent (bevent);
+                break;
             }
         }
     }