From 9f0dd75f02f5eceb758436de07f18fcc892c12f0 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Sun, 14 Aug 2005 10:56:45 +0000 Subject: * Add service browser support to C client API * Small fix to avahi-common to get make distcheck further git-svn-id: file:///home/lennart/svn/public/avahi/trunk@317 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/browser.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) (limited to 'avahi-client/browser.c') diff --git a/avahi-client/browser.c b/avahi-client/browser.c index 3e30110..bcd9914 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -238,3 +238,112 @@ out: dbus_error_free (&error); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + +/* AvahiServiceBrowser */ + +AvahiServiceBrowser* avahi_service_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, char *type, char *domain, AvahiServiceBrowserCallback callback, void *user_data) +{ + AvahiServiceBrowser *tmp = NULL; + DBusMessage *message = NULL, *reply; + DBusError error; + char *path; + + if (client == NULL) + return NULL; + + dbus_error_init (&error); + + message = dbus_message_new_method_call (AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, + AVAHI_DBUS_INTERFACE_SERVER, "ServiceBrowserNew"); + + if (!dbus_message_append_args (message, + DBUS_TYPE_INT32, &interface, + DBUS_TYPE_INT32, &protocol, + DBUS_TYPE_STRING, &type, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_INVALID)) + goto dbus_error; + + reply = dbus_connection_send_with_reply_and_block (client->bus, message, -1, &error); + + if (dbus_error_is_set (&error) || reply == NULL) + goto dbus_error; + + if (!dbus_message_get_args (reply, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) + goto dbus_error; + + if (dbus_error_is_set (&error) || path == NULL) + goto dbus_error; + + tmp = malloc (sizeof (AvahiServiceBrowser)); + tmp->client = client; + tmp->callback = callback; + tmp->user_data = user_data; + tmp->path = strdup (path); + + AVAHI_LLIST_PREPEND(AvahiServiceBrowser, service_browsers, client->service_browsers, tmp); + + return tmp; + +dbus_error: + dbus_error_free (&error); + avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); + + return NULL; +} + +char* +avahi_service_browser_path (AvahiServiceBrowser *b) +{ + return b->path; +} + +DBusHandlerResult +avahi_service_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message) +{ + AvahiServiceBrowser *n, *db = NULL; + DBusError error; + const char *path; + char *name, *type, *domain; + int interface, protocol; + + dbus_error_init (&error); + + path = dbus_message_get_path (message); + + if (path == NULL) + goto out; + + for (n = client->service_browsers; n != NULL; n = n->service_browsers_next) + { + printf ("cmp: %s, %s\n", n->path, path); + if (strcmp (n->path, path) == 0) { + db = n; + break; + } + } + + if (db == NULL) + goto out; + + 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_INVALID); + + if (dbus_error_is_set (&error)) + goto out; + + db->callback (db, interface, protocol, event, name, type, domain, db->user_data); + + return DBUS_HANDLER_RESULT_HANDLED; + +out: + dbus_error_free (&error); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + + -- cgit