X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fclient.c;h=49c82d53d086cc8061eee0069f2be1868f891473;hb=c3d36ee186b5fb24480590080215f7e14ee0f6a6;hp=6ff099a662bb919d658a05348fe79eaba5372a1c;hpb=98d4644e8f9445fa4cf7395b05a9f860b8f3cb9c;p=catta diff --git a/avahi-client/client.c b/avahi-client/client.c index 6ff099a..49c82d5 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -1,8 +1,34 @@ +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include +#include +#include #include #include -#include #include #define DBUS_API_SUBJECT_TO_CHANGE @@ -11,19 +37,84 @@ #include -struct _AvahiClientPriv +#include "client.h" +#include "internal.h" + +int +avahi_client_set_errno (AvahiClient *client, int error) +{ + if (client == NULL) return error; + + client->error = error; + + return 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); +} + +void +avahi_client_state_request_callback (DBusPendingCall *call, void *data) { - DBusConnection *bus; -}; + AvahiClient *client = data; + DBusError error; + DBusMessage *reply; + int state, type; + + dbus_error_init (&error); + + reply = dbus_pending_call_steal_reply (call); + + type = dbus_message_get_type (reply); + + 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); + } + + dbus_pending_call_unref (call); +} + +void +avahi_client_schedule_state_request (AvahiClient *client) +{ + DBusMessage *message; + DBusPendingCall *pcall; + + if (client == NULL) return; + + message = dbus_message_new_method_call (AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, "GetState"); + + dbus_connection_send_with_reply (client->bus, message, &pcall, -1); + + dbus_pending_call_set_notify (pcall, avahi_client_state_request_callback, client, NULL); +} static DBusHandlerResult filter_func (DBusConnection *bus, DBusMessage *message, void *data) { + AvahiClient *client = data; DBusError error; - g_assert (bus != NULL); - g_assert (message != NULL); - printf ("dbus: interface=%s, path=%s, member=%s\n", dbus_message_get_interface (message), dbus_message_get_path (message), @@ -41,83 +132,137 @@ filter_func (DBusConnection *bus, DBusMessage *message, void *data) goto out; } - if (strcmp (name, AVAHI_DBUS_NAME) < 0) { + if (strcmp (name, AVAHI_DBUS_NAME) == 0) { + if (old == NULL && new != NULL) { - fprintf(stderr, "Avahi Daemon reconnected\n"); + 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 */ } } - - return DBUS_HANDLER_RESULT_HANDLED; + } else if (dbus_message_is_signal (message, AVAHI_DBUS_NAME, "StateChanged")) { + printf ("server statehcange\n"); + } 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; + 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; + } + printf ("statechange (%s) to %d\n", group->path, state); + avahi_entry_group_state_change (group, 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")) { + 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")) { + return avahi_service_type_browser_event (client, AVAHI_BROWSER_REMOVE, message); } + return DBUS_HANDLER_RESULT_HANDLED; + out: return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } -static int _dbus_add_match (DBusConnection *bus, char *type, char *interface, char *sender, char *path) -{ - DBusError error; - char *filter; - - g_assert (bus != NULL); - - dbus_error_init (&error); - filter = g_strdup_printf ("type='%s', interface='%s', sender='%s', path='%s'", type, interface, sender, path); - dbus_bus_add_match (bus, filter, &error); - g_free (filter); - - if (dbus_error_is_set (&error)) - { - fprintf (stderr, "Error adding filter match: %s\n", error.message); - dbus_error_free (&error); - return FALSE; - } - - return TRUE; -} - AvahiClient * -avahi_client_new () +avahi_client_new (AvahiClientCallback callback, void *user_data) { - AvahiClient *tmp; + AvahiClient *tmp = NULL; DBusError error; - tmp = malloc (sizeof (AvahiClient)); - tmp->priv = malloc (sizeof (AvahiClientPriv)); - - g_assert (tmp != NULL); - g_assert (tmp->priv != NULL); - dbus_error_init (&error); - tmp->priv->bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error); + if (!(tmp = malloc(sizeof(AvahiClient)))) + goto fail; - dbus_connection_setup_with_g_main (tmp->priv->bus, NULL); + AVAHI_LLIST_HEAD_INIT(AvahiEntryGroup, tmp->groups); + AVAHI_LLIST_HEAD_INIT(AvahiDomainBrowser, tmp->domain_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiServieTypeBrowser, tmp->service_type_browsers); + + tmp->bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error); if (dbus_error_is_set (&error)) { fprintf(stderr, "Error getting system d-bus: %s\n", error.message); - dbus_error_free (&error); goto fail; } - dbus_connection_set_exit_on_disconnect (tmp->priv->bus, FALSE); + dbus_connection_setup_with_g_main (tmp->bus, NULL); + dbus_connection_set_exit_on_disconnect (tmp->bus, FALSE); - if (!dbus_connection_add_filter (tmp->priv->bus, filter_func, tmp, NULL)) + if (!dbus_connection_add_filter (tmp->bus, filter_func, tmp, NULL)) { fprintf (stderr, "Failed to add d-bus filter\n"); goto fail; } - if (!_dbus_add_match (tmp->priv->bus, "signal", AVAHI_DBUS_INTERFACE_SERVER, AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER)) goto fail; - if (!_dbus_add_match (tmp->priv->bus, "signal", DBUS_INTERFACE_DBUS, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS)) 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_error_is_set (&error)) + { + fprintf (stderr, "Error adding filter match: %s\n", error.message); + goto fail; + + } + dbus_bus_add_match (tmp->bus, + "type='signal', " + "interface='" DBUS_INTERFACE_DBUS "', " + "sender='" DBUS_SERVICE_DBUS "', " + "path='" DBUS_PATH_DBUS "'", + &error); + + if (dbus_error_is_set (&error)) + { + fprintf (stderr, "Error adding filter match: %s\n", error.message); + goto fail; + } + + tmp->callback = callback; + tmp->user_data = user_data; + + avahi_client_schedule_state_request (tmp); + + avahi_client_set_errno (tmp, AVAHI_OK); return tmp; fail: - if (tmp->priv) free (tmp->priv); - if (tmp) free (tmp); + free (tmp); + + if (dbus_error_is_set(&error)) + dbus_error_free(&error); + return NULL; } @@ -127,32 +272,33 @@ avahi_client_get_string_reply_and_block (AvahiClient *client, char *method, char DBusMessage *message; DBusMessage *reply; DBusError error; - char *ret; + char *ret, *new; - g_assert (client != NULL); - g_assert (method != NULL); + if (client == NULL || method == NULL) return NULL; dbus_error_init (&error); message = dbus_message_new_method_call (AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, method); - fprintf (stderr, "message = dbus_message_new_method_call (%s, %s, %s, %s)\n", AVAHI_DBUS_NAME, AVAHI_DBUS_PATH_SERVER, AVAHI_DBUS_INTERFACE_SERVER, method); 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; } } - reply = dbus_connection_send_with_reply_and_block (client->priv->bus, message, -1, &error); + 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); + + avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); return NULL; } @@ -160,19 +306,26 @@ avahi_client_get_string_reply_and_block (AvahiClient *client, char *method, char { dbus_message_unref (message); fprintf (stderr, "Could not connect to Avahi daemon\n"); + + avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); return NULL; } - dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &ret); + dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &ret, DBUS_TYPE_INVALID); if (dbus_error_is_set (&error)) { fprintf (stderr, "Failed to parse %s reply: %s\n", method, error.message); dbus_error_free (&error); + + avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR); return NULL; } - return ret; + new = strdup (ret); + + avahi_client_set_errno (client, AVAHI_OK); + return new; } char* @@ -198,15 +351,3 @@ avahi_client_get_host_name_fqdn (AvahiClient *client) { return avahi_client_get_string_reply_and_block (client, "GetHostNameFqdn", NULL); } - -char* -avahi_client_get_alternative_host_name (AvahiClient *client, char *host) -{ - return avahi_client_get_string_reply_and_block (client, "GetAlternativeHostName", host); -} - -char* -avahi_client_get_alternative_service_name (AvahiClient *client, char *service) -{ - return avahi_client_get_string_reply_and_block (client, "GetAlternativeServiceName", service); -}