X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2Favahi-browse.c;h=4d427cf2f465601858392be907f7d4f7fd57984c;hb=6ecd227ceadc32ed229246aa61df6361c7b58a95;hp=dcf3e473e90ecd9d8c76ba7819ad58f917afc5c2;hpb=7aa497b127f2939317c42fccf533f873f525597d;p=catta diff --git a/avahi-utils/avahi-browse.c b/avahi-utils/avahi-browse.c index dcf3e47..4d427cf 100644 --- a/avahi-utils/avahi-browse.c +++ b/avahi-utils/avahi-browse.c @@ -50,7 +50,9 @@ typedef enum { COMMAND_HELP, COMMAND_VERSION, - COMMAND_RUN + COMMAND_BROWSE_SERVICES, + COMMAND_BROWSE_ALL_SERVICES, + COMMAND_BROWSE_DOMAINS } Command; typedef struct Config { @@ -60,9 +62,9 @@ typedef struct Config { char *domain; char *stype; int ignore_local; - int show_all; Command command; int resolve; + int no_fail; #ifdef HAVE_GDBM int no_db_lookup; #endif @@ -87,6 +89,7 @@ static int n_all_for_now = 0, n_cache_exhausted = 0, n_resolving = 0; static AvahiStringList *browsed_types = NULL; static ServiceInfo *services = NULL; static int n_columns = 80; +static int browsing = 0; static void check_terminate(Config *c) { @@ -142,7 +145,8 @@ static void print_service_line(Config *config, char c, AvahiIfIndex interface, A printf("%c %4s %4s %-*s %-20s %s\n", c, - if_indextoname(interface, ifname), avahi_proto_to_string(protocol), + 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); } @@ -403,68 +407,223 @@ static void browse_all(Config *c) { n_all_for_now++; } -static void client_callback(AVAHI_GCC_UNUSED AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) { - switch (state) { - case AVAHI_CLIENT_DISCONNECTED: - fprintf(stderr, "Client disconnected, exiting.\n"); +static void domain_browser_callback( + AvahiDomainBrowser *b, + AVAHI_GCC_UNUSED AvahiIfIndex interface, + AVAHI_GCC_UNUSED AvahiProtocol protocol, + AvahiBrowserEvent event, + const char *domain, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + void *userdata) { + + Config *c = userdata; + + 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); + break; + } + + case AVAHI_BROWSER_FAILURE: + 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); + break; + } +} +static void browse_domains(Config *c) { + AvahiDomainBrowser *b; + + assert(c); + + if (!(b = avahi_domain_browser_new( + client, + AVAHI_IF_UNSPEC, + AVAHI_PROTO_UNSPEC, + c->domain, + AVAHI_DOMAIN_BROWSER_BROWSE, + 0, + domain_browser_callback, + c))) { + + fprintf(stderr, "avahi_domain_browser_new() failed: %s\n", avahi_strerror(avahi_client_errno(client))); + avahi_simple_poll_quit(simple_poll); + } + + n_cache_exhausted++; + n_all_for_now++; +} + +static int start(Config *config) { + + assert(!browsing); + + if (config->verbose) { + 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))); + 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))); + 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"); + } + + if (config->command == COMMAND_BROWSE_SERVICES) + browse_service_type(config, config->stype, config->domain); + else if (config->command == COMMAND_BROWSE_ALL_SERVICES) + browse_all(config); + else { + assert(config->command == COMMAND_BROWSE_DOMAINS); + browse_domains(config); + } + + 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"); + + 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)); + avahi_simple_poll_quit(simple_poll); + } + + } else { + 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: - ; + + if (!browsing) + if (start(config) < 0) + avahi_simple_poll_quit(simple_poll); + + break; + + case AVAHI_CLIENT_CONNECTING: + + if (config->verbose) + fprintf(stderr, "Waiting for daemon ...\n"); + + break; } } static void help(FILE *f, const char *argv0) { fprintf(f, - "%s [options] \n" - "%s [options] -a\n\n" - " -h --help Show this help\n" - " -V --version Show version\n" - " -d --domain=DOMAIN The domain to browse\n" - " -a --all Show all services, regardless of the type\n" - " -v --verbose Enable verbose mode\n" - " -t --terminate Terminate after getting or 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" + "%s [options] \n" + "%s [options] -a\n" + "%s [options] -D\n\n" + " -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 server is not available\n" #ifdef HAVE_GDBM - " -k --no-db-lookup Don't lookup service types\n" + " -k --no-db-lookup Don't lookup service types\n" #endif - - , argv0, argv0); + , argv0, argv0, argv0); } static int parse_command_line(Config *c, int argc, char *argv[]) { int o; static const struct option long_options[] = { - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'V' }, - { "domain", required_argument, NULL, 'd' }, - { "all", no_argument, NULL, 'a' }, - { "verbose", no_argument, NULL, 'v' }, - { "terminate", no_argument, NULL, 't' }, - { "cache", no_argument, NULL, 'c' }, - { "ignore-local", no_argument, NULL, 'l' }, - { "resolve", no_argument, NULL, 'r' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, + { "browse-domains", no_argument, NULL, 'D' }, + { "domain", required_argument, NULL, 'd' }, + { "all", no_argument, NULL, 'a' }, + { "verbose", no_argument, NULL, 'v' }, + { "terminate", no_argument, NULL, 't' }, + { "cache", no_argument, NULL, 'c' }, + { "ignore-local", no_argument, NULL, 'l' }, + { "resolve", no_argument, NULL, 'r' }, + { "no-fail", no_argument, NULL, 'f' }, #ifdef HAVE_GDBM - { "no-db-lookup", no_argument, NULL, 'k' }, + { "no-db-lookup", no_argument, NULL, 'k' }, #endif { NULL, 0, NULL, 0 } }; assert(c); - c->command = COMMAND_RUN; + c->command = COMMAND_BROWSE_SERVICES; c->verbose = c->terminate_on_cache_exhausted = c->terminate_on_all_for_now = - c->show_all = c->ignore_local = - c->resolve = 0; + c->resolve = + c->no_fail = 0; c->domain = c->stype = NULL; #ifdef HAVE_GDBM @@ -472,7 +631,7 @@ static int parse_command_line(Config *c, int argc, char *argv[]) { #endif opterr = 0; - while ((o = getopt_long(argc, argv, "hVd:avtclr" + while ((o = getopt_long(argc, argv, "hVd:avtclrDf" #ifdef HAVE_GDBM "k" #endif @@ -485,12 +644,15 @@ static int parse_command_line(Config *c, int argc, char *argv[]) { case 'V': c->command = COMMAND_VERSION; break; + case 'a': + c->command = COMMAND_BROWSE_ALL_SERVICES; + break; + case 'D': + c->command = COMMAND_BROWSE_DOMAINS; + break; case 'd': c->domain = avahi_strdup(optarg); break; - case 'a': - c->show_all = 1; - break; case 'v': c->verbose = 1; break; @@ -506,6 +668,9 @@ static int parse_command_line(Config *c, int argc, char *argv[]) { case 'r': c->resolve = 1; break; + case 'f': + c->no_fail = 1; + break; #ifdef HAVE_GDBM case 'k': c->no_db_lookup = 1; @@ -517,7 +682,7 @@ static int parse_command_line(Config *c, int argc, char *argv[]) { } } - if (c->command == COMMAND_RUN && !c->show_all) { + if (c->command == COMMAND_BROWSE_SERVICES) { if (optind >= argc) { fprintf(stderr, "Too few arguments\n"); return -1; @@ -568,7 +733,9 @@ int main(int argc, char *argv[]) { ret = 0; break; - case COMMAND_RUN: + 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"); @@ -578,32 +745,10 @@ int main(int argc, char *argv[]) { if (sigint_install(simple_poll) < 0) goto fail; - if (!(client = avahi_client_new(avahi_simple_poll_get(simple_poll), client_callback, NULL, &error))) { + 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)); goto fail; } - - if (config.verbose) { - 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))); - 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))); - goto fail; - } - - fprintf(stderr, "Server version: %s; Host name: %s\n\n", version, hn); - fprintf(stderr, "E Ifce Prot %-*s %-20s Domain\n", n_columns-35, "Name", "Type"); - } - - if (config.show_all) - browse_all(&config); - else - browse_service_type(&config, config.stype, config.domain); avahi_simple_poll_loop(simple_poll); ret = 0;