#include <config.h>
#endif
-#include <avahi-client/client.h>
-#include <avahi-common/dbus.h>
-#include <avahi-common/llist.h>
-#include <avahi-common/error.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <stdlib.h>
+#include <avahi-common/dbus.h>
+#include <avahi-common/llist.h>
+#include <avahi-common/error.h>
+#include <avahi-common/dbus.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/dbus-watch-glue.h>
#include "client.h"
#include "internal.h"
-int
-avahi_client_set_errno (AvahiClient *client, int error)
-{
- if (client == NULL) return error;
-
- client->error = error;
+int avahi_client_set_errno (AvahiClient *client, int error) {
+ assert(client);
- return error;
+ return client->error = error;
}
-
-static
-void avahi_client_state_change (AvahiClient *client, int state)
-{
- if (client == NULL || client->callback == NULL)
- return;
- client->callback (client, state, client->user_data);
-}
+int avahi_client_set_dbus_error(AvahiClient *client, DBusError *error) {
+ assert(client);
+ assert(error);
-void
-avahi_client_state_request_callback (DBusPendingCall *call, void *data)
-{
- AvahiClient *client = data;
- DBusError error;
- DBusMessage *reply;
- int state, type;
+ return avahi_client_set_errno(client, avahi_error_dbus_to_number(error->name));
+}
- dbus_error_init (&error);
+static void client_set_state (AvahiClient *client, AvahiServerState state) {
+ assert(client);
- reply = dbus_pending_call_steal_reply (call);
+ if (client->state == state)
+ return;
- type = dbus_message_get_type (reply);
+ client->state = state;
- if (type == DBUS_MESSAGE_TYPE_METHOD_RETURN)
- {
- dbus_message_get_args (reply, &error, DBUS_TYPE_INT32, &state, DBUS_TYPE_INVALID);
-
- if (dbus_error_is_set (&error))
- {
- fprintf (stderr, "internal error parsing client state change for client\n");
- return;
- }
-
- printf ("statechange (client) to %d\n", state);
-
- avahi_client_state_change (client, state);
- } else if (type == DBUS_MESSAGE_TYPE_ERROR) {
- dbus_set_error_from_message (&error, reply);
- fprintf (stderr, "Error from reply: %s\n", error.message);
+ switch (client->state) {
+ case AVAHI_CLIENT_DISCONNECTED:
+ case AVAHI_CLIENT_FAILURE:
+ if (client->bus) {
+ dbus_connection_disconnect(client->bus);
+ dbus_connection_unref(client->bus);
+ client->bus = NULL;
+ }
+
+ /* Fall through */
+
+ case AVAHI_CLIENT_S_COLLISION:
+ case AVAHI_CLIENT_S_REGISTERING:
+
+ /* Clear cached strings */
+ avahi_free(client->host_name);
+ avahi_free(client->host_name_fqdn);
+ avahi_free(client->domain_name);
+
+ client->host_name = NULL;
+ client->host_name_fqdn = NULL;
+ client->domain_name = NULL;
+ break;
+
+ case AVAHI_CLIENT_S_RUNNING:
+ break;
+
}
-
- dbus_pending_call_unref (call);
+
+ if (client->callback)
+ client->callback (client, state, client->userdata);
}
-void
-avahi_client_schedule_state_request (AvahiClient *client)
-{
- DBusMessage *message;
- DBusPendingCall *pcall;
-
- if (client == NULL) return;
+static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, void *userdata) {
+ AvahiClient *client = userdata;
+ DBusError error;
- message = dbus_message_new_method_call (AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, "GetState");
+ assert(bus);
+ assert(message);
+
+ dbus_error_init (&error);
- dbus_connection_send_with_reply (client->bus, message, &pcall, -1);
+/* 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)); */
- dbus_pending_call_set_notify (pcall, avahi_client_state_request_callback, client, NULL);
-}
+ if (client->state == AVAHI_CLIENT_DISCONNECTED)
+ goto fail;
-static DBusHandlerResult
-filter_func (DBusConnection *bus, DBusMessage *message, void *data)
-{
- AvahiClient *client = data;
- DBusError error;
-
- printf ("dbus: interface=%s, path=%s, member=%s\n",
- dbus_message_get_interface (message),
- dbus_message_get_path (message),
- dbus_message_get_member (message));
+ if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
- dbus_error_init (&error);
+ /* The DBUS server died or kicked us */
+ client_set_state(client, AVAHI_CLIENT_DISCONNECTED);
- if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
- gchar *name, *old, *new;
- dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old, DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID);
+ } if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
+ char *name, *old, *new;
- if (dbus_error_is_set (&error)) {
- fprintf(stderr, "Failed to parse NameOwnerChanged message: %s", error.message);
- dbus_error_free (&error);
- goto out;
+ if (!dbus_message_get_args(
+ message, &error,
+ DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_STRING, &old,
+ DBUS_TYPE_STRING, &new,
+ DBUS_TYPE_INVALID) || dbus_error_is_set (&error)) {
+
+ fprintf(stderr, "WARNING: Failed to parse NameOwnerChanged signal: %s\n", error.message);
+ goto fail;
}
- if (strcmp (name, AVAHI_DBUS_NAME) == 0) {
+ if (strcmp(name, AVAHI_DBUS_NAME) == 0)
- if (old == NULL && new != NULL) {
- fprintf(stderr, "Avahi Daemon connected\n");
- avahi_client_state_change (client, AVAHI_CLIENT_RECONNECTED);
- } else if (old != NULL && new == NULL) {
- fprintf(stderr, "Avahi Daemon disconnected\n");
- avahi_client_state_change (client, AVAHI_CLIENT_DISCONNECTED);
- /* XXX: we really need to expire all entry groups */
- }
+ /* Regardless if the server lost or acquired its name or
+ * if the name was transfered: our services are no longer
+ * available, so we disconnect ourselves */
+
+ client_set_state(client, AVAHI_CLIENT_DISCONNECTED);
+
+ } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_SERVER, "StateChanged")) {
+ int32_t state;
+ char *e = NULL;
+ int c;
+
+ if (!dbus_message_get_args(
+ message, &error,
+ DBUS_TYPE_INT32, &state,
+ DBUS_TYPE_STRING, &e,
+ DBUS_TYPE_INVALID) || dbus_error_is_set (&error)) {
+ fprintf(stderr, "WARNING: Failed to parse Server.StateChanged signal: %s\n", error.message);
+ goto fail;
}
- } else if (dbus_message_is_signal (message, AVAHI_DBUS_NAME, "StateChanged")) {
- printf ("server statehcange\n");
+
+ if ((c = avahi_error_dbus_to_number(e)) != AVAHI_OK)
+ avahi_client_set_errno(client, c);
+
+ client_set_state(client, (AvahiClientState) state);
+
} else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_ENTRY_GROUP, "StateChanged")) {
const char *path;
- AvahiEntryGroup *n, *group = NULL;
- path = dbus_message_get_path (message);
-
- for (n = client->groups; n != NULL; n = n->groups_next)
- {
- if (strcmp (n->path, path) == 0)
- {
- group = n;
+ AvahiEntryGroup *g;
+ path = dbus_message_get_path(message);
+
+ for (g = client->groups; g; g = g->groups_next)
+ if (strcmp(g->path, path) == 0)
break;
- }
- }
- if (group == NULL)
- {
- fprintf (stderr, "Received state change for unknown EntryGroup object (%s)\n", path);
- } else {
- int state;
- DBusError error;
- dbus_error_init (&error);
- dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &state, DBUS_TYPE_INVALID);
- if (dbus_error_is_set (&error))
- {
- fprintf (stderr, "internal error parsing entrygroup statechange for %s\n", group->path);
- goto out;
+ if (g) {
+ int32_t state;
+ char *e;
+ int c;
+
+ if (!dbus_message_get_args(
+ message, &error,
+ DBUS_TYPE_INT32, &state,
+ DBUS_TYPE_STRING, &e,
+ DBUS_TYPE_INVALID) ||
+ dbus_error_is_set(&error)) {
+ fprintf(stderr, "WARNING: Failed to parse EntryGroup.StateChanged signal: %s\n", error.message);
+ goto fail;
}
- printf ("statechange (%s) to %d\n", group->path, state);
- avahi_entry_group_state_change (group, state);
+
+ if ((c = avahi_error_dbus_to_number(e)) != AVAHI_OK)
+ avahi_client_set_errno(client, c);
+
+ avahi_entry_group_set_state(g, state);
}
- } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "ItemNew")) {
- return avahi_domain_browser_event (client, AVAHI_BROWSER_NEW, message);
- } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "ItemRemove")) {
- return avahi_domain_browser_event (client, AVAHI_BROWSER_REMOVE, message);
- } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "ItemNew")) {
+
+ } else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "ItemNew"))
+ return avahi_domain_browser_event(client, AVAHI_BROWSER_NEW, message);
+ else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "ItemRemove"))
+ return avahi_domain_browser_event(client, AVAHI_BROWSER_REMOVE, message);
+ else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "CacheExhausted"))
+ return avahi_domain_browser_event(client, AVAHI_BROWSER_CACHE_EXHAUSTED, message);
+ else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "AllForNow"))
+ return avahi_domain_browser_event(client, AVAHI_BROWSER_ALL_FOR_NOW, message);
+ else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "Failure"))
+ return avahi_domain_browser_event(client, AVAHI_BROWSER_FAILURE, message);
+
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "ItemNew"))
return avahi_service_type_browser_event (client, AVAHI_BROWSER_NEW, message);
- } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "ItemRemove")) {
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "ItemRemove"))
return avahi_service_type_browser_event (client, AVAHI_BROWSER_REMOVE, message);
- }
-
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "CacheExhausted"))
+ return avahi_service_type_browser_event (client, AVAHI_BROWSER_CACHE_EXHAUSTED, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "AllForNow"))
+ return avahi_service_type_browser_event (client, AVAHI_BROWSER_ALL_FOR_NOW, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "Failure"))
+ return avahi_service_type_browser_event (client, AVAHI_BROWSER_FAILURE, message);
+
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "ItemNew"))
+ return avahi_service_browser_event (client, AVAHI_BROWSER_NEW, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "ItemRemove"))
+ return avahi_service_browser_event (client, AVAHI_BROWSER_REMOVE, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "CacheExhausted"))
+ return avahi_service_browser_event (client, AVAHI_BROWSER_CACHE_EXHAUSTED, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "AllForNow"))
+ return avahi_service_browser_event (client, AVAHI_BROWSER_ALL_FOR_NOW, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Failure"))
+ return avahi_service_browser_event (client, AVAHI_BROWSER_FAILURE, message);
+
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "Found"))
+ return avahi_service_resolver_event (client, AVAHI_RESOLVER_FOUND, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "Failure"))
+ return avahi_service_resolver_event (client, AVAHI_RESOLVER_FAILURE, message);
+
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "Found"))
+ return avahi_host_name_resolver_event (client, AVAHI_RESOLVER_FOUND, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "Failure"))
+ return avahi_host_name_resolver_event (client, AVAHI_RESOLVER_FAILURE, message);
+
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "Found"))
+ return avahi_address_resolver_event (client, AVAHI_RESOLVER_FOUND, message);
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "Failure"))
+ return avahi_address_resolver_event (client, AVAHI_RESOLVER_FAILURE, message);
+
return DBUS_HANDLER_RESULT_HANDLED;
-out:
+fail:
+
+ dbus_error_free (&error);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
-AvahiClient *
-avahi_client_new (AvahiClientCallback callback, void *user_data)
-{
- AvahiClient *tmp = NULL;
+static int get_server_state(AvahiClient *client, int *ret_error) {
+ DBusMessage *message = NULL, *reply = NULL;
DBusError error;
+ int32_t state;
+ int e = AVAHI_ERR_NO_MEMORY;
+
+ assert(client);
- tmp = g_new (AvahiClient, 1);
+ dbus_error_init(&error);
- if (tmp == NULL)
+ if (!(message = dbus_message_new_method_call(AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, "GetState")))
goto fail;
- AVAHI_LLIST_HEAD_INIT(AvahiEntryGroup, tmp->groups);
- AVAHI_LLIST_HEAD_INIT(AvahiDomainBrowser, tmp->domain_browsers);
- AVAHI_LLIST_HEAD_INIT(AvahiServieTypeBrowser, tmp->service_type_browsers);
+ reply = dbus_connection_send_with_reply_and_block (client->bus, message, -1, &error);
- dbus_error_init (&error);
+ if (!reply || dbus_error_is_set (&error))
+ goto fail;
- tmp->bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+ if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &state, DBUS_TYPE_INVALID) ||
+ dbus_error_is_set (&error))
+ goto fail;
- dbus_connection_setup_with_g_main (tmp->bus, NULL);
+ client_set_state(client, (AvahiServerState) state);
- if (dbus_error_is_set (&error)) {
- fprintf(stderr, "Error getting system d-bus: %s\n", error.message);
- dbus_error_free (&error);
+ dbus_message_unref(message);
+ dbus_message_unref(reply);
+
+ return AVAHI_OK;
+
+fail:
+ if (dbus_error_is_set(&error)) {
+ e = avahi_error_dbus_to_number (error.name);
+ dbus_error_free(&error);
+ }
+
+ if (ret_error)
+ *ret_error = e;
+
+ if (message)
+ dbus_message_unref(message);
+ if (reply)
+ dbus_message_unref(reply);
+
+ return e;
+}
+
+static int check_version(AvahiClient *client, int *ret_error) {
+ DBusMessage *message = NULL, *reply = NULL;
+ DBusError error;
+ char *version;
+ int e = AVAHI_ERR_NO_MEMORY;
+
+ assert(client);
+
+ dbus_error_init(&error);
+
+ if (!(message = dbus_message_new_method_call(AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, "GetVersionString")))
+ goto fail;
+
+ reply = dbus_connection_send_with_reply_and_block (client->bus, message, -1, &error);
+
+ if (!reply || dbus_error_is_set (&error))
+ goto fail;
+
+ if (!dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &version, DBUS_TYPE_INVALID) ||
+ dbus_error_is_set (&error))
+ goto fail;
+
+ if (strcmp(version, PACKAGE_STRING) != 0) {
+ e = AVAHI_ERR_VERSION_MISMATCH;
goto fail;
}
- dbus_connection_set_exit_on_disconnect (tmp->bus, FALSE);
+ dbus_message_unref(message);
+ dbus_message_unref(reply);
+
+ return AVAHI_OK;
+
+fail:
+ if (dbus_error_is_set(&error)) {
+ e = avahi_error_dbus_to_number (error.name);
+ dbus_error_free(&error);
+ }
+
+ if (ret_error)
+ *ret_error = e;
+
+ if (message)
+ dbus_message_unref(message);
+ if (reply)
+ dbus_message_unref(reply);
+
+ return e;
+}
+
+
+/* This function acts like dbus_bus_get but creates a private
+ * connection instead */
+static DBusConnection*
+avahi_dbus_bus_get (DBusError *error)
+{
+ DBusConnection *conn;
+ const char *env_addr;
+
+ env_addr = getenv ("DBUS_SYSTEM_BUS_ADDRESS");
- if (!dbus_connection_add_filter (tmp->bus, filter_func, tmp, NULL))
+ if (env_addr == NULL || (*env_addr == 0))
{
- fprintf (stderr, "Failed to add d-bus filter\n");
+ env_addr = DBUS_SYSTEM_BUS_DEFAULT_ADDRESS;
+ }
+
+ conn = dbus_connection_open_private (env_addr, error);
+
+ if (!conn)
+ return NULL;
+
+ dbus_connection_set_exit_on_disconnect (conn, FALSE);
+
+ if (!dbus_bus_register (conn, error))
+ {
+ dbus_connection_close (conn);
+ dbus_connection_unref (conn);
+
+ return NULL;
+ }
+
+ return conn;
+}
+
+AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientCallback callback, void *userdata, int *ret_error) {
+ AvahiClient *client = NULL;
+ DBusError error;
+
+ dbus_error_init (&error);
+
+ if (!(client = avahi_new(AvahiClient, 1))) {
+ if (ret_error)
+ *ret_error = AVAHI_ERR_NO_MEMORY;
+ goto fail;
+ }
+
+ client->poll_api = poll_api;
+ client->error = AVAHI_OK;
+ client->callback = callback;
+ client->userdata = userdata;
+ client->state = AVAHI_CLIENT_DISCONNECTED;
+
+ client->host_name = NULL;
+ client->host_name_fqdn = NULL;
+ client->domain_name = NULL;
+ client->version_string = NULL;
+ client->local_service_cookie_valid = 0;
+
+ AVAHI_LLIST_HEAD_INIT(AvahiEntryGroup, client->groups);
+ 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);
+ AVAHI_LLIST_HEAD_INIT(AvahiHostNameResolver, client->host_name_resolvers);
+ AVAHI_LLIST_HEAD_INIT(AvahiAddressResolver, client->address_resolvers);
+
+ if (!(client->bus = avahi_dbus_bus_get(&error)) ||
+ dbus_error_is_set (&error))
+ goto fail;
+
+ if (avahi_dbus_connection_glue(client->bus, poll_api) < 0) {
+ if (ret_error)
+ *ret_error = AVAHI_ERR_NO_MEMORY; /* Not optimal */
goto fail;
}
- dbus_bus_add_match (tmp->bus,
- "type='signal', "
- "interface='" AVAHI_DBUS_INTERFACE_SERVER "', "
- "sender='" AVAHI_DBUS_NAME "', "
- "path='" AVAHI_DBUS_PATH_SERVER "'",
- &error);
+ if (!dbus_connection_add_filter (client->bus, filter_func, client, NULL)) {
+ if (ret_error)
+ *ret_error = AVAHI_ERR_NO_MEMORY;
+ goto fail;
+ }
+
+ dbus_bus_add_match(
+ client->bus,
+ "type='signal', "
+ "interface='" AVAHI_DBUS_INTERFACE_SERVER "', "
+ "sender='" AVAHI_DBUS_NAME "', "
+ "path='" AVAHI_DBUS_PATH_SERVER "'",
+ &error);
if (dbus_error_is_set (&error))
- {
- fprintf (stderr, "Error adding filter match: %s\n", error.message);
- dbus_error_free (&error);
goto fail;
- }
+ dbus_bus_add_match (
+ client->bus,
+ "type='signal', "
+ "interface='" DBUS_INTERFACE_DBUS "', "
+ "sender='" DBUS_SERVICE_DBUS "', "
+ "path='" DBUS_PATH_DBUS "'",
+ &error);
+
+ if (dbus_error_is_set (&error))
+ goto fail;
- dbus_bus_add_match (tmp->bus,
- "type='signal', "
- "interface='" DBUS_INTERFACE_DBUS "', "
- "sender='" DBUS_SERVICE_DBUS "', "
- "path='" DBUS_PATH_DBUS "'",
- &error);
+ dbus_bus_add_match (
+ client->bus,
+ "type='signal', "
+ "interface='" DBUS_INTERFACE_LOCAL "'",
+ &error);
if (dbus_error_is_set (&error))
- {
- fprintf (stderr, "Error adding filter match: %s\n", error.message);
+ goto fail;
+
+ if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) ||
+ dbus_error_is_set(&error)) {
+
+ /* We free the error so its not set, that way the fail target
+ * will return the NO_DAEMON error rather than a DBUS error */
dbus_error_free (&error);
+
+ if (ret_error)
+ *ret_error = AVAHI_ERR_NO_DAEMON;
+
goto fail;
}
- tmp->callback = callback;
- tmp->user_data = user_data;
+ if (check_version(client, ret_error) < 0)
+ goto fail;
- avahi_client_schedule_state_request (tmp);
+ if (get_server_state(client, ret_error) < 0)
+ goto fail;
- avahi_client_set_errno (tmp, AVAHI_OK);
- return tmp;
+ return client;
fail:
- if (tmp) free (tmp);
+
+ if (client)
+ avahi_client_free(client);
+
+ if (dbus_error_is_set(&error)) {
+
+ if (ret_error)
+ *ret_error = avahi_error_dbus_to_number(error.name);
+
+ dbus_error_free(&error);
+ }
+
return NULL;
}
-static char*
-avahi_client_get_string_reply_and_block (AvahiClient *client, char *method, char *param)
-{
- DBusMessage *message;
- DBusMessage *reply;
+void avahi_client_free(AvahiClient *client) {
+ assert(client);
+
+ while (client->groups)
+ avahi_entry_group_free(client->groups);
+
+ while (client->domain_browsers)
+ avahi_domain_browser_free(client->domain_browsers);
+
+ while (client->service_browsers)
+ avahi_service_browser_free(client->service_browsers);
+
+ 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);
+ }
+
+ avahi_free(client->version_string);
+ avahi_free(client->host_name);
+ avahi_free(client->host_name_fqdn);
+ avahi_free(client->domain_name);
+
+ avahi_free(client);
+}
+
+static char* avahi_client_get_string_reply_and_block (AvahiClient *client, const char *method, const char *param) {
+ DBusMessage *message = NULL, *reply = NULL;
DBusError error;
- char *ret, *new;
+ char *ret, *n;
- if (client == NULL || method == NULL) return NULL;
+ assert(client);
+ assert(method);
dbus_error_init (&error);
- message = dbus_message_new_method_call (AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, method);
+ if (!(message = dbus_message_new_method_call (AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, method))) {
+ avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY);
+ goto fail;
+ }
- if (param != NULL)
- {
- if (!dbus_message_append_args (message, DBUS_TYPE_STRING, ¶m, DBUS_TYPE_INVALID))
- {
- avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
- fprintf (stderr, "Failed to append string argument to %s message\n", method);
- return NULL;
+ if (param) {
+ if (!dbus_message_append_args (message, DBUS_TYPE_STRING, ¶m, DBUS_TYPE_INVALID)) {
+ avahi_client_set_errno (client, AVAHI_ERR_NO_MEMORY);
+ goto fail;
}
}
reply = dbus_connection_send_with_reply_and_block (client->bus, message, -1, &error);
- if (dbus_error_is_set (&error))
- {
- fprintf (stderr, "Error sending %s message: %s\n", method, error.message);
- dbus_error_free (&error);
- dbus_message_unref (message);
+ if (!reply || dbus_error_is_set (&error))
+ goto fail;
- avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
- return NULL;
+ if (!dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &ret, DBUS_TYPE_INVALID) ||
+ dbus_error_is_set (&error))
+ goto fail;
+
+ if (!(n = avahi_strdup(ret))) {
+ avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY);
+ goto fail;
}
- if (reply == NULL)
- {
- dbus_message_unref (message);
- fprintf (stderr, "Could not connect to Avahi daemon\n");
+ dbus_message_unref(message);
+ dbus_message_unref(reply);
+
+ return n;
- avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
+fail:
+
+ if (message)
+ dbus_message_unref(message);
+ if (reply)
+ dbus_message_unref(reply);
+
+ if (dbus_error_is_set(&error)) {
+ avahi_client_set_dbus_error(client, &error);
+ dbus_error_free(&error);
+ }
+
+ return NULL;
+}
+
+const char* avahi_client_get_version_string (AvahiClient *client) {
+ assert(client);
+
+ if (client->state == AVAHI_CLIENT_DISCONNECTED) {
+ avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE);
return NULL;
}
- dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &ret, DBUS_TYPE_INVALID);
+ if (!client->version_string)
+ client->version_string = avahi_client_get_string_reply_and_block(client, "GetVersionString", NULL);
- if (dbus_error_is_set (&error))
- {
- fprintf (stderr, "Failed to parse %s reply: %s\n", method, error.message);
- dbus_error_free (&error);
+ return client->version_string;
+}
+
+const char* avahi_client_get_domain_name (AvahiClient *client) {
+ assert(client);
+
+ if (client->state == AVAHI_CLIENT_DISCONNECTED) {
+ avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE);
+ return NULL;
+ }
+
+ if (!client->domain_name)
+ client->domain_name = avahi_client_get_string_reply_and_block(client, "GetDomainName", NULL);
+
+ return client->domain_name;
+}
- avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
+const char* avahi_client_get_host_name (AvahiClient *client) {
+ assert(client);
+
+ if (client->state == AVAHI_CLIENT_DISCONNECTED) {
+ avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE);
return NULL;
}
- new = strdup (ret);
+ if (!client->host_name)
+ client->host_name = avahi_client_get_string_reply_and_block(client, "GetHostName", NULL);
+
+ return client->host_name;
+}
+
+const char* avahi_client_get_host_name_fqdn (AvahiClient *client) {
+ assert(client);
- avahi_client_set_errno (client, AVAHI_OK);
- return new;
+ if (client->state == AVAHI_CLIENT_DISCONNECTED) {
+ avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE);
+ return NULL;
+ }
+
+ if (!client->host_name_fqdn)
+ client->host_name_fqdn = avahi_client_get_string_reply_and_block(client, "GetHostNameFqdn", NULL);
+
+ return client->host_name_fqdn;
}
-char*
-avahi_client_get_version_string (AvahiClient *client)
-{
- return avahi_client_get_string_reply_and_block (client, "GetVersionString", NULL);
+AvahiClientState avahi_client_get_state(AvahiClient *client) {
+ assert(client);
+
+ return client->state;
}
-char*
-avahi_client_get_domain_name (AvahiClient *client)
-{
- return avahi_client_get_string_reply_and_block (client, "GetDomainName", NULL);
+int avahi_client_errno(AvahiClient *client) {
+ assert(client);
+
+ return client->error;
}
-char*
-avahi_client_get_host_name (AvahiClient *client)
-{
- return avahi_client_get_string_reply_and_block (client, "GetHostName", NULL);
+/* Just for internal use */
+int avahi_client_simple_method_call(AvahiClient *client, const char *path, const char *interface, const char *method) {
+ DBusMessage *message = NULL, *reply = NULL;
+ DBusError error;
+ int r = AVAHI_OK;
+
+ dbus_error_init(&error);
+
+ assert(client);
+ assert(path);
+ assert(interface);
+ assert(method);
+
+ if (!(message = dbus_message_new_method_call(AVAHI_DBUS_NAME, path, interface, method))) {
+ r = avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY);
+ goto fail;
+ }
+
+ if (!(reply = dbus_connection_send_with_reply_and_block(client->bus, message, -1, &error)) ||
+ dbus_error_is_set (&error)) {
+ r = avahi_client_set_errno(client, AVAHI_ERR_DBUS_ERROR);
+ goto fail;
+ }
+
+ if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INVALID) ||
+ dbus_error_is_set (&error)) {
+ r = avahi_client_set_errno(client, AVAHI_ERR_DBUS_ERROR);
+ goto fail;
+ }
+
+ dbus_message_unref(message);
+ dbus_message_unref(reply);
+
+ return AVAHI_OK;
+
+fail:
+ if (dbus_error_is_set(&error)) {
+ r = avahi_client_set_dbus_error(client, &error);
+ dbus_error_free(&error);
+ }
+
+ if (message)
+ dbus_message_unref(message);
+
+ if (reply)
+ dbus_message_unref(reply);
+
+ return r;
}
-char*
-avahi_client_get_host_name_fqdn (AvahiClient *client)
-{
- return avahi_client_get_string_reply_and_block (client, "GetHostNameFqdn", NULL);
+uint32_t avahi_client_get_local_service_cookie(AvahiClient *client) {
+ DBusMessage *message = NULL, *reply = NULL;
+ DBusError error;
+ assert(client);
+
+ if (client->state == AVAHI_CLIENT_DISCONNECTED) {
+ avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE);
+ return AVAHI_SERVICE_COOKIE_INVALID;
+ }
+
+ if (client->local_service_cookie_valid)
+ return client->local_service_cookie;
+
+ dbus_error_init (&error);
+
+ if (!(message = dbus_message_new_method_call(AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, "GetLocalServiceCookie"))) {
+ avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY);
+ goto fail;
+ }
+
+ reply = dbus_connection_send_with_reply_and_block (client->bus, message, -1, &error);
+
+ if (!reply || dbus_error_is_set (&error))
+ goto fail;
+
+ if (!dbus_message_get_args (reply, &error, DBUS_TYPE_UINT32, &client->local_service_cookie, DBUS_TYPE_INVALID) ||
+ dbus_error_is_set (&error))
+ goto fail;
+
+ dbus_message_unref(message);
+ dbus_message_unref(reply);
+
+ client->local_service_cookie_valid = 1;
+ return client->local_service_cookie;
+
+fail:
+
+ if (message)
+ dbus_message_unref(message);
+ if (reply)
+ dbus_message_unref(reply);
+
+ if (dbus_error_is_set(&error)) {
+ avahi_client_set_dbus_error(client, &error);
+ dbus_error_free(&error);
+ }
+
+ return AVAHI_SERVICE_COOKIE_INVALID;
}
projects / catta / blobdiff