-/* $Id$ */
-
/***
This file is part of avahi.
using System.Collections;
using System.Net;
using System.Runtime.InteropServices;
+using System.Text;
using Mono.Unix;
namespace Avahi
UInt16 port, IntPtr txt, LookupResultFlags flags,
IntPtr userdata);
- public class ServiceResolver : IDisposable
+ public class ServiceResolver : ResolverBase, IDisposable
{
private IntPtr handle;
private ServiceInfo currentInfo;
private ArrayList foundListeners = new ArrayList ();
private ArrayList timeoutListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_service_resolver_new (IntPtr client, int iface, Protocol proto,
- IntPtr name, IntPtr type, IntPtr domain,
+ byte[] name, byte[] type, byte[] domain,
Protocol aproto, LookupFlags flags,
ServiceResolverCallback cb,
IntPtr userdata);
Stop (false);
}
}
-
+
public event EventHandler Timeout
{
add {
GetLookupFlags (service.Flags))
{
}
-
+
public ServiceResolver (Client client, int iface, Protocol proto, string name,
string type, string domain, Protocol aproto, LookupFlags flags)
{
(foundListeners.Count == 0 && timeoutListeners.Count == 0))
return;
- IntPtr namePtr = Utility.StringToPtr (name);
- IntPtr typePtr = Utility.StringToPtr (type);
- IntPtr domainPtr = Utility.StringToPtr (domain);
-
lock (client) {
- handle = avahi_service_resolver_new (client.Handle, iface, proto, namePtr, typePtr, domainPtr,
- aproto, flags, cb, IntPtr.Zero);
+ handle = avahi_service_resolver_new (client.Handle, iface, proto,
+ Utility.StringToBytes (name), Utility.StringToBytes (type),
+ Utility.StringToBytes (domain), aproto, flags, cb, IntPtr.Zero);
+
+ if (handle == IntPtr.Zero)
+ client.ThrowError ();
}
-
- Utility.Free (namePtr);
- Utility.Free (typePtr);
- Utility.Free (domainPtr);
}
private void Stop (bool force)
info.Address = Utility.PtrToAddress (address);
info.Port = port;
+ if (proto == Protocol.IPv6)
+ info.Address.ScopeId = iface;
+
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);
info.Text = (byte[][]) txtlist.ToArray (typeof (byte[]));
info.Flags = flags;
-
- if (revent == ResolverEvent.Found) {
+
+ switch (revent) {
+ case ResolverEvent.Found:
currentInfo = info;
foreach (ServiceInfoHandler handler in foundListeners)
- handler (this, info);
- } else {
- currentInfo = ServiceInfo.Zero;
-
- foreach (EventHandler handler in timeoutListeners)
- handler (this, new EventArgs ());
+ handler (this, new ServiceInfoArgs (info));
+ break;
+ case ResolverEvent.Failure:
+ EmitFailure (client.LastError);
+ break;
}
}