* update to the latest avahi-client API (LookupFlags)

* add the local service cookie bits
* update docs


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@620 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

19 files changed, 358 insertions, 132 deletions

diff --git a/avahi-sharp/AddressResolver.cs b/avahi-sharp/AddressResolver.cs
index c462346..038b0c9 100644
--- a/avahi-sharp/AddressResolver.cs
+++ b/avahi-sharp/AddressResolver.cs
@@ -30,7 +30,7 @@ namespace Avahi
 
     internal delegate void AddressResolverCallback (IntPtr resolver, int iface, Protocol proto,
                                                     ResolverEvent revent, Protocol aproto, IntPtr address,
-                                                    IntPtr hostname, IntPtr userdata);
+                                                    IntPtr hostname, LookupResultFlags flags, IntPtr userdata);
 
     public delegate void HostAddressHandler (object o, string host, IPAddress address);
     
@@ -41,6 +41,7 @@ namespace Avahi
         private int iface;
         private Protocol proto;
         private IPAddress address;
+        private LookupFlags flags;
         private AddressResolverCallback cb;
 
         private IPAddress currentAddress;
@@ -51,7 +52,8 @@ namespace Avahi
         
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_address_resolver_new (IntPtr client, int iface, Protocol proto,
-                                                                 IntPtr address, AddressResolverCallback cb,
+                                                                 IntPtr address, LookupFlags flags,
+                                                                 AddressResolverCallback cb,
                                                                  IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -91,16 +93,18 @@ namespace Avahi
             get { return currentHost; }
         }
 
-        public AddressResolver (Client client, IPAddress address) : this (client, -1, Protocol.Unspecified, address)
+        public AddressResolver (Client client, IPAddress address) : this (client, -1, Protocol.Unspecified,
+                                                                          address, LookupFlags.None)
         {
         }
 
-        public AddressResolver (Client client, int iface, Protocol proto, IPAddress address)
+        public AddressResolver (Client client, int iface, Protocol proto, IPAddress address, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.address = address;
+            this.flags = flags;
             cb = OnAddressResolverCallback;
         }
 
@@ -123,7 +127,7 @@ namespace Avahi
             IntPtr addrPtr = Utility.StringToPtr (address.ToString ());
 
             lock (client) {
-                handle = avahi_address_resolver_new (client.Handle, iface, proto, addrPtr,
+                handle = avahi_address_resolver_new (client.Handle, iface, proto, addrPtr, flags,
                                                      cb, IntPtr.Zero);
             }
             
@@ -144,7 +148,7 @@ namespace Avahi
 
         private void OnAddressResolverCallback (IntPtr resolver, int iface, Protocol proto,
                                                 ResolverEvent revent, Protocol aproto, IntPtr address,
-                                                IntPtr hostname, IntPtr userdata)
+                                                IntPtr hostname, LookupResultFlags flags, IntPtr userdata)
         {
             if (revent == ResolverEvent.Found) {
                 currentAddress = Utility.PtrToAddress (address);
diff --git a/avahi-sharp/AvahiTest.cs b/avahi-sharp/AvahiTest.cs
index a23eee5..0f8e1c0 100644
--- a/avahi-sharp/AvahiTest.cs
+++ b/avahi-sharp/AvahiTest.cs
@@ -43,16 +43,25 @@ public class AvahiTest {
 	{
 		Console.WriteLine ("Entry group status: " + state);
 
+		/*
 		if (state == EntryGroupState.Established) {
 			DomainBrowser browser = new DomainBrowser (client);
 			browser.DomainAdded += OnDomainAdded;
 		}
+		*/
+
+		BrowseServiceTypes ("dns-sd.org");
 	}
 
 	private static void OnDomainAdded (object o, DomainInfo info)
 	{
 		Console.WriteLine ("Got domain added: " + info.Domain);
-		ServiceTypeBrowser stb = new ServiceTypeBrowser (client, info.Domain);
+		BrowseServiceTypes (info.Domain);
+	}
+
+	private static void BrowseServiceTypes (string domain)
+	{
+		ServiceTypeBrowser stb = new ServiceTypeBrowser (client, domain);
 		stb.ServiceTypeAdded += OnServiceTypeAdded;
 	}
 
diff --git a/avahi-sharp/Client.cs b/avahi-sharp/Client.cs
index 783c003..d9466bc 100644
--- a/avahi-sharp/Client.cs
+++ b/avahi-sharp/Client.cs
@@ -55,6 +55,23 @@ namespace Avahi
         Collision,
         Disconnected = 100
     }
+
+    [Flags]
+    public enum LookupFlags {
+        None,
+        UseWideArea,
+        UseMulticast,
+        NoTxt,
+        NoAddress
+    }
+
+    [Flags]
+    public enum LookupResultFlags {
+        None,
+        Cached,
+        WideArea,
+        Multicast
+    }
     
     public class Client : IDisposable
     {
@@ -108,6 +125,14 @@ namespace Avahi
         [DllImport ("avahi-common")]
         private static extern void avahi_simple_poll_quit (IntPtr spoll);
 
+        [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 ("libc")]
         private static extern int poll(IntPtr ufds, uint nfds, int timeout);
 
@@ -163,6 +188,15 @@ namespace Avahi
             }
         }
 
+        public uint LocalServiceCookie
+        {
+            get {
+                lock (this) {
+                    return avahi_client_get_local_service_cookie (handle);
+                }
+            }
+        }
+
         internal int LastError
         {
             get {
@@ -210,6 +244,27 @@ namespace Avahi
             }
         }
 
+        public bool IsServiceLocal (ServiceInfo service)
+        {
+            return IsServiceLocal (service.NetworkInterface, service.Protocol, service.Name,
+                                   service.ServiceType, service.Domain);
+        }
+
+        public bool IsServiceLocal (int iface, Protocol proto, string name, string type, 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);
+
+            Utility.Free (namePtr);
+            Utility.Free (typePtr);
+            Utility.Free (domainPtr);
+
+            return result == 1;
+        }
+
         internal void CheckError ()
         {
             int error = LastError;
diff --git a/avahi-sharp/DomainBrowser.cs b/avahi-sharp/DomainBrowser.cs
index 76438f8..fb32e77 100644
--- a/avahi-sharp/DomainBrowser.cs
+++ b/avahi-sharp/DomainBrowser.cs
@@ -26,7 +26,7 @@ using System.Runtime.InteropServices;
 namespace Avahi
 {
     internal delegate void DomainBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                  IntPtr domain, IntPtr userdata);
+                                                  IntPtr domain, LookupResultFlags flags, IntPtr userdata);
 
     public enum DomainBrowserType {
         Register,
@@ -41,6 +41,7 @@ namespace Avahi
         public int NetworkInterface;
         public Protocol Protocol;
         public string Domain;
+        public LookupResultFlags Flags;
     }
 
     public delegate void DomainInfoHandler (object o, DomainInfo info);
@@ -54,6 +55,7 @@ namespace Avahi
         private Protocol proto;
         private string domain;
         private DomainBrowserType btype;
+        private LookupFlags flags;
         private DomainBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
@@ -61,7 +63,8 @@ namespace Avahi
         
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_domain_browser_new (IntPtr client, int iface, int proto,
-                                                               IntPtr domain, int btype, DomainBrowserCallback cb,
+                                                               IntPtr domain, int btype, LookupFlags flags,
+                                                               DomainBrowserCallback cb,
                                                                IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -97,16 +100,18 @@ namespace Avahi
         }
 
         public DomainBrowser (Client client) : this (client, -1, Protocol.Unspecified, client.DomainName,
-                                                     DomainBrowserType.Browse) {
+                                                     DomainBrowserType.Browse, LookupFlags.None) {
         }
         
-        public DomainBrowser (Client client, int iface, Protocol proto, string domain, DomainBrowserType btype)
+        public DomainBrowser (Client client, int iface, Protocol proto, string domain,
+                              DomainBrowserType btype, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
             this.btype = btype;
+            this.flags = flags;
             cb = OnDomainBrowserCallback;
         }
 
@@ -128,7 +133,7 @@ namespace Avahi
 
             lock (client) {
                 IntPtr domainPtr = Utility.StringToPtr (domain);
-                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype,
+                handle = avahi_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype, flags,
                                                    cb, IntPtr.Zero);
                 Utility.Free (domainPtr);
             }
@@ -146,13 +151,14 @@ namespace Avahi
         }
 
         private void OnDomainBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                              IntPtr domain, IntPtr userdata)
+                                              IntPtr domain, LookupResultFlags flags, IntPtr userdata)
         {
 
             DomainInfo info;
             info.NetworkInterface = iface;
             info.Protocol = proto;
             info.Domain = Utility.PtrToString (domain);
+            info.Flags = flags;
 
             infos.Add (info);
             
diff --git a/avahi-sharp/HostNameResolver.cs b/avahi-sharp/HostNameResolver.cs
index d522cea..fad5d77 100644
--- a/avahi-sharp/HostNameResolver.cs
+++ b/avahi-sharp/HostNameResolver.cs
@@ -30,7 +30,7 @@ namespace Avahi
 
     internal delegate void HostNameResolverCallback (IntPtr resolver, int iface, Protocol proto,
                                                      ResolverEvent revent, IntPtr hostname, IntPtr address,
-                                                     IntPtr userdata);
+                                                     LookupResultFlags flags, IntPtr userdata);
 
     public class HostNameResolver : IDisposable
     {
@@ -40,6 +40,7 @@ namespace Avahi
         private Protocol proto;
         private string hostname;
         private Protocol aproto;
+        private LookupFlags flags;
         private HostNameResolverCallback cb;
 
         private IPAddress currentAddress;
@@ -50,7 +51,7 @@ namespace Avahi
         
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_host_name_resolver_new (IntPtr client, int iface, Protocol proto,
-                                                                   IntPtr hostname, Protocol aproto,
+                                                                   IntPtr hostname, Protocol aproto, LookupFlags flags,
                                                                    HostNameResolverCallback cb, IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -91,18 +92,20 @@ namespace Avahi
         }
 
         public HostNameResolver (Client client, string hostname) : this (client, -1, Protocol.Unspecified,
-                                                                         hostname, Protocol.Unspecified)
+                                                                         hostname, Protocol.Unspecified,
+                                                                         LookupFlags.None)
         {
         }
 
         public HostNameResolver (Client client, int iface, Protocol proto, string hostname,
-                                 Protocol aproto)
+                                 Protocol aproto, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.hostname = hostname;
             this.aproto = aproto;
+            this.flags = flags;
             cb = OnHostNameResolverCallback;
         }
 
@@ -125,7 +128,7 @@ namespace Avahi
             IntPtr hostPtr = Utility.StringToPtr (hostname);
 
             lock (client) {
-                handle = avahi_host_name_resolver_new (client.Handle, iface, proto, hostPtr, aproto,
+                handle = avahi_host_name_resolver_new (client.Handle, iface, proto, hostPtr, aproto, flags,
                                                        cb, IntPtr.Zero);
             }
             
@@ -146,7 +149,7 @@ namespace Avahi
 
         private void OnHostNameResolverCallback (IntPtr resolver, int iface, Protocol proto,
                                                  ResolverEvent revent, IntPtr hostname, IntPtr address,
-                                                 IntPtr userdata)
+                                                 LookupResultFlags flags, IntPtr userdata)
         {
             if (revent == ResolverEvent.Found) {
                 currentAddress = Utility.PtrToAddress (address);
diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index 5da7ea4..92b8011 100644
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -27,7 +27,8 @@ using System.Runtime.InteropServices;
 namespace Avahi
 {
     internal delegate void ServiceBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                   IntPtr name, IntPtr type, IntPtr domain, IntPtr userdata);
+                                                   IntPtr name, IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                   IntPtr userdata);
     
     public struct ServiceInfo
     {
@@ -41,6 +42,7 @@ namespace Avahi
         public IPAddress Address;
         public UInt16 Port;
         public byte[][] Text;
+        public LookupResultFlags Flags;
 
         public static ServiceInfo Zero = new ServiceInfo ();
     }
@@ -56,6 +58,7 @@ namespace Avahi
         private Protocol proto;
         private string domain;
         private string type;
+        private LookupFlags flags;
         private ServiceBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
@@ -63,7 +66,8 @@ namespace Avahi
         
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_service_browser_new (IntPtr client, int iface, int proto, IntPtr type,
-                                                                IntPtr domain, ServiceBrowserCallback cb,
+                                                                IntPtr domain, LookupFlags flags,
+                                                                ServiceBrowserCallback cb,
                                                                 IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -103,17 +107,18 @@ namespace Avahi
         }
         
         public ServiceBrowser (Client client, string type, string domain) : this (client, -1, Protocol.Unspecified,
-                                                                                  type, domain)
+                                                                                  type, domain, LookupFlags.None)
         {
         }
         
-        public ServiceBrowser (Client client, int iface, Protocol proto, string type, string domain)
+        public ServiceBrowser (Client client, int iface, Protocol proto, string type, string domain, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
             this.type = type;
+            this.flags = flags;
             cb = OnServiceBrowserCallback;
         }
 
@@ -137,7 +142,7 @@ namespace Avahi
             IntPtr typePtr = Utility.StringToPtr (type);
 
             lock (client) {
-                handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr,
+                handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr, flags,
                                                     cb, IntPtr.Zero);
             }
             Utility.Free (domainPtr);
@@ -157,7 +162,8 @@ namespace Avahi
         }
 
         private void OnServiceBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                               IntPtr name, IntPtr type, IntPtr domain, IntPtr userdata)
+                                               IntPtr name, IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                               IntPtr userdata)
         {
 
             ServiceInfo info;
@@ -170,6 +176,7 @@ namespace Avahi
             info.Address = null;
             info.Port = 0;
             info.Text = null;
+            info.Flags = flags;
 
             infos.Add (info);
             
diff --git a/avahi-sharp/ServiceResolver.cs b/avahi-sharp/ServiceResolver.cs
index 8e8464b..a39299d 100644
--- a/avahi-sharp/ServiceResolver.cs
+++ b/avahi-sharp/ServiceResolver.cs
@@ -31,7 +31,8 @@ namespace Avahi
     internal delegate void ServiceResolverCallback (IntPtr resolver, int iface, Protocol proto,
                                                     ResolverEvent revent, IntPtr name, IntPtr type,
                                                     IntPtr domain, IntPtr host, IntPtr address,
-                                                    UInt16 port, IntPtr txt, IntPtr userdata);
+                                                    UInt16 port, IntPtr txt, LookupResultFlags flags,
+                                                    IntPtr userdata);
 
     public class ServiceResolver : IDisposable
     {
@@ -44,6 +45,7 @@ namespace Avahi
         private string type;
         private string domain;
         private Protocol aproto;
+        private LookupFlags flags;
         private ServiceResolverCallback cb;
 
         private ArrayList foundListeners = new ArrayList ();
@@ -52,7 +54,8 @@ namespace Avahi
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_service_resolver_new (IntPtr client, int iface, Protocol proto,
                                                                  IntPtr name, IntPtr type, IntPtr domain,
-                                                                 Protocol aproto, ServiceResolverCallback cb,
+                                                                 Protocol aproto, LookupFlags flags,
+                                                                 ServiceResolverCallback cb,
                                                                  IntPtr userdata);
 
         [DllImport ("avahi-common")]
@@ -145,7 +148,7 @@ namespace Avahi
 
             lock (client) {
                 handle = avahi_service_resolver_new (client.Handle, iface, proto, namePtr, typePtr, domainPtr,
-                                                     aproto, cb, IntPtr.Zero);
+                                                     aproto, flags, cb, IntPtr.Zero);
             }
             
             Utility.Free (namePtr);
@@ -168,7 +171,8 @@ namespace Avahi
         private void OnServiceResolverCallback (IntPtr resolver, int iface, Protocol proto,
                                                 ResolverEvent revent, IntPtr name, IntPtr type,
                                                 IntPtr domain, IntPtr host, IntPtr address,
-                                                UInt16 port, IntPtr txt, IntPtr userdata)
+                                                UInt16 port, IntPtr txt, LookupResultFlags flags,
+                                                IntPtr userdata)
         {
             ServiceInfo info;
             info.NetworkInterface = iface;
@@ -191,6 +195,7 @@ namespace Avahi
             }
 
             info.Text = (byte[][]) txtlist.ToArray (typeof (byte[]));
+            info.Flags = flags;
             
             if (revent == ResolverEvent.Found) {
                 currentInfo = info;
diff --git a/avahi-sharp/ServiceTypeBrowser.cs b/avahi-sharp/ServiceTypeBrowser.cs
index ab6a866..4d996d6 100644
--- a/avahi-sharp/ServiceTypeBrowser.cs
+++ b/avahi-sharp/ServiceTypeBrowser.cs
@@ -26,7 +26,8 @@ using System.Runtime.InteropServices;
 namespace Avahi
 {
     internal delegate void ServiceTypeBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                       IntPtr type, IntPtr domain, IntPtr userdata);
+                                                       IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                       IntPtr userdata);
     
     public struct ServiceTypeInfo
     {
@@ -34,6 +35,7 @@ namespace Avahi
         public Protocol Protocol;
         public string Domain;
         public string ServiceType;
+        public LookupResultFlags Flags;
     }
 
     public delegate void ServiceTypeInfoHandler (object o, ServiceTypeInfo info);
@@ -46,6 +48,7 @@ namespace Avahi
         private int iface;
         private Protocol proto;
         private string domain;
+        private LookupFlags flags;
         private ServiceTypeBrowserCallback cb;
 
         private ArrayList addListeners = new ArrayList ();
@@ -53,7 +56,8 @@ namespace Avahi
         
         [DllImport ("avahi-client")]
         private static extern IntPtr avahi_service_type_browser_new (IntPtr client, int iface, int proto,
-                                                                     IntPtr domain, ServiceTypeBrowserCallback cb,
+                                                                     IntPtr domain, LookupFlags flags,
+                                                                     ServiceTypeBrowserCallback cb,
                                                                      IntPtr userdata);
 
         [DllImport ("avahi-client")]
@@ -92,16 +96,18 @@ namespace Avahi
         {
         }
 
-        public ServiceTypeBrowser (Client client, string domain) : this (client, -1, Protocol.Unspecified, domain)
+        public ServiceTypeBrowser (Client client, string domain) : this (client, -1, Protocol.Unspecified,
+                                                                         domain, LookupFlags.None)
         {
         }
-        
-        public ServiceTypeBrowser (Client client, int iface, Protocol proto, string domain)
+
+        public ServiceTypeBrowser (Client client, int iface, Protocol proto, string domain, LookupFlags flags)
         {
             this.client = client;
             this.iface = iface;
             this.proto = proto;
             this.domain = domain;
+            this.flags = flags;
             cb = OnServiceTypeBrowserCallback;
         }
 
@@ -123,7 +129,7 @@ namespace Avahi
 
             lock (client) {
                 IntPtr domainPtr = Utility.StringToPtr (domain);
-                handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr,
+                handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr, flags,
                                                          cb, IntPtr.Zero);
                 Utility.Free (domainPtr);
             }
@@ -142,7 +148,8 @@ namespace Avahi
         }
 
         private void OnServiceTypeBrowserCallback (IntPtr browser, int iface, Protocol proto, BrowserEvent bevent,
-                                                   IntPtr type, IntPtr domain, IntPtr userdata)
+                                                   IntPtr type, IntPtr domain, LookupResultFlags flags,
+                                                   IntPtr userdata)
         {
 
             ServiceTypeInfo info;
@@ -150,6 +157,7 @@ namespace Avahi
             info.Protocol = proto;
             info.Domain = Utility.PtrToString (domain);
             info.ServiceType = Utility.PtrToString (type);
+            info.Flags = flags;
 
             infos.Add (info);
             
diff --git a/avahi-sharp/en/Avahi/AddressResolver.xml b/avahi-sharp/en/Avahi/AddressResolver.xml
index e4ebd27..1043bb5 100644
--- a/avahi-sharp/en/Avahi/AddressResolver.xml
+++ b/avahi-sharp/en/Avahi/AddressResolver.xml
@@ -27,24 +27,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public AddressResolver (Avahi.Client client, int iface, Avahi.Protocol proto, System.Net.IPAddress address);" />
-      <MemberType>Constructor</MemberType>
-      <Parameters>
-        <Parameter Name="client" Type="Avahi.Client" />
-        <Parameter Name="iface" Type="System.Int32" />
-        <Parameter Name="proto" Type="Avahi.Protocol" />
-        <Parameter Name="address" Type="System.Net.IPAddress" />
-      </Parameters>
-      <Docs>
-        <param name="client">To be added.</param>
-        <param name="iface">To be added.</param>
-        <param name="proto">To be added.</param>
-        <param name="address">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Found">
       <MemberSignature Language="C#" Value="public event Avahi.HostAddressHandler Found;" />
       <MemberType>Event</MemberType>
@@ -103,6 +85,26 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public AddressResolver (Avahi.Client client, int iface, Avahi.Protocol proto, System.Net.IPAddress address, Avahi.LookupFlags flags);" />
+      <MemberType>Constructor</MemberType>
+      <Parameters>
+        <Parameter Name="client" Type="Avahi.Client" />
+        <Parameter Name="iface" Type="System.Int32" />
+        <Parameter Name="proto" Type="Avahi.Protocol" />
+        <Parameter Name="address" Type="System.Net.IPAddress" />
+        <Parameter Name="flags" Type="Avahi.LookupFlags" />
+      </Parameters>
+      <Docs>
+        <param name="client">To be added.</param>
+        <param name="iface">To be added.</param>
+        <param name="proto">To be added.</param>
+        <param name="address">To be added.</param>
+        <param name="flags">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/Client.xml b/avahi-sharp/en/Avahi/Client.xml
index 54e691d..f9c9fd7 100644
--- a/avahi-sharp/en/Avahi/Client.xml
+++ b/avahi-sharp/en/Avahi/Client.xml
@@ -105,6 +105,58 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="IsServiceLocal">
+      <MemberSignature Language="C#" Value="public bool IsServiceLocal (Avahi.ServiceInfo service);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="service" Type="Avahi.ServiceInfo" />
+      </Parameters>
+      <Docs>
+        <param name="service">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="IsServiceLocal">
+      <MemberSignature Language="C#" Value="public bool IsServiceLocal (int iface, Avahi.Protocol proto, string name, string type, string domain);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="iface" Type="System.Int32" />
+        <Parameter Name="proto" Type="Avahi.Protocol" />
+        <Parameter Name="name" Type="System.String" />
+        <Parameter Name="type" Type="System.String" />
+        <Parameter Name="domain" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="iface">To be added.</param>
+        <param name="proto">To be added.</param>
+        <param name="name">To be added.</param>
+        <param name="type">To be added.</param>
+        <param name="domain">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="LocalServiceCookie">
+      <MemberSignature Language="C#" Value="public uint LocalServiceCookie { get; };" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.UInt32</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/DomainBrowser.xml b/avahi-sharp/en/Avahi/DomainBrowser.xml
index ca9a4f5..9590868 100644
--- a/avahi-sharp/en/Avahi/DomainBrowser.xml
+++ b/avahi-sharp/en/Avahi/DomainBrowser.xml
@@ -25,26 +25,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public DomainBrowser (Avahi.Client client, int iface, Avahi.Protocol proto, string domain, Avahi.DomainBrowserType btype);" />
-      <MemberType>Constructor</MemberType>
-      <Parameters>
-        <Parameter Name="client" Type="Avahi.Client" />
-        <Parameter Name="iface" Type="System.Int32" />
-        <Parameter Name="proto" Type="Avahi.Protocol" />
-        <Parameter Name="domain" Type="System.String" />
-        <Parameter Name="btype" Type="Avahi.DomainBrowserType" />
-      </Parameters>
-      <Docs>
-        <param name="client">To be added.</param>
-        <param name="iface">To be added.</param>
-        <param name="proto">To be added.</param>
-        <param name="domain">To be added.</param>
-        <param name="btype">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="DomainAdded">
       <MemberSignature Language="C#" Value="public event Avahi.DomainInfoHandler DomainAdded;" />
       <MemberType>Event</MemberType>
@@ -91,6 +71,28 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public DomainBrowser (Avahi.Client client, int iface, Avahi.Protocol proto, string domain, Avahi.DomainBrowserType btype, Avahi.LookupFlags flags);" />
+      <MemberType>Constructor</MemberType>
+      <Parameters>
+        <Parameter Name="client" Type="Avahi.Client" />
+        <Parameter Name="iface" Type="System.Int32" />
+        <Parameter Name="proto" Type="Avahi.Protocol" />
+        <Parameter Name="domain" Type="System.String" />
+        <Parameter Name="btype" Type="Avahi.DomainBrowserType" />
+        <Parameter Name="flags" Type="Avahi.LookupFlags" />
+      </Parameters>
+      <Docs>
+        <param name="client">To be added.</param>
+        <param name="iface">To be added.</param>
+        <param name="proto">To be added.</param>
+        <param name="domain">To be added.</param>
+        <param name="btype">To be added.</param>
+        <param name="flags">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/DomainInfo.xml b/avahi-sharp/en/Avahi/DomainInfo.xml
index d111ebf..dddfd60 100644
--- a/avahi-sharp/en/Avahi/DomainInfo.xml
+++ b/avahi-sharp/en/Avahi/DomainInfo.xml
@@ -42,6 +42,17 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Flags">
+      <MemberSignature Language="C#" Value="public Avahi.LookupResultFlags Flags;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Avahi.LookupResultFlags</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/EntryGroup.xml b/avahi-sharp/en/Avahi/EntryGroup.xml
index cb953c8..d493968 100644
--- a/avahi-sharp/en/Avahi/EntryGroup.xml
+++ b/avahi-sharp/en/Avahi/EntryGroup.xml
@@ -160,6 +160,22 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GetAlternativeServiceName">
+      <MemberSignature Language="C#" Value="public static string GetAlternativeServiceName (string name);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="name" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="name">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/HostNameResolver.xml b/avahi-sharp/en/Avahi/HostNameResolver.xml
index ca65f23..5f33e80 100644
--- a/avahi-sharp/en/Avahi/HostNameResolver.xml
+++ b/avahi-sharp/en/Avahi/HostNameResolver.xml
@@ -27,26 +27,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public HostNameResolver (Avahi.Client client, int iface, Avahi.Protocol proto, string hostname, Avahi.Protocol aproto);" />
-      <MemberType>Constructor</MemberType>
-      <Parameters>
-        <Parameter Name="client" Type="Avahi.Client" />
-        <Parameter Name="iface" Type="System.Int32" />
-        <Parameter Name="proto" Type="Avahi.Protocol" />
-        <Parameter Name="hostname" Type="System.String" />
-        <Parameter Name="aproto" Type="Avahi.Protocol" />
-      </Parameters>
-      <Docs>
-        <param name="client">To be added.</param>
-        <param name="iface">To be added.</param>
-        <param name="proto">To be added.</param>
-        <param name="hostname">To be added.</param>
-        <param name="aproto">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="Found">
       <MemberSignature Language="C#" Value="public event Avahi.HostAddressHandler Found;" />
       <MemberType>Event</MemberType>
@@ -105,6 +85,28 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public HostNameResolver (Avahi.Client client, int iface, Avahi.Protocol proto, string hostname, Avahi.Protocol aproto, Avahi.LookupFlags flags);" />
+      <MemberType>Constructor</MemberType>
+      <Parameters>
+        <Parameter Name="client" Type="Avahi.Client" />
+        <Parameter Name="iface" Type="System.Int32" />
+        <Parameter Name="proto" Type="Avahi.Protocol" />
+        <Parameter Name="hostname" Type="System.String" />
+        <Parameter Name="aproto" Type="Avahi.Protocol" />
+        <Parameter Name="flags" Type="Avahi.LookupFlags" />
+      </Parameters>
+      <Docs>
+        <param name="client">To be added.</param>
+        <param name="iface">To be added.</param>
+        <param name="proto">To be added.</param>
+        <param name="hostname">To be added.</param>
+        <param name="aproto">To be added.</param>
+        <param name="flags">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/ServiceBrowser.xml b/avahi-sharp/en/Avahi/ServiceBrowser.xml
index 860a8ed..3e94fbc 100644
--- a/avahi-sharp/en/Avahi/ServiceBrowser.xml
+++ b/avahi-sharp/en/Avahi/ServiceBrowser.xml
@@ -43,26 +43,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ServiceBrowser (Avahi.Client client, int iface, Avahi.Protocol proto, string type, string domain);" />
-      <MemberType>Constructor</MemberType>
-      <Parameters>
-        <Parameter Name="client" Type="Avahi.Client" />
-        <Parameter Name="iface" Type="System.Int32" />
-        <Parameter Name="proto" Type="Avahi.Protocol" />
-        <Parameter Name="type" Type="System.String" />
-        <Parameter Name="domain" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <param name="client">To be added.</param>
-        <param name="iface">To be added.</param>
-        <param name="proto">To be added.</param>
-        <param name="type">To be added.</param>
-        <param name="domain">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="ServiceAdded">
       <MemberSignature Language="C#" Value="public event Avahi.ServiceInfoHandler ServiceAdded;" />
       <MemberType>Event</MemberType>
@@ -109,6 +89,28 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public ServiceBrowser (Avahi.Client client, int iface, Avahi.Protocol proto, string type, string domain, Avahi.LookupFlags flags);" />
+      <MemberType>Constructor</MemberType>
+      <Parameters>
+        <Parameter Name="client" Type="Avahi.Client" />
+        <Parameter Name="iface" Type="System.Int32" />
+        <Parameter Name="proto" Type="Avahi.Protocol" />
+        <Parameter Name="type" Type="System.String" />
+        <Parameter Name="domain" Type="System.String" />
+        <Parameter Name="flags" Type="Avahi.LookupFlags" />
+      </Parameters>
+      <Docs>
+        <param name="client">To be added.</param>
+        <param name="iface">To be added.</param>
+        <param name="proto">To be added.</param>
+        <param name="type">To be added.</param>
+        <param name="domain">To be added.</param>
+        <param name="flags">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/ServiceInfo.xml b/avahi-sharp/en/Avahi/ServiceInfo.xml
index 14bc2c0..d780085 100644
--- a/avahi-sharp/en/Avahi/ServiceInfo.xml
+++ b/avahi-sharp/en/Avahi/ServiceInfo.xml
@@ -119,6 +119,17 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Flags">
+      <MemberSignature Language="C#" Value="public Avahi.LookupResultFlags Flags;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Avahi.LookupResultFlags</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/ServiceTypeBrowser.xml b/avahi-sharp/en/Avahi/ServiceTypeBrowser.xml
index 26948d8..6fa2af9 100644
--- a/avahi-sharp/en/Avahi/ServiceTypeBrowser.xml
+++ b/avahi-sharp/en/Avahi/ServiceTypeBrowser.xml
@@ -39,24 +39,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName=".ctor">
-      <MemberSignature Language="C#" Value="public ServiceTypeBrowser (Avahi.Client client, int iface, Avahi.Protocol proto, string domain);" />
-      <MemberType>Constructor</MemberType>
-      <Parameters>
-        <Parameter Name="client" Type="Avahi.Client" />
-        <Parameter Name="iface" Type="System.Int32" />
-        <Parameter Name="proto" Type="Avahi.Protocol" />
-        <Parameter Name="domain" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <param name="client">To be added.</param>
-        <param name="iface">To be added.</param>
-        <param name="proto">To be added.</param>
-        <param name="domain">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="ServiceTypeAdded">
       <MemberSignature Language="C#" Value="public event Avahi.ServiceTypeInfoHandler ServiceTypeAdded;" />
       <MemberType>Event</MemberType>
@@ -103,6 +85,42 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public ServiceTypeBrowser (Avahi.Client client, string domain, Avahi.LookupFlags flags);" />
+      <MemberType>Constructor</MemberType>
+      <Parameters>
+        <Parameter Name="client" Type="Avahi.Client" />
+        <Parameter Name="domain" Type="System.String" />
+        <Parameter Name="flags" Type="Avahi.LookupFlags" />
+      </Parameters>
+      <Docs>
+        <param name="client">To be added.</param>
+        <param name="domain">To be added.</param>
+        <param name="flags">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public ServiceTypeBrowser (Avahi.Client client, int iface, Avahi.Protocol proto, string domain, Avahi.LookupFlags flags);" />
+      <MemberType>Constructor</MemberType>
+      <Parameters>
+        <Parameter Name="client" Type="Avahi.Client" />
+        <Parameter Name="iface" Type="System.Int32" />
+        <Parameter Name="proto" Type="Avahi.Protocol" />
+        <Parameter Name="domain" Type="System.String" />
+        <Parameter Name="flags" Type="Avahi.LookupFlags" />
+      </Parameters>
+      <Docs>
+        <param name="client">To be added.</param>
+        <param name="iface">To be added.</param>
+        <param name="proto">To be added.</param>
+        <param name="domain">To be added.</param>
+        <param name="flags">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/Avahi/ServiceTypeInfo.xml b/avahi-sharp/en/Avahi/ServiceTypeInfo.xml
index 875ddf0..5b09ae9 100644
--- a/avahi-sharp/en/Avahi/ServiceTypeInfo.xml
+++ b/avahi-sharp/en/Avahi/ServiceTypeInfo.xml
@@ -53,6 +53,17 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Flags">
+      <MemberSignature Language="C#" Value="public Avahi.LookupResultFlags Flags;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>Avahi.LookupResultFlags</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
   <Docs>
     <summary>To be added.</summary>
diff --git a/avahi-sharp/en/index.xml b/avahi-sharp/en/index.xml
index 7bd09b5..516d18d 100644
--- a/avahi-sharp/en/index.xml
+++ b/avahi-sharp/en/index.xml
@@ -52,6 +52,8 @@
       <Type Name="ClientState" />
       <Type Name="DomainBrowserType" />
       <Type Name="EntryGroupState" />
+      <Type Name="LookupFlags" />
+      <Type Name="LookupResultFlags" />
     </Namespace>
   </Types>
   <Title>avahi-sharp</Title>