X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FDomainBrowser.cs;h=3ce9e4d83ef237c16ee8ba54b03a7ca1abb213fb;hb=57c2beeef0ae8e84dc790f023867da5dfc9aac7f;hp=76438f813d27fc854550734b929d9e8256dd1ed8;hpb=264700bf97de2e4430494cb41201950162fba020;p=catta

diff --git a/avahi-sharp/DomainBrowser.cs b/avahi-sharp/DomainBrowser.cs
index 76438f8..3ce9e4d 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,11 +41,12 @@ namespace Avahi
         public int NetworkInterface;
         public Protocol Protocol;
         public string Domain;
+        public LookupResultFlags Flags;
     }
 
     public delegate void DomainInfoHandler (object o, DomainInfo info);
     
-    public class DomainBrowser : IDisposable
+    public class DomainBrowser : BrowserBase, IDisposable
     {
         private IntPtr handle;
         private ArrayList infos = new ArrayList ();
@@ -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,26 +151,33 @@ 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);
-            
-            if (bevent == BrowserEvent.Added) {
+
+            switch (bevent) {
+            case BrowserEvent.Added:
                 infos.Add (info);
 
                 foreach (DomainInfoHandler handler in addListeners)
                     handler (this, info);
-            } else {
+                break;
+            case BrowserEvent.Removed:
                 infos.Remove (info);
 
                 foreach (DomainInfoHandler handler in removeListeners)
                     handler (this, info);
+                break;
+            default:
+                EmitBrowserEvent (bevent);
+                break;
             }
         }
     }