Update getnameinfo.c, remove dead code, and fix error reporting.

Also add a unit test for the salen size checking.

Bug: 1889275
Change-Id: I8ec4107df9e2e9a8571e8915525249c6e44b98ad
This commit is contained in:
Elliott Hughes
2013-02-13 09:49:33 -08:00
parent f659b3c90d
commit d8213bb573
5 changed files with 89 additions and 457 deletions

View File

@@ -19,10 +19,39 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
TEST(netdb, getaddrinfo_NULL_hints) {
addrinfo* ai = NULL;
ASSERT_EQ(0, getaddrinfo("localhost", "9999", NULL, &ai));
freeaddrinfo(ai);
}
TEST(netdb, getnameinfo_salen) {
sockaddr_storage ss;
memset(&ss, 0, sizeof(ss));
sockaddr* sa = reinterpret_cast<sockaddr*>(&ss);
char tmp[16];
ss.ss_family = AF_INET;
socklen_t too_much = sizeof(ss);
socklen_t just_right = sizeof(sockaddr_in);
socklen_t too_little = sizeof(sockaddr_in) - 1;
ASSERT_EQ(0, getnameinfo(sa, too_much, tmp, sizeof(tmp), NULL, 0, NI_NUMERICHOST));
ASSERT_STREQ("0.0.0.0", tmp);
ASSERT_EQ(0, getnameinfo(sa, just_right, tmp, sizeof(tmp), NULL, 0, NI_NUMERICHOST));
ASSERT_STREQ("0.0.0.0", tmp);
ASSERT_EQ(EAI_FAMILY, getnameinfo(sa, too_little, tmp, sizeof(tmp), NULL, 0, NI_NUMERICHOST));
ss.ss_family = AF_INET6;
just_right = sizeof(sockaddr_in6);
too_little = sizeof(sockaddr_in6) - 1;
too_much = just_right + 1;
ASSERT_EQ(0, getnameinfo(sa, too_much, tmp, sizeof(tmp), NULL, 0, NI_NUMERICHOST));
ASSERT_STREQ("::", tmp);
ASSERT_EQ(0, getnameinfo(sa, just_right, tmp, sizeof(tmp), NULL, 0, NI_NUMERICHOST));
ASSERT_STREQ("::", tmp);
ASSERT_EQ(EAI_FAMILY, getnameinfo(sa, too_little, tmp, sizeof(tmp), NULL, 0, NI_NUMERICHOST));
}