X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fpublish-service.c;h=6132622e52f6972d0eb8251f03391cd38c0c47d5;hb=d0c6f66e03793c19c034c26c1267f9382167b3ad;hp=7c9879ccf66a49d6df79b20d28e8d646e1e2460c;hpb=8c585e0162e7d773a18ef179e7e8561c2aa71e17;p=catta diff --git a/examples/publish-service.c b/examples/publish-service.c index 7c9879c..6132622 100644 --- a/examples/publish-service.c +++ b/examples/publish-service.c @@ -26,34 +26,37 @@ #include #include #include +#include #include +#include +#include -static AvahiEntryGroup *group = NULL; -static GMainLoop *main_loop = NULL; -static gchar *name = NULL; +static AvahiSEntryGroup *group = 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, AvahiSEntryGroup *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,38 +64,50 @@ static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryG } static void create_services(AvahiServer *s) { - gchar r[128]; - 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) - group = avahi_entry_group_new(s, entry_group_callback, NULL); - - g_message("Adding service '%s'", name); + if (!group) { + if (!(group = avahi_s_entry_group_new(s, entry_group_callback, NULL))) { + fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); + goto fail; + } + } + + 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 (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."); - g_main_loop_quit(main_loop); - return; + 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) { + fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret)); + goto fail; } /* Add the same service for BSD LPR */ - if (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."); - g_main_loop_quit(main_loop); - return; + if ((ret = avahi_server_add_service(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { + fprintf(stderr, "Failed to add _printer._tcp service: %s\n", avahi_strerror(ret)); + goto fail; } /* Tell the server to register the service */ - avahi_entry_group_commit(group); + if ((ret = avahi_s_entry_group_commit(group)) < 0) { + fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); + goto fail; + } + + return; + +fail: + 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 */ @@ -102,56 +117,84 @@ static void server_callback(AvahiServer *s, AvahiServerState state, gpointer use create_services(s); else if (state == AVAHI_SERVER_COLLISION) { - gchar *n; + 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); - avahi_server_set_host_name(s, n); - g_free(n); + fprintf(stderr, "Host name collision, retrying with '%s'\n", n); + r = avahi_server_set_host_name(s, n); + avahi_free(n); + + if (r < 0) { + fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(r)); + + avahi_simple_poll_quit(simple_poll); + return; + } /* Let's drop our registered services. When the server is back * in AVAHI_SERVER_RUNNING state we will register them * again with the new host name. */ if (group) - avahi_entry_group_reset(group); + avahi_s_entry_group_reset(group); } } int main(int argc, char*argv[]) { AvahiServerConfig config; AvahiServer *server = NULL; - + 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); + 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) { + 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: + /* Cleanup things */ if (group) - avahi_entry_group_free(group); + avahi_s_entry_group_free(group); 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 0; + return ret; }