-/* $Id$ */
-
/***
This file is part of avahi.
using System;
using System.Collections;
using System.Runtime.InteropServices;
+using System.Text;
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,
- RegisterDefault,
Browse,
BrowseDefault,
+ Register,
+ RegisterDefault,
BrowseLegacy
}
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 DomainInfoArgs : EventArgs
+ {
+ private DomainInfo domain;
+
+ public DomainInfo Domain
+ {
+ get { return domain; }
+ }
+
+ public DomainInfoArgs (DomainInfo domain)
+ {
+ this.domain = domain;
+ }
+ }
+
+ public delegate void DomainInfoHandler (object o, DomainInfoArgs args);
+
+ public class DomainBrowser : BrowserBase, IDisposable
{
private IntPtr handle;
private ArrayList infos = new ArrayList ();
private Protocol proto;
private string domain;
private DomainBrowserType btype;
+ private LookupFlags flags;
+ private DomainBrowserCallback cb;
private ArrayList addListeners = new ArrayList ();
private ArrayList removeListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_domain_browser_new (IntPtr client, int iface, int proto,
- IntPtr domain, int btype, DomainBrowserCallback cb,
+ byte[] domain, int btype, LookupFlags flags,
+ DomainBrowserCallback cb,
IntPtr userdata);
[DllImport ("avahi-client")]
Stop (false);
}
}
-
+
public event DomainInfoHandler DomainRemoved
{
add {
}
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;
}
~DomainBrowser ()
private void Start ()
{
- if (handle != IntPtr.Zero || (addListeners.Count == 0 && removeListeners.Count == 0))
+ if (client.Handle == IntPtr.Zero && handle != IntPtr.Zero ||
+ (addListeners.Count == 0 && removeListeners.Count == 0))
return;
- IntPtr domainPtr = Utility.StringToPtr (domain);
- handle = avahi_domain_browser_new (client.Handle, iface, (int) proto, domainPtr, (int) btype,
- OnDomainBrowserCallback, IntPtr.Zero);
- Utility.Free (domainPtr);
+ lock (client) {
+ handle = avahi_domain_browser_new (client.Handle, iface, (int) proto,
+ Utility.StringToBytes (domain), (int) btype, flags,
+ cb, IntPtr.Zero);
+
+ if (handle == IntPtr.Zero)
+ client.ThrowError ();
+ }
}
private void Stop (bool force)
{
- if (handle != IntPtr.Zero && (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
- avahi_domain_browser_free (handle);
- handle = IntPtr.Zero;
+ if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+ (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
+ lock (client) {
+ avahi_domain_browser_free (handle);
+ handle = IntPtr.Zero;
+ }
}
}
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 {
+ handler (this, new DomainInfoArgs (info));
+ break;
+ case BrowserEvent.Removed:
infos.Remove (info);
foreach (DomainInfoHandler handler in removeListeners)
- handler (this, info);
+ handler (this, new DomainInfoArgs (info));
+ break;
+ default:
+ EmitBrowserEvent (bevent);
+ break;
}
}
}