-/* $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
#include <sys/socket.h>
#include <net/if.h>
#include <locale.h>
+#include <ctype.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/error.h>
#include <avahi-common/malloc.h>
#include <avahi-common/domain.h>
#include <avahi-common/llist.h>
+#include <avahi-common/i18n.h>
#include <avahi-client/client.h>
#include <avahi-client/lookup.h>
#include "sigint.h"
-#ifdef HAVE_GDBM
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
#include "stdb.h"
#endif
COMMAND_BROWSE_SERVICES,
COMMAND_BROWSE_ALL_SERVICES,
COMMAND_BROWSE_DOMAINS
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
+ , COMMAND_DUMP_STDB
+#endif
} Command;
typedef struct Config {
Command command;
int resolve;
int no_fail;
-#ifdef HAVE_GDBM
+ int parsable;
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
int no_db_lookup;
#endif
} Config;
assert(n_all_for_now >= 0);
assert(n_cache_exhausted >= 0);
assert(n_resolving >= 0);
-
+
if (n_all_for_now <= 0 && n_resolving <= 0) {
- if (c->verbose) {
- printf(": All for now\n");
+ if (c->verbose && !c->parsable) {
+ printf(_(": All for now\n"));
n_all_for_now++; /* Make sure that this event is not repeated */
}
-
+
if (c->terminate_on_all_for_now)
avahi_simple_poll_quit(simple_poll);
}
-
+
if (n_cache_exhausted <= 0 && n_resolving <= 0) {
- if (c->verbose) {
- printf(": Cache exhausted\n");
+ if (c->verbose && !c->parsable) {
+ printf(_(": Cache exhausted\n"));
n_cache_exhausted++; /* Make sure that this event is not repeated */
}
-
+
if (c->terminate_on_cache_exhausted)
avahi_simple_poll_quit(simple_poll);
}
return NULL;
}
-static void print_service_line(Config *config, char c, AvahiIfIndex interface, AvahiProtocol protocol, const char *name, const char *type, const char *domain) {
+static char *make_printable(const char *from, char *to) {
+ const char *f;
+ char *t;
+
+ for (f = from, t = to; *f; f++, t++)
+ *t = isprint(*f) ? *f : '_';
+
+ *t = 0;
+
+ return to;
+}
+
+static void print_service_line(Config *config, char c, AvahiIfIndex interface, AvahiProtocol protocol, const char *name, const char *type, const char *domain, int nl) {
char ifname[IF_NAMESIZE];
-#ifdef HAVE_GDBM
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
if (!config->no_db_lookup)
type = stdb_lookup(type);
#endif
-
- printf("%c %4s %4s %-*s %-20s %s\n",
- c,
- interface != AVAHI_IF_UNSPEC ? if_indextoname(interface, ifname) : "n/a",
- protocol != AVAHI_PROTO_UNSPEC ? avahi_proto_to_string(protocol) : "n/a",
- n_columns-35, name, type, domain);
+
+ if (config->parsable) {
+ char sn[AVAHI_DOMAIN_NAME_MAX], *e = sn;
+ size_t l = sizeof(sn);
+
+ printf("%c;%s;%s;%s;%s;%s%s",
+ c,
+ interface != AVAHI_IF_UNSPEC ? if_indextoname(interface, ifname) : _("n/a"),
+ protocol != AVAHI_PROTO_UNSPEC ? avahi_proto_to_string(protocol) : _("n/a"),
+ avahi_escape_label(name, strlen(name), &e, &l), type, domain, nl ? "\n" : "");
+
+ } else {
+ char label[AVAHI_LABEL_MAX];
+ make_printable(name, label);
+
+ printf("%c %6s %4s %-*s %-20s %s\n",
+ c,
+ interface != AVAHI_IF_UNSPEC ? if_indextoname(interface, ifname) : _("n/a"),
+ protocol != AVAHI_PROTO_UNSPEC ? avahi_proto_to_string(protocol) : _("n/a"),
+ n_columns-35, label, type, domain);
+ }
+
+ fflush(stdout);
}
static void service_resolver_callback(
AvahiStringList *txt,
AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
void *userdata) {
-
+
ServiceInfo *i = userdata;
-
+
assert(r);
assert(i);
t = avahi_string_list_to_string(txt);
- print_service_line(i->config, '=', interface, protocol, name, type, domain);
-
- printf(" hostname = [%s]\n"
- " address = [%s]\n"
- " port = [%i]\n"
- " txt = [%s]\n",
- host_name,
- address,
- port,
- t);
+ print_service_line(i->config, '=', interface, protocol, name, type, domain, 0);
+
+ if (i->config->parsable)
+ printf(";%s;%s;%u;%s\n",
+ host_name,
+ address,
+ port,
+ t);
+ else
+ printf(" hostname = [%s]\n"
+ " address = [%s]\n"
+ " port = [%u]\n"
+ " txt = [%s]\n",
+ host_name,
+ address,
+ port,
+ t);
+
avahi_free(t);
break;
}
case AVAHI_RESOLVER_FAILURE:
-
- fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", name, type, domain, avahi_strerror(avahi_client_errno(client)));
+
+ fprintf(stderr, _("Failed to resolve service '%s' of type '%s' in domain '%s': %s\n"), name, type, domain, avahi_strerror(avahi_client_errno(client)));
break;
}
-
+
avahi_service_resolver_free(i->resolver);
i->resolver = NULL;
assert(n_resolving > 0);
n_resolving--;
check_terminate(i->config);
+ fflush(stdout);
}
static ServiceInfo *add_service(Config *c, AvahiIfIndex interface, AvahiProtocol protocol, const char *name, const char *type, const char *domain) {
if (c->resolve) {
if (!(i->resolver = avahi_service_resolver_new(client, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, 0, service_resolver_callback, i))) {
avahi_free(i);
- fprintf(stderr, "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", name, type, domain, avahi_strerror(avahi_client_errno(client)));
+ fprintf(stderr, _("Failed to resolve service '%s' of type '%s' in domain '%s': %s\n"), name, type, domain, avahi_strerror(avahi_client_errno(client)));
return NULL;
}
if (i->resolver)
avahi_service_resolver_free(i->resolver);
-
+
avahi_free(i->name);
avahi_free(i->type);
avahi_free(i->domain);
void *userdata) {
Config *c = userdata;
-
+
assert(b);
assert(c);
add_service(c, interface, protocol, name, type, domain);
- print_service_line(c, '+', interface, protocol, name, type, domain);
+ print_service_line(c, '+', interface, protocol, name, type, domain, 1);
break;
}
case AVAHI_BROWSER_REMOVE: {
ServiceInfo *info;
-
+
if (!(info = find_service(interface, protocol, name, type, domain)))
return;
remove_service(c, info);
-
- print_service_line(c, '-', interface, protocol, name, type, domain);
+
+ print_service_line(c, '-', interface, protocol, name, type, domain, 1);
break;
}
-
+
case AVAHI_BROWSER_FAILURE:
- fprintf(stderr, "service_browser failed: %s\n", avahi_strerror(avahi_client_errno(client)));
+ fprintf(stderr, _("service_browser failed: %s\n"), avahi_strerror(avahi_client_errno(client)));
avahi_simple_poll_quit(simple_poll);
break;
n_cache_exhausted --;
check_terminate(c);
break;
-
+
case AVAHI_BROWSER_ALL_FOR_NOW:
n_all_for_now --;
check_terminate(c);
static void browse_service_type(Config *c, const char *stype, const char *domain) {
AvahiServiceBrowser *b;
AvahiStringList *i;
-
+
assert(c);
assert(client);
assert(stype);
service_browser_callback,
c))) {
- fprintf(stderr, "avahi_service_browser_new() failed: %s\n", avahi_strerror(avahi_client_errno(client)));
+ fprintf(stderr, _("avahi_service_browser_new() failed: %s\n"), avahi_strerror(avahi_client_errno(client)));
avahi_simple_poll_quit(simple_poll);
}
assert(b);
assert(c);
-
+
switch (event) {
-
+
case AVAHI_BROWSER_NEW:
browse_service_type(c, type, domain);
break;
break;
case AVAHI_BROWSER_FAILURE:
- fprintf(stderr, "service_type_browser failed: %s\n", avahi_strerror(avahi_client_errno(client)));
+ fprintf(stderr, _("service_type_browser failed: %s\n"), avahi_strerror(avahi_client_errno(client)));
avahi_simple_poll_quit(simple_poll);
break;
-
+
case AVAHI_BROWSER_CACHE_EXHAUSTED:
n_cache_exhausted --;
check_terminate(c);
break;
-
+
case AVAHI_BROWSER_ALL_FOR_NOW:
n_all_for_now --;
check_terminate(c);
static void browse_all(Config *c) {
AvahiServiceTypeBrowser *b;
-
+
assert(c);
if (!(b = avahi_service_type_browser_new(
0,
service_type_browser_callback,
c))) {
-
- fprintf(stderr, "avahi_service_type_browser_new() failed: %s\n", avahi_strerror(avahi_client_errno(client)));
+
+ fprintf(stderr, _("avahi_service_type_browser_new() failed: %s\n"), avahi_strerror(avahi_client_errno(client)));
avahi_simple_poll_quit(simple_poll);
}
assert(b);
assert(c);
-
+
switch (event) {
-
+
case AVAHI_BROWSER_NEW:
case AVAHI_BROWSER_REMOVE: {
char ifname[IF_NAMESIZE];
-
- printf("%c %4s %4s %s\n",
- event == AVAHI_BROWSER_NEW ? '+' : '-',
- interface != AVAHI_IF_UNSPEC ? if_indextoname(interface, ifname) : "n/a",
- protocol != AVAHI_PROTO_UNSPEC ? avahi_proto_to_string(protocol) : "n/a",
- domain);
+
+ if (c->parsable)
+ printf("%c;%s;%s;%s\n",
+ event == AVAHI_BROWSER_NEW ? '+' : '-',
+ interface != AVAHI_IF_UNSPEC ? if_indextoname(interface, ifname) : "",
+ protocol != AVAHI_PROTO_UNSPEC ? avahi_proto_to_string(protocol) : "",
+ domain);
+ else
+ printf("%c %4s %4s %s\n",
+ event == AVAHI_BROWSER_NEW ? '+' : '-',
+ interface != AVAHI_IF_UNSPEC ? if_indextoname(interface, ifname) : "n/a",
+ protocol != AVAHI_PROTO_UNSPEC ? avahi_proto_to_string(protocol) : "n/a",
+ domain);
break;
}
case AVAHI_BROWSER_FAILURE:
- fprintf(stderr, "domain_browser failed: %s\n", avahi_strerror(avahi_client_errno(client)));
+ fprintf(stderr, ("domain_browser failed: %s\n"), avahi_strerror(avahi_client_errno(client)));
avahi_simple_poll_quit(simple_poll);
break;
-
+
case AVAHI_BROWSER_CACHE_EXHAUSTED:
n_cache_exhausted --;
check_terminate(c);
break;
-
+
case AVAHI_BROWSER_ALL_FOR_NOW:
n_all_for_now --;
check_terminate(c);
domain_browser_callback,
c))) {
- fprintf(stderr, "avahi_domain_browser_new() failed: %s\n", avahi_strerror(avahi_client_errno(client)));
+ fprintf(stderr, _("avahi_domain_browser_new() failed: %s\n"), avahi_strerror(avahi_client_errno(client)));
avahi_simple_poll_quit(simple_poll);
}
static int start(Config *config) {
assert(!browsing);
-
- if (config->verbose) {
+
+ if (config->verbose && !config->parsable) {
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)));
return -1;
}
-
+
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)));
return -1;
}
-
- fprintf(stderr, "Server version: %s; Host name: %s\n", version, hn);
-
- if (config->command == COMMAND_BROWSE_DOMAINS)
- fprintf(stderr, "E Ifce Prot Domain\n");
- else
- fprintf(stderr, "E Ifce Prot %-*s %-20s Domain\n", n_columns-35, "Name", "Type");
+
+ fprintf(stderr, _("Server version: %s; Host name: %s\n"), version, hn);
+
+ if (config->command == COMMAND_BROWSE_DOMAINS) {
+ /* Translators: This is a column heading with abbreviations for
+ * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain */
+ fprintf(stderr, _("E Ifce Prot Domain\n"));
+ } else {
+ /* Translators: This is a column heading with abbreviations for
+ * Event (+/-), Network Interface, Protocol (IPv4/v6), Domain */
+ fprintf(stderr, _("E Ifce Prot %-*s %-20s Domain\n"), n_columns-35, _("Name"), _("Type"));
+ }
}
-
+
if (config->command == COMMAND_BROWSE_SERVICES)
browse_service_type(config, config->stype, config->domain);
else if (config->command == COMMAND_BROWSE_ALL_SERVICES)
browsing = 1;
return 0;
}
-
+
static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) {
Config *config = userdata;
/* This function might be called when avahi_client_new() has not
* returned yet.*/
client = c;
-
+
switch (state) {
case AVAHI_CLIENT_FAILURE:
-
+
if (config->no_fail && avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) {
int error;
/* We have been disconnected, so let reconnect */
- fprintf(stderr, "Disconnected, reconnecting ...\n");
+ fprintf(stderr, _("Disconnected, reconnecting ...\n"));
avahi_client_free(client);
client = NULL;
avahi_string_list_free(browsed_types);
browsed_types = NULL;
-
+
while (services)
remove_service(config, services);
browsing = 0;
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_REGISTERING:
case AVAHI_CLIENT_S_RUNNING:
case AVAHI_CLIENT_S_COLLISION:
avahi_simple_poll_quit(simple_poll);
break;
-
+
case AVAHI_CLIENT_CONNECTING:
-
- if (config->verbose)
- fprintf(stderr, "Waiting for daemon ...\n");
+
+ if (config->verbose && !config->parsable)
+ fprintf(stderr, _("Waiting for daemon ...\n"));
break;
}
fprintf(f,
"%s [options] <service type>\n"
"%s [options] -a\n"
- "%s [options] -D\n\n",
+ "%s [options] -D\n"
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
+ "%s [options] -b\n"
+#endif
+ "\n",
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
+ argv0,
+#endif
argv0, argv0, argv0);
- fprintf(f,
- " -h --help Show this help\n"
- " -V --version Show version\n"
- " -D --browse-domains Browse for browsing domains instead of services\n"
- " -a --all Show all services, regardless of the type\n"
- " -d --domain=DOMAIN The domain to browse in\n"
- " -v --verbose Enable verbose mode\n"
- " -t --terminate Terminate after dumping a more or less complete list\n"
- " -c --cache Terminate after dumping all entries from the cache\n"
- " -l --ignore-local Ignore local services\n"
- " -r --resolve Resolve services found\n"
- " -f --no-fail Don't fail if the daemon is not available\n"
-#ifdef HAVE_GDBM
- " -k --no-db-lookup Don't lookup service types\n"
+ fprintf(f, "%s%s",
+ _(" -h --help Show this help\n"
+ " -V --version Show version\n"
+ " -D --browse-domains Browse for browsing domains instead of services\n"
+ " -a --all Show all services, regardless of the type\n"
+ " -d --domain=DOMAIN The domain to browse in\n"
+ " -v --verbose Enable verbose mode\n"
+ " -t --terminate Terminate after dumping a more or less complete list\n"
+ " -c --cache Terminate after dumping all entries from the cache\n"
+ " -l --ignore-local Ignore local services\n"
+ " -r --resolve Resolve services found\n"
+ " -f --no-fail Don't fail if the daemon is not available\n"
+ " -p --parsable Output in parsable format\n"),
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
+ _(" -k --no-db-lookup Don't lookup service types\n"
+ " -b --dump-db Dump service type database\n")
+#else
+ ""
#endif
);
}
{ "ignore-local", no_argument, NULL, 'l' },
{ "resolve", no_argument, NULL, 'r' },
{ "no-fail", no_argument, NULL, 'f' },
-#ifdef HAVE_GDBM
+ { "parsable", no_argument, NULL, 'p' },
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
{ "no-db-lookup", no_argument, NULL, 'k' },
+ { "dump-db", no_argument, NULL, 'b' },
#endif
{ NULL, 0, NULL, 0 }
};
c->terminate_on_all_for_now =
c->ignore_local =
c->resolve =
- c->no_fail = 0;
+ c->no_fail =
+ c->parsable = 0;
c->domain = c->stype = NULL;
-#ifdef HAVE_GDBM
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
c->no_db_lookup = 0;
#endif
-
- opterr = 0;
- while ((o = getopt_long(argc, argv, "hVd:avtclrDf"
-#ifdef HAVE_GDBM
- "k"
+
+ while ((o = getopt_long(argc, argv, "hVd:avtclrDfp"
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
+ "kb"
#endif
, long_options, NULL)) >= 0) {
case 'f':
c->no_fail = 1;
break;
-#ifdef HAVE_GDBM
+ case 'p':
+ c->parsable = 1;
+ break;
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
case 'k':
c->no_db_lookup = 1;
break;
+ case 'b':
+ c->command = COMMAND_DUMP_STDB;
+ break;
#endif
default:
- fprintf(stderr, "Invalid command line argument: %c\n", o);
return -1;
}
}
if (c->command == COMMAND_BROWSE_SERVICES) {
if (optind >= argc) {
- fprintf(stderr, "Too few arguments\n");
+ fprintf(stderr, _("Too few arguments\n"));
return -1;
}
c->stype = avahi_strdup(argv[optind]);
optind++;
}
-
+
if (optind < argc) {
- fprintf(stderr, "Too many arguments\n");
+ fprintf(stderr, _("Too many arguments\n"));
return -1;
}
-
+
return 0;
}
const char *argv0;
char *ec;
+ avahi_init_i18n();
setlocale(LC_ALL, "");
if ((argv0 = strrchr(argv[0], '/')))
if (n_columns < 40)
n_columns = 40;
-
+
if (parse_command_line(&config, argv0, argc, argv) < 0)
goto fail;
help(stdout, argv0);
ret = 0;
break;
-
+
case COMMAND_VERSION:
printf("%s "PACKAGE_VERSION"\n", argv0);
ret = 0;
case COMMAND_BROWSE_SERVICES:
case COMMAND_BROWSE_ALL_SERVICES:
case COMMAND_BROWSE_DOMAINS:
-
+
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;
}
-
+
avahi_simple_poll_loop(simple_poll);
ret = 0;
break;
+
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
+ case COMMAND_DUMP_STDB: {
+ char *t;
+ stdb_setent();
+
+ while ((t = stdb_getent())) {
+ if (config.no_db_lookup)
+ printf("%s\n", t);
+ else
+ printf("%s\n", stdb_lookup(t));
+ }
+
+ ret = 0;
+ break;
+ }
+#endif
}
-
-
+
+
fail:
while (services)
avahi_client_free(client);
sigint_uninstall();
-
+
if (simple_poll)
avahi_simple_poll_free(simple_poll);
avahi_string_list_free(browsed_types);
-#ifdef HAVE_GDBM
+#if defined(HAVE_GDBM) || defined(HAVE_DBM)
stdb_shutdown();
-#endif
+#endif
return ret;
}
projects / catta / blobdiff