From 4e2113a7d5b702ff070e8220b32662bb00ae02dd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 6 Nov 2005 16:12:03 +0000 Subject: * Rename AVAHI_ERR_NOT_CONNECTED to AVAHI_ERR_DISCONNECTED * Remove client state AVAHI_CLIENT_DISCONNECTED and replace it with AVAHI_CLIENT_FAILURE with error code set to AVAHI_ERR_DISCONNECTED git-svn-id: file:///home/lennart/svn/public/avahi/trunk@935 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/browser.c | 12 ++++++------ avahi-client/client.c | 26 ++++++++++++++------------ avahi-client/client.h | 3 +-- avahi-client/entrygroup.c | 20 ++++++++++---------- avahi-client/resolver.c | 12 ++++++------ 5 files changed, 37 insertions(+), 36 deletions(-) (limited to 'avahi-client') diff --git a/avahi-client/browser.c b/avahi-client/browser.c index 1ac2e20..bf9c15f 100644 --- a/avahi-client/browser.c +++ b/avahi-client/browser.c @@ -125,7 +125,7 @@ AvahiDomainBrowser* avahi_domain_browser_new( dbus_error_init (&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -248,7 +248,7 @@ int avahi_domain_browser_free (AvahiDomainBrowser *b) { client = b->client; - if (b->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (b->path && client->state != AVAHI_CLIENT_FAILURE) r = avahi_client_simple_method_call(client, b->path, AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "Free"); AVAHI_LLIST_REMOVE(AvahiDomainBrowser, domain_browsers, client->domain_browsers, b); @@ -367,7 +367,7 @@ AvahiServiceTypeBrowser* avahi_service_type_browser_new( dbus_error_init(&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -473,7 +473,7 @@ int avahi_service_type_browser_free (AvahiServiceTypeBrowser *b) { assert(b); client = b->client; - if (b->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (b->path && client->state != AVAHI_CLIENT_FAILURE) r = avahi_client_simple_method_call(client, b->path, AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "Free"); AVAHI_LLIST_REMOVE(AvahiServiceTypeBrowser, service_type_browsers, b->client->service_type_browsers, b); @@ -583,7 +583,7 @@ AvahiServiceBrowser* avahi_service_browser_new( dbus_error_init(&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -694,7 +694,7 @@ int avahi_service_browser_free (AvahiServiceBrowser *b) { assert(b); client = b->client; - if (b->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (b->path && client->state != AVAHI_CLIENT_FAILURE) r = avahi_client_simple_method_call(client, b->path, AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Free"); AVAHI_LLIST_REMOVE(AvahiServiceBrowser, service_browsers, b->client->service_browsers, b); diff --git a/avahi-client/client.c b/avahi-client/client.c index d4faed0..ef77366 100644 --- a/avahi-client/client.c +++ b/avahi-client/client.c @@ -61,7 +61,6 @@ static void client_set_state (AvahiClient *client, AvahiServerState state) { client->state = state; switch (client->state) { - case AVAHI_CLIENT_DISCONNECTED: case AVAHI_CLIENT_FAILURE: if (client->bus) { dbus_connection_disconnect(client->bus); @@ -107,13 +106,14 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, /* dbus_message_get_path (message), */ /* dbus_message_get_member (message)); */ - if (client->state == AVAHI_CLIENT_DISCONNECTED) + if (client->state == AVAHI_CLIENT_FAILURE) goto fail; if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) { /* The DBUS server died or kicked us */ - client_set_state(client, AVAHI_CLIENT_DISCONNECTED); + avahi_client_set_errno(client, AVAHI_ERR_DISCONNECTED); + client_set_state(client, AVAHI_CLIENT_FAILURE); } if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) { char *name, *old, *new; @@ -129,13 +129,15 @@ static DBusHandlerResult filter_func(DBusConnection *bus, DBusMessage *message, goto fail; } - if (strcmp(name, AVAHI_DBUS_NAME) == 0) + if (strcmp(name, AVAHI_DBUS_NAME) == 0) { /* 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); + + avahi_client_set_errno(client, AVAHI_ERR_DISCONNECTED); + client_set_state(client, AVAHI_CLIENT_FAILURE); + } } else if (dbus_message_is_signal (message, AVAHI_DBUS_INTERFACE_SERVER, "StateChanged")) { int32_t state; @@ -387,7 +389,7 @@ AvahiClient *avahi_client_new(const AvahiPoll *poll_api, AvahiClientCallback cal client->error = AVAHI_OK; client->callback = callback; client->userdata = userdata; - client->state = AVAHI_CLIENT_DISCONNECTED; + client->state = AVAHI_CLIENT_FAILURE; client->host_name = NULL; client->host_name_fqdn = NULL; @@ -577,7 +579,7 @@ fail: const char* avahi_client_get_version_string (AvahiClient *client) { assert(client); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); return NULL; } @@ -591,7 +593,7 @@ const char* avahi_client_get_version_string (AvahiClient *client) { const char* avahi_client_get_domain_name (AvahiClient *client) { assert(client); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); return NULL; } @@ -605,7 +607,7 @@ const char* avahi_client_get_domain_name (AvahiClient *client) { const char* avahi_client_get_host_name (AvahiClient *client) { assert(client); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); return NULL; } @@ -619,7 +621,7 @@ const char* avahi_client_get_host_name (AvahiClient *client) { const char* avahi_client_get_host_name_fqdn (AvahiClient *client) { assert(client); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); return NULL; } @@ -697,7 +699,7 @@ uint32_t avahi_client_get_local_service_cookie(AvahiClient *client) { DBusError error; assert(client); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); return AVAHI_SERVICE_COOKIE_INVALID; } diff --git a/avahi-client/client.h b/avahi-client/client.h index 36bf7cd..3e18fca 100644 --- a/avahi-client/client.h +++ b/avahi-client/client.h @@ -46,8 +46,7 @@ typedef enum { AVAHI_CLIENT_S_REGISTERING = AVAHI_SERVER_REGISTERING, /**< Server state: REGISTERING */ AVAHI_CLIENT_S_RUNNING = AVAHI_SERVER_RUNNING, /**< Server state: RUNNING */ AVAHI_CLIENT_S_COLLISION = AVAHI_SERVER_COLLISION, /**< Server state: COLLISION */ - AVAHI_CLIENT_DISCONNECTED = 100, /**< Lost DBUS connection to the Avahi daemon */ - AVAHI_CLIENT_FAILURE = 101 /**< Some kind of error happened on the client side */ + AVAHI_CLIENT_FAILURE = 100 /**< Some kind of error happened on the client side */ } AvahiClientState; /** The function prototype for the callback of an AvahiClient */ diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c index 50afb12..4c5c914 100644 --- a/avahi-client/entrygroup.c +++ b/avahi-client/entrygroup.c @@ -111,7 +111,7 @@ AvahiEntryGroup* avahi_entry_group_new (AvahiClient *client, AvahiEntryGroupCall dbus_error_init (&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -237,7 +237,7 @@ int avahi_entry_group_free(AvahiEntryGroup *group) { assert(group); - if (group->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (group->path && client->state != AVAHI_CLIENT_FAILURE) r = entry_group_simple_method_call(group, "Free"); AVAHI_LLIST_REMOVE(AvahiEntryGroup, groups, client->groups, group); @@ -251,7 +251,7 @@ int avahi_entry_group_free(AvahiEntryGroup *group) { int avahi_entry_group_commit(AvahiEntryGroup *group) { assert(group); - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); return entry_group_simple_method_call(group, "Commit"); @@ -260,7 +260,7 @@ int avahi_entry_group_commit(AvahiEntryGroup *group) { int avahi_entry_group_reset(AvahiEntryGroup *group) { assert(group); - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); return entry_group_simple_method_call(group, "Reset"); @@ -288,7 +288,7 @@ int avahi_entry_group_is_empty (AvahiEntryGroup *group) { assert(group); client = group->client; - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); dbus_error_init(&error); @@ -409,7 +409,7 @@ int avahi_entry_group_add_service_strlst( client = group->client; - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); if (!domain) @@ -528,7 +528,7 @@ int avahi_entry_group_add_service_subtype( client = group->client; - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); if (!domain) @@ -638,7 +638,7 @@ int avahi_entry_group_update_service_txt_strlst( client = group->client; - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); if (!domain) @@ -726,7 +726,7 @@ int avahi_entry_group_add_address( client = group->client; - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); dbus_error_init(&error); @@ -815,7 +815,7 @@ int avahi_entry_group_add_record( client = group->client; - if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED) + if (!group->path || group->client->state == AVAHI_CLIENT_FAILURE) return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE); dbus_error_init(&error); diff --git a/avahi-client/resolver.c b/avahi-client/resolver.c index d06c43c..2301134 100644 --- a/avahi-client/resolver.c +++ b/avahi-client/resolver.c @@ -209,7 +209,7 @@ AvahiServiceResolver * avahi_service_resolver_new( dbus_error_init (&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -331,7 +331,7 @@ int avahi_service_resolver_free(AvahiServiceResolver *r) { assert(r); client = r->client; - if (r->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (r->path && client->state != AVAHI_CLIENT_FAILURE) ret = avahi_client_simple_method_call(client, r->path, AVAHI_DBUS_INTERFACE_SERVICE_RESOLVER, "Free"); AVAHI_LLIST_REMOVE(AvahiServiceResolver, service_resolvers, client->service_resolvers, r); @@ -446,7 +446,7 @@ AvahiHostNameResolver * avahi_host_name_resolver_new( dbus_error_init (&error); - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -546,7 +546,7 @@ int avahi_host_name_resolver_free(AvahiHostNameResolver *r) { assert(r); client = r->client; - if (r->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (r->path && client->state != AVAHI_CLIENT_FAILURE) ret = avahi_client_simple_method_call(client, r->path, AVAHI_DBUS_INTERFACE_HOST_NAME_RESOLVER, "Free"); AVAHI_LLIST_REMOVE(AvahiHostNameResolver, host_name_resolvers, client->host_name_resolvers, r); @@ -669,7 +669,7 @@ AvahiAddressResolver * avahi_address_resolver_new( return NULL; } - if (client->state == AVAHI_CLIENT_DISCONNECTED) { + if (client->state == AVAHI_CLIENT_FAILURE) { avahi_client_set_errno(client, AVAHI_ERR_BAD_STATE); goto fail; } @@ -768,7 +768,7 @@ int avahi_address_resolver_free(AvahiAddressResolver *r) { assert(r); client = r->client; - if (r->path && client->state != AVAHI_CLIENT_DISCONNECTED) + if (r->path && client->state != AVAHI_CLIENT_FAILURE) ret = avahi_client_simple_method_call(client, r->path, AVAHI_DBUS_INTERFACE_ADDRESS_RESOLVER, "Free"); AVAHI_LLIST_REMOVE(AvahiAddressResolver, address_resolvers, client->address_resolvers, r); -- cgit