X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FEntryGroup.cs;h=24abae4d5222b0b4c0998b8ef9eac73d5578110e;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=3f8a94cd98f3abfe44a2a06bbba2aa310754df23;hpb=740bc001fb647255709b5385d5a8a19781722097;p=catta diff --git a/avahi-sharp/EntryGroup.cs b/avahi-sharp/EntryGroup.cs index 3f8a94c..24abae4 100644 --- a/avahi-sharp/EntryGroup.cs +++ b/avahi-sharp/EntryGroup.cs @@ -1,5 +1,3 @@ -/* $Id$ */ - /*** This file is part of avahi. @@ -20,8 +18,10 @@ ***/ using System; +using System.Net; using System.Runtime.InteropServices; - +using System.Text; +using Mono.Unix; namespace Avahi { @@ -35,9 +35,11 @@ namespace Avahi AllowMultiple = 8, NoReverse = 16, NoCookie = 32, - Update = 64 + Update = 64, + UseWideArea = 128, + UseMulticast = 256 } - + public enum EntryGroupState { Uncommited, Registering, @@ -46,15 +48,30 @@ namespace Avahi Failure } + public class EntryGroupStateArgs : EventArgs + { + private EntryGroupState state; + + public EntryGroupState State + { + get { return state; } + } + + public EntryGroupStateArgs (EntryGroupState state) + { + this.state = state; + } + } + internal delegate void EntryGroupCallback (IntPtr group, EntryGroupState state, IntPtr userdata); - public delegate void EntryGroupStateHandler (object o, EntryGroupState state); - + public delegate void EntryGroupStateHandler (object o, EntryGroupStateArgs args); + public class EntryGroup : IDisposable { private Client client; private IntPtr handle; private EntryGroupCallback cb; - + [DllImport ("avahi-client")] private static extern IntPtr avahi_entry_group_new (IntPtr client, EntryGroupCallback cb, IntPtr userdata); @@ -72,10 +89,30 @@ namespace Avahi [DllImport ("avahi-client")] private static extern int avahi_entry_group_add_service_strlst (IntPtr group, int iface, Protocol proto, - PublishFlags flags, IntPtr name, IntPtr type, - IntPtr domain, IntPtr host, UInt16 port, + PublishFlags flags, byte[] name, byte[] type, + byte[] domain, byte[] host, UInt16 port, IntPtr strlst); - + + [DllImport ("avahi-client")] + private static extern int avahi_entry_group_update_service_strlst (IntPtr group, int iface, Protocol proto, + PublishFlags flags, byte[] name, + byte[] type, byte[] domain, IntPtr strlst); + + [DllImport ("avahi-client")] + private static extern int avahi_entry_group_add_service_subtype (IntPtr group, int iface, Protocol proto, + PublishFlags flags, byte[] name, byte[] type, + byte[] domain, byte[] subtype); + + [DllImport ("avahi-client")] + private static extern int avahi_entry_group_add_address (IntPtr group, int iface, Protocol proto, + PublishFlags flags, byte[] name, IntPtr address); + + + [DllImport ("avahi-client")] + private static extern int avahi_entry_group_add_record (IntPtr group, int iface, Protocol proto, + PublishFlags flags, byte[] name, RecordClass clazz, + RecordType type, uint ttl, byte[] rdata, int size); + [DllImport ("avahi-client")] private static extern void avahi_entry_group_free (IntPtr group); @@ -83,16 +120,16 @@ namespace Avahi private static extern IntPtr avahi_string_list_new (IntPtr txt); [DllImport ("avahi-common")] - private static extern IntPtr avahi_string_list_add (IntPtr list, IntPtr txt); + private static extern IntPtr avahi_string_list_add (IntPtr list, byte[] txt); [DllImport ("avahi-common")] private static extern void avahi_string_list_free (IntPtr list); [DllImport ("avahi-common")] - private static extern IntPtr avahi_alternative_service_name (IntPtr name); + private static extern IntPtr avahi_alternative_service_name (byte[] name); public event EntryGroupStateHandler StateChanged; - + public EntryGroupState State { get { @@ -110,7 +147,7 @@ namespace Avahi } } } - + public EntryGroup (Client client) { this.client = client; @@ -173,40 +210,167 @@ namespace Avahi if (txt != null) { foreach (string item in txt) { - IntPtr itemPtr = Utility.StringToPtr (item); - list = avahi_string_list_add (list, itemPtr); - Utility.Free (itemPtr); + list = avahi_string_list_add (list, Utility.StringToBytes (item)); } } - IntPtr namePtr = Utility.StringToPtr (name); - IntPtr typePtr = Utility.StringToPtr (type); - IntPtr domainPtr = Utility.StringToPtr (domain); - IntPtr hostPtr = Utility.StringToPtr (host); + AddService (iface, proto, flags, name, type, domain, host, port, list); + } + + public void AddService (int iface, Protocol proto, PublishFlags flags, string name, string type, string domain, + string host, UInt16 port, params byte[][] txt) + { + IntPtr list = avahi_string_list_new (IntPtr.Zero); + + if (txt != null) { + foreach (byte[] item in txt) { + list = avahi_string_list_add (list, item); + } + } + + AddService (iface, proto, flags, name, type, domain, host, port, list); + } + + private void AddService (int iface, Protocol proto, PublishFlags flags, string name, string type, + string domain, string host, UInt16 port, IntPtr list) + { + int ret; lock (client) { - int ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags, namePtr, typePtr, domainPtr, - hostPtr, port, list); + ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags, + Utility.StringToBytes (name), + Utility.StringToBytes (type), + Utility.StringToBytes (domain), + Utility.StringToBytes (host), port, list); + } + + avahi_string_list_free (list); + + if (ret < 0) { + client.ThrowError (); + } + } + + public void UpdateService (string name, string type, string domain, params string[] txt) + { + UpdateService (-1, Protocol.Unspecified, PublishFlags.None, name, type, domain, txt); + } + + public void UpdateService (int iface, Protocol proto, PublishFlags flags, string name, string type, + string domain, params string[] txt) + { + IntPtr list = avahi_string_list_new (IntPtr.Zero); + + if (txt != null) { + foreach (string item in txt) { + list = avahi_string_list_add (list, Utility.StringToBytes (item)); + } + } + + UpdateService (iface, proto, flags, name, type, domain, list); + } + + public void UpdateService (int iface, Protocol proto, PublishFlags flags, string name, string type, + string domain, params byte[][] txt) + { + IntPtr list = avahi_string_list_new (IntPtr.Zero); + + if (txt != null) { + foreach (byte[] item in txt) { + list = avahi_string_list_add (list, item); + } + } + + UpdateService (iface, proto, flags, name, type, domain, list); + } + + private void UpdateService (int iface, Protocol proto, PublishFlags flags, string name, string type, + string domain, IntPtr list) + { + lock (client) { + int ret = avahi_entry_group_update_service_strlst (handle, iface, proto, flags, + Utility.StringToBytes (name), + Utility.StringToBytes (type), + Utility.StringToBytes (domain), + list); + + avahi_string_list_free (list); + if (ret < 0) { client.ThrowError (); } } - - avahi_string_list_free (list); } - public static string GetAlternativeServiceName (string name) { - IntPtr namePtr = Utility.StringToPtr (name); - IntPtr result = avahi_alternative_service_name (namePtr); - Utility.Free (namePtr); + public void AddServiceSubtype (string name, string type, string domain, string subtype) + { + AddServiceSubtype (-1, Protocol.Unspecified, PublishFlags.None, name, type, domain, subtype); + } + + public void AddServiceSubtype (int iface, Protocol proto, PublishFlags flags, string name, + string type, string domain, string subtype) + { + lock (client) { + int ret = avahi_entry_group_add_service_subtype (handle, iface, proto, flags, + Utility.StringToBytes (name), + Utility.StringToBytes (type), + Utility.StringToBytes (domain), + Utility.StringToBytes (subtype)); + + if (ret < 0) { + client.ThrowError (); + } + } + } + + public void AddAddress (string name, IPAddress address) + { + AddAddress (-1, Protocol.Unspecified, PublishFlags.None, name, address); + } + + public void AddAddress (int iface, Protocol proto, PublishFlags flags, string name, IPAddress address) + { + IntPtr addressPtr = Utility.AddressToPtr (address); + + lock (client) { + int ret = avahi_entry_group_add_address (handle, iface, proto, flags, + Utility.StringToBytes (name), addressPtr); + + Utility.Free (addressPtr); + + if (ret < 0) { + client.ThrowError (); + } + } + } + + public void AddRecord (string name, RecordClass clazz, RecordType type, uint ttl, byte[] rdata, int length) + { + AddRecord (-1, Protocol.Unspecified, PublishFlags.None, name, clazz, type, ttl, rdata, length); + } + + public void AddRecord (int iface, Protocol proto, PublishFlags flags, string name, + RecordClass clazz, RecordType type, uint ttl, byte[] rdata, int length) + { + lock (client) { + int ret = avahi_entry_group_add_record (handle, iface, proto, flags, + Utility.StringToBytes (name), + clazz, type, ttl, rdata, length); - return Utility.PtrToStringFree (result); + if (ret < 0) { + client.ThrowError (); + } + } + } + + public static string GetAlternativeServiceName (string name) { + return Utility.PtrToStringFree (avahi_alternative_service_name (Utility.StringToBytes (name))); } private void OnEntryGroupCallback (IntPtr group, EntryGroupState state, IntPtr userdata) { if (StateChanged != null) - StateChanged (this, state); + StateChanged (this, new EntryGroupStateArgs (state)); } } }