From 66c497f4637276f390f1a7afaf7fe07616da9f1a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 20 Aug 2005 22:57:33 +0000 Subject: * Disable debug output of avahi-client * implement service resolving API in avahi-client * fix some memory corruption bugs in dbus-watch-glue * add avahi-client examples git-svn-id: file:///home/lennart/svn/public/avahi/trunk@363 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/Makefile.am | 4 +- avahi-client/client.c | 12 ++- avahi-client/client.h | 45 ++++++++ avahi-client/internal.h | 10 ++ avahi-client/resolver.c | 263 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 329 insertions(+), 5 deletions(-) create mode 100644 avahi-client/resolver.c (limited to 'avahi-client') diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am index 972aba9..d1cba37 100644 --- a/avahi-client/Makefile.am +++ b/avahi-client/Makefile.am @@ -36,7 +36,9 @@ lib_LTLIBRARIES = libavahi-client.la libavahi_client_la_SOURCES = \ client.c client.h \ entrygroup.c \ - browser.c + browser.c \ + resolver.c + libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common.la libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0 diff --git a/avahi-client/client.c b/avahi-client/client.c index 2361cbc..bb623c0 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -102,10 +102,10 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, dbus_error_init (&error); - fprintf(stderr, "dbus: interface=%s, path=%s, member=%s\n", - dbus_message_get_interface (message), - dbus_message_get_path (message), - dbus_message_get_member (message)); +/* fprintf(stderr, "dbus: interface=%s, path=%s, member=%s\n", */ +/* dbus_message_get_interface (message), */ +/* dbus_message_get_path (message), */ +/* dbus_message_get_member (message)); */ if (client->state == AVAHI_CLIENT_DISCONNECTED) goto fail; @@ -259,6 +259,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientCallback cal AVAHI_LLIST_HEAD_INIT(AvahiDomainBrowser, client->domain_browsers); AVAHI_LLIST_HEAD_INIT(AvahiServiceBrowser, client->service_browsers); AVAHI_LLIST_HEAD_INIT(AvahiServiceTypeBrowser, client->service_type_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiServiceResolver, client->service_resolvers); if (!(client->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error)) || dbus_error_is_set (&error)) @@ -352,6 +353,9 @@ void avahi_client_free(AvahiClient *client) { while (client->service_type_browsers) avahi_service_type_browser_free(client->service_type_browsers); + while (client->service_resolvers) + avahi_service_resolver_free(client->service_resolvers); + if (client->bus) { dbus_connection_disconnect(client->bus); dbus_connection_unref(client->bus); diff --git a/avahi-client/client.h b/avahi-client/client.h index 056adfb..2753f1b 100644 --- a/avahi-client/client.h +++ b/avahi-client/client.h @@ -37,12 +37,24 @@ AVAHI_C_DECL_BEGIN #endif +/** A connection context */ typedef struct AvahiClient AvahiClient; + +/** An entry group object */ typedef struct AvahiEntryGroup AvahiEntryGroup; + +/** A domain browser object */ typedef struct AvahiDomainBrowser AvahiDomainBrowser; + +/** A service browser object */ typedef struct AvahiServiceBrowser AvahiServiceBrowser; + +/** A service type browser object */ typedef struct AvahiServiceTypeBrowser AvahiServiceTypeBrowser; +/** A service resolver object */ +typedef struct AvahiServiceResolver AvahiServiceResolver; + /** States of a client object, note that AvahiServerStates are also emitted */ typedef enum { AVAHI_CLIENT_S_INVALID = AVAHI_SERVER_INVALID, @@ -67,6 +79,21 @@ typedef void (*AvahiServiceBrowserCallback) (AvahiServiceBrowser *b, AvahiIfInde /** The function prototype for the callback of an AvahiServiceTypeBrowser */ typedef void (*AvahiServiceTypeBrowserCallback) (AvahiServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *type, const char *domain, void *userdata); +/** The function prototype for the callback of an AvahiServiceResolver */ +typedef void (*AvahiServiceResolverCallback) ( + AvahiServiceResolver *r, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, + const char *type, + const char *domain, + const char *host_name, + const AvahiAddress *a, + uint16_t port, + AvahiStringList *txt, + void *userdata); + /** Creates a new client instance */ AvahiClient* avahi_client_new (const AvahiPoll *poll_api, AvahiClientCallback callback, void *userdata, int *error); @@ -197,6 +224,24 @@ const char* avahi_service_browser_get_dbus_path (AvahiServiceBrowser *); /* Cleans up and frees an AvahiServiceBrowser object */ int avahi_service_browser_free (AvahiServiceBrowser *); +/** Create a new service resolver object */ +AvahiServiceResolver * avahi_service_resolver_new( + AvahiClient *client, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *name, + const char *type, + const char *domain, + AvahiProtocol aprotocol, + AvahiServiceResolverCallback callback, + void *userdata); + +/** Free a service resolver object */ +int avahi_service_resolver_free(AvahiServiceResolver *r); + +/** Block until the resolving is complete */ +int avahi_service_resolver_block(AvahiServiceResolver *r); + #ifndef DOXYGEN_SHOULD_SKIP_THIS AVAHI_C_DECL_END #endif diff --git a/avahi-client/internal.h b/avahi-client/internal.h index 3859d70..1788122 100644 --- a/avahi-client/internal.h +++ b/avahi-client/internal.h @@ -41,6 +41,7 @@ struct AvahiClient { AVAHI_LLIST_HEAD(AvahiDomainBrowser, domain_browsers); AVAHI_LLIST_HEAD(AvahiServiceBrowser, service_browsers); AVAHI_LLIST_HEAD(AvahiServiceTypeBrowser, service_type_browsers); + AVAHI_LLIST_HEAD(AvahiServiceResolver, service_resolvers); }; struct AvahiEntryGroup { @@ -76,6 +77,14 @@ struct AvahiServiceTypeBrowser { AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, service_type_browsers); }; +struct AvahiServiceResolver { + DBusPendingCall *call; + AvahiClient *client; + AvahiServiceResolverCallback callback; + void *userdata; + AVAHI_LLIST_FIELDS(AvahiServiceResolver, service_resolvers); +}; + int avahi_client_set_errno (AvahiClient *client, int error); int avahi_client_set_dbus_error(AvahiClient *client, DBusError *error); @@ -86,4 +95,5 @@ DBusHandlerResult avahi_domain_browser_event (AvahiClient *client, AvahiBrowserE DBusHandlerResult avahi_service_type_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message); DBusHandlerResult avahi_service_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message); + #endif diff --git a/avahi-client/resolver.c b/avahi-client/resolver.c new file mode 100644 index 0000000..66208cf --- /dev/null +++ b/avahi-client/resolver.c @@ -0,0 +1,263 @@ +/* $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. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#include "client.h" +#include "internal.h" + +static void pending_call_callback(DBusPendingCall *pending, void *userdata) { + AvahiServiceResolver *r = userdata; + DBusMessage *message = NULL; + AvahiStringList *strlst = NULL; + DBusError error; + + assert(pending); + assert(r); + + dbus_error_init(&error); + + if (!(message = dbus_pending_call_steal_reply(pending))) + goto fail; + + if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_RETURN) { + int j; + int32_t interface, protocol, aprotocol; + char *name, *type, *domain, *host, *address; + uint16_t port; + DBusMessageIter iter, sub; + AvahiAddress a; + + if (!dbus_message_get_args( + message, &error, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_STRING, &host, + DBUS_TYPE_INT32, &aprotocol, + DBUS_TYPE_STRING, &address, + DBUS_TYPE_UINT16, &port, + DBUS_TYPE_INVALID) || + dbus_error_is_set (&error)) { + fprintf(stderr, "Failed to parse resolver event.\n"); + goto fail; + } + + dbus_message_iter_init(message, &iter); + + for (j = 0; j < 9; j++) + dbus_message_iter_next(&iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY || + dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_ARRAY) { + fprintf(stderr, "Error parsing service resolving message"); + goto fail; + } + + strlst = NULL; + dbus_message_iter_recurse(&iter, &sub); + + for (;;) { + DBusMessageIter sub2; + int at, n; + uint8_t *k; + + if ((at = dbus_message_iter_get_arg_type(&sub)) == DBUS_TYPE_INVALID) + break; + + assert(at == DBUS_TYPE_ARRAY); + + if (dbus_message_iter_get_element_type(&sub) != DBUS_TYPE_BYTE) { + fprintf(stderr, "Error parsing service resolving message"); + goto fail; + } + + dbus_message_iter_recurse(&sub, &sub2); + dbus_message_iter_get_fixed_array(&sub2, &k, &n); + strlst = avahi_string_list_add_arbitrary(strlst, k, n); + + dbus_message_iter_next(&sub); + } + + assert(address); + if (!avahi_address_parse(address, (AvahiProtocol) aprotocol, &a)) { + fprintf(stderr, "Failed to parse address\n"); + goto fail; + } + + r->callback(r, (AvahiIfIndex) interface, (AvahiProtocol) protocol, AVAHI_RESOLVER_FOUND, name, type, domain, host, &a, port, strlst, r->userdata); + + } else { + + assert(dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_ERROR); + + avahi_client_set_errno(r->client, avahi_error_dbus_to_number(dbus_message_get_error_name(message))); + + r->callback(r, (AvahiIfIndex) 0, (AvahiProtocol) 0, AVAHI_RESOLVER_TIMEOUT, NULL, NULL, NULL, NULL, NULL, 0, NULL, r->userdata); + } + +fail: + + if (message) + dbus_message_unref(message); + + avahi_string_list_free(strlst); + + dbus_error_free (&error); +} + +AvahiServiceResolver * avahi_service_resolver_new( + AvahiClient *client, + AvahiIfIndex interface, + AvahiProtocol protocol, + const char *name, + const char *type, + const char *domain, + AvahiProtocol aprotocol, + AvahiServiceResolverCallback callback, + void *userdata) { + + DBusError error; + AvahiServiceResolver *r; + DBusMessage *message; + int32_t i_interface, i_protocol, i_aprotocol; + + assert(client); + assert(name); + assert(type); + + if (!domain) + domain = ""; + + dbus_error_init (&error); + + if (client->state == AVAHI_CLIENT_DISCONNECTED) { + avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); + goto fail; + } + + if (!(r = avahi_new(AvahiServiceResolver, 1))) { + avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY); + goto fail; + } + + r->client = client; + r->callback = callback; + r->userdata = userdata; + r->call = NULL; + + AVAHI_LLIST_PREPEND(AvahiServiceResolver, service_resolvers, client->service_resolvers, r); + + if (!(message = dbus_message_new_method_call(AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, "ResolveService"))) { + avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY); + goto fail; + } + + i_interface = interface; + i_protocol = protocol; + i_aprotocol = aprotocol; + + if (!(dbus_message_append_args( + message, + DBUS_TYPE_INT32, &i_interface, + DBUS_TYPE_INT32, &i_protocol, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_INT32, &i_aprotocol, + DBUS_TYPE_INVALID))) { + avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY); + goto fail; + } + + if (!dbus_connection_send_with_reply(client->bus, message, &r->call, -1) || + !dbus_pending_call_set_notify(r->call, pending_call_callback, r, NULL)) { + avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY); + goto fail; + } + + dbus_message_unref(message); + + return r; + +fail: + + if (dbus_error_is_set(&error)) { + avahi_client_set_dbus_error(client, &error); + dbus_error_free(&error); + } + + if (r) + avahi_service_resolver_free(r); + + if (message) + dbus_message_unref(message); + + return NULL; + +} + +int avahi_service_resolver_free(AvahiServiceResolver *r) { + AvahiClient *client; + + assert(r); + client = r->client; + + if (r->call) { + dbus_pending_call_cancel(r->call); + dbus_pending_call_unref(r->call); + } + + AVAHI_LLIST_REMOVE(AvahiServiceResolver, service_resolvers, client->service_resolvers, r); + + avahi_free(r); + + return AVAHI_OK; +} + +int avahi_service_resolver_block(AvahiServiceResolver *r) { + AvahiClient *client; + + assert(r); + client = r->client; + + if (r->call) + dbus_pending_call_block(r->call); + + return AVAHI_OK; +} + -- cgit