get rid of a lot of old svn cruft

[catta] / avahi-sharp / AddressResolver.cs

diff --git a/avahi-sharp/AddressResolver.cs b/avahi-sharp/AddressResolver.cs
index 038b0c9aef591cdafdba0183d9f90cb6115025bd..c11e97d751f23be7c6630158a78b7ea979267502 100644 (file)
--- a/avahi-sharp/AddressResolver.cs
+++ b/avahi-sharp/AddressResolver.cs
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
 
@@ -29,12 +27,34 @@ namespace Avahi
 {
 
     internal delegate void AddressResolverCallback (IntPtr resolver, int iface, Protocol proto,
-                                                    ResolverEvent revent, Protocol aproto, IntPtr address,
+                                                    ResolverEvent revent, IntPtr address,
                                                     IntPtr hostname, LookupResultFlags flags, IntPtr userdata);
 
-    public delegate void HostAddressHandler (object o, string host, IPAddress address);
-    
-    public class AddressResolver : IDisposable
+    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 HostAddressArgs (string host, IPAddress address)
+        {
+            this.host = host;
+            this.address = address;
+        }
+    }
+
+    public class AddressResolver : ResolverBase, IDisposable
     {
         private IntPtr handle;
         private Client client;
@@ -49,7 +69,7 @@ namespace Avahi
 
         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, LookupFlags flags,
@@ -70,7 +90,7 @@ namespace Avahi
                 Stop (false);
             }
         }
-        
+
         public event EventHandler Timeout
         {
             add {
@@ -124,13 +144,16 @@ namespace Avahi
                 (foundListeners.Count == 0 && timeoutListeners.Count == 0))
                 return;
 
-            IntPtr addrPtr = Utility.StringToPtr (address.ToString ());
+            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);
         }
 
@@ -147,21 +170,20 @@ namespace Avahi
         }
 
         private void OnAddressResolverCallback (IntPtr resolver, int iface, Protocol proto,
-                                                ResolverEvent revent, Protocol aproto, IntPtr address,
+                                                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;
             }
         }
     }