#include <avahi-common/malloc.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/alternative.h>
+#include <avahi-common/timeval.h>
+
#include <avahi-core/core.h>
#include <avahi-core/log.h>
#include <avahi-core/publish.h>
#include <avahi-core/lookup.h>
+#include <avahi-core/dns-srv-rr.h>
static AvahiSEntryGroup *group = NULL;
static AvahiServer *server = NULL;
case AVAHI_BROWSER_CACHE_EXHAUSTED : return "CACHE_EXHAUSTED";
case AVAHI_BROWSER_ALL_FOR_NOW : return "ALL_FOR_NOW";
case AVAHI_BROWSER_FAILURE : return "FAILURE";
- case AVAHI_BROWSER_NOT_FOUND : return "NOT_FOUND";
}
abort();
static const char *resolver_event_to_string(AvahiResolverEvent event) {
switch (event) {
case AVAHI_RESOLVER_FOUND: return "FOUND";
- case AVAHI_RESOLVER_TIMEOUT: return "TIMEOUT";
- case AVAHI_RESOLVER_NOT_FOUND: return "NOT_FOUND";
case AVAHI_RESOLVER_FAILURE: return "FAILURE";
}
abort();
static void server_callback(AvahiServer *s, AvahiServerState state, void* userdata) {
- avahi_log_debug("server state: %i", state);
+ server = s;
+ avahi_log_debug("server state: %i", state);
if (state == AVAHI_SERVER_RUNNING) {
avahi_log_debug("Server startup complete. Host name is <%s>. Service cookie is %u", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s));
const AvahiAddress *a,
AvahiLookupResultFlags flags,
void* userdata) {
- char t[64];
+ char t[AVAHI_ADDRESS_STR_MAX];
if (a)
avahi_address_snprint(t, sizeof(t), a);
const char *hostname,
AvahiLookupResultFlags flags,
void* userdata) {
- char t[64];
+ char t[AVAHI_ADDRESS_STR_MAX];
avahi_address_snprint(t, sizeof(t), a);
if (event != AVAHI_RESOLVER_FOUND)
avahi_log_debug("SR: (%i.%i) <%s> as %s in <%s> [%s]", iface, protocol, name, service_type, domain_name, resolver_event_to_string(event));
else {
- char t[64], *s;
+ char t[AVAHI_ADDRESS_STR_MAX], *s;
avahi_address_snprint(t, sizeof(t), a);
AvahiLookupResultFlags flags,
void* userdata) {
- char t[64] = "n/a";
+ char t[AVAHI_ADDRESS_STR_MAX] = "n/a";
if (a)
avahi_address_snprint(t, sizeof(t), a);
avahi_elapse_time(&tv, 1000*60, 0);
poll_api->timeout_new(poll_api, &tv, quit_timeout_callback, simple_poll);
- for (;;)
- if (avahi_simple_poll_iterate(simple_poll, -1) != 0)
- break;
+ avahi_simple_poll_loop(simple_poll);
avahi_s_record_browser_free(r);
avahi_s_host_name_resolver_free(hnr);