update to latest api changes

[catta] / avahi-sharp / Client.cs

diff --git a/avahi-sharp/Client.cs b/avahi-sharp/Client.cs
index f5ba0693779a78722f5f0a43dd7206fc30d7f09e..394efc58e22100db7790d83782927e1815a923f2 100644 (file)
--- a/avahi-sharp/Client.cs
+++ b/avahi-sharp/Client.cs
@@ -29,12 +29,15 @@ namespace Avahi
 {
     internal enum ResolverEvent {
         Found,
-        Timeout
+        Failure
     }
     
     internal enum BrowserEvent {
         Added,
-        Removed
+        Removed,
+        CacheExhausted,
+        AllForNow,
+        Failure
     }
 
     internal delegate int PollCallback (IntPtr ufds, uint nfds, int timeout);
@@ -47,21 +50,27 @@ namespace Avahi
         IPv4 = 0,
         IPv6 = 1
     }
-    
-    public enum ClientState {
+
+    internal enum ServerState {
         Invalid,
         Registering,
         Running,
-        Collision,
-        Disconnected = 100
+        Collision
+    }
+    
+    public enum ClientState {
+        Registering = ServerState.Registering,
+        Running = ServerState.Running,
+        Collision = ServerState.Collision,
+        Failure = 100,
+        Connecting = 101
     }
 
     [Flags]
     public enum LookupFlags {
         None = 0,
         UseWideArea = 1,
-        UseMulticast = 2,
-        NoTxt = 4,
+        UseMulticast = 4,
         NoAddress = 8
     }
 
@@ -70,7 +79,16 @@ namespace Avahi
         None = 0,
         Cached = 1,
         WideArea = 2,
-        Multicast = 4
+        Multicast = 4,
+        Local = 8,
+        OurOwn = 16,
+    }
+
+    [Flags]
+    public enum ClientFlags {
+        None = 0,
+        IgnoreUserConfig = 1,
+        NoFail = 2
     }
     
     public class Client : IDisposable
@@ -83,7 +101,7 @@ namespace Avahi
         private Thread thread;
 
         [DllImport ("avahi-client")]
-        private static extern IntPtr avahi_client_new (IntPtr poll, ClientCallback handler,
+        private static extern IntPtr avahi_client_new (IntPtr poll, ClientFlags flags, ClientCallback handler,
                                                        IntPtr userData, out int error);
 
         [DllImport ("avahi-client")]
@@ -117,7 +135,7 @@ namespace Avahi
         private static extern void avahi_simple_poll_free (IntPtr spoll);
 
         [DllImport ("avahi-common")]
-        private static extern int avahi_simple_poll_iterate (IntPtr spoll, int timeout);
+        private static extern int avahi_simple_poll_loop (IntPtr spoll);
 
         [DllImport ("avahi-common")]
         private static extern void avahi_simple_poll_set_func (IntPtr spoll, PollCallback cb);
@@ -128,10 +146,6 @@ namespace Avahi
         [DllImport ("avahi-client")]
         private static extern uint avahi_client_get_local_service_cookie (IntPtr client);
 
-        [DllImport ("avahi-client")]
-        private static extern int avahi_client_is_service_local (IntPtr client, int iface, Protocol proto,
-                                                                 IntPtr name, IntPtr type, IntPtr domain);
-
 
         [DllImport ("libc")]
         private static extern int poll(IntPtr ufds, uint nfds, int timeout);
@@ -197,16 +211,16 @@ namespace Avahi
             }
         }
 
-        internal int LastError
+        internal ErrorCode LastError
         {
             get {
                 lock (this) {
-                    return avahi_client_errno (handle);
+                    return (ErrorCode) avahi_client_errno (handle);
                 }
             }
         }
 
-        public Client ()
+        public Client (ClientFlags flags)
         {
             spoll = avahi_simple_poll_new ();
 
@@ -216,7 +230,7 @@ namespace Avahi
             cb = OnClientCallback;
 
             int error;
-            handle = avahi_client_new (poll, cb, IntPtr.Zero, out error);
+            handle = avahi_client_new (poll, flags, cb, IntPtr.Zero, out error);
             if (error != 0)
                 throw new ClientException (error);
 
@@ -225,6 +239,9 @@ namespace Avahi
             thread.Start ();
         }
 
+        public Client () : this (ClientFlags.None) {
+        }
+
         ~Client ()
         {
             Dispose ();
@@ -232,44 +249,19 @@ namespace Avahi
 
         public void Dispose ()
         {
-            lock (this) {
-                if (handle != IntPtr.Zero) {
-                    thread.Abort ();
-
-                    avahi_client_free (handle);
-                    avahi_simple_poll_quit (spoll);
-                    avahi_simple_poll_free (spoll);
-                    handle = IntPtr.Zero;
-                }
+            if (handle != IntPtr.Zero) {
+                avahi_client_free (handle);
+                avahi_simple_poll_quit (spoll);
+                avahi_simple_poll_free (spoll);
+                handle = IntPtr.Zero;
             }
         }
 
-        public bool IsServiceLocal (ServiceInfo service)
-        {
-            return IsServiceLocal (service.NetworkInterface, service.Protocol, service.Name,
-                                   service.ServiceType, service.Domain);
-        }
-
-        public bool IsServiceLocal (int iface, Protocol proto, string name, string type, string domain)
+        internal void ThrowError ()
         {
-            IntPtr namePtr = Utility.StringToPtr (name);
-            IntPtr typePtr = Utility.StringToPtr (type);
-            IntPtr domainPtr = Utility.StringToPtr (domain);
-            
-            int result = avahi_client_is_service_local (handle, iface, proto, namePtr, typePtr, domainPtr);
+            ErrorCode error = LastError;
 
-            Utility.Free (namePtr);
-            Utility.Free (typePtr);
-            Utility.Free (domainPtr);
-
-            return result == 1;
-        }
-
-        internal void CheckError ()
-        {
-            int error = LastError;
-
-            if (error != 0)
+            if (error != ErrorCode.Ok)
                 throw new ClientException (error);
         }
         
@@ -289,12 +281,8 @@ namespace Avahi
         private void PollLoop () {
             try {
                 lock (this) {
-                    while (true) {
-                        if (avahi_simple_poll_iterate (spoll, -1) != 0)
-                            break;
-                    }
+                    avahi_simple_poll_loop (spoll);
                 }
-            } catch (ThreadAbortException e) {
             } catch (Exception e) {
                 Console.Error.WriteLine ("Error in avahi-sharp event loop: " + e);
             }