#include <avahi-client/client.h>
#include <avahi-common/error.h>
+#include <avahi-common/simple-watch.h>
+#include <avahi-common/malloc.h>
#include <stdio.h>
-#include <glib.h>
+#include <assert.h>
-void
+static const AvahiPoll *poll_api = NULL;
+static AvahiSimplePoll *simple_poll = NULL;
+
+
+static void
avahi_client_callback (AvahiClient *c, AvahiClientState state, void *user_data)
{
printf ("XXX: Callback on client, state -> %d, data -> %s\n", state, (char*)user_data);
}
-void
+static void
avahi_entry_group_callback (AvahiEntryGroup *g, AvahiEntryGroupState state, void *user_data)
{
- printf ("XXX: Callback on %s, state -> %d, data -> %s\n", avahi_entry_group_path (g), state, (char*)user_data);
+ printf ("XXX: Callback on %s, state -> %d, data -> %s\n", avahi_entry_group_get_dbus_path(g), state, (char*)user_data);
}
-void
-avahi_domain_browser_callback (AvahiDomainBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, char *domain, void *user_data)
+static void
+avahi_domain_browser_callback (AvahiDomainBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *domain, void *user_data)
{
- printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", avahi_domain_browser_path (b), interface, protocol, event, domain, (char*)user_data);
+ printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), domain (%s), data (%s)\n", avahi_domain_browser_get_dbus_path (b), interface, protocol, event, domain, (char*)user_data);
}
-void
-avahi_service_browser_callback (AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, char *name, char *type, char *domain, void *user_data)
+static void
+avahi_service_browser_callback (AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, void *user_data)
{
- printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), name (%s), type (%s), domain (%s), data (%s)\n", avahi_service_browser_path (b), interface, protocol, event, name, type, domain, (char*)user_data);
+ printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), name (%s), type (%s), domain (%s), data (%s)\n", avahi_service_browser_get_dbus_path (b), interface, protocol, event, name, type, domain, (char*)user_data);
}
-void
-avahi_service_type_browser_callback (AvahiServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, char *type, char *domain, void *user_data)
+static void
+avahi_service_type_browser_callback (AvahiServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *type, const char *domain, void *user_data)
{
- printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", avahi_service_type_browser_path (b), interface, protocol, event, type, domain, (char*)user_data);
+ printf ("XXX: Callback on %s, interface (%d), protocol (%d), event (%d), type (%s), domain (%s), data (%s)\n", avahi_service_type_browser_get_dbus_path (b), interface, protocol, event, type, domain, (char*)user_data);
}
-gboolean
-test_free_domain_browser (gpointer data)
+static void test_free_domain_browser(AvahiTimeout *timeout, void* userdata)
{
+ AvahiServiceBrowser *b = userdata;
printf ("XXX: freeing domain browser\n");
- AvahiServiceBrowser *b = data;
avahi_service_browser_free (b);
- return FALSE;
}
-gboolean
-test_free_entry_group (gpointer data)
+static void test_free_entry_group (AvahiTimeout *timeout, void* userdata)
{
+ AvahiEntryGroup *g = userdata;
printf ("XXX: freeing entry group\n");
- AvahiEntryGroup *g = data;
avahi_entry_group_free (g);
- return FALSE;
}
-int
-main (int argc, char *argv[])
+
+static void test_entry_group_reset (AvahiTimeout *timeout, void* userdata)
{
- GMainLoop *loop;
+ AvahiEntryGroup *g = userdata;
+
+ printf ("XXX: resetting entry group\n");
+ avahi_entry_group_reset (g);
+
+ avahi_entry_group_add_service (g, AVAHI_IF_UNSPEC, AF_UNSPEC, "Lathiat's Site", "_http._tcp", "", "", 80, "foo=bar2", NULL);
+
+ avahi_entry_group_commit (g);
+}
+
+static void terminate(AvahiTimeout *timeout, void *userdata) {
+
+ avahi_simple_poll_quit(simple_poll);
+}
+
+int main (int argc, char *argv[]) {
AvahiClient *avahi;
AvahiEntryGroup *group;
- AvahiStringList *txt;
AvahiDomainBrowser *domain;
AvahiServiceBrowser *sb;
AvahiServiceTypeBrowser *st;
- char *ret;
+ const char *ret;
+ int error;
+ struct timeval tv;
- loop = g_main_loop_new (NULL, FALSE);
+ simple_poll = avahi_simple_poll_new();
+ poll_api = avahi_simple_poll_get(simple_poll);
- avahi = avahi_client_new (avahi_client_callback, "omghai2u");
+ if (!(avahi = avahi_client_new(poll_api, avahi_client_callback, "omghai2u", &error))) {
+ fprintf(stderr, "Client failed: %s\n", avahi_strerror(error));
+ goto fail;
+ }
- g_assert (avahi != NULL);
+ printf("State: %i\n", avahi_client_get_state(avahi));
ret = avahi_client_get_version_string (avahi);
- printf ("Avahi Server Version: %s (Error Return: %s)\n", ret, avahi_strerror (avahi_client_errno (avahi)));
- g_free (ret);
+ printf("Avahi Server Version: %s (Error Return: %s)\n", ret, ret ? "OK" : avahi_strerror(avahi_client_errno(avahi)));
ret = avahi_client_get_host_name (avahi);
- printf ("Host Name: %s (Error Return: %s)\n", ret, avahi_strerror (avahi_client_errno (avahi)));
- g_free (ret);
+ printf("Host Name: %s (Error Return: %s)\n", ret, ret ? "OK" : avahi_strerror(avahi_client_errno(avahi)));
ret = avahi_client_get_domain_name (avahi);
- printf ("Domain Name: %s (Error Return: %s)\n", ret, avahi_strerror (avahi_client_errno (avahi)));
- g_free (ret);
+ printf("Domain Name: %s (Error Return: %s)\n", ret, ret ? "OK" : avahi_strerror(avahi_client_errno(avahi)));
ret = avahi_client_get_host_name_fqdn (avahi);
- printf ("FQDN: %s (Error Return: %s)\n", ret, avahi_strerror (avahi_client_errno (avahi)));
- g_free (ret);
+ printf("FQDN: %s (Error Return: %s)\n", ret, ret ? "OK" : avahi_strerror(avahi_client_errno(avahi)));
group = avahi_entry_group_new (avahi, avahi_entry_group_callback, "omghai");
+ printf("Creating entry group: %s\n", group ? "OK" : avahi_strerror(avahi_client_errno (avahi)));
- printf ("Creating entry group: %s\n", avahi_strerror (avahi_client_errno (avahi)));
-
- if (group == NULL)
- printf ("Failed to create entry group object\n");
- else
- printf ("Sucessfully created entry group, path %s\n", avahi_entry_group_path (group));
-
- txt = avahi_string_list_new ("foo=bar", NULL);
+ assert(group);
+
+ printf("Sucessfully created entry group, path %s\n", avahi_entry_group_get_dbus_path (group));
- avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AF_UNSPEC, "Lathiat's Site", "_http._tcp", "", "", 80, txt);
+ avahi_entry_group_add_service (group, AVAHI_IF_UNSPEC, AF_UNSPEC, "Lathiat's Site", "_http._tcp", "", "", 80, "foo=bar", NULL);
avahi_entry_group_commit (group);
- domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "", AVAHI_DOMAIN_BROWSER_BROWSE, avahi_domain_browser_callback, "omghai3u");
+ domain = avahi_domain_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, NULL, AVAHI_DOMAIN_BROWSER_BROWSE, avahi_domain_browser_callback, "omghai3u");
+
if (domain == NULL)
printf ("Failed to create domain browser object\n");
else
- printf ("Sucessfully created domain browser, path %s\n", avahi_domain_browser_path (domain));
+ printf ("Sucessfully created domain browser, path %s\n", avahi_domain_browser_get_dbus_path (domain));
st = avahi_service_type_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "", avahi_service_type_browser_callback, "omghai3u");
if (st == NULL)
printf ("Failed to create service type browser object\n");
else
- printf ("Sucessfully created service type browser, path %s\n", avahi_service_type_browser_path (st));
+ printf ("Sucessfully created service type browser, path %s\n", avahi_service_type_browser_get_dbus_path (st));
sb = avahi_service_browser_new (avahi, AVAHI_IF_UNSPEC, AF_UNSPEC, "_http._tcp", "", avahi_service_browser_callback, "omghai3u");
if (sb == NULL)
printf ("Failed to create service browser object\n");
else
- printf ("Sucessfully created service browser, path %s\n", avahi_service_browser_path (sb));
+ printf ("Sucessfully created service browser, path %s\n", avahi_service_browser_get_dbus_path (sb));
+
+
+ avahi_elapse_time(&tv, 8000, 0);
+ poll_api->timeout_new(poll_api, &tv, test_entry_group_reset, group);
+ avahi_elapse_time(&tv, 20000, 0);
+ poll_api->timeout_new(poll_api, &tv, test_free_entry_group, group);
+ avahi_elapse_time(&tv, 25000, 0);
+ poll_api->timeout_new(poll_api, &tv, test_free_domain_browser, sb);
+
+ avahi_elapse_time(&tv, 30000, 0);
+ poll_api->timeout_new(poll_api, &tv, terminate, NULL);
+
+ for (;;)
+ if (avahi_simple_poll_iterate(simple_poll, -1) != 0)
+ break;
- g_timeout_add (2000, test_free_entry_group, group);
- g_timeout_add (5000, test_free_domain_browser, sb);
+fail:
- g_main_loop_run (loop);
+ if (avahi)
+ avahi_client_free (avahi);
- g_free (avahi);
+ if (simple_poll)
+ avahi_simple_poll_free(simple_poll);
return 0;
}
projects / catta / blobdiff