diff options
| author | James Willcox <snopr@snorp.net> | 2005-11-17 21:11:13 +0000 |
|---|---|---|
| committer | James Willcox <snopr@snorp.net> | 2005-11-17 21:11:13 +0000 |
| commit | 9a589e1f5221d1bd995b6c4fa73e3a074d4c2da4 (patch) | |
| tree | 10b4bf2a914fa421474e6e895331d3cb4b07c9d9 /avahi-sharp/ServiceBrowser.cs | |
| parent | 84e07c25895dd6a8f706499a867afa44b9444ce2 (diff) | |
* add byte[] overloads for EntryGroup methods
* cleanup string marshalling
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@999 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-sharp/ServiceBrowser.cs')
| -rw-r--r-- | avahi-sharp/ServiceBrowser.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs index 639dd0a..520e339 100644 --- a/avahi-sharp/ServiceBrowser.cs +++ b/avahi-sharp/ServiceBrowser.cs @@ -23,6 +23,7 @@ using System; using System.Net; using System.Collections; using System.Runtime.InteropServices; +using System.Text; namespace Avahi { @@ -79,8 +80,8 @@ namespace Avahi 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, LookupFlags flags, + private static extern IntPtr avahi_service_browser_new (IntPtr client, int iface, int proto, byte[] type, + byte[] domain, LookupFlags flags, ServiceBrowserCallback cb, IntPtr userdata); @@ -152,15 +153,14 @@ namespace Avahi (addListeners.Count == 0 && removeListeners.Count == 0)) return; - IntPtr domainPtr = Utility.StringToPtr (domain); - IntPtr typePtr = Utility.StringToPtr (type); - lock (client) { - handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr, flags, - cb, IntPtr.Zero); + 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 (); } - Utility.Free (domainPtr); - Utility.Free (typePtr); } private void Stop (bool force) |