dbus_error_init (&error);
- 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));
+/* 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)); */
if (client->state == AVAHI_CLIENT_DISCONNECTED)
goto fail;
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_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_BROWSER, "ItemNew")) {
+
+ 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")) {
+ else if (dbus_message_is_signal(message, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "ItemRemove"))
return avahi_service_browser_event (client, AVAHI_BROWSER_REMOVE, message);
- }
return DBUS_HANDLER_RESULT_HANDLED;
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);
- client->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
- if (!client->bus || dbus_error_is_set (&error))
+ if (!(client->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error)) ||
+ dbus_error_is_set (&error))
goto fail;
if (avahi_dbus_connection_glue(client->bus, poll_api) < 0) {
if (dbus_error_is_set (&error))
goto fail;
- if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error))) {
+ if (!(dbus_bus_name_has_owner(client->bus, AVAHI_DBUS_NAME, &error)) ||
+ dbus_error_is_set(&error)) {
if (ret_error)
*ret_error = AVAHI_ERR_NO_DAEMON;
void avahi_client_free(AvahiClient *client) {
assert(client);
- if (client->bus) {
- dbus_connection_disconnect(client->bus);
- dbus_connection_unref(client->bus);
- }
-
while (client->groups)
avahi_entry_group_free(client->groups);
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);