gluon-neighbour-info: improve verbosity on wrong cli parameters (#829)

gluon-neighbour-info: improve verbosity on wrong cli parameters
This commit is contained in:
lemoer 2016-07-25 15:52:27 +02:00 committed by Matthias Schiffer
parent 1c42aa0e42
commit 8e8f794c24

View File

@ -38,7 +38,7 @@
void usage() { void usage() {
puts("Usage: gluon-neighbour-info [-h] [-s] [-l] [-c <count>] [-t <sec>] -d <dest> -p <port> -i <if0> -r <request>"); puts("Usage: gluon-neighbour-info [-h] [-s] [-l] [-c <count>] [-t <sec>] -d <dest> -p <port> -i <if0> -r <request>");
puts(" -p <int> UDP port"); puts(" -p <int> UDP port");
puts(" -d <ip6> multicast group, e.g. ff02:0:0:0:0:0:2:1001"); puts(" -d <ip6> destination address (unicast ip6 or multicast group, e.g. ff02:0:0:0:0:0:2:1001)");
puts(" -i <string> interface, e.g. eth0 "); puts(" -i <string> interface, e.g. eth0 ");
puts(" -r <string> request, e.g. nodeinfo"); puts(" -r <string> request, e.g. nodeinfo");
puts(" -t <sec> timeout in seconds (default: 3)"); puts(" -t <sec> timeout in seconds (default: 3)");
@ -145,7 +145,6 @@ int main(int argc, char **argv) {
} }
client_addr.sin6_family = AF_INET6; client_addr.sin6_family = AF_INET6;
client_addr.sin6_addr = in6addr_any;
opterr = 0; opterr = 0;
@ -206,10 +205,20 @@ int main(int argc, char **argv) {
} }
if (request_string == NULL) { if (request_string == NULL) {
fprintf(stderr, "No request string supplied"); fprintf(stderr, "No request string supplied\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (client_addr.sin6_port == htons(0)) {
fprintf(stderr, "No port supplied\n");
exit(EXIT_FAILURE);
}
if (IN6_IS_ADDR_UNSPECIFIED(&client_addr.sin6_addr)) {
fprintf(stderr, "No destination address supplied\n");
exit(EXIT_FAILURE);
}
if (sse) { if (sse) {
fputs("Content-Type: text/event-stream\n\n", stdout); fputs("Content-Type: text/event-stream\n\n", stdout);
fflush(stdout); fflush(stdout);