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 3ce9e4d83ef237c16ee8ba54b03a7ca1abb213fb..a1165dcc638e58086d3a8aa2ddd901b2e4841474 100644 (file)
--- a/avahi-sharp/DomainBrowser.cs
+++ b/avahi-sharp/DomainBrowser.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
 
@@ -22,6 +20,7 @@
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Avahi
 {
@@ -29,10 +28,10 @@ namespace Avahi
                                                   IntPtr domain, LookupResultFlags flags, IntPtr userdata);
 
     public enum DomainBrowserType {
-        Register,
-        RegisterDefault,
         Browse,
         BrowseDefault,
+        Register,
+        RegisterDefault,
         BrowseLegacy
     }
 
@@ -44,8 +43,23 @@ namespace Avahi
         public LookupResultFlags Flags;
     }
 
-    public delegate void DomainInfoHandler (object o, DomainInfo info);
-    
+    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, DomainInfoArgs args);
+
     public class DomainBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
@@ -60,10 +74,10 @@ namespace Avahi
 
         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, LookupFlags flags,
+                                                               byte[] domain, int btype, LookupFlags flags,
                                                                DomainBrowserCallback cb,
                                                                IntPtr userdata);
 
@@ -81,7 +95,7 @@ namespace Avahi
                 Stop (false);
             }
         }
-        
+
         public event DomainInfoHandler DomainRemoved
         {
             add {
@@ -102,7 +116,7 @@ namespace Avahi
         public DomainBrowser (Client client) : this (client, -1, Protocol.Unspecified, client.DomainName,
                                                      DomainBrowserType.Browse, LookupFlags.None) {
         }
-        
+
         public DomainBrowser (Client client, int iface, Protocol proto, string domain,
                               DomainBrowserType btype, LookupFlags flags)
         {
@@ -132,10 +146,12 @@ namespace Avahi
                 return;
 
             lock (client) {
-                IntPtr domainPtr = Utility.StringToPtr (domain);
-                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype, flags,
+                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto,
+                                                   Utility.StringToBytes (domain), (int) btype, flags,
                                                    cb, IntPtr.Zero);
-                Utility.Free (domainPtr);
+
+                if (handle == IntPtr.Zero)
+                    client.ThrowError ();
             }
         }
 
@@ -160,20 +176,18 @@ namespace Avahi
             info.Domain = Utility.PtrToString (domain);
             info.Flags = flags;
 
-            infos.Add (info);
-
             switch (bevent) {
             case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (DomainInfoHandler handler in addListeners)
-                    handler (this, info);
+                    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);