X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2Favahi-publish.c;h=485de3a649bec19f07ede19574602d2ed1cdbfaa;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=77dc42276bb2f038630c4b4e8d1df64c59091b23;hpb=c1e5b725e8e769c8ac1f5df97aac53896b05af43;p=catta diff --git a/avahi-utils/avahi-publish.c b/avahi-utils/avahi-publish.c index 77dc422..485de3a 100644 --- a/avahi-utils/avahi-publish.c +++ b/avahi-utils/avahi-publish.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi 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 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 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -30,18 +28,20 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include "sigint.h" typedef enum { - COMMAND_UNSPEC, + COMMAND_UNSPEC, COMMAND_HELP, COMMAND_VERSION, COMMAND_PUBLISH_SERVICE, @@ -49,7 +49,7 @@ typedef enum { } Command; typedef struct Config { - int verbose, no_fail; + int verbose, no_fail, no_reverse; Command command; char *name, *stype, *domain, *host; uint16_t port; @@ -73,12 +73,12 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, case AVAHI_ENTRY_GROUP_ESTABLISHED: - fprintf(stderr, "Established under name '%s'\n", config->name); + fprintf(stderr, _("Established under name '%s'\n"), config->name); break; case AVAHI_ENTRY_GROUP_FAILURE: - - fprintf(stderr, "Failed to register: %s\n", avahi_strerror(avahi_client_errno(client))); + + fprintf(stderr, _("Failed to register: %s\n"), avahi_strerror(avahi_client_errno(client))); break; case AVAHI_ENTRY_GROUP_COLLISION: { @@ -91,15 +91,15 @@ static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, n = avahi_alternative_host_name(config->name); } - fprintf(stderr, "Name collision, picking new name '%s'.\n", n); + fprintf(stderr, _("Name collision, picking new name '%s'.\n"), n); avahi_free(config->name); config->name = n; - + register_stuff(config); - + break; } - + case AVAHI_ENTRY_GROUP_UNCOMMITED: case AVAHI_ENTRY_GROUP_REGISTERING: ; @@ -111,7 +111,7 @@ static int register_stuff(Config *config) { if (!entry_group) { if (!(entry_group = avahi_entry_group_new(client, entry_group_callback, config))) { - fprintf(stderr, "Failed to create entry group: %s\n", avahi_strerror(avahi_client_errno(client))); + fprintf(stderr, _("Failed to create entry group: %s\n"), avahi_strerror(avahi_client_errno(client))); return -1; } } @@ -120,24 +120,24 @@ static int register_stuff(Config *config) { if (config->command == COMMAND_PUBLISH_ADDRESS) { - if (avahi_entry_group_add_address(entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, config->name, &config->address) < 0) { - fprintf(stderr, "Failed to add address: %s\n", avahi_strerror(avahi_client_errno(client))); + if (avahi_entry_group_add_address(entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, config->no_reverse ? AVAHI_PUBLISH_NO_REVERSE : 0, config->name, &config->address) < 0) { + fprintf(stderr, _("Failed to add address: %s\n"), avahi_strerror(avahi_client_errno(client))); return -1; } - + } else { AvahiStringList *i; - + assert(config->command == COMMAND_PUBLISH_SERVICE); if (avahi_entry_group_add_service_strlst(entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, config->name, config->stype, config->domain, config->host, config->port, config->txt) < 0) { - fprintf(stderr, "Failed to add service: %s\n", avahi_strerror(avahi_client_errno(client))); + fprintf(stderr, _("Failed to add service: %s\n"), avahi_strerror(avahi_client_errno(client))); return -1; } for (i = config->subtypes; i; i = i->next) if (avahi_entry_group_add_service_subtype(entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, config->name, config->stype, config->domain, (char*) i->text) < 0) { - fprintf(stderr, "Failed to add subtype '%s': %s\n", i->text, avahi_strerror(avahi_client_errno(client))); + fprintf(stderr, _("Failed to add subtype '%s': %s\n"), i->text, avahi_strerror(avahi_client_errno(client))); return -1; } } @@ -149,9 +149,9 @@ static int register_stuff(Config *config) { static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) { Config *config = userdata; - + client = c; - + switch (state) { case AVAHI_CLIENT_FAILURE: @@ -160,38 +160,38 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN /* We have been disconnected, so let reconnect */ - fprintf(stderr, "Disconnected, reconnecting ...\n"); + fprintf(stderr, _("Disconnected, reconnecting ...\n")); avahi_client_free(client); client = NULL; entry_group = NULL; if (!(client = avahi_client_new(avahi_simple_poll_get(simple_poll), AVAHI_CLIENT_NO_FAIL, client_callback, config, &error))) { - fprintf(stderr, "Failed to create client object: %s\n", avahi_strerror(error)); + fprintf(stderr, _("Failed to create client object: %s\n"), avahi_strerror(error)); avahi_simple_poll_quit(simple_poll); } } else { - fprintf(stderr, "Client failure, exiting: %s\n", avahi_strerror(avahi_client_errno(c))); + fprintf(stderr, _("Client failure, exiting: %s\n"), avahi_strerror(avahi_client_errno(c))); avahi_simple_poll_quit(simple_poll); } break; - + case AVAHI_CLIENT_S_RUNNING: if (register_stuff(config) < 0) avahi_simple_poll_quit(simple_poll); - + break; case AVAHI_CLIENT_S_COLLISION: if (config->verbose) - fprintf(stderr, "Host name conflict\n"); + fprintf(stderr, _("Host name conflict\n")); /* Fall through */ - + case AVAHI_CLIENT_S_REGISTERING: if (entry_group) { @@ -199,33 +199,34 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN entry_group = NULL; } break; - + case AVAHI_CLIENT_CONNECTING: - + if (config->verbose) - fprintf(stderr, "Waiting for daemon ...\n"); - + fprintf(stderr, _("Waiting for daemon ...\n")); + break; - + ; } } static void help(FILE *f, const char *argv0) { fprintf(f, - "%s [options] %s []\n" - "%s [options] %s
\n\n" - " -h --help Show this help\n" - " -V --version Show version\n" - " -s --service Publish service\n" - " -a --address Publish address\n" - " -v --verbose Enable verbose mode\n" - " -d --domain=DOMAIN Domain to publish service in\n" - " -H --host=DOMAIN Host where service resides\n" - " --subtype=SUBTYPE An additional subtype to register this service with\n" - " -f --no-fail Don't fail if the daemon is not available\n", - argv0, strstr(argv0, "service") ? "[-s]" : "-s", - argv0, strstr(argv0, "address") ? "[-a]" : "-a"); + _("%s [options] %s []\n" + "%s [options] %s
\n\n" + " -h --help Show this help\n" + " -V --version Show version\n" + " -s --service Publish service\n" + " -a --address Publish address\n" + " -v --verbose Enable verbose mode\n" + " -d --domain=DOMAIN Domain to publish service in\n" + " -H --host=DOMAIN Host where service resides\n" + " --subtype=SUBTYPE An additional subtype to register this service with\n" + " -R --no-reverse Do not publish reverse entry with address\n" + " -f --no-fail Don't fail if the daemon is not available\n"), + argv0, strstr(argv0, "service") ? "[-s]" : "-s", + argv0, strstr(argv0, "address") ? "[-a]" : "-a"); } static int parse_command_line(Config *c, const char *argv0, int argc, char *argv[]) { @@ -234,7 +235,7 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv enum { ARG_SUBTYPE = 256 }; - + static const struct option long_options[] = { { "help", no_argument, NULL, 'h' }, { "version", no_argument, NULL, 'V' }, @@ -244,6 +245,7 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv { "domain", required_argument, NULL, 'd' }, { "host", required_argument, NULL, 'H' }, { "subtype", required_argument, NULL, ARG_SUBTYPE}, + { "no-reverse", no_argument, NULL, 'R' }, { "no-fail", no_argument, NULL, 'f' }, { NULL, 0, NULL, 0 } }; @@ -251,13 +253,12 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv assert(c); c->command = strstr(argv0, "address") ? COMMAND_PUBLISH_ADDRESS : (strstr(argv0, "service") ? COMMAND_PUBLISH_SERVICE : COMMAND_UNSPEC); - c->verbose = c->no_fail = 0; + c->verbose = c->no_fail = c->no_reverse = 0; c->host = c->name = c->domain = c->stype = NULL; c->port = 0; c->txt = c->subtypes = NULL; - opterr = 0; - while ((o = getopt_long(argc, argv, "hVsavd:H:f", long_options, NULL)) >= 0) { + while ((o = getopt_long(argc, argv, "hVsavRd:H:f", long_options, NULL)) >= 0) { switch(o) { case 'h': @@ -275,6 +276,9 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv case 'v': c->verbose = 1; break; + case 'R': + c->no_reverse = 1; + break; case 'd': avahi_free(c->domain); c->domain = avahi_strdup(optarg); @@ -290,29 +294,28 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv c->subtypes = avahi_string_list_add(c->subtypes, optarg); break; default: - fprintf(stderr, "Invalid command line argument: %c\n", o); return -1; } } if (c->command == COMMAND_PUBLISH_ADDRESS) { if (optind+2 != argc) { - fprintf(stderr, "Bad number of arguments\n"); + fprintf(stderr, _("Bad number of arguments\n")); return -1; } avahi_free(c->name); c->name = avahi_strdup(argv[optind]); avahi_address_parse(argv[optind+1], AVAHI_PROTO_UNSPEC, &c->address); - + } else if (c->command == COMMAND_PUBLISH_SERVICE) { char *e; long int p; int i; - + if (optind+3 > argc) { - fprintf(stderr, "Bad number of arguments\n"); + fprintf(stderr, _("Bad number of arguments\n")); return -1; } @@ -323,16 +326,16 @@ static int parse_command_line(Config *c, const char *argv0, int argc, char *argv p = strtol(argv[optind+2], &e, 0); if (errno != 0 || *e || p < 0 || p > 0xFFFF) { - fprintf(stderr, "Failed to parse port number: %s\n", argv[optind+2]); + fprintf(stderr, _("Failed to parse port number: %s\n"), argv[optind+2]); return -1; } c->port = p; - + for (i = optind+3; i < argc; i++) c->txt = avahi_string_list_add(c->txt, argv[i]); } - + return 0; } @@ -341,6 +344,9 @@ int main(int argc, char *argv[]) { Config config; const char *argv0; + avahi_init_i18n(); + setlocale(LC_ALL, ""); + if ((argv0 = strrchr(argv[0], '/'))) argv0++; else @@ -352,14 +358,14 @@ int main(int argc, char *argv[]) { switch (config.command) { case COMMAND_UNSPEC: ret = 1; - fprintf(stderr, "No command specified.\n"); + fprintf(stderr, _("No command specified.\n")); break; - + case COMMAND_HELP: help(stdout, argv0); ret = 0; break; - + case COMMAND_VERSION: printf("%s "PACKAGE_VERSION"\n", argv0); ret = 0; @@ -367,17 +373,17 @@ int main(int argc, char *argv[]) { case COMMAND_PUBLISH_SERVICE: case COMMAND_PUBLISH_ADDRESS: - + if (!(simple_poll = avahi_simple_poll_new())) { - fprintf(stderr, "Failed to create simple poll object.\n"); + fprintf(stderr, _("Failed to create simple poll object.\n")); goto fail; } - + if (sigint_install(simple_poll) < 0) goto fail; - + if (!(client = avahi_client_new(avahi_simple_poll_get(simple_poll), config.no_fail ? AVAHI_CLIENT_NO_FAIL : 0, client_callback, &config, &error))) { - fprintf(stderr, "Failed to create client object: %s\n", avahi_strerror(error)); + fprintf(stderr, _("Failed to create client object: %s\n"), avahi_strerror(error)); goto fail; } @@ -385,30 +391,30 @@ int main(int argc, char *argv[]) { const char *version, *hn; if (!(version = avahi_client_get_version_string(client))) { - fprintf(stderr, "Failed to query version string: %s\n", avahi_strerror(avahi_client_errno(client))); + fprintf(stderr, _("Failed to query version string: %s\n"), avahi_strerror(avahi_client_errno(client))); goto fail; } if (!(hn = avahi_client_get_host_name_fqdn(client))) { - fprintf(stderr, "Failed to query host name: %s\n", avahi_strerror(avahi_client_errno(client))); + fprintf(stderr, _("Failed to query host name: %s\n"), avahi_strerror(avahi_client_errno(client))); goto fail; } - - fprintf(stderr, "Server version: %s; Host name: %s\n", version, hn); + + fprintf(stderr, _("Server version: %s; Host name: %s\n"), version, hn); } avahi_simple_poll_loop(simple_poll); ret = 0; break; } - + fail: if (client) avahi_client_free(client); sigint_uninstall(); - + if (simple_poll) avahi_simple_poll_free(simple_poll);