add an 'Error' property to ClientStateArgs

[catta] / avahi-sharp / Client.cs

diff --git a/avahi-sharp/Client.cs b/avahi-sharp/Client.cs
index 73b6f57c0b85f19db23ea3e84c51d027e928a161..6d39469072947cb6fd0f7ad694be45df239d013d 100644 (file)
--- a/avahi-sharp/Client.cs
+++ b/avahi-sharp/Client.cs
@@ -24,6 +24,10 @@ using System;
 using System.Threading;
 using System.Collections;
 using System.Runtime.InteropServices;
+using Mono.Unix;
+using Mono.Unix.Native;
+
+using Stdlib = Mono.Unix.Native.Stdlib;
 
 namespace Avahi
 {
@@ -43,27 +47,57 @@ namespace Avahi
     internal delegate int PollCallback (IntPtr ufds, uint nfds, int timeout);
     internal delegate void ClientCallback (IntPtr client, ClientState state, IntPtr userData);
 
-    public delegate void ClientStateHandler (object o, ClientState state);
+    public delegate void ClientStateHandler (object o, ClientStateArgs state);
+
+    public class ClientStateArgs : EventArgs
+    {
+        private ClientState state;
+        private ErrorCode error;
+
+        public ClientState State
+        {
+            get { return state; }
+        }
+
+        public ErrorCode Error
+        {
+            get { return error; }
+        }
 
+        public ClientStateArgs (ClientState state, ErrorCode error)
+        {
+            this.state = state;
+            this.error = error;
+        }
+    }
+    
     public enum Protocol {
         Unspecified = -1,
         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 = 4,
+        UseMulticast = 2,
+       NoTxt = 4,
         NoAddress = 8
     }
 
@@ -76,6 +110,13 @@ namespace Avahi
         Local = 8,
         OurOwn = 16,
     }
+
+    [Flags]
+    public enum ClientFlags {
+        None = 0,
+        IgnoreUserConfig = 1,
+        NoFail = 2
+    }
     
     public class Client : IDisposable
     {
@@ -87,7 +128,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")]
@@ -132,6 +173,15 @@ namespace Avahi
         [DllImport ("avahi-client")]
         private static extern uint avahi_client_get_local_service_cookie (IntPtr client);
 
+        [DllImport ("avahi-common")]
+        private static extern int avahi_service_name_join (IntPtr buf, int len, byte[] name, byte[] type,
+                                                           byte[] domain);
+
+        [DllImport ("avahi-common")]
+        private static extern int avahi_service_name_split (byte[] service, IntPtr name, int name_len,
+                                                            IntPtr type, int type_len,
+                                                            IntPtr domain, int domain_len);
+
 
         [DllImport ("libc")]
         private static extern int poll(IntPtr ufds, uint nfds, int timeout);
@@ -206,7 +256,7 @@ namespace Avahi
             }
         }
 
-        public Client ()
+        public Client (ClientFlags flags)
         {
             spoll = avahi_simple_poll_new ();
 
@@ -216,7 +266,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 +275,9 @@ namespace Avahi
             thread.Start ();
         }
 
+        public Client () : this (ClientFlags.None) {
+        }
+
         ~Client ()
         {
             Dispose ();
@@ -232,19 +285,67 @@ 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 static string JoinServiceName (string name, string type, string domain)
+        {
+            int len = 4 * (name.Length + type.Length + domain.Length) + 4;
+            IntPtr buf = Stdlib.malloc ((ulong) len);
+
+            int ret = avahi_service_name_join (buf, len,
+                                               Utility.StringToBytes (name),
+                                               Utility.StringToBytes (type),
+                                               Utility.StringToBytes (domain));
+
+            if (ret < 0) {
+                Utility.Free (buf);
+                return null; // FIXME, should throw exception
             }
+
+            string service = Utility.PtrToString (buf);
+            Utility.Free (buf);
+
+            return service;
+        }
+
+        public static void SplitServiceName (string service, out string name, out string type, out string domain)
+        {
+            int len = 1024;
+
+            IntPtr namePtr = Stdlib.malloc ((ulong) len);
+            IntPtr typePtr = Stdlib.malloc ((ulong) len);
+            IntPtr domainPtr = Stdlib.malloc ((ulong) len);
+            
+            int ret = avahi_service_name_split (Utility.StringToBytes (service), namePtr, len, typePtr, len,
+                                                domainPtr, len);
+
+            if (ret < 0) {
+                Utility.Free (namePtr);
+                Utility.Free (typePtr);
+                Utility.Free (domainPtr);
+                
+                name = null;
+                type = null;
+                domain = null;
+                return;
+            }
+
+            name = Utility.PtrToString (namePtr);
+            type = Utility.PtrToString (typePtr);
+            domain = Utility.PtrToString (domainPtr);
+
+            Utility.Free (namePtr);
+            Utility.Free (typePtr);
+            Utility.Free (domainPtr);
         }
 
-        internal void CheckError ()
+        internal void ThrowError ()
         {
             ErrorCode error = LastError;
 
@@ -255,7 +356,7 @@ namespace Avahi
         private void OnClientCallback (IntPtr client, ClientState state, IntPtr userData)
         {
             if (StateChanged != null)
-                StateChanged (this, state);
+                StateChanged (this, new ClientStateArgs (state, LastError));
         }
 
         private int OnPollCallback (IntPtr ufds, uint nfds, int timeout) {
@@ -270,7 +371,6 @@ namespace Avahi
                 lock (this) {
                     avahi_simple_poll_loop (spoll);
                 }
-            } catch (ThreadAbortException e) {
             } catch (Exception e) {
                 Console.Error.WriteLine ("Error in avahi-sharp event loop: " + e);
             }