X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fbrowser.c;h=01608d09d8b7e3edfe5963bbd8181437d606dcea;hb=519c8939aa6d436c8ed48bb0f390e9971676928f;hp=54ae7c434445075fccfe8c42582f59b0ee623bf0;hpb=f8c479234af6b676027df4fb6b38ce8e22949049;p=catta diff --git a/avahi-client/browser.c b/avahi-client/browser.c index 54ae7c4..01608d0 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -23,28 +23,26 @@ #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" -/* AvahiClientDomainBrowser */ +/* AvahiDomainBrowser */ -AvahiClientDomainBrowser* avahi_domain_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, char *domain, AvahiDomainBrowserType btype, AvahiClientDomainBrowserCallback callback, void *user_data) +AvahiDomainBrowser* avahi_domain_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, const char *domain, AvahiDomainBrowserType btype, AvahiDomainBrowserCallback callback, void *user_data) { - AvahiClientDomainBrowser *tmp = NULL; + AvahiDomainBrowser *tmp = NULL; DBusMessage *message = NULL, *reply; DBusError error; char *path; @@ -71,13 +69,13 @@ AvahiClientDomainBrowser* avahi_domain_browser_new (AvahiClient *client, AvahiIf if (dbus_error_is_set (&error) || path == NULL) goto dbus_error; - tmp = malloc (sizeof (AvahiClientDomainBrowser)); + tmp = avahi_new (AvahiDomainBrowser, 1); tmp->client = client; tmp->callback = callback; tmp->user_data = user_data; tmp->path = strdup (path); - AVAHI_LLIST_PREPEND(AvahiClientDomainBrowser, domain_browsers, client->domain_browsers, tmp); + AVAHI_LLIST_PREPEND(AvahiDomainBrowser, domain_browsers, client->domain_browsers, tmp); return tmp; @@ -88,8 +86,33 @@ dbus_error: return NULL; } -char* -avahi_domain_browser_path (AvahiClientDomainBrowser *b) +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; } @@ -97,7 +120,7 @@ avahi_domain_browser_path (AvahiClientDomainBrowser *b) DBusHandlerResult avahi_domain_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message) { - AvahiClientDomainBrowser *n, *db = NULL; + AvahiDomainBrowser *n, *db = NULL; DBusError error; const char *path; char *domain; @@ -112,7 +135,6 @@ avahi_domain_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMe 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; @@ -137,10 +159,10 @@ out: return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } -/* AvahiClientServiceTypeBrowser */ -AvahiClientServiceTypeBrowser* avahi_service_type_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, char *domain, AvahiClientServiceTypeBrowserCallback callback, void *user_data) +/* AvahiServiceTypeBrowser */ +AvahiServiceTypeBrowser* avahi_service_type_browser_new (AvahiClient *client, AvahiIfIndex interface, AvahiProtocol protocol, const char *domain, AvahiServiceTypeBrowserCallback callback, void *user_data) { - AvahiClientServiceTypeBrowser *tmp = NULL; + AvahiServiceTypeBrowser *tmp = NULL; DBusMessage *message = NULL, *reply; DBusError error; char *path; @@ -169,13 +191,13 @@ AvahiClientServiceTypeBrowser* avahi_service_type_browser_new (AvahiClient *clie if (dbus_error_is_set (&error) || path == NULL) goto dbus_error; - tmp = malloc (sizeof (AvahiClientServiceTypeBrowser)); + tmp = avahi_new(AvahiServiceTypeBrowser, 1); tmp->client = client; tmp->callback = callback; tmp->user_data = user_data; tmp->path = strdup (path); - AVAHI_LLIST_PREPEND(AvahiClientServiceTypeBrowser, service_type_browsers, client->service_type_browsers, tmp); + AVAHI_LLIST_PREPEND(AvahiServiceTypeBrowser, service_type_browsers, client->service_type_browsers, tmp); return tmp; @@ -186,8 +208,33 @@ dbus_error: return NULL; } -char* -avahi_service_type_browser_path (AvahiClientServiceTypeBrowser *b) +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; } @@ -195,7 +242,7 @@ avahi_service_type_browser_path (AvahiClientServiceTypeBrowser *b) DBusHandlerResult avahi_service_type_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message) { - AvahiClientServiceTypeBrowser *n, *db = NULL; + AvahiServiceTypeBrowser *n, *db = NULL; DBusError error; const char *path; char *domain, *type; @@ -210,7 +257,6 @@ avahi_service_type_browser_event (AvahiClient *client, AvahiBrowserEvent event, 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; @@ -238,3 +284,136 @@ 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; +} + +