X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fcore-publish-service.c;h=1d5ce9d317b9df34ff91ad8df70d7d60694c8f7e;hb=f9f5f0f3cd6c0af6a84af274ef8c4c5302d0a5fb;hp=8029eb816a817b235a076d41b2bcd256553e43a6;hpb=9c0f9c65093cfa53d45f9b68782321eb8063a032;p=catta diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c index 8029eb8..1d5ce9d 100644 --- a/examples/core-publish-service.c +++ b/examples/core-publish-service.c @@ -1,18 +1,18 @@ /*** - This file is part of avahi. + This file is part of catta. - avahi is free software; you can redistribute it and/or modify it + catta is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - avahi is distributed in the hope that it will be useful, but WITHOUT + catta is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with avahi; if not, write to the Free Software + License along with catta; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ @@ -24,22 +24,24 @@ #include #include #include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -static AvahiSEntryGroup *group = NULL; -static AvahiSimplePoll *simple_poll = NULL; +static CattaSEntryGroup *group = NULL; +static CattaSimplePoll *simple_poll = NULL; static char *name = NULL; -static void create_services(AvahiServer *s); +static void create_services(CattaServer *s); -static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) { +static void entry_group_callback(CattaServer *s, CattaSEntryGroup *g, CattaEntryGroupState state, CATTA_GCC_UNUSED void *userdata) { assert(s); assert(g == group); @@ -47,18 +49,18 @@ static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntry switch (state) { - case AVAHI_ENTRY_GROUP_ESTABLISHED: + case CATTA_ENTRY_GROUP_ESTABLISHED: /* The entry group has been established successfully */ fprintf(stderr, "Service '%s' successfully established.\n", name); break; - case AVAHI_ENTRY_GROUP_COLLISION: { + case CATTA_ENTRY_GROUP_COLLISION: { char *n; /* A service name collision happened. Let's pick a new name */ - n = avahi_alternative_service_name(name); - avahi_free(name); + n = catta_alternative_service_name(name); + catta_free(name); name = n; fprintf(stderr, "Service name collision, renaming service to '%s'\n", name); @@ -68,29 +70,29 @@ static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntry break; } - case AVAHI_ENTRY_GROUP_FAILURE : + case CATTA_ENTRY_GROUP_FAILURE : - fprintf(stderr, "Entry group failure: %s\n", avahi_strerror(avahi_server_errno(s))); + fprintf(stderr, "Entry group failure: %s\n", catta_strerror(catta_server_errno(s))); /* Some kind of failure happened while we were registering our services */ - avahi_simple_poll_quit(simple_poll); + catta_simple_poll_quit(simple_poll); break; - case AVAHI_ENTRY_GROUP_UNCOMMITED: - case AVAHI_ENTRY_GROUP_REGISTERING: + case CATTA_ENTRY_GROUP_UNCOMMITED: + case CATTA_ENTRY_GROUP_REGISTERING: ; } } -static void create_services(AvahiServer *s) { +static void create_services(CattaServer *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_s_entry_group_new(s, entry_group_callback, NULL))) { - fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); + if (!(group = catta_s_entry_group_new(s, entry_group_callback, NULL))) { + fprintf(stderr, "catta_entry_group_new() failed: %s\n", catta_strerror(catta_server_errno(s))); goto fail; } @@ -100,43 +102,43 @@ static void create_services(AvahiServer *s) { 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, 0, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { - fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret)); + if ((ret = catta_server_add_service(s, group, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, 0, name, "_ipp._tcp", NULL, NULL, 651, "test=blah", r, NULL)) < 0) { + fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", catta_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, 0, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { - fprintf(stderr, "Failed to add _printer._tcp service: %s\n", avahi_strerror(ret)); + if ((ret = catta_server_add_service(s, group, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, 0, name, "_printer._tcp", NULL, NULL, 515, NULL)) < 0) { + fprintf(stderr, "Failed to add _printer._tcp service: %s\n", catta_strerror(ret)); goto fail; } /* Add an additional (hypothetic) subtype */ - if ((ret = avahi_server_add_service_subtype(s, group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_printer._tcp", NULL, "_magic._sub._printer._tcp") < 0)) { - fprintf(stderr, "Failed to add subtype _magic._sub._printer._tcp: %s\n", avahi_strerror(ret)); + if ((ret = catta_server_add_service_subtype(s, group, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, 0, name, "_printer._tcp", NULL, "_magic._sub._printer._tcp") < 0)) { + fprintf(stderr, "Failed to add subtype _magic._sub._printer._tcp: %s\n", catta_strerror(ret)); goto fail; } /* Tell the server to register the service */ - if ((ret = avahi_s_entry_group_commit(group)) < 0) { - fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); + if ((ret = catta_s_entry_group_commit(group)) < 0) { + fprintf(stderr, "Failed to commit entry_group: %s\n", catta_strerror(ret)); goto fail; } return; fail: - avahi_simple_poll_quit(simple_poll); + catta_simple_poll_quit(simple_poll); } -static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UNUSED void * userdata) { +static void server_callback(CattaServer *s, CattaServerState state, CATTA_GCC_UNUSED void * userdata) { assert(s); /* Called whenever the server state changes */ switch (state) { - case AVAHI_SERVER_RUNNING: + case CATTA_SERVER_RUNNING: /* The serve has startup successfully and registered its host * name on the network, so it's time to create our services */ @@ -145,20 +147,20 @@ static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UN break; - case AVAHI_SERVER_COLLISION: { + case CATTA_SERVER_COLLISION: { 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)); + n = catta_alternative_host_name(catta_server_get_host_name(s)); fprintf(stderr, "Host name collision, retrying with '%s'\n", n); - r = avahi_server_set_host_name(s, n); - avahi_free(n); + r = catta_server_set_host_name(s, n); + catta_free(n); if (r < 0) { - fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(r)); + fprintf(stderr, "Failed to set new host name: %s\n", catta_strerror(r)); - avahi_simple_poll_quit(simple_poll); + catta_simple_poll_quit(simple_poll); return; } @@ -166,32 +168,40 @@ static void server_callback(AvahiServer *s, AvahiServerState state, AVAHI_GCC_UN /* Fall through */ - case AVAHI_SERVER_REGISTERING: + case CATTA_SERVER_REGISTERING: /* Let's drop our registered services. When the server is back - * in AVAHI_SERVER_RUNNING state we will register them + * in CATTA_SERVER_RUNNING state we will register them * again with the new host name. */ if (group) - avahi_s_entry_group_reset(group); + catta_s_entry_group_reset(group); break; - case AVAHI_SERVER_FAILURE: + case CATTA_SERVER_FAILURE: /* Terminate on failure */ - fprintf(stderr, "Server failure: %s\n", avahi_strerror(avahi_server_errno(s))); - avahi_simple_poll_quit(simple_poll); + fprintf(stderr, "Server failure: %s\n", catta_strerror(catta_server_errno(s))); + catta_simple_poll_quit(simple_poll); break; - case AVAHI_SERVER_INVALID: + case CATTA_SERVER_INVALID: ; } } -int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) { - AvahiServerConfig config; - AvahiServer *server = NULL; +static void signal_exit(int signum) { + int errnosave = errno; + catta_simple_poll_quit(simple_poll); + errno = errnosave; + + (void)signum; // ignore +} + +int main(CATTA_GCC_UNUSED int argc, CATTA_GCC_UNUSED char*argv[]) { + CattaServerConfig config; + CattaServer *server = NULL; int error; int ret = 1; @@ -199,33 +209,37 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) { srand(time(NULL)); /* Allocate main loop object */ - if (!(simple_poll = avahi_simple_poll_new())) { + if (!(simple_poll = catta_simple_poll_new())) { fprintf(stderr, "Failed to create simple poll object.\n"); goto fail; } - name = avahi_strdup("MegaPrinter"); + name = catta_strdup("MegaPrinter"); /* Let's set the host name for this server. */ - avahi_server_config_init(&config); - config.host_name = avahi_strdup("gurkiman"); + catta_server_config_init(&config); + config.host_name = catta_strdup("gurkiman"); config.publish_workstation = 0; config.publish_no_reverse = 1; /* Allocate a new server */ - server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, server_callback, NULL, &error); + server = catta_server_new(catta_simple_poll_get(simple_poll), &config, server_callback, NULL, &error); /* Free the configuration data */ - avahi_server_config_free(&config); + catta_server_config_free(&config); /* Check wether creating the server object succeeded */ if (!server) { - fprintf(stderr, "Failed to create server: %s\n", avahi_strerror(error)); + fprintf(stderr, "Failed to create server: %s\n", catta_strerror(error)); goto fail; } + /* exit cleanly on signals */ + signal(SIGINT, signal_exit); + signal(SIGTERM, signal_exit); + /* Run the main loop */ - avahi_simple_poll_loop(simple_poll); + catta_simple_poll_loop(simple_poll); ret = 0; @@ -234,12 +248,12 @@ fail: /* Cleanup things */ if (server) - avahi_server_free(server); + catta_server_free(server); if (simple_poll) - avahi_simple_poll_free(simple_poll); + catta_simple_poll_free(simple_poll); - avahi_free(name); + catta_free(name); return ret; }