X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FUtility.cs;h=9081b011dc210a1e631ee5470021b9354f4e6221;hb=94ec2faf542bee1b9434bdbd2f01e20894d8bc3f;hp=55254ebde96531458e2e94aaab37cbf17e598313;hpb=a26804ae8742b59b220b5a0776f42de3da026d6a;p=catta

diff --git a/avahi-sharp/Utility.cs b/avahi-sharp/Utility.cs
index 55254eb..9081b01 100644
--- a/avahi-sharp/Utility.cs
+++ b/avahi-sharp/Utility.cs
@@ -24,7 +24,9 @@ using System.Net;
 using System.Text;
 using System.Runtime.InteropServices;
 using Mono.Unix;
+using Mono.Unix.Native;
 
+using Stdlib = Mono.Unix.Native.Stdlib;
 
 namespace Avahi
 {
@@ -36,6 +38,9 @@ namespace Avahi
         [DllImport ("avahi-common")]
         private static extern IntPtr avahi_address_snprint (IntPtr buf, int size, IntPtr address);
 
+        [DllImport ("avahi-common")]
+        private static extern IntPtr avahi_address_parse (IntPtr str, Protocol proto, IntPtr ret);
+
         public static string PtrToString (IntPtr ptr)
         {
             if (ptr == IntPtr.Zero)
@@ -57,12 +62,20 @@ namespace Avahi
             return ret;
         }
 
-        public static IntPtr StringToPtr (string str)
+        public static byte[] StringToBytes (string str)
+        {
+            if (str == null)
+                return null;
+
+            return Encoding.UTF8.GetBytes (str + "\0"); // lame.
+        }
+
+        private static IntPtr StringToPtr (string str)
         {
             if (str == null)
                 return IntPtr.Zero;
 
-            byte[] bytes = Encoding.UTF8.GetBytes (str);
+            byte[] bytes = Utility.StringToBytes (str);
             IntPtr buf = Stdlib.malloc ((uint) bytes.Length + 1);
             Marshal.Copy (bytes, 0, buf, bytes.Length);
             Marshal.WriteByte (buf, bytes.Length, 0);
@@ -74,6 +87,16 @@ namespace Avahi
             Stdlib.free (ptr);
         }
 
+        public static IntPtr AddressToPtr (IPAddress address)
+        {
+            IntPtr straddr = Utility.StringToPtr (address.ToString ());
+            IntPtr addrPtr = Stdlib.malloc (32);
+            avahi_address_parse (straddr, Protocol.Unspecified, addrPtr);
+            Utility.Free (straddr);
+
+            return addrPtr;
+        }
+
         public static IPAddress PtrToAddress (IntPtr ptr)
         {
             IPAddress address = null;