-/* $Id$ */
-
/***
This file is part of avahi.
{
internal delegate void AddressResolverCallback (IntPtr resolver, int iface, Protocol proto,
- ResolverEvent revent, Protocol aproto, IntPtr address,
- IntPtr hostname, IntPtr userdata);
+ ResolverEvent revent, IntPtr address,
+ IntPtr hostname, LookupResultFlags flags, IntPtr userdata);
+
+ public delegate void HostAddressHandler (object o, HostAddressArgs args);
+
+ public class HostAddressArgs : EventArgs
+ {
+ private string host;
+ private IPAddress address;
+
+ public string Host
+ {
+ get { return host; }
+ }
+
+ public IPAddress Address
+ {
+ get { return address; }
+ }
- public delegate void HostAddressHandler (object o, string host, IPAddress address);
-
- public class AddressResolver : IDisposable
+ public HostAddressArgs (string host, IPAddress address)
+ {
+ this.host = host;
+ this.address = address;
+ }
+ }
+
+ public class AddressResolver : ResolverBase, IDisposable
{
private IntPtr handle;
private Client client;
private int iface;
private Protocol proto;
private IPAddress address;
+ private LookupFlags flags;
+ private AddressResolverCallback cb;
private IPAddress currentAddress;
private string currentHost;
private ArrayList foundListeners = new ArrayList ();
private ArrayList timeoutListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_address_resolver_new (IntPtr client, int iface, Protocol proto,
- IntPtr address, AddressResolverCallback cb,
+ IntPtr address, LookupFlags flags,
+ AddressResolverCallback cb,
IntPtr userdata);
[DllImport ("avahi-client")]
Stop (false);
}
}
-
+
public event EventHandler Timeout
{
add {
get { return currentHost; }
}
- public AddressResolver (Client client, IPAddress address) : this (client, -1, Protocol.Unspecified, address)
+ public AddressResolver (Client client, IPAddress address) : this (client, -1, Protocol.Unspecified,
+ address, LookupFlags.None)
{
}
- public AddressResolver (Client client, int iface, Protocol proto, IPAddress address)
+ public AddressResolver (Client client, int iface, Protocol proto, IPAddress address, LookupFlags flags)
{
this.client = client;
this.iface = iface;
this.proto = proto;
this.address = address;
+ this.flags = flags;
+ cb = OnAddressResolverCallback;
}
~AddressResolver ()
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 addrPtr = Utility.StringToPtr (address.ToString ());
- handle = avahi_address_resolver_new (client.Handle, iface, proto, addrPtr,
- OnAddressResolverCallback, IntPtr.Zero);
+ IntPtr addrPtr = Utility.AddressToPtr (address);
+
+ lock (client) {
+ handle = avahi_address_resolver_new (client.Handle, iface, proto, addrPtr, flags,
+ cb, IntPtr.Zero);
+
+ if (handle == IntPtr.Zero)
+ client.ThrowError ();
+ }
+
Utility.Free (addrPtr);
}
private void Stop (bool force)
{
- if (handle != IntPtr.Zero && (force || (foundListeners.Count == 0 && timeoutListeners.Count == 0))) {
- avahi_address_resolver_free (handle);
- handle = IntPtr.Zero;
+ if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+ (force || (foundListeners.Count == 0 && timeoutListeners.Count == 0))) {
+
+ lock (client) {
+ avahi_address_resolver_free (handle);
+ handle = IntPtr.Zero;
+ }
}
}
private void OnAddressResolverCallback (IntPtr resolver, int iface, Protocol proto,
- ResolverEvent revent, Protocol aproto, IntPtr address,
- IntPtr hostname, IntPtr userdata)
+ ResolverEvent revent, IntPtr address,
+ IntPtr hostname, 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;
}
}
}