fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-sharp / DomainBrowser.cs

diff --git a/avahi-sharp/DomainBrowser.cs b/avahi-sharp/DomainBrowser.cs
index deed9b8637c089aa775fc886cf225b09dd493819..a1165dcc638e58086d3a8aa2ddd901b2e4841474 100644 (file)
--- a/avahi-sharp/DomainBrowser.cs
+++ b/avahi-sharp/DomainBrowser.cs
@@ -1,17 +1,37 @@
+/***
+  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 DomainBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                  IntPtr domain, IntPtr userdata);
+                                                  IntPtr domain, LookupResultFlags flags, IntPtr userdata);
 
     public enum DomainBrowserType {
-        Register,
-        RegisterDefault,
         Browse,
         BrowseDefault,
+        Register,
+        RegisterDefault,
         BrowseLegacy
     }
 
@@ -20,11 +40,27 @@ namespace Avahi
         public int NetworkInterface;
         public Protocol Protocol;
         public string Domain;
+        public LookupResultFlags Flags;
+    }
+
+    public class DomainInfoArgs : EventArgs
+    {
+        private DomainInfo domain;
+
+        public DomainInfo Domain
+        {
+            get { return domain; }
+        }
+
+        public DomainInfoArgs (DomainInfo domain)
+        {
+            this.domain = domain;
+        }
     }
 
-    public delegate void DomainInfoHandler (object o, DomainInfo info);
-    
-    public class DomainBrowser : IDisposable
+    public delegate void DomainInfoHandler (object o, DomainInfoArgs args);
+
+    public class DomainBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
         private ArrayList infos = new ArrayList ();
@@ -33,13 +69,16 @@ namespace Avahi
         private Protocol proto;
         private string domain;
         private DomainBrowserType btype;
+        private LookupFlags flags;
+        private DomainBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
         private ArrayList removeListeners = new ArrayList ();
-        
+
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_domain_browser_new (IntPtr client, int iface, int proto,
-                                                               IntPtr domain, int btype, DomainBrowserCallback cb,
+                                                               byte[] domain, int btype, LookupFlags flags,
+                                                               DomainBrowserCallback cb,
                                                                IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -56,7 +95,7 @@ namespace Avahi
                 Stop (false);
             }
         }
-        
+
         public event DomainInfoHandler DomainRemoved
         {
             add {
@@ -75,16 +114,19 @@ namespace Avahi
         }
 
         public DomainBrowser (Client client) : this (client, -1, Protocol.Unspecified, client.DomainName,
-                                                     DomainBrowserType.Browse) {
+                                                     DomainBrowserType.Browse, LookupFlags.None) {
         }
-        
-        public DomainBrowser (Client client, int iface, Protocol proto, string domain, DomainBrowserType btype)
+
+        public DomainBrowser (Client client, int iface, Protocol proto, string domain,
+                              DomainBrowserType btype, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
             this.btype = btype;
+            this.flags = flags;
+            cb = OnDomainBrowserCallback;
         }
 
         ~DomainBrowser ()
@@ -99,44 +141,57 @@ 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_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype,
-                                               OnDomainBrowserCallback, IntPtr.Zero);
-            Utility.Free (domainPtr);
+            lock (client) {
+                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto,
+                                                   Utility.StringToBytes (domain), (int) btype, 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_domain_browser_free (handle);
-                handle = IntPtr.Zero;
+            if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+                (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
+                lock (client) {
+                    avahi_domain_browser_free (handle);
+                    handle = IntPtr.Zero;
+                }
             }
         }
 
         private void OnDomainBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                              IntPtr domain, IntPtr userdata)
+                                              IntPtr domain, LookupResultFlags flags, IntPtr userdata)
         {
 
             DomainInfo info;
             info.NetworkInterface = iface;
             info.Protocol = proto;
             info.Domain = Utility.PtrToString (domain);
+            info.Flags = flags;
 
-            infos.Add (info);
-            
-            if (bevent == BrowserEvent.Added) {
+            switch (bevent) {
+            case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (DomainInfoHandler handler in addListeners)
-                    handler (this, info);
-            } else {
+                    handler (this, new DomainInfoArgs (info));
+                break;
+            case BrowserEvent.Removed:
                 infos.Remove (info);
 
                 foreach (DomainInfoHandler handler in removeListeners)
-                    handler (this, info);
+                    handler (this, new DomainInfoArgs (info));
+                break;
+            default:
+                EmitBrowserEvent (bevent);
+                break;
             }
         }
     }