oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

make getnameinfo quiet by default

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-02-20 14:01:53 -08:00
parent 7c86764dea
commit 24eeb74c4a
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/roken/getaddrinfo-test.c
View File

@@ -40,10 +40,12 @@ static int flags;
static int family; static int family;
static int socktype; static int socktype;
static int verbose_counter;
static int version_flag; static int version_flag;
static int help_flag; static int help_flag;
static struct getargs args[] = { static struct getargs args[] = {
{"verbose", 0, arg_counter, &verbose_counter,"verbose", NULL},
{"flags", 0, arg_integer, &flags, "flags", NULL}, {"flags", 0, arg_integer, &flags, "flags", NULL},
{"family", 0, arg_integer, &family, "family", NULL}, {"family", 0, arg_integer, &family, "family", NULL},
{"socktype",0, arg_integer, &socktype, "socktype", NULL}, {"socktype",0, arg_integer, &socktype, "socktype", NULL},
@@ -68,7 +70,8 @@ doit (const char *nodename, const char *servname)
struct addrinfo *res, *r; struct addrinfo *res, *r;
int ret; int ret;
printf ("(%s,%s)... ", nodename ? nodename : "null", servname); if (verbose_counter)
printf ("(%s,%s)... ", nodename ? nodename : "null", servname);
memset (&hints, 0, sizeof(hints)); memset (&hints, 0, sizeof(hints));
hints.ai_flags = flags; hints.ai_flags = flags;
@@ -76,11 +79,11 @@ doit (const char *nodename, const char *servname)
hints.ai_socktype = socktype; hints.ai_socktype = socktype;
ret = getaddrinfo (nodename, servname, &hints, &res); ret = getaddrinfo (nodename, servname, &hints, &res);
if (ret) { if (ret)
printf ("error: %s\n", gai_strerror(ret)); errx(1, "error: %s\n", gai_strerror(ret));
return;
} if (verbose_counter)
printf ("\n"); printf ("\n");
for (r = res; r != NULL; r = r->ai_next) { for (r = res; r != NULL; r = r->ai_next) {
char addrstr[256]; char addrstr[256];
@@ -88,17 +91,20 @@ doit (const char *nodename, const char *servname)
if (inet_ntop (r->ai_family, if (inet_ntop (r->ai_family,
socket_get_address (r->ai_addr), socket_get_address (r->ai_addr),
addrstr, sizeof(addrstr)) == NULL) { addrstr, sizeof(addrstr)) == NULL) {
printf ("\tbad address?\n"); if (verbose_counter)
printf ("\tbad address?\n");
continue; continue;
} }
printf ("\tfamily = %d, socktype = %d, protocol = %d, " if (verbose_counter) {
"address = \"%s\", port = %d", printf ("\tfamily = %d, socktype = %d, protocol = %d, "
r->ai_family, r->ai_socktype, r->ai_protocol, "address = \"%s\", port = %d",
addrstr, r->ai_family, r->ai_socktype, r->ai_protocol,
ntohs(socket_get_port (r->ai_addr))); addrstr,
if (r->ai_canonname) ntohs(socket_get_port (r->ai_addr)));
printf (", canonname = \"%s\"", r->ai_canonname); if (r->ai_canonname)
printf ("\n"); printf (", canonname = \"%s\"", r->ai_canonname);
printf ("\n");
}
} }
freeaddrinfo (res); freeaddrinfo (res);
} }