X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FDomainBrowser.cs;h=a1165dcc638e58086d3a8aa2ddd901b2e4841474;hb=5dd25ac05574bb62b91a591c5728efa60d9dde34;hp=50ac75778db363ac347cac0881b4add0aaaf4ee4;hpb=84a9392791c574c56ca148157b8b951851208398;p=catta diff --git a/avahi-sharp/DomainBrowser.cs b/avahi-sharp/DomainBrowser.cs index 50ac757..a1165dc 100644 --- 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 { @@ -60,7 +59,7 @@ namespace Avahi } public delegate void DomainInfoHandler (object o, DomainInfoArgs args); - + public class DomainBrowser : BrowserBase, IDisposable { private IntPtr handle; @@ -75,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); @@ -96,7 +95,7 @@ namespace Avahi Stop (false); } } - + public event DomainInfoHandler DomainRemoved { add { @@ -117,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) { @@ -147,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 (); } }