-/* $Id$ */
-
/***
This file is part of avahi.
using System;
using System.Collections;
using System.Runtime.InteropServices;
+using System.Text;
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
{
public int NetworkInterface;
public Protocol Protocol;
public string Domain;
public string ServiceType;
+ public LookupResultFlags Flags;
+ }
+
+ public class ServiceTypeInfoArgs : EventArgs
+ {
+ private ServiceTypeInfo type;
+
+ public ServiceTypeInfo ServiceType
+ {
+ get { return type; }
+ }
+
+ public ServiceTypeInfoArgs (ServiceTypeInfo type)
+ {
+ this.type = type;
+ }
}
- public delegate void ServiceTypeInfoHandler (object o, ServiceTypeInfo info);
-
- public class ServiceTypeBrowser : IDisposable
+ public delegate void ServiceTypeInfoHandler (object o, ServiceTypeInfoArgs args);
+
+ public class ServiceTypeBrowser : BrowserBase, IDisposable
{
private IntPtr handle;
private ArrayList infos = new ArrayList ();
private int iface;
private Protocol proto;
private string domain;
+ private LookupFlags flags;
private ServiceTypeBrowserCallback cb;
private ArrayList addListeners = new ArrayList ();
private ArrayList removeListeners = new ArrayList ();
-
+
[DllImport ("avahi-client")]
private static extern IntPtr avahi_service_type_browser_new (IntPtr client, int iface, int proto,
- IntPtr domain, ServiceTypeBrowserCallback cb,
+ byte[] domain, LookupFlags flags,
+ ServiceTypeBrowserCallback cb,
IntPtr userdata);
[DllImport ("avahi-client")]
Stop (false);
}
}
-
+
public event ServiceTypeInfoHandler ServiceTypeRemoved
{
add {
{
}
- 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;
}
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_service_type_browser_new (client.Handle, iface, (int) proto, domainPtr,
- cb, IntPtr.Zero);
- Utility.Free (domainPtr);
+ lock (client) {
+ handle = avahi_service_type_browser_new (client.Handle, iface, (int) proto,
+ Utility.StringToBytes (domain), 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_service_type_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_type_browser_free (handle);
+ handle = IntPtr.Zero;
+ }
}
}
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;
info.Protocol = proto;
info.Domain = Utility.PtrToString (domain);
info.ServiceType = Utility.PtrToString (type);
+ info.Flags = flags;
- infos.Add (info);
-
- if (bevent == BrowserEvent.Added) {
+ switch (bevent) {
+ case BrowserEvent.Added:
infos.Add (info);
foreach (ServiceTypeInfoHandler handler in addListeners)
- handler (this, info);
- } else {
+ handler (this, new ServiceTypeInfoArgs (info));
+ break;
+ case BrowserEvent.Removed:
infos.Remove (info);
foreach (ServiceTypeInfoHandler handler in removeListeners)
- handler (this, info);
+ handler (this, new ServiceTypeInfoArgs (info));
+ break;
+ default:
+ EmitBrowserEvent (bevent);
+ break;
}
}
}