#include <dbus/dbus.h>
+#include <avahi-common/dbus.h>
#include <avahi-common/llist.h>
#include <avahi-common/malloc.h>
#include <avahi-common/dbus.h>
#include <avahi-common/dbus-watch-glue.h>
+#include <avahi-common/alternative.h>
+#include <avahi-common/error.h>
#include <avahi-core/log.h>
#include <avahi-core/core.h>
typedef struct Server Server;
typedef struct Client Client;
typedef struct EntryGroupInfo EntryGroupInfo;
-typedef struct HostNameResolverInfo HostNameResolverInfo;
-typedef struct AddressResolverInfo AddressResolverInfo;
+typedef struct SyncHostNameResolverInfo SyncHostNameResolverInfo;
+typedef struct AsyncHostNameResolverInfo AsyncHostNameResolverInfo;
+typedef struct SyncAddressResolverInfo SyncAddressResolverInfo;
+typedef struct AsyncAddressResolverInfo AsyncAddressResolverInfo;
typedef struct DomainBrowserInfo DomainBrowserInfo;
typedef struct ServiceTypeBrowserInfo ServiceTypeBrowserInfo;
typedef struct ServiceBrowserInfo ServiceBrowserInfo;
-typedef struct ServiceResolverInfo ServiceResolverInfo;
+typedef struct SyncServiceResolverInfo SyncServiceResolverInfo;
+typedef struct AsyncServiceResolverInfo AsyncServiceResolverInfo;
#define MAX_CLIENTS 20
#define MAX_OBJECTS_PER_CLIENT 50
AVAHI_LLIST_FIELDS(EntryGroupInfo, entry_groups);
};
-struct HostNameResolverInfo {
+struct SyncHostNameResolverInfo {
Client *client;
AvahiSHostNameResolver *host_name_resolver;
DBusMessage *message;
- AVAHI_LLIST_FIELDS(HostNameResolverInfo, host_name_resolvers);
+ AVAHI_LLIST_FIELDS(SyncHostNameResolverInfo, sync_host_name_resolvers);
};
-struct AddressResolverInfo {
+struct AsyncHostNameResolverInfo {
+ unsigned id;
+ Client *client;
+ AvahiSHostNameResolver *host_name_resolver;
+ char *path;
+
+ AVAHI_LLIST_FIELDS(AsyncHostNameResolverInfo, async_host_name_resolvers);
+};
+
+struct SyncAddressResolverInfo {
Client *client;
AvahiSAddressResolver *address_resolver;
DBusMessage *message;
- AVAHI_LLIST_FIELDS(AddressResolverInfo, address_resolvers);
+ AVAHI_LLIST_FIELDS(SyncAddressResolverInfo, sync_address_resolvers);
+};
+
+struct AsyncAddressResolverInfo {
+ unsigned id;
+ Client *client;
+ AvahiSAddressResolver *address_resolver;
+ char *path;
+
+ AVAHI_LLIST_FIELDS(AsyncAddressResolverInfo, async_address_resolvers);
};
struct DomainBrowserInfo {
AVAHI_LLIST_FIELDS(ServiceBrowserInfo, service_browsers);
};
-struct ServiceResolverInfo {
+struct SyncServiceResolverInfo {
Client *client;
AvahiSServiceResolver *service_resolver;
DBusMessage *message;
- AVAHI_LLIST_FIELDS(ServiceResolverInfo, service_resolvers);
+ AVAHI_LLIST_FIELDS(SyncServiceResolverInfo, sync_service_resolvers);
+};
+
+struct AsyncServiceResolverInfo {
+ unsigned id;
+ Client *client;
+ AvahiSServiceResolver *service_resolver;
+ char *path;
+
+ AVAHI_LLIST_FIELDS(AsyncServiceResolverInfo, async_service_resolvers);
};
struct Client {
AVAHI_LLIST_FIELDS(Client, clients);
AVAHI_LLIST_HEAD(EntryGroupInfo, entry_groups);
- AVAHI_LLIST_HEAD(HostNameResolverInfo, host_name_resolvers);
- AVAHI_LLIST_HEAD(AddressResolverInfo, address_resolvers);
+ AVAHI_LLIST_HEAD(SyncHostNameResolverInfo, sync_host_name_resolvers);
+ AVAHI_LLIST_HEAD(AsyncHostNameResolverInfo, async_host_name_resolvers);
+ AVAHI_LLIST_HEAD(SyncAddressResolverInfo, sync_address_resolvers);
+ AVAHI_LLIST_HEAD(AsyncAddressResolverInfo, async_address_resolvers);
AVAHI_LLIST_HEAD(DomainBrowserInfo, domain_browsers);
AVAHI_LLIST_HEAD(ServiceTypeBrowserInfo, service_type_browsers);
AVAHI_LLIST_HEAD(ServiceBrowserInfo, service_browsers);
- AVAHI_LLIST_HEAD(ServiceResolverInfo, service_resolvers);
+ AVAHI_LLIST_HEAD(SyncServiceResolverInfo, sync_service_resolvers);
+ AVAHI_LLIST_HEAD(AsyncServiceResolverInfo, async_service_resolvers);
};
struct Server {
avahi_free(i);
}
-static void host_name_resolver_free(HostNameResolverInfo *i) {
+static void sync_host_name_resolver_free(SyncHostNameResolverInfo *i) {
assert(i);
if (i->host_name_resolver)
avahi_s_host_name_resolver_free(i->host_name_resolver);
dbus_message_unref(i->message);
- AVAHI_LLIST_REMOVE(HostNameResolverInfo, host_name_resolvers, i->client->host_name_resolvers, i);
+ AVAHI_LLIST_REMOVE(SyncHostNameResolverInfo, sync_host_name_resolvers, i->client->sync_host_name_resolvers, i);
i->client->n_objects--;
assert(i->client->n_objects >= 0);
avahi_free(i);
}
-static void address_resolver_free(AddressResolverInfo *i) {
+static void async_host_name_resolver_free(AsyncHostNameResolverInfo *i) {
+ assert(i);
+
+ if (i->host_name_resolver)
+ avahi_s_host_name_resolver_free(i->host_name_resolver);
+ dbus_connection_unregister_object_path(server->bus, i->path);
+ AVAHI_LLIST_REMOVE(AsyncHostNameResolverInfo, async_host_name_resolvers, i->client->async_host_name_resolvers, i);
+
+ i->client->n_objects--;
+ assert(i->client->n_objects >= 0);
+
+ avahi_free(i);
+}
+
+static void sync_address_resolver_free(SyncAddressResolverInfo *i) {
assert(i);
if (i->address_resolver)
avahi_s_address_resolver_free(i->address_resolver);
dbus_message_unref(i->message);
- AVAHI_LLIST_REMOVE(AddressResolverInfo, address_resolvers, i->client->address_resolvers, i);
+ AVAHI_LLIST_REMOVE(SyncAddressResolverInfo, sync_address_resolvers, i->client->sync_address_resolvers, i);
+
+ i->client->n_objects--;
+ assert(i->client->n_objects >= 0);
+
+ avahi_free(i);
+}
+
+static void async_address_resolver_free(AsyncAddressResolverInfo *i) {
+ assert(i);
+
+ if (i->address_resolver)
+ avahi_s_address_resolver_free(i->address_resolver);
+ dbus_connection_unregister_object_path(server->bus, i->path);
+ AVAHI_LLIST_REMOVE(AsyncAddressResolverInfo, async_address_resolvers, i->client->async_address_resolvers, i);
i->client->n_objects--;
assert(i->client->n_objects >= 0);
avahi_free(i);
}
-static void service_resolver_free(ServiceResolverInfo *i) {
+static void sync_service_resolver_free(SyncServiceResolverInfo *i) {
assert(i);
if (i->service_resolver)
avahi_s_service_resolver_free(i->service_resolver);
dbus_message_unref(i->message);
- AVAHI_LLIST_REMOVE(ServiceResolverInfo, service_resolvers, i->client->service_resolvers, i);
+ AVAHI_LLIST_REMOVE(SyncServiceResolverInfo, sync_service_resolvers, i->client->sync_service_resolvers, i);
+
+ i->client->n_objects--;
+ assert(i->client->n_objects >= 0);
+
+ avahi_free(i);
+}
+
+static void async_service_resolver_free(AsyncServiceResolverInfo *i) {
+ assert(i);
+
+ if (i->service_resolver)
+ avahi_s_service_resolver_free(i->service_resolver);
+
+ dbus_connection_unregister_object_path(server->bus, i->path);
+ AVAHI_LLIST_REMOVE(AsyncServiceResolverInfo, async_service_resolvers, i->client->async_service_resolvers, i);
i->client->n_objects--;
assert(i->client->n_objects >= 0);
while (c->entry_groups)
entry_group_free(c->entry_groups);
- while (c->host_name_resolvers)
- host_name_resolver_free(c->host_name_resolvers);
+ while (c->sync_host_name_resolvers)
+ sync_host_name_resolver_free(c->sync_host_name_resolvers);
+
+ while (c->async_host_name_resolvers)
+ async_host_name_resolver_free(c->async_host_name_resolvers);
+
+ while (c->sync_address_resolvers)
+ sync_address_resolver_free(c->sync_address_resolvers);
- while (c->address_resolvers)
- address_resolver_free(c->address_resolvers);
+ while (c->async_address_resolvers)
+ async_address_resolver_free(c->async_address_resolvers);
while (c->domain_browsers)
domain_browser_free(c->domain_browsers);
while (c->service_browsers)
service_browser_free(c->service_browsers);
- while (c->service_resolvers)
- service_resolver_free(c->service_resolvers);
+ while (c->sync_service_resolvers)
+ sync_service_resolver_free(c->sync_service_resolvers);
+
+ while (c->async_service_resolvers)
+ async_service_resolver_free(c->async_service_resolvers);
assert(c->n_objects == 0);
client->name = avahi_strdup(name);
client->current_id = 0;
client->n_objects = 0;
+
AVAHI_LLIST_HEAD_INIT(EntryGroupInfo, client->entry_groups);
- AVAHI_LLIST_HEAD_INIT(HostNameResolverInfo, client->host_name_resolvers);
- AVAHI_LLIST_HEAD_INIT(AddressResolverInfo, client->address_resolvers);
+ AVAHI_LLIST_HEAD_INIT(SyncHostNameResolverInfo, client->sync_host_name_resolvers);
+ AVAHI_LLIST_HEAD_INIT(AsyncHostNameResolverInfo, client->async_host_name_resolvers);
+ AVAHI_LLIST_HEAD_INIT(SyncAddressResolverInfo, client->sync_address_resolvers);
+ AVAHI_LLIST_HEAD_INIT(AsyncAddressResolverInfo, client->async_address_resolvers);
AVAHI_LLIST_HEAD_INIT(DomainBrowserInfo, client->domain_browsers);
AVAHI_LLIST_HEAD_INIT(ServiceTypeBrowserInfo, client->service_type_browsers);
AVAHI_LLIST_HEAD_INIT(ServiceBrowserInfo, client->service_browsers);
- AVAHI_LLIST_HEAD_INIT(ServiceResolverInfo, client->service_resolvers);
+ AVAHI_LLIST_HEAD_INIT(SyncServiceResolverInfo, client->sync_service_resolvers);
+ AVAHI_LLIST_HEAD_INIT(AsyncServiceResolverInfo, client->async_service_resolvers);
AVAHI_LLIST_PREPEND(Client, clients, server->clients, client);
static DBusHandlerResult respond_error(DBusConnection *c, DBusMessage *m, int error, const char *text) {
DBusMessage *reply;
- const char * const table[- AVAHI_ERR_MAX] = {
- NULL, /* OK */
- AVAHI_DBUS_ERR_FAILURE,
- AVAHI_DBUS_ERR_BAD_STATE,
- AVAHI_DBUS_ERR_INVALID_HOST_NAME,
- AVAHI_DBUS_ERR_INVALID_DOMAIN_NAME,
- AVAHI_DBUS_ERR_NO_NETWORK,
- AVAHI_DBUS_ERR_INVALID_TTL,
- AVAHI_DBUS_ERR_IS_PATTERN,
- AVAHI_DBUS_ERR_LOCAL_COLLISION,
- AVAHI_DBUS_ERR_INVALID_RECORD,
- AVAHI_DBUS_ERR_INVALID_SERVICE_NAME,
- AVAHI_DBUS_ERR_INVALID_SERVICE_TYPE,
- AVAHI_DBUS_ERR_INVALID_PORT,
- AVAHI_DBUS_ERR_INVALID_KEY,
- AVAHI_DBUS_ERR_INVALID_ADDRESS,
- AVAHI_DBUS_ERR_TIMEOUT,
- AVAHI_DBUS_ERR_TOO_MANY_CLIENTS,
- AVAHI_DBUS_ERR_TOO_MANY_OBJECTS,
- AVAHI_DBUS_ERR_TOO_MANY_ENTRIES,
- AVAHI_DBUS_ERR_OS,
- AVAHI_DBUS_ERR_ACCESS_DENIED,
- AVAHI_DBUS_ERR_INVALID_OPERATION,
- AVAHI_DBUS_ERR_DBUS_ERROR,
- AVAHI_DBUS_ERR_NOT_CONNECTED,
- AVAHI_DBUS_ERR_NO_MEMORY,
- AVAHI_DBUS_ERR_INVALID_OBJECT,
- AVAHI_DBUS_ERR_NO_DAEMON
- };
-
assert(-error > -AVAHI_OK);
assert(-error < -AVAHI_ERR_MAX);
- reply = dbus_message_new_error(m, table[-error], text ? text : avahi_strerror(error));
+ reply = dbus_message_new_error(m, avahi_error_number_to_dbus (error), text ? text : avahi_strerror(error));
dbus_connection_send(c, reply, NULL);
dbus_message_unref(reply);
}
static void host_name_resolver_callback(AvahiSHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const char *host_name, const AvahiAddress *a, void* userdata) {
- HostNameResolverInfo *i = userdata;
+ SyncHostNameResolverInfo *i = userdata;
assert(r);
assert(host_name);
respond_error(server->bus, i->message, AVAHI_ERR_TIMEOUT, NULL);
}
- host_name_resolver_free(i);
+ sync_host_name_resolver_free(i);
}
static void address_resolver_callback(AvahiSAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const AvahiAddress *address, const char *host_name, void* userdata) {
- AddressResolverInfo *i = userdata;
+ SyncAddressResolverInfo *i = userdata;
assert(r);
assert(address);
respond_error(server->bus, i->message, AVAHI_ERR_TIMEOUT, NULL);
}
- address_resolver_free(i);
+ sync_address_resolver_free(i);
}
static DBusHandlerResult msg_domain_browser_impl(DBusConnection *c, DBusMessage *m, void *userdata) {
AvahiStringList *txt,
void* userdata) {
- ServiceResolverInfo *i = userdata;
+ SyncServiceResolverInfo *i = userdata;
assert(r);
assert(i);
respond_error(server->bus, i->message, AVAHI_ERR_TIMEOUT, NULL);
}
- service_resolver_free(i);
+ sync_service_resolver_free(i);
}
static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, void *userdata) {
Client *client;
int32_t interface, protocol, aprotocol;
char *name;
- HostNameResolverInfo *i;
+ SyncHostNameResolverInfo *i;
if (!dbus_message_get_args(
m, &error,
return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL);
}
- i = avahi_new(HostNameResolverInfo, 1);
+ i = avahi_new(SyncHostNameResolverInfo, 1);
i->client = client;
i->message = dbus_message_ref(m);
- AVAHI_LLIST_PREPEND(HostNameResolverInfo, host_name_resolvers, client->host_name_resolvers, i);
+ AVAHI_LLIST_PREPEND(SyncHostNameResolverInfo, sync_host_name_resolvers, client->sync_host_name_resolvers, i);
client->n_objects++;
if (!(i->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, (AvahiProtocol) aprotocol, host_name_resolver_callback, i))) {
- host_name_resolver_free(i);
+ sync_host_name_resolver_free(i);
return respond_error(c, m, avahi_server_errno(avahi_server), NULL);
}
Client *client;
int32_t interface, protocol;
char *address;
- AddressResolverInfo *i;
+ SyncAddressResolverInfo *i;
AvahiAddress a;
if (!dbus_message_get_args(
return respond_error(c, m, AVAHI_ERR_TOO_MANY_OBJECTS, NULL);
}
- i = avahi_new(AddressResolverInfo, 1);
+ i = avahi_new(SyncAddressResolverInfo, 1);
i->client = client;
i->message = dbus_message_ref(m);
- AVAHI_LLIST_PREPEND(AddressResolverInfo, address_resolvers, client->address_resolvers, i);
+ AVAHI_LLIST_PREPEND(SyncAddressResolverInfo, sync_address_resolvers, client->sync_address_resolvers, i);
client->n_objects++;
if (!(i->address_resolver = avahi_s_address_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, &a, address_resolver_callback, i))) {
- address_resolver_free(i);
+ sync_address_resolver_free(i);
return respond_error(c, m, avahi_server_errno(avahi_server), NULL);
}
Client *client;
int32_t interface, protocol, aprotocol;
char *name, *type, *domain;
- ServiceResolverInfo *i;
+ SyncServiceResolverInfo *i;
if (!dbus_message_get_args(
m, &error,
if (!*domain)
domain = NULL;
- i = avahi_new(ServiceResolverInfo, 1);
+ i = avahi_new(SyncServiceResolverInfo, 1);
i->client = client;
i->message = dbus_message_ref(m);
- AVAHI_LLIST_PREPEND(ServiceResolverInfo, service_resolvers, client->service_resolvers, i);
+ AVAHI_LLIST_PREPEND(SyncServiceResolverInfo, sync_service_resolvers, client->sync_service_resolvers, i);
client->n_objects++;
if (!(i->service_resolver = avahi_s_service_resolver_new(avahi_server, (AvahiIfIndex) interface, (AvahiProtocol) protocol, name, type, domain, (AvahiProtocol) aprotocol, service_resolver_callback, i))) {
- service_resolver_free(i);
+ sync_service_resolver_free(i);
return respond_error(c, m, avahi_server_errno(avahi_server), NULL);
}
NULL
};
-
dbus_error_init(&error);
server = avahi_new(Server, 1);
server->current_id = 0;
server->n_clients = 0;
- server->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error);
- if (dbus_error_is_set(&error)) {
- avahi_log_warn("dbus_bus_get(): %s", error.message);
+ if (!(server->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error))) {
+ assert(dbus_error_is_set(&error));
+ avahi_log_error("dbus_bus_get(): %s", error.message);
goto fail;
}
- avahi_dbus_connection_glue(server->bus, poll_api);
+ if (avahi_dbus_connection_glue(server->bus, poll_api) < 0) {
+ avahi_log_error("avahi_dbus_connection_glue() failed");
+ goto fail;
+ }
- dbus_bus_request_name(server->bus, AVAHI_DBUS_NAME, 0, &error);
- if (dbus_error_is_set(&error)) {
- avahi_log_warn("dbus_bus_request_name(): %s", error.message);
+ if (dbus_bus_request_name(server->bus, AVAHI_DBUS_NAME, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ if (dbus_error_is_set(&error)) {
+ avahi_log_error("dbus_bus_request_name(): %s", error.message);
+ goto fail;
+ }
+
+ avahi_log_error("Failed to acquire DBUS name '"AVAHI_DBUS_NAME"'");
goto fail;
}
- dbus_connection_add_filter(server->bus, msg_signal_filter_impl, (void*) poll_api, NULL);
+ if (!(dbus_connection_add_filter(server->bus, msg_signal_filter_impl, (void*) poll_api, NULL))) {
+ avahi_log_error("dbus_connection_add_filter() failed");
+ goto fail;
+ }
+
dbus_bus_add_match(server->bus, "type='signal',""interface='" DBUS_INTERFACE_DBUS "'", &error);
- dbus_connection_register_object_path(server->bus, AVAHI_DBUS_PATH_SERVER, &server_vtable, NULL);
+
+ if (dbus_error_is_set(&error)) {
+ avahi_log_error("dbus_bus_add_match(): %s", error.message);
+ goto fail;
+ }
+
+ if (!(dbus_connection_register_object_path(server->bus, AVAHI_DBUS_PATH_SERVER, &server_vtable, NULL))) {
+ avahi_log_error("dbus_connection_register_object_path() failed");
+ goto fail;
+ }
return 0;
dbus_connection_disconnect(server->bus);
dbus_connection_unref(server->bus);
}
-
- dbus_error_free (&error);
+
+ if (dbus_error_is_set(&error))
+ dbus_error_free(&error);
+
avahi_free(server);
server = NULL;
return -1;