From 98b772ffc6e06ca0e19c2d31326c281a77646367 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Thu, 11 Aug 2005 15:10:55 +0000 Subject: * Add ServiceTypeBrowser support to C API git-svn-id: file:///home/lennart/svn/public/avahi/trunk@290 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/browser.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 4 deletions(-) (limited to 'avahi-client/browser.c') diff --git a/avahi-client/browser.c b/avahi-client/browser.c index 292162c..3e30110 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -40,6 +40,8 @@ #include "client.h" #include "internal.h" +/* AvahiDomainBrowser */ + AvahiDomainBrowser* avahi_domain_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, char *domain, AvahiDomainBrowserType btype, AvahiDomainBrowserCallback callback, void *user_data) { AvahiDomainBrowser *tmp = NULL; @@ -93,7 +95,7 @@ avahi_domain_browser_path (AvahiDomainBrowser *b) } DBusHandlerResult -avahi_entry_group_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message) +avahi_domain_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message) { AvahiDomainBrowser *n, *db = NULL; DBusError error; @@ -105,7 +107,6 @@ avahi_entry_group_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessa path = dbus_message_get_path (message); - printf ("bailing out 1\n"); if (path == NULL) goto out; @@ -118,14 +119,12 @@ avahi_entry_group_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessa } } - printf ("bailing out 2\n"); if (db == NULL) goto out; dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &interface, DBUS_TYPE_INT32, &protocol, DBUS_TYPE_STRING, &domain, DBUS_TYPE_INVALID); - printf ("bailing out 3\n"); if (dbus_error_is_set (&error)) goto out; @@ -137,3 +136,105 @@ out: dbus_error_free (&error); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + +/* AvahiServiceTypeBrowser */ +AvahiServiceTypeBrowser* avahi_service_type_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, char *domain, AvahiServiceTypeBrowserCallback callback, void *user_data) +{ + AvahiServiceTypeBrowser *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, + "ServiceTypeBrowserNew"); + + if (!dbus_message_append_args (message, DBUS_TYPE_INT32, &interface, DBUS_TYPE_INT32, &protocol, 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 (AvahiServiceTypeBrowser)); + tmp->client = client; + tmp->callback = callback; + tmp->user_data = user_data; + tmp->path = strdup (path); + + AVAHI_LLIST_PREPEND(AvahiServiceTypeBrowser, service_type_browsers, client->service_type_browsers, tmp); + + return tmp; + +dbus_error: + dbus_error_free (&error); + avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); + + return NULL; +} + +char* +avahi_service_type_browser_path (AvahiServiceTypeBrowser *b) +{ + return b->path; +} + +DBusHandlerResult +avahi_service_type_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message) +{ + AvahiServiceTypeBrowser *n, *db = NULL; + DBusError error; + const char *path; + char *domain, *type; + int interface, protocol; + + dbus_error_init (&error); + + path = dbus_message_get_path (message); + + if (path == NULL) + goto out; + + for (n = client->service_type_browsers; n != NULL; n = n->service_type_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, &type, + DBUS_TYPE_STRING, &domain, + DBUS_TYPE_INVALID); + + if (dbus_error_is_set (&error)) + goto out; + + db->callback (db, interface, protocol, event, type, domain, db->user_data); + + return DBUS_HANDLER_RESULT_HANDLED; + +out: + dbus_error_free (&error); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} -- cgit