X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fbrowser.c;h=01608d09d8b7e3edfe5963bbd8181437d606dcea;hb=519c8939aa6d436c8ed48bb0f390e9971676928f;hp=292162c763f639d7d4090f09618f94a36e86619f;hpb=fde1c3d1a0156f0e06a819cc0958ec077a88c8c6;p=catta diff --git a/avahi-client/browser.c b/avahi-client/browser.c index 292162c..01608d0 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -23,24 +23,24 @@ #include #endif -#include -#include -#include -#include #include #include #include -#define DBUS_API_SUBJECT_TO_CHANGE #include -#include -#include +#include +#include +#include +#include +#include #include "client.h" #include "internal.h" -AvahiDomainBrowser* avahi_domain_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, char *domain, AvahiDomainBrowserType btype, AvahiDomainBrowserCallback callback, void *user_data) +/* AvahiDomainBrowser */ + +AvahiDomainBrowser* avahi_domain_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, const char *domain, AvahiDomainBrowserType btype, AvahiDomainBrowserCallback callback, void *user_data) { AvahiDomainBrowser *tmp = NULL; DBusMessage *message = NULL, *reply; @@ -69,7 +69,7 @@ AvahiDomainBrowser* avahi_domain_browser_new (AvahiClient *client, AvahiIfIndex if (dbus_error_is_set (&error) || path == NULL) goto dbus_error; - tmp = malloc (sizeof (AvahiDomainBrowser)); + tmp = avahi_new (AvahiDomainBrowser, 1); tmp->client = client; tmp->callback = callback; tmp->user_data = user_data; @@ -86,14 +86,39 @@ dbus_error: return NULL; } -char* +int +avahi_domain_browser_free (AvahiDomainBrowser *b) +{ + AvahiClient *client = b->client; + DBusMessage *message = NULL; + + if (b == NULL || b->path == NULL) + return avahi_client_set_errno (client, AVAHI_ERR_INVALID_OBJECT); + + message = dbus_message_new_method_call (AVAHI_DBUS_NAME, + b->path, + AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "Free"); + + if (message == NULL) + return avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); + + dbus_connection_send (client->bus, message, NULL); + + AVAHI_LLIST_REMOVE(AvahiDomainBrowser, domain_browsers, client->domain_browsers, b); + + avahi_free (b); + + return avahi_client_set_errno (client, AVAHI_OK); +} + +const char* avahi_domain_browser_path (AvahiDomainBrowser *b) { return b->path; } 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,27 +130,23 @@ 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; for (n = client->domain_browsers; n != NULL; n = n->domain_browsers_next) { - printf ("cmp: %s, %s\n", n->path, path); if (strcmp (n->path, path) == 0) { db = n; break; } } - 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 +158,262 @@ 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, const 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 = avahi_new(AvahiServiceTypeBrowser, 1); + 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; +} + +int +avahi_service_type_browser_free (AvahiServiceTypeBrowser *b) +{ + AvahiClient *client = b->client; + DBusMessage *message = NULL; + + if (b == NULL || b->path == NULL) + return avahi_client_set_errno (client, AVAHI_ERR_INVALID_OBJECT); + + message = dbus_message_new_method_call (AVAHI_DBUS_NAME, + b->path, + AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "Free"); + + if (message == NULL) + return avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); + + dbus_connection_send (b->client->bus, message, NULL); + + AVAHI_LLIST_REMOVE(AvahiServiceTypeBrowser, service_type_browsers, b->client->service_type_browsers, b); + + avahi_free (b); + + return avahi_client_set_errno (client, AVAHI_OK); +} + +const 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) + { + 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; +} + +/* AvahiServiceBrowser */ + +AvahiServiceBrowser* avahi_service_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, const char *type, const 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 = avahi_new(AvahiServiceBrowser, 1); + 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; +} + +int +avahi_service_browser_free (AvahiServiceBrowser *b) +{ + AvahiClient *client = b->client; + DBusMessage *message = NULL; + + if (b == NULL || b->path == NULL) + return avahi_client_set_errno (client, AVAHI_ERR_INVALID_OBJECT); + + message = dbus_message_new_method_call (AVAHI_DBUS_NAME, + b->path, + AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Free"); + + if (message == NULL) + return avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); + + dbus_connection_send (b->client->bus, message, NULL); + + AVAHI_LLIST_REMOVE(AvahiServiceBrowser, service_browsers, b->client->service_browsers, b); + + avahi_free (b); + + return avahi_client_set_errno (client, AVAHI_OK); +} + +const 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) + { + 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; +} + +