+/* $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
internal delegate void HostNameResolverCallback (IntPtr resolver, int iface, Protocol proto,
ResolverEvent revent, IntPtr hostname, IntPtr address,
- IntPtr userdata);
+ LookupResultFlags flags, IntPtr userdata);
- public class HostNameResolver : IDisposable
+ public class HostNameResolver : ResolverBase, IDisposable
{
private IntPtr handle;
private Client client;
private Protocol proto;
private string hostname;
private Protocol aproto;
+ private LookupFlags flags;
+ private HostNameResolverCallback cb;
private IPAddress currentAddress;
private string currentHost;
[DllImport ("avahi-client")]
private static extern IntPtr avahi_host_name_resolver_new (IntPtr client, int iface, Protocol proto,
- IntPtr hostname, Protocol aproto,
+ byte[] hostname, Protocol aproto, LookupFlags flags,
HostNameResolverCallback cb, IntPtr userdata);
[DllImport ("avahi-client")]
}
public HostNameResolver (Client client, string hostname) : this (client, -1, Protocol.Unspecified,
- hostname, Protocol.Unspecified)
+ hostname, Protocol.Unspecified,
+ LookupFlags.None)
{
}
public HostNameResolver (Client client, int iface, Protocol proto, string hostname,
- Protocol aproto)
+ Protocol aproto, LookupFlags flags)
{
this.client = client;
this.iface = iface;
this.proto = proto;
this.hostname = hostname;
this.aproto = aproto;
+ this.flags = flags;
+ cb = OnHostNameResolverCallback;
}
~HostNameResolver ()
private void Start ()
{
- if (handle != IntPtr.Zero || (foundListeners.Count == 0 && timeoutListeners.Count == 0))
+ if (client.Handle == IntPtr.Zero || handle != IntPtr.Zero ||
+ (foundListeners.Count == 0 && timeoutListeners.Count == 0))
return;
- IntPtr hostPtr = Utility.StringToPtr (hostname);
- handle = avahi_host_name_resolver_new (client.Handle, iface, proto, hostPtr, aproto,
- OnHostNameResolverCallback, IntPtr.Zero);
- Utility.Free (hostPtr);
+ lock (client) {
+ handle = avahi_host_name_resolver_new (client.Handle, iface, proto,
+ Utility.StringToBytes (hostname), aproto, flags,
+ cb, IntPtr.Zero);
+
+ if (handle == IntPtr.Zero)
+ client.ThrowError ();
+ }
}
private void Stop (bool force)
{
- if (handle != IntPtr.Zero && (force || (foundListeners.Count == 0 && timeoutListeners.Count == 0))) {
- avahi_host_name_resolver_free (handle);
- handle = IntPtr.Zero;
+ if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+ (force || (foundListeners.Count == 0 && timeoutListeners.Count == 0))) {
+
+ lock (client) {
+ avahi_host_name_resolver_free (handle);
+ handle = IntPtr.Zero;
+ }
}
}
private void OnHostNameResolverCallback (IntPtr resolver, int iface, Protocol proto,
ResolverEvent revent, IntPtr hostname, IntPtr address,
- IntPtr userdata)
+ LookupResultFlags flags, IntPtr userdata)
{
- if (revent == ResolverEvent.Found) {
+ switch (revent) {
+ case ResolverEvent.Found:
currentAddress = Utility.PtrToAddress (address);
currentHost = Utility.PtrToString (hostname);
foreach (HostAddressHandler handler in foundListeners)
- handler (this, currentHost, currentAddress);
- } else {
- currentAddress = null;
- currentHost = null;
-
- foreach (EventHandler handler in timeoutListeners)
- handler (this, new EventArgs ());
+ handler (this, new HostAddressArgs (currentHost, currentAddress));
+ break;
+ case ResolverEvent.Failure:
+ EmitFailure (client.LastError);
+ break;
}
}
}