diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | inet/Makefile | 2 | ||||
| -rw-r--r-- | inet/tst-getni2.c | 41 |
3 files changed, 45 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e211a52879..5ac68bc45a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-12-08 Ulrich Drepper <drepper@redhat.com> + * inet/Makefile (tests): Add tst-getni2. + * inet/tst-getni2.c: New file. + [BZ #7080] * inet/getnameinfo.c (getnameinfo): Check for output buffers being NULL when NI_NAMEREQD is set. diff --git a/inet/Makefile b/inet/Makefile index 64154bb096..16b2aae683 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -53,7 +53,7 @@ aux := check_pf check_native ifreq tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \ - tst-getni1 + tst-getni1 tst-getni2 include ../Rules diff --git a/inet/tst-getni2.c b/inet/tst-getni2.c new file mode 100644 index 0000000000..b949d888d5 --- /dev/null +++ b/inet/tst-getni2.c @@ -0,0 +1,41 @@ +#include <netdb.h> +#include <stdio.h> +#include <sys/socket.h> + +static int +do_test (void) +{ + int retval = 0; + + struct sockaddr_in6 s; + s.sin6_family = AF_INET6; + s.sin6_port = htons (80); + s.sin6_flowinfo = 0; + s.sin6_addr = (struct in6_addr) IN6ADDR_ANY_INIT; + s.sin6_scope_id = 0; + char buf[1000]; + buf[0] = '\0'; + int r = getnameinfo((struct sockaddr *) &s, sizeof (s), buf, sizeof (buf), + NULL, 0, NI_NUMERICSERV); + printf("r = %d, buf = \"%s\"\n", r, buf); + if (r != 0) + { + puts ("failed without NI_NAMEREQD"); + retval = 1; + } + + buf[0] = '\0'; + r = getnameinfo((struct sockaddr *) &s, sizeof (s), buf, sizeof (buf), + NULL, 0, NI_NUMERICSERV | NI_NAMEREQD); + printf("r = %d, buf = \"%s\"\n", r, buf); + if (r != EAI_NONAME) + { + puts ("did not fail with EAI_NONAME with NI_NAMEREQD set"); + retval = 1; + } + + return retval; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |