X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FServiceResolver.cs;h=e94bd13bba53d85d49399c5212778d2729542ac6;hb=c75a6b480b047abc73ee7afd912aef249e9da8e3;hp=af3bf5bcb67ff8c7b673e236222d06ace5edd8a4;hpb=ba12decc4413dedf22c06545d1ec5938efa8954a;p=catta diff --git a/avahi-sharp/ServiceResolver.cs b/avahi-sharp/ServiceResolver.cs index af3bf5b..e94bd13 100644 --- a/avahi-sharp/ServiceResolver.cs +++ b/avahi-sharp/ServiceResolver.cs @@ -1,3 +1,24 @@ +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + using System; using System.Collections; using System.Net; @@ -10,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 { @@ -23,6 +45,8 @@ namespace Avahi private string type; private string domain; private Protocol aproto; + private LookupFlags flags; + private ServiceResolverCallback cb; private ArrayList foundListeners = new ArrayList (); private ArrayList timeoutListeners = new ArrayList (); @@ -30,9 +54,19 @@ 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")] + private static extern IntPtr avahi_string_list_get_next (IntPtr list); + + [DllImport ("avahi-common")] + private static extern IntPtr avahi_string_list_get_text (IntPtr list); + + [DllImport ("avahi-common")] + private static extern int avahi_string_list_get_size (IntPtr list); + [DllImport ("avahi-client")] private static extern void avahi_service_resolver_free (IntPtr handle); @@ -68,19 +102,21 @@ namespace Avahi public ServiceResolver (Client client, string name, string type, string domain) : this (client, -1, Protocol.Unspecified, name, type, domain, - Protocol.Unspecified) + Protocol.Unspecified, + LookupFlags.None) { } public ServiceResolver (Client client, ServiceInfo service) : this (client, service.NetworkInterface, service.Protocol, service.Name, service.ServiceType, service.Domain, - Protocol.Unspecified) + Protocol.Unspecified, + GetLookupFlags (service.Flags)) { } public ServiceResolver (Client client, int iface, Protocol proto, string name, - string type, string domain, Protocol aproto) + string type, string domain, Protocol aproto, LookupFlags flags) { this.client = client; this.iface = iface; @@ -89,8 +125,8 @@ namespace Avahi this.type = type; this.domain = domain; this.aproto = aproto; - - + this.flags = flags; + cb = OnServiceResolverCallback; } ~ServiceResolver () @@ -105,14 +141,19 @@ namespace Avahi private void Start () { - if (handle != IntPtr.Zero || (foundListeners.Count == 0 && timeoutListeners.Count == 0)) + if (client.Handle == IntPtr.Zero || handle != IntPtr.Zero || + (foundListeners.Count == 0 && timeoutListeners.Count == 0)) return; IntPtr namePtr = Utility.StringToPtr (name); IntPtr typePtr = Utility.StringToPtr (type); IntPtr domainPtr = Utility.StringToPtr (domain); - handle = avahi_service_resolver_new (client.Handle, iface, proto, namePtr, typePtr, domainPtr, - aproto, OnServiceResolverCallback, IntPtr.Zero); + + lock (client) { + handle = avahi_service_resolver_new (client.Handle, iface, proto, namePtr, typePtr, domainPtr, + aproto, flags, cb, IntPtr.Zero); + } + Utility.Free (namePtr); Utility.Free (typePtr); Utility.Free (domainPtr); @@ -120,16 +161,21 @@ namespace Avahi private void Stop (bool force) { - if (handle != IntPtr.Zero && (force || (foundListeners.Count == 0 && timeoutListeners.Count == 0))) { - avahi_service_resolver_free (handle); - handle = IntPtr.Zero; + if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero && + (force || (foundListeners.Count == 0 && timeoutListeners.Count == 0))) { + + lock (client) { + avahi_service_resolver_free (handle); + handle = IntPtr.Zero; + } } } 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; @@ -137,11 +183,23 @@ namespace Avahi info.Domain = Utility.PtrToString (domain); info.ServiceType = Utility.PtrToString (type); info.Name = Utility.PtrToString (name); - info.Host = Utility.PtrToString (host); + info.HostName = Utility.PtrToString (host); info.Address = Utility.PtrToAddress (address); info.Port = port; - info.Text = null; + ArrayList txtlist = new ArrayList (); + for (IntPtr l = txt; l != IntPtr.Zero; l = avahi_string_list_get_next (l)) { + IntPtr buf = avahi_string_list_get_text (l); + int len = avahi_string_list_get_size (l); + + byte[] txtbuf = new byte[len]; + Marshal.Copy (buf, txtbuf, 0, len); + txtlist.Add (txtbuf); + } + + info.Text = (byte[][]) txtlist.ToArray (typeof (byte[])); + info.Flags = flags; + if (revent == ResolverEvent.Found) { currentInfo = info; @@ -154,5 +212,16 @@ namespace Avahi handler (this, new EventArgs ()); } } + + private static LookupFlags GetLookupFlags (LookupResultFlags rflags) { + LookupFlags ret = LookupFlags.None; + + if ((rflags & LookupResultFlags.Multicast) > 0) + ret |= LookupFlags.UseMulticast; + if ((rflags & LookupResultFlags.WideArea) > 0) + ret |= LookupFlags.UseWideArea; + + return ret; + } } }