#ifdef HAVE_AVAHI
+#include <unistd.h>
#include "afp_avahi.h"
static void publish_reply(AvahiEntryGroup *g,
assert(ctx->client);
if (!ctx->group) {
-
if (!(ctx->group = avahi_entry_group_new(ctx->client,
publish_reply,
ctx))) {
- LOG(log_error,
- logtype_afpd,
- "Failed to create entry group: %s\n",
+ LOG(log_error, logtype_afpd, "Failed to create entry group: %s",
avahi_strerror(avahi_client_errno(ctx->client)));
goto fail;
}
}
- LOG(log_info, logtype_afpd, "Adding service '%s'\n", ctx->name);
+ LOG(log_info, logtype_afpd, "Adding service '%s'", ctx->name);
if (avahi_entry_group_is_empty(ctx->group)) {
/* Register our service */
NULL,
ctx->port,
NULL) < 0) {
- LOG(log_error,
- logtype_afpd,
- "Failed to add service: %s\n",
+ LOG(log_error, logtype_afpd, "Failed to add service: %s",
avahi_strerror(avahi_client_errno(ctx->client)));
goto fail;
}
if (avahi_entry_group_commit(ctx->group) < 0) {
- LOG(log_error,
- logtype_afpd,
- "Failed to commit entry group: %s\n",
+ LOG(log_error, logtype_afpd, "Failed to commit entry group: %s",
avahi_strerror(avahi_client_errno(ctx->client)));
goto fail;
}
return;
- fail:
- avahi_client_free (ctx->client);
-#ifndef HAVE_AVAHI_THREADED_POLL
- avahi_simple_poll_quit(ctx->simple_poll);
-#else
- avahi_threaded_poll_quit(ctx->threaded_poll);
-#endif
+fail:
+ avahi_client_free (ctx->client);
+ avahi_threaded_poll_quit(ctx->threaded_poll);
}
/* Called when publishing of service data completes */
AVAHI_GCC_UNUSED void *userdata)
{
struct context *ctx = userdata;
+ char *n;
assert(g == ctx->group);
/* The entry group has been established successfully */
break;
- case AVAHI_ENTRY_GROUP_COLLISION: {
- char *n;
-
+ case AVAHI_ENTRY_GROUP_COLLISION:
/* Pick a new name for our service */
-
n = avahi_alternative_service_name(ctx->name);
assert(n);
-
avahi_free(ctx->name);
ctx->name = n;
-
register_stuff(ctx);
break;
- }
-
- case AVAHI_ENTRY_GROUP_FAILURE: {
- LOG(log_error,
- logtype_afpd,
- "Failed to register service: %s\n",
- avahi_strerror(avahi_client_errno(ctx->client)));
- avahi_client_free (avahi_entry_group_get_client(g));
-#ifndef HAVE_AVAHI_THREADED_POLL
- avahi_simple_poll_quit(ctx->simple_poll);
-#else
- avahi_threaded_poll_quit(ctx->threaded_poll);
-#endif
- break;
- }
-
- case AVAHI_ENTRY_GROUP_UNCOMMITED:
+
+ case AVAHI_ENTRY_GROUP_FAILURE:
+ LOG(log_error, logtype_afpd, "Failed to register service: %s",
+ avahi_strerror(avahi_client_errno(ctx->client)));
+ avahi_client_free(avahi_entry_group_get_client(g));
+ avahi_threaded_poll_quit(ctx->threaded_poll);
+ break;
+
+ case AVAHI_ENTRY_GROUP_UNCOMMITED:
+ break;
case AVAHI_ENTRY_GROUP_REGISTERING:
- ;
+ break;
}
}
ctx->client = client;
switch (state) {
-
case AVAHI_CLIENT_S_RUNNING:
-
/* The server has startup successfully and registered its host
* name on the network, so it's time to create our services */
if (!ctx->group)
break;
case AVAHI_CLIENT_S_COLLISION:
-
if (ctx->group)
avahi_entry_group_reset(ctx->group);
break;
case AVAHI_CLIENT_FAILURE: {
-
if (avahi_client_errno(client) == AVAHI_ERR_DISCONNECTED) {
int error;
ctx->group = NULL;
/* Reconnect to the server */
-
-#ifndef HAVE_AVAHI_THREADED_POLL
- if (!(ctx->client = avahi_client_new(avahi_simple_poll_get(ctx->simple_poll),
-#else
if (!(ctx->client = avahi_client_new(avahi_threaded_poll_get(ctx->threaded_poll),
-#endif
AVAHI_CLIENT_NO_FAIL,
client_callback,
ctx,
&error))) {
- LOG(log_error,
- logtype_afpd,
- "Failed to contact server: %s\n",
+ LOG(log_error, logtype_afpd, "Failed to contact server: %s\n",
avahi_strerror(error));
avahi_client_free (ctx->client);
-#ifndef HAVE_AVAHI_THREADED_POLL
- avahi_simple_poll_quit(ctx->simple_poll);
-#else
avahi_threaded_poll_quit(ctx->threaded_poll);
-#endif
- }
-
- } else {
- LOG(log_error,
- logtype_afpd,
- "Client failure: %s\n",
- avahi_strerror(avahi_client_errno(client)));
-
- avahi_client_free (ctx->client);
-#ifndef HAVE_AVAHI_THREADED_POLL
- avahi_simple_poll_quit(ctx->simple_poll);
-#else
- avahi_threaded_poll_quit(ctx->threaded_poll);
-#endif
}
+ } else {
+ LOG(log_error, logtype_afpd, "Client failure: %s\n",
+ avahi_strerror(avahi_client_errno(client)));
+ avahi_client_free (ctx->client);
+ avahi_threaded_poll_quit(ctx->threaded_poll);
+ }
break;
}
case AVAHI_CLIENT_S_REGISTERING:
+ break;
case AVAHI_CLIENT_CONNECTING:
- ;
+ break;
}
}
-static void* thread(void *userdata) {
-#ifndef HAVE_AVAHI_THREADED_POLL
- struct context *ctx = userdata;
- sigset_t mask;
- int r;
-
- /* Make sure that signals are delivered to the main thread */
- sigfillset(&mask);
- pthread_sigmask(SIG_BLOCK, &mask, NULL);
-
- pthread_mutex_lock(&ctx->mutex);
-
- /* Run the main loop */
- LOG(log_info, logtype_afpd, "Starting avahi loop...");
- r = avahi_simple_poll_loop(ctx->simple_poll);
-
- /* Cleanup some stuff */
- if (ctx->client)
- avahi_client_free(ctx->client);
- ctx->client = NULL;
- ctx->group = NULL;
-
- pthread_mutex_unlock(&ctx->mutex);
-#endif
- return NULL;
-}
-
-static int poll_func(struct pollfd *ufds,
- unsigned int nfds,
- int timeout,
- void *userdata) {
-#ifndef HAVE_AVAHI_THREADED_POLL
- pthread_mutex_t *mutex = userdata;
- int r;
-
- /* Before entering poll() we unlock the mutex, so that
- * avahi_simple_poll_quit() can succeed from another thread. */
-
- pthread_mutex_unlock(mutex);
- r = poll(ufds, nfds, timeout);
- pthread_mutex_lock(mutex);
-
- return r;
-#else
- return 0;
-#endif
-}
-
/*
* Tries to setup the Zeroconf thread and any
* neccessary config setting.
assert(ctx);
ctx->client = NULL;
ctx->group = NULL;
-#ifndef HAVE_AVAHI_THREADED_POLL
- ctx->simple_poll = NULL;
- pthread_mutex_init(&ctx->mutex, NULL);
-#else
ctx->threaded_poll = NULL;
-#endif
ctx->thread_running = 0;
- LOG(log_info,
- logtype_afpd,
- "Setting port for Zeroconf service to: %i.\n",
- port);
+ LOG(log_debug, logtype_afpd, "Setting port for Zeroconf service to: %i.", port);
ctx->port = port;
/* Prepare service name */
if (!name) {
- LOG(log_info,
- logtype_afpd,
- "Assigning default service name.\n");
+ LOG(log_debug, logtype_afpd, "Assigning default service name.");
gethostname(service+14, sizeof(service)-15);
service[sizeof(service)-1] = 0;
-
ctx->name = strdup(service);
- }
- else {
+ } else {
ctx->name = strdup(name);
}
assert(ctx->name);
/* first of all we need to initialize our threading env */
-#ifdef HAVE_AVAHI_THREADED_POLL
if (!(ctx->threaded_poll = avahi_threaded_poll_new())) {
goto fail;
}
-#else
- if (!(ctx->simple_poll = avahi_simple_poll_new())) {
- LOG(log_error,
- logtype_afpd,
- "Failed to create event loop object.\n");
- goto fail;
- }
-
- avahi_simple_poll_set_func(ctx->simple_poll, poll_func, &ctx->mutex);
-#endif
/* now we need to acquire a client */
-#ifdef HAVE_AVAHI_THREADED_POLL
if (!(ctx->client = avahi_client_new(avahi_threaded_poll_get(ctx->threaded_poll),
AVAHI_CLIENT_NO_FAIL,
client_callback,
ctx,
&error))) {
- LOG(log_error,
- logtype_afpd,
- "Failed to create client object: %s\n",
- avahi_strerror(avahi_client_errno(ctx->client)));
- goto fail;
- }
-#else
- if (!(ctx->client = avahi_client_new(avahi_simple_poll_get(ctx->simple_poll),
- AVAHI_CLIENT_NO_FAIL,
- client_callback,
- ctx,
- &error))) {
- LOG(log_error,
- logtype_afpd,
- "Failed to create client object: %s\n",
+ LOG(log_error, logtype_afpd, "Failed to create client object: %s",
avahi_strerror(avahi_client_errno(ctx->client)));
goto fail;
}
-#endif
return ctx;
fail:
-
if (ctx)
av_zeroconf_unregister(ctx);
struct context *ctx = u;
int ret;
-#ifdef HAVE_AVAHI_THREADED_POLL
/* Finally, start the event loop thread */
if (avahi_threaded_poll_start(ctx->threaded_poll) < 0) {
LOG(log_error,
logtype_afpd,
- "Failed to create thread: %s\n",
+ "Failed to create thread: %s",
avahi_strerror(avahi_client_errno(ctx->client)));
goto fail;
} else {
- LOG(log_info, logtype_afpd, "Successfully started avahi loop.\n");
- }
-#else
- /* Create the mDNS event handler */
- if ((ret = pthread_create(&ctx->thread_id, NULL, thread, ctx)) < 0) {
- LOG(log_error,
- logtype_afpd,
- "Failed to create thread: %s\n", strerror(ret));
- goto fail;
- } else {
- LOG(log_info, logtype_afpd, "Successfully started avahi loop.\n");
+ LOG(log_info, logtype_afpd, "Successfully started avahi loop.");
}
-#endif
ctx->thread_running = 1;
-
return 0;
fail:
-
- if (ctx)
+ if (ctx)
av_zeroconf_unregister(ctx);
return -1;
}
-/*
- * Used to lock access to the loop.
- * Currently unused.
- */
-void av_zeroconf_lock(void *u) {
-#ifdef HAVE_AVAHI_THREADED_POLL
- struct context *ctx = u;
-
- avahi_threaded_poll_lock(ctx->threaded_poll);
-#endif
-}
-
-/*
- * Used to unlock access to the loop.
- * Currently unused.
- */
-void av_zeroconf_unlock(void *u) {
-#ifdef HAVE_AVAHI_THREADED_POLL
- struct context *ctx = u;
-
- avahi_threaded_poll_unlock(ctx->threaded_poll);
-#endif
-}
-
/*
* Tries to shutdown this loop impl.
* Call this function from outside this thread.
struct context *ctx = u;
/* Call this when the app shuts down */
-#ifdef HAVE_AVAHI_THREADED_POLL
avahi_threaded_poll_stop(ctx->threaded_poll);
avahi_free(ctx->name);
avahi_client_free(ctx->client);
avahi_threaded_poll_free(ctx->threaded_poll);
-#else
- av_zeroconf_unregister(ctx);
-#endif
}
/*
struct context *ctx = u;
if (ctx->thread_running) {
-#ifndef HAVE_AVAHI_THREADED_POLL
- pthread_mutex_lock(&ctx->mutex);
- avahi_simple_poll_quit(ctx->simple_poll);
- pthread_mutex_unlock(&ctx->mutex);
-
- pthread_join(ctx->thread_id, NULL);
-#else
/* First, block the event loop */
avahi_threaded_poll_lock(ctx->threaded_poll);
/* Finally, unblock the event loop */
avahi_threaded_poll_unlock(ctx->threaded_poll);
-#endif
ctx->thread_running = 0;
}
if (ctx->client)
avahi_client_free(ctx->client);
-#ifndef HAVE_AVAHI_THREADED_POLL
- if (ctx->simple_poll)
- avahi_simple_poll_free(ctx->simple_poll);
-
- pthread_mutex_destroy(&ctx->mutex);
-#else
if (ctx->threaded_poll)
avahi_threaded_poll_free(ctx->threaded_poll);
-#endif
free(ctx);
projects / netatalk.git / commitdiff