+/* $Id$ */
+
/***
This file is part of avahi.
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
{
public string ServiceType;
public string Name;
- public string Host;
+ public string HostName;
public IPAddress Address;
public UInt16 Port;
public byte[][] Text;
+ public LookupResultFlags Flags;
public static ServiceInfo Zero = new ServiceInfo ();
}
private Protocol proto;
private string domain;
private string type;
+ private LookupFlags flags;
+ private ServiceBrowserCallback cb;
private ArrayList addListeners = new ArrayList ();
private ArrayList removeListeners = new ArrayList ();
[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")]
}
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;
}
~ServiceBrowser ()
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);
IntPtr typePtr = Utility.StringToPtr (type);
- handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr,
- OnServiceBrowserCallback, IntPtr.Zero);
+
+ lock (client) {
+ handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr, flags,
+ cb, IntPtr.Zero);
+ }
Utility.Free (domainPtr);
Utility.Free (typePtr);
}
private void Stop (bool force)
{
- if (handle != IntPtr.Zero && (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
- avahi_service_browser_free (handle);
- handle = IntPtr.Zero;
+ if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+ (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
+
+ lock (client) {
+ avahi_service_browser_free (handle);
+ handle = IntPtr.Zero;
+ }
}
}
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;
info.Domain = Utility.PtrToString (domain);
info.ServiceType = Utility.PtrToString (type);
info.Name = Utility.PtrToString (name);
- info.Host = null;
+ info.HostName = null;
info.Address = null;
info.Port = 0;
info.Text = null;
+ info.Flags = flags;
infos.Add (info);