X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FClient.cs;h=b3815b32cb5d3120bacf2b83bad89c82ae5819bf;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=f5ba0693779a78722f5f0a43dd7206fc30d7f09e;hpb=fbd822ec8fa4575a61e81e2ecf2c4e6f8266a0ff;p=catta diff --git a/avahi-sharp/Client.cs b/avahi-sharp/Client.cs index f5ba069..b3815b3 100644 --- a/avahi-sharp/Client.cs +++ b/avahi-sharp/Client.cs @@ -1,5 +1,3 @@ -/* $Id$ */ - /*** This file is part of avahi. @@ -24,36 +22,72 @@ 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 { 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); 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] @@ -61,7 +95,7 @@ namespace Avahi None = 0, UseWideArea = 1, UseMulticast = 2, - NoTxt = 4, + NoTxt = 4, NoAddress = 8 } @@ -70,9 +104,18 @@ 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 { private IntPtr handle; @@ -83,7 +126,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")] @@ -106,7 +149,7 @@ namespace Avahi [DllImport ("avahi-client")] private static extern int avahi_client_errno (IntPtr handle); - + [DllImport ("avahi-common")] private static extern IntPtr avahi_simple_poll_new (); @@ -117,7 +160,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,9 +171,14 @@ 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 ("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")] @@ -142,7 +190,7 @@ namespace Avahi { get { return handle; } } - + public string Version { get { @@ -197,16 +245,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 +264,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 +273,9 @@ namespace Avahi thread.Start (); } + public Client () : this (ClientFlags.None) { + } + ~Client () { Dispose (); @@ -232,51 +283,83 @@ namespace Avahi public void Dispose () { - lock (this) { - if (handle != IntPtr.Zero) { - thread.Abort (); - + if (handle != IntPtr.Zero) { + lock (this) { avahi_client_free (handle); + handle = IntPtr.Zero; + avahi_simple_poll_quit (spoll); + Monitor.Wait (this); + avahi_simple_poll_free (spoll); - handle = IntPtr.Zero; } } } - public bool IsServiceLocal (ServiceInfo service) + public static string JoinServiceName (string name, string type, string domain) { - return IsServiceLocal (service.NetworkInterface, service.Protocol, service.Name, - service.ServiceType, service.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 bool IsServiceLocal (int iface, Protocol proto, string name, string type, string domain) + public static void SplitServiceName (string service, out string name, out string type, out string domain) { - 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); + 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); - - return result == 1; } - internal void CheckError () + internal void ThrowError () { - int error = LastError; + ErrorCode error = LastError; - if (error != 0) + if (error != ErrorCode.Ok) throw new ClientException (error); } - + 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) { @@ -289,12 +372,9 @@ namespace Avahi private void PollLoop () { try { lock (this) { - while (true) { - if (avahi_simple_poll_iterate (spoll, -1) != 0) - break; - } + avahi_simple_poll_loop (spoll); + Monitor.Pulse (this); } - } catch (ThreadAbortException e) { } catch (Exception e) { Console.Error.WriteLine ("Error in avahi-sharp event loop: " + e); }