+/* $Id$ */
+
/***
This file is part of avahi.
private string type;
private string domain;
private Protocol aproto;
+ private ServiceResolverCallback cb;
private ArrayList foundListeners = new ArrayList ();
private ArrayList timeoutListeners = new ArrayList ();
Protocol aproto, ServiceResolverCallback cb,
IntPtr userdata);
+ [DllImport ("avahi-common")]
+ private static extern IntPtr avahi_string_list_get_next (IntPtr list);
+
+ [DllImport ("avahi-common")]
+ private static extern IntPtr avahi_string_list_get_text (IntPtr list);
+
+ [DllImport ("avahi-common")]
+ private static extern int avahi_string_list_get_size (IntPtr list);
+
[DllImport ("avahi-client")]
private static extern void avahi_service_resolver_free (IntPtr handle);
this.type = type;
this.domain = domain;
this.aproto = aproto;
-
-
+ cb = OnServiceResolverCallback;
}
~ServiceResolver ()
IntPtr typePtr = Utility.StringToPtr (type);
IntPtr domainPtr = Utility.StringToPtr (domain);
handle = avahi_service_resolver_new (client.Handle, iface, proto, namePtr, typePtr, domainPtr,
- aproto, OnServiceResolverCallback, IntPtr.Zero);
+ aproto, cb, IntPtr.Zero);
Utility.Free (namePtr);
Utility.Free (typePtr);
Utility.Free (domainPtr);
IntPtr domain, IntPtr host, IntPtr address,
UInt16 port, IntPtr txt, IntPtr userdata)
{
+
ServiceInfo info;
info.NetworkInterface = iface;
info.Protocol = proto;
info.Domain = Utility.PtrToString (domain);
info.ServiceType = Utility.PtrToString (type);
info.Name = Utility.PtrToString (name);
- info.Host = Utility.PtrToString (host);
+ info.HostName = Utility.PtrToString (host);
info.Address = Utility.PtrToAddress (address);
info.Port = port;
- info.Text = null;
+ ArrayList txtlist = new ArrayList ();
+ for (IntPtr l = txt; l != IntPtr.Zero; l = avahi_string_list_get_next (l)) {
+ IntPtr buf = avahi_string_list_get_text (l);
+ int len = avahi_string_list_get_size (l);
+
+ byte[] txtbuf = new byte[len];
+ Marshal.Copy (buf, txtbuf, 0, len);
+ txtlist.Add (txtbuf);
+ }
+
+ info.Text = (byte[][]) txtlist.ToArray (typeof (byte[]));
+
if (revent == ResolverEvent.Found) {
currentInfo = info;