first pass at updating to the 0.6 apis

[catta] / avahi-sharp / Client.cs

diff --git a/avahi-sharp/Client.cs b/avahi-sharp/Client.cs
index 783c00342f6fdd6b6f29783b8a08c3ce255b4ebb..73b6f57c0b85f19db23ea3e84c51d027e928a161 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);
@@ -55,6 +58,24 @@ namespace Avahi
         Collision,
         Disconnected = 100
     }
+
+    [Flags]
+    public enum LookupFlags {
+        None = 0,
+        UseWideArea = 1,
+        UseMulticast = 4,
+        NoAddress = 8
+    }
+
+    [Flags]
+    public enum LookupResultFlags {
+        None = 0,
+        Cached = 1,
+        WideArea = 2,
+        Multicast = 4,
+        Local = 8,
+        OurOwn = 16,
+    }
     
     public class Client : IDisposable
     {
@@ -100,7 +121,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);
@@ -108,6 +129,10 @@ namespace Avahi
         [DllImport ("avahi-common")]
         private static extern void avahi_simple_poll_quit (IntPtr spoll);
 
+        [DllImport ("avahi-client")]
+        private static extern uint avahi_client_get_local_service_cookie (IntPtr client);
+
+
         [DllImport ("libc")]
         private static extern int poll(IntPtr ufds, uint nfds, int timeout);
 
@@ -163,11 +188,20 @@ namespace Avahi
             }
         }
 
-        internal int LastError
+        public uint LocalServiceCookie
         {
             get {
                 lock (this) {
-                    return avahi_client_errno (handle);
+                    return avahi_client_get_local_service_cookie (handle);
+                }
+            }
+        }
+
+        internal ErrorCode LastError
+        {
+            get {
+                lock (this) {
+                    return (ErrorCode) avahi_client_errno (handle);
                 }
             }
         }
@@ -212,9 +246,9 @@ namespace Avahi
 
         internal void CheckError ()
         {
-            int error = LastError;
+            ErrorCode error = LastError;
 
-            if (error != 0)
+            if (error != ErrorCode.Ok)
                 throw new ClientException (error);
         }
         
@@ -234,10 +268,7 @@ 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) {