X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FEntryGroup.cs;h=85c9a1d51e5cad7388bd5b3b2ae8ca54a7854d4f;hb=bf7f48d6f58f28681b81915ddc4723950b947346;hp=aa97dbda2adac0b21e5df4ee6a596ca3c75017b3;hpb=4d283fbd912fbeab578447ea18c0d8f47aa5cea6;p=catta

diff --git a/avahi-sharp/EntryGroup.cs b/avahi-sharp/EntryGroup.cs
index aa97dbd..85c9a1d 100644
--- a/avahi-sharp/EntryGroup.cs
+++ b/avahi-sharp/EntryGroup.cs
@@ -40,6 +40,7 @@ namespace Avahi
     {
         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);
@@ -73,23 +74,38 @@ namespace Avahi
         [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);
+
         public event EntryGroupStateHandler StateChanged;
         
         public EntryGroupState State
         {
-            get { return avahi_entry_group_get_state (handle); }
+            get {
+                lock (client) {
+                    return avahi_entry_group_get_state (handle);
+                }
+            }
         }
 
         public bool IsEmpty
         {
-            get { return avahi_entry_group_is_empty (handle); }
+            get {
+                lock (client) {
+                    return avahi_entry_group_is_empty (handle);
+                }
+            }
         }
         
         public EntryGroup (Client client)
         {
             this.client = client;
-            handle = avahi_entry_group_new (client.Handle, OnEntryGroupCallback, IntPtr.Zero);
-            client.CheckError ();
+            cb = OnEntryGroupCallback;
+
+            lock (client) {
+                handle = avahi_entry_group_new (client.Handle, cb, IntPtr.Zero);
+                client.CheckError ();
+            }
         }
 
         ~EntryGroup ()
@@ -99,32 +115,38 @@ namespace Avahi
 
         public void Dispose ()
         {
-            if (handle != IntPtr.Zero) {
-                avahi_entry_group_free (handle);
-                handle = IntPtr.Zero;
+            if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero) {
+                lock (client) {
+                    avahi_entry_group_free (handle);
+                    handle = IntPtr.Zero;
+                }
             }
         }
 
         public void Commit ()
         {
-            avahi_entry_group_commit (handle);
-            client.CheckError ();
+            lock (client) {
+                avahi_entry_group_commit (handle);
+                client.CheckError ();
+            }
         }
 
         public void Reset ()
         {
-            avahi_entry_group_reset (handle);
-            client.CheckError ();
+            lock (client) {
+                avahi_entry_group_reset (handle);
+                client.CheckError ();
+            }
         }
 
         public void AddService (string name, string type, string domain,
-                                UInt16 port, string[] txt)
+                                UInt16 port, params string[] txt)
         {
             AddService (-1, Protocol.Unspecified, name, type, domain, null, port, txt);
         }
 
         public void AddService (int iface, Protocol proto, string name, string type, string domain,
-                                string host, UInt16 port, string[] txt)
+                                string host, UInt16 port, params string[] txt)
         {
             IntPtr list = avahi_string_list_new (IntPtr.Zero);
 
@@ -140,13 +162,25 @@ namespace Avahi
             IntPtr typePtr = Utility.StringToPtr (type);
             IntPtr domainPtr = Utility.StringToPtr (domain);
             IntPtr hostPtr = Utility.StringToPtr (host);
-            avahi_entry_group_add_service_strlst (handle, iface, proto, namePtr, typePtr, domainPtr,
-                                                  hostPtr, port, list);
+
+            lock (client) {
+                avahi_entry_group_add_service_strlst (handle, iface, proto, namePtr, typePtr, domainPtr,
+                                                      hostPtr, port, list);
+            }
+            
             avahi_string_list_free (list);
 
             client.CheckError ();
         }
 
+        public static string GetAlternativeServiceName (string name) {
+            IntPtr namePtr = Utility.StringToPtr (name);
+            IntPtr result = avahi_alternative_service_name (namePtr);
+            Utility.Free (namePtr);
+
+            return Utility.PtrToStringFree (result);
+        }
+
         private void OnEntryGroupCallback (IntPtr group, EntryGroupState state, IntPtr userdata)
         {
             if (StateChanged != null)