diff options
Diffstat (limited to 'examples/publish-service.c')
| -rw-r--r-- | examples/publish-service.c | 87 |
1 files changed, 49 insertions, 38 deletions
diff --git a/examples/publish-service.c b/examples/publish-service.c index 37ecc02..4a78402 100644 --- a/examples/publish-service.c +++ b/examples/publish-service.c @@ -26,34 +26,37 @@ #include <time.h> #include <stdio.h> #include <stdlib.h> +#include <assert.h> #include <avahi-core/core.h> +#include <avahi-common/simple-watch.h> +#include <avahi-common/malloc.h> static AvahiEntryGroup *group = NULL; -static GMainLoop *main_loop = NULL; -static gchar *name = NULL; +static AvahiSimplePoll *simple_poll = NULL; +static char *name = NULL; static void create_services(AvahiServer *s); -static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata) { - g_assert(s); - g_assert(g == group); +static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) { + assert(s); + assert(g == group); /* Called whenever the entry group state changes */ if (state == AVAHI_ENTRY_GROUP_ESTABLISHED) /* The entry group has been established successfully */ - g_message("Service '%s' successfully established.", name); + fprintf(stderr, "Service '%s' successfully established.\n", name); else if (state == AVAHI_ENTRY_GROUP_COLLISION) { - gchar *n; + char *n; /* A service name collision happened. Let's pick a new name */ n = avahi_alternative_service_name(name); - g_free(name); + avahi_free(name); name = n; - g_message("Service name collision, renaming service to '%s'", name); + fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); /* And recreate the services */ create_services(s); @@ -61,50 +64,50 @@ static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryG } static void create_services(AvahiServer *s) { - gchar r[128]; - gint ret; - g_assert(s); + char r[128]; + int ret; + assert(s); /* If this is the first time we're called, let's create a new entry group */ if (!group) { if (!(group = avahi_entry_group_new(s, entry_group_callback, NULL))) { - g_message("avahi_entry_group_new() failed: %s", avahi_strerror(avahi_server_errno(s))); + fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); goto fail; } } - g_message("Adding service '%s'", name); + fprintf(stderr, "Adding service '%s'\n", name); /* Create some random TXT data */ snprintf(r, sizeof(r), "random=%i", rand()); /* Add the service for IPP */ if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { - g_message("Failed to add _ipp._tcp service: %s", avahi_strerror(ret)); + fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret)); goto fail; } /* Add the same service for BSD LPR */ if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { - g_message("Failed to add _printer._tcp service: %s", avahi_strerror(ret)); + fprintf(stderr, "Failed to add _printer._tcp service: %s\n", avahi_strerror(ret)); goto fail; } /* Tell the server to register the service */ if ((ret = avahi_entry_group_commit(group)) < 0) { - g_message("Failed to commit entry_group: %s", avahi_strerror(ret)); + fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); goto fail; } return; fail: - g_main_loop_quit(main_loop); + avahi_simple_poll_quit(simple_poll); return; } -static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) { - g_assert(s); +static void server_callback(AvahiServer *s, AvahiServerState state, void * userdata) { + assert(s); /* Called whenever the server state changes */ @@ -114,19 +117,19 @@ static void server_callback(AvahiServer *s, AvahiServerState state, gpointer use create_services(s); else if (state == AVAHI_SERVER_COLLISION) { - gchar *n; - gint r; + char *n; + int r; /* A host name collision happened. Let's pick a new name for the server */ n = avahi_alternative_host_name(avahi_server_get_host_name(s)); - g_message("Host name collision, retrying with '%s'", n); + fprintf(stderr, "Host name collision, retrying with '%s'\n", n); r = avahi_server_set_host_name(s, n); - g_free(n); + avahi_free(n); if (r < 0) { - g_message("Failed to set new host name: %s", avahi_strerror(r)); + fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(r)); - g_main_loop_quit(main_loop); + avahi_simple_poll_quit(simple_poll); return; } @@ -141,34 +144,42 @@ static void server_callback(AvahiServer *s, AvahiServerState state, gpointer use int main(int argc, char*argv[]) { AvahiServerConfig config; AvahiServer *server = NULL; - gint error; + int error; int ret = 1; + /* Initialize the pseudo-RNG */ srand(time(NULL)); + + /* Allocate main loop object */ + if (!(simple_poll = avahi_simple_poll_new())) { + fprintf(stderr, "Failed to create simple poll object.\n"); + goto fail; + } - name = g_strdup("MegaPrinter"); + name = avahi_strdup("MegaPrinter"); /* Let's set the host name for this server. */ avahi_server_config_init(&config); - config.host_name = g_strdup("gurkiman"); - config.publish_workstation = FALSE; + config.host_name = avahi_strdup("gurkiman"); + config.publish_workstation = 0; /* Allocate a new server */ - server = avahi_server_new(NULL, &config, server_callback, NULL, &error); + server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, server_callback, NULL, &error); /* Free the configuration data */ avahi_server_config_free(&config); /* Check wether creating the server object succeeded */ if (!server) { - g_message("Failed to create server: %s", avahi_strerror(error)); + fprintf(stderr, "Failed to create server: %s", avahi_strerror(error)); goto fail; } /* Run the main loop */ - main_loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(main_loop); - + for (;;) + if (avahi_simple_poll_iterate(simple_poll, -1) != 0) + break; + ret = 0; fail: @@ -180,10 +191,10 @@ fail: if (server) avahi_server_free(server); - if (main_loop) - g_main_loop_unref(main_loop); + if (simple_poll) + avahi_simple_poll_free(simple_poll); - g_free(name); + avahi_free(name); return ret; } |