#include <arpa/inet.h>
#include <stdlib.h>
#include <unistd.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include <avahi-common/alternative.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/simple-watch.h>
#include "core.h"
-#include "util.h"
+#include "log.h"
-static gchar *name = NULL;
-static AvahiEntryGroup *group = NULL;
+static char *name = NULL;
+static AvahiSEntryGroup *group = NULL;
static int try = 0;
static AvahiServer *avahi = NULL;
+static const AvahiPoll *poll_api;
-static gboolean dump_timeout(gpointer data) {
- avahi_server_dump(avahi, stdout);
- return TRUE;
+static void dump_line(const char *text, void* userdata) {
+ printf("%s\n", text);
}
-static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata);
+static void dump_timeout_callback(AvahiTimeout *timeout, void* data) {
+ struct timeval tv;
+
+ avahi_server_dump(avahi, dump_line, NULL);
-static void create_service(gchar *t) {
- gchar *n;
+ avahi_elapse_time(&tv, 5000, 0);
+ poll_api->timeout_update(timeout, &tv);
+}
- g_assert(t || name);
+static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* userdata);
- if (group)
- avahi_entry_group_free(group);
-
- n = t ? g_strdup(t) : avahi_alternative_service_name(name);
- g_free(name);
+static void create_service(const char *t) {
+ char *n;
+
+ assert(t || name);
+
+ n = t ? avahi_strdup(t) : avahi_alternative_service_name(name);
+ avahi_free(name);
name = n;
- if (try > 10)
- sleep(2); /* ugly ugly ugly hack */
+ if (group)
+ avahi_s_entry_group_reset(group);
+ else
+ group = avahi_s_entry_group_new(avahi, entry_group_callback, NULL);
- group = avahi_entry_group_new(avahi, entry_group_callback, NULL);
- avahi_server_add_service(avahi, group, 0, AF_UNSPEC, "_http._tcp", name, NULL, NULL, 80, "foo", NULL);
- avahi_entry_group_commit(group);
+ avahi_server_add_service(avahi, group, 0, AF_UNSPEC, name, "_http._tcp", NULL, NULL, 80, "foo", NULL);
+ avahi_s_entry_group_commit(group);
try++;
}
-static gboolean rename_timeout(gpointer data) {
-
+static void rename_timeout_callback(AvahiTimeout *timeout, void *userdata) {
+ struct timeval tv;
if (access("flag", F_OK) == 0) {
create_service("New - Bonjour Service Name");
- return FALSE;
+ return;
}
- return TRUE;
+ avahi_elapse_time(&tv, 5000, 0);
+ poll_api->timeout_update(timeout, &tv);
}
-
-
-static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata) {
+static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void* userdata) {
if (state == AVAHI_ENTRY_GROUP_COLLISION)
create_service(NULL);
else if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) {
- g_message("ESTABLISHED !!!!");
+ avahi_log_debug("ESTABLISHED !!!!");
try = 0;
}
}
+static void server_callback(AvahiServer *s, AvahiServerState state, void* userdata) {
+ avahi_log_debug("server state: %i", state);
+
+ if (state == AVAHI_SERVER_RUNNING) {
+ create_service("gurke");
+ avahi_server_dump(avahi, dump_line, NULL);
+ }
+}
+
int main(int argc, char *argv[]) {
- GMainLoop *loop = NULL;
+ int error;
+ AvahiSimplePoll *simple_poll;
+ struct timeval tv;
- avahi = avahi_server_new(NULL, NULL);
- create_service("gurke");
- avahi_server_dump(avahi, stdout);
+ simple_poll = avahi_simple_poll_new();
+ poll_api = avahi_simple_poll_get(simple_poll);
- loop = g_main_loop_new(NULL, FALSE);
- g_timeout_add(1000*5, dump_timeout, avahi);
- g_timeout_add(1000*5, rename_timeout, avahi);
- g_main_loop_run(loop);
- g_main_loop_unref(loop);
+ avahi = avahi_server_new(poll_api, NULL, server_callback, NULL, &error);
- avahi_entry_group_free(group);
+ avahi_elapse_time(&tv, 5000, 0);
+ poll_api->timeout_new(poll_api, &tv, dump_timeout_callback, avahi);
+
+ avahi_elapse_time(&tv, 5000, 0);
+ poll_api->timeout_new(poll_api, &tv, rename_timeout_callback, avahi);
+
+ for (;;)
+ if (avahi_simple_poll_iterate(simple_poll, -1) != 0)
+ break;
+
+ if (group)
+ avahi_s_entry_group_free(group);
avahi_server_free(avahi);
+
+ avahi_simple_poll_free(simple_poll);
return 0;
}