Chiebot-Mirror
/
c-ares
mirror of https://github.com/c-ares/c-ares.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleanup some Windows warnings in test

Browse Source
pull/630/head
Brad House 1 year ago
parent 6b408a9bc9
commit 5c1a5d8050
19 changed files with 215 additions and 208 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      test/CMakeLists.txt
  2. 2
      test/ares-test-main.cc
  3. 36
      test/ares-test-misc.cc
  4. 40
      test/ares-test-parse-a.cc
  5. 28
      test/ares-test-parse-aaaa.cc
  6. 12
      test/ares-test-parse-caa.cc
  7. 18
      test/ares-test-parse-mx.cc
  8. 18
      test/ares-test-parse-naptr.cc
  9. 18
      test/ares-test-parse-ns.cc
  10. 28
      test/ares-test-parse-ptr.cc
  11. 16
      test/ares-test-parse-soa-any.cc
  12. 16
      test/ares-test-parse-soa.cc
  13. 26
      test/ares-test-parse-srv.cc
  14. 24
      test/ares-test-parse-txt.cc
  15. 26
      test/ares-test-parse-uri.cc
  16. 8
      test/ares-test-parse.cc
  17. 34
      test/ares-test.cc
  18. 28
      test/ares-test.h
  19. 38
      test/dns-proto.cc

7
test/CMakeLists.txt vendored
Unescape View File

@ -6,6 +6,11 @@ set(CMAKE_CXX_EXTENSIONS FALSE)
enable_language(CXX)
# Get rid of: warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
IF (MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
ENDIF ()
find_package(Threads)
# create target to access and use internal cares library
@ -20,6 +25,8 @@ target_include_directories(caresinternal
"${CMAKE_INSTALL_INCLUDEDIR}"
)
IF (CARES_STATIC)
target_link_libraries(caresinternal INTERFACE ${PROJECT_NAME}::cares_static)
ELSE ()

2
test/ares-test-main.cc vendored
Unescape View File

@ -38,7 +38,7 @@ int main(int argc, char* argv[]) {
gtest_argv.push_back(argv[ii]);
}
}
int gtest_argc = gtest_argv.size();
int gtest_argc = (int)gtest_argv.size();
gtest_argv.push_back(nullptr);
::testing::InitGoogleTest(&gtest_argc, gtest_argv.data());

36
test/ares-test-misc.cc vendored
Unescape View File

@ -355,7 +355,7 @@ TEST_F(DefaultChannelTest, SendFailure) {
std::string ExpandName(const std::vector<byte>& data, int offset,
long *enclen) {
char *name = nullptr;
int rc = ares_expand_name(data.data() + offset, data.data(), data.size(),
int rc = ares_expand_name(data.data() + offset, data.data(), (int)data.size(),
&name, enclen);
EXPECT_EQ(ARES_SUCCESS, rc);
std::string result;
@ -421,7 +421,7 @@ TEST_F(LibraryTest, ExpandNameFailure) {
long enclen;
SetAllocFail(1);
EXPECT_EQ(ARES_ENOMEM,
ares_expand_name(data1.data(), data1.data(), data1.size(),
ares_expand_name(data1.data(), data1.data(), (int)data1.size(),
&name, &enclen));
// Empty packet
@ -430,37 +430,37 @@ TEST_F(LibraryTest, ExpandNameFailure) {
// Start beyond enclosing data
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data1.data() + data1.size(), data1.data(), data1.size(),
ares_expand_name(data1.data() + data1.size(), data1.data(), (int)data1.size(),
&name, &enclen));
// Length beyond size of enclosing data
std::vector<byte> data2a = {0x13, 'c', 'o', 'm', 0x00};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data2a.data(), data2a.data(), data2a.size(),
ares_expand_name(data2a.data(), data2a.data(), (int)data2a.size(),
&name, &enclen));
std::vector<byte> data2b = {0x1};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data2b.data(), data2b.data(), data2b.size(),
ares_expand_name(data2b.data(), data2b.data(), (int)data2b.size(),
&name, &enclen));
std::vector<byte> data2c = {0xC0};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data2c.data(), data2c.data(), data2c.size(),
ares_expand_name(data2c.data(), data2c.data(), (int)data2c.size(),
&name, &enclen));
// Indirection beyond enclosing data
std::vector<byte> data3a = {0xC0, 0x02};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data3a.data(), data3a.data(), data3a.size(),
ares_expand_name(data3a.data(), data3a.data(), (int)data3a.size(),
&name, &enclen));
std::vector<byte> data3b = {0xC0, 0x0A, 'c', 'o', 'm', 0x00};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data3b.data(), data3b.data(), data3b.size(),
ares_expand_name(data3b.data(), data3b.data(), (int)data3b.size(),
&name, &enclen));
// Invalid top bits in label length
std::vector<byte> data4 = {0x03, 'c', 'o', 'm', 0x00, 0x80, 0x00};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data4.data() + 5, data4.data(), data4.size(),
ares_expand_name(data4.data() + 5, data4.data(), (int)data4.size(),
&name, &enclen));
// Label too long: 64-byte label, with invalid top 2 bits of length (01).
@ -471,29 +471,29 @@ TEST_F(LibraryTest, ExpandNameFailure) {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
0x00};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data5.data(), data5.data(), data5.size(),
ares_expand_name(data5.data(), data5.data(), (int)data5.size(),
&name, &enclen)) << name;
// Incomplete indirect length
std::vector<byte> data6 = {0x03, 'c', 'o', 'm', 0x00, 0xC0};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data6.data() + 5, data6.data(), data6.size(),
ares_expand_name(data6.data() + 5, data6.data(), (int)data6.size(),
&name, &enclen));
// Indirection loops
std::vector<byte> data7 = {0xC0, 0x02, 0xC0, 0x00};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data7.data(), data7.data(), data7.size(),
ares_expand_name(data7.data(), data7.data(), (int)data7.size(),
&name, &enclen));
std::vector<byte> data8 = {3, 'd', 'e', 'f', 0xC0, 0x08, 0x00, 0x00,
3, 'a', 'b', 'c', 0xC0, 0x00};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data8.data(), data8.data(), data8.size(),
ares_expand_name(data8.data(), data8.data(), (int)data8.size(),
&name, &enclen));
std::vector<byte> data9 = {0x12, 0x23, // start 2 bytes in
3, 'd', 'e', 'f', 0xC0, 0x02};
EXPECT_EQ(ARES_EBADNAME,
ares_expand_name(data9.data() + 2, data9.data(), data9.size(),
ares_expand_name(data9.data() + 2, data9.data(), (int)data9.size(),
&name, &enclen));
}
@ -551,21 +551,21 @@ TEST_F(LibraryTest, ExpandString) {
char* result = nullptr;
long len;
EXPECT_EQ(ARES_SUCCESS,
ares_expand_string(s1.data(), s1.data(), s1.size(),
ares_expand_string(s1.data(), s1.data(), (int)s1.size(),
(unsigned char**)&result, &len));
EXPECT_EQ("abc", std::string(result));
EXPECT_EQ(1 + 3, len); // amount of data consumed includes 1 byte len
ares_free_string(result);
result = nullptr;
EXPECT_EQ(ARES_EBADSTR,
ares_expand_string(s1.data() + 1, s1.data(), s1.size(),
ares_expand_string(s1.data() + 1, s1.data(), (int)s1.size(),
(unsigned char**)&result, &len));
EXPECT_EQ(ARES_EBADSTR,
ares_expand_string(s1.data() + 4, s1.data(), s1.size(),
ares_expand_string(s1.data() + 4, s1.data(), (int)s1.size(),
(unsigned char**)&result, &len));
SetAllocFail(1);
EXPECT_EQ(ARES_ENOMEM,
ares_expand_string(s1.data(), s1.data(), s1.size(),
ares_expand_string(s1.data(), s1.data(), (int)s1.size(),
(unsigned char**)&result, &len));
}

40
test/ares-test-parse-a.cc vendored
Unescape View File

@ -67,7 +67,7 @@ TEST_F(LibraryTest, ParseAReplyOK) {
struct hostent *host = nullptr;
struct ares_addrttl info[5];
int count = 5;
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
EXPECT_EQ(0x01020304, info[0].ttl);
@ -81,7 +81,7 @@ TEST_F(LibraryTest, ParseAReplyOK) {
ares_free_hostent(host);
// Repeat without providing a hostent
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
nullptr, info, &count));
EXPECT_EQ(1, count);
EXPECT_EQ(0x01020304, info[0].ttl);
@ -141,7 +141,7 @@ TEST_F(LibraryTest, ParseAReplyNoData) {
struct hostent *host = nullptr;
struct ares_addrttl info[2];
int count = 2;
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(0, count);
EXPECT_EQ(nullptr, host);
@ -150,7 +150,7 @@ TEST_F(LibraryTest, ParseAReplyNoData) {
pkt.add_answer(new DNSCnameRR("example.com", 200, "c.example.com"));
data = pkt.data();
// Expect success as per https://github.com/c-ares/c-ares/commit/2c63440127feed70ccefb148b8f938a2df6c15f8
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(0, count);
EXPECT_NE(nullptr, host);
@ -173,7 +173,7 @@ TEST_F(LibraryTest, ParseAReplyVariantA) {
struct ares_addrttl info[2];
int count = 2;
std::vector<byte> data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
EXPECT_EQ("18.7.22.69", AddressToString(&(info[0].ipaddr), 4));
@ -190,7 +190,7 @@ TEST_F(LibraryTest, ParseAReplyJustCname) {
struct ares_addrttl info[2];
int count = 2;
std::vector<byte> data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(0, count);
ASSERT_NE(nullptr, host);
@ -218,7 +218,7 @@ TEST_F(LibraryTest, ParseAReplyVariantCname) {
struct ares_addrttl info[2];
int count = 2;
std::vector<byte> data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
EXPECT_EQ("129.97.123.22", AddressToString(&(info[0].ipaddr), 4));
@ -228,7 +228,7 @@ TEST_F(LibraryTest, ParseAReplyVariantCname) {
// Repeat parsing without places to put the results.
count = 0;
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
nullptr, info, &count));
}
@ -249,7 +249,7 @@ TEST_F(LibraryTest, ParseAReplyVariantCnameChain) {
struct ares_addrttl info[2];
int count = 2;
std::vector<byte> data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
EXPECT_EQ("8.8.8.8", AddressToString(&(info[0].ipaddr), 4));
@ -271,7 +271,7 @@ TEST_F(LibraryTest, DISABLED_ParseAReplyVariantCnameLast) {
struct ares_addrttl info[8];
int count = 8;
std::vector<byte> data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(4, count);
EXPECT_EQ("129.97.123.221", AddressToString(&(info[0].ipaddr), 4));
@ -299,7 +299,7 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.add_question(new DNSQuestion("example.com", T_A));
@ -308,7 +308,7 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_A));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.questions_.clear();
@ -318,7 +318,7 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
// Not a response.
pkt.set_response(false);
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.set_response(true);
@ -326,7 +326,7 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
// Bad return code.
pkt.set_rcode(FORMERR);
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.set_rcode(NOERROR);
@ -335,7 +335,7 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
// Two questions
pkt.add_question(new DNSQuestion("example.com", T_A));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.questions_.clear();
@ -345,7 +345,7 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.answers_.clear();
@ -354,7 +354,7 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.add_answer(new DNSARR("example.com", 100, {0x02, 0x03, 0x04, 0x05}));
@ -362,10 +362,10 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), len,
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), (int)len,
&host, info, &count));
EXPECT_EQ(nullptr, host);
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), len,
EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(data.data(), (int)len,
nullptr, info, &count));
}
}
@ -385,7 +385,7 @@ TEST_F(LibraryTest, ParseAReplyAllocFail) {
for (int ii = 1; ii <= 8; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENOMEM, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count)) << ii;
EXPECT_EQ(nullptr, host);
}

28
test/ares-test-parse-aaaa.cc vendored
Unescape View File

@ -36,7 +36,7 @@ TEST_F(LibraryTest, ParseAaaaReplyOK) {
struct hostent *host = nullptr;
struct ares_addr6ttl info[5];
int count = 5;
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
EXPECT_EQ(100, info[0].ttl);
@ -50,7 +50,7 @@ TEST_F(LibraryTest, ParseAaaaReplyOK) {
// Repeat without providing places to put the results
count = 0;
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), (int)data.size(),
nullptr, info, &count));
}
@ -66,7 +66,7 @@ TEST_F(LibraryTest, ParseAaaaReplyCname) {
struct hostent *host = nullptr;
struct ares_addr6ttl info[5];
int count = 5;
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
// CNAME TTL overrides AAAA TTL.
@ -81,7 +81,7 @@ TEST_F(LibraryTest, ParseAaaaReplyCname) {
// Repeat without providing a hostent
count = 5;
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), (int)data.size(),
nullptr, info, &count));
EXPECT_EQ(1, count);
EXPECT_EQ(50, info[0].ttl);
@ -97,14 +97,14 @@ TEST_F(LibraryTest, ParseAaaaReplyNoData) {
struct hostent *host = nullptr;
struct ares_addr6ttl info[2];
int count = 2;
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(0, count);
EXPECT_EQ(nullptr, host);
// Again but with a CNAME.
pkt.add_answer(new DNSCnameRR("example.com", 200, "c.example.com"));
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(0, count);
EXPECT_EQ(nullptr, host);
@ -126,7 +126,7 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.add_question(new DNSQuestion("example.com", T_AAAA));
@ -135,7 +135,7 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_AAAA));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.questions_.clear();
@ -144,7 +144,7 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
// Two questions.
pkt.add_question(new DNSQuestion("example.com", T_AAAA));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.questions_.clear();
@ -154,7 +154,7 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.answers_.clear();
@ -165,7 +165,7 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(nullptr, host);
pkt.add_answer(new DNSAaaaRR("example.com", 100,
@ -175,10 +175,10 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), len,
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), (int)len,
&host, info, &count));
EXPECT_EQ(nullptr, host);
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), len,
EXPECT_EQ(ARES_EBADRESP, ares_parse_aaaa_reply(data.data(), (int)len,
nullptr, info, &count));
}
}
@ -199,7 +199,7 @@ TEST_F(LibraryTest, ParseAaaaReplyAllocFail) {
for (int ii = 1; ii <= 8; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_aaaa_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENOMEM, ares_parse_aaaa_reply(data.data(), (int)data.size(),
&host, info, &count)) << ii;
EXPECT_EQ(nullptr, host);
}

12
test/ares-test-parse-caa.cc vendored
Unescape View File

@ -41,7 +41,7 @@ TEST_F(LibraryTest, ParseCaaReplyMultipleOK) {
};
struct ares_caa_reply* caa = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_caa_reply(data.data(), data.size(), &caa));
EXPECT_EQ(ARES_SUCCESS, ares_parse_caa_reply(data.data(), (int)data.size(), &caa));
ASSERT_NE(nullptr, caa);
ASSERT_NE(nullptr, caa->next);
ASSERT_NE(nullptr, caa->next->next);
@ -59,7 +59,7 @@ TEST_F(LibraryTest, ParseCaaReplySingleOK) {
};
struct ares_caa_reply* caa = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_caa_reply(data.data(), data.size(), &caa));
EXPECT_EQ(ARES_SUCCESS, ares_parse_caa_reply(data.data(), (int)data.size(), &caa));
ASSERT_NE(nullptr, caa);
EXPECT_EQ(caa->critical, 0);
@ -80,7 +80,7 @@ TEST_F(LibraryTest, ParseCaaBogusReply1) {
};
struct ares_caa_reply* caa = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_caa_reply(data.data(), data.size(), &caa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_caa_reply(data.data(), (int)data.size(), &caa));
ASSERT_EQ(nullptr, caa);
}
@ -93,7 +93,7 @@ TEST_F(LibraryTest, ParseCaaBogusReply2) {
};
struct ares_caa_reply* caa = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_caa_reply(data.data(), data.size(), &caa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_caa_reply(data.data(), (int)data.size(), &caa));
ASSERT_EQ(nullptr, caa);
}
@ -106,7 +106,7 @@ TEST_F(LibraryTest, ParseCaaBogusReply3) {
};
struct ares_caa_reply* caa = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_caa_reply(data.data(), data.size(), &caa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_caa_reply(data.data(), (int)data.size(), &caa));
ASSERT_EQ(nullptr, caa);
}
@ -122,7 +122,7 @@ TEST_F(LibraryTest, ParseCaaEmptyReply) {
};
struct ares_caa_reply* caa = nullptr;
EXPECT_EQ(ARES_ENODATA, ares_parse_caa_reply(data.data(), data.size(), &caa));
EXPECT_EQ(ARES_ENODATA, ares_parse_caa_reply(data.data(), (int)data.size(), &caa));
ASSERT_EQ(nullptr, caa);
}

18
test/ares-test-parse-mx.cc vendored
Unescape View File

@ -33,7 +33,7 @@ TEST_F(LibraryTest, ParseMxReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_mx_reply* mx = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_mx_reply(data.data(), data.size(), &mx));
EXPECT_EQ(ARES_SUCCESS, ares_parse_mx_reply(data.data(), (int)data.size(), &mx));
ASSERT_NE(nullptr, mx);
EXPECT_EQ("mx1.example.com", std::string(mx->host));
EXPECT_EQ(100, mx->priority);
@ -74,7 +74,7 @@ TEST_F(LibraryTest, ParseMxReplyMalformed) {
};
struct ares_mx_reply* mx = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), data.size(), &mx));
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), (int)data.size(), &mx));
ASSERT_EQ(nullptr, mx);
}
@ -90,7 +90,7 @@ TEST_F(LibraryTest, ParseMxReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), data.size(), &mx));
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), (int)data.size(), &mx));
EXPECT_EQ(nullptr, mx);
pkt.add_question(new DNSQuestion("example.com", T_MX));
@ -99,7 +99,7 @@ TEST_F(LibraryTest, ParseMxReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_MX));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), data.size(), &mx));
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), (int)data.size(), &mx));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_MX));
#endif
@ -107,7 +107,7 @@ TEST_F(LibraryTest, ParseMxReplyErrors) {
// Two questions.
pkt.add_question(new DNSQuestion("example.com", T_MX));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), data.size(), &mx));
EXPECT_EQ(ARES_EBADRESP, ares_parse_mx_reply(data.data(), (int)data.size(), &mx));
EXPECT_EQ(nullptr, mx);
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_MX));
@ -117,7 +117,7 @@ TEST_F(LibraryTest, ParseMxReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSSrvRR("example.abc.def.com", 180, 0, 10, 8160, "example.abc.def.com"));
data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_mx_reply(data.data(), data.size(), &mx));
EXPECT_EQ(ARES_SUCCESS, ares_parse_mx_reply(data.data(), (int)data.size(), &mx));
EXPECT_EQ(nullptr, mx);
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
@ -125,14 +125,14 @@ TEST_F(LibraryTest, ParseMxReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_mx_reply(data.data(), data.size(), &mx));
EXPECT_EQ(ARES_ENODATA, ares_parse_mx_reply(data.data(), (int)data.size(), &mx));
EXPECT_EQ(nullptr, mx);
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
int rc = ares_parse_mx_reply(data.data(), len, &mx);
int rc = ares_parse_mx_reply(data.data(), (int)len, &mx);
EXPECT_EQ(nullptr, mx);
EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
}
@ -150,7 +150,7 @@ TEST_F(LibraryTest, ParseMxReplyAllocFail) {
for (int ii = 1; ii <= 5; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_mx_reply(data.data(), data.size(), &mx)) << ii;
EXPECT_EQ(ARES_ENOMEM, ares_parse_mx_reply(data.data(), (int)data.size(), &mx)) << ii;
}
}

18
test/ares-test-parse-naptr.cc vendored
Unescape View File

@ -35,7 +35,7 @@ TEST_F(LibraryTest, ParseNaptrReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_naptr_reply* naptr = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_SUCCESS, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
ASSERT_NE(nullptr, naptr);
EXPECT_EQ("SP", std::string((char*)naptr->flags));
EXPECT_EQ("service", std::string((char*)naptr->service));
@ -69,7 +69,7 @@ TEST_F(LibraryTest, ParseNaptrReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_EBADRESP, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
pkt.add_question(new DNSQuestion("example.com", T_NAPTR));
#ifdef DISABLED
@ -77,7 +77,7 @@ TEST_F(LibraryTest, ParseNaptrReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_NAPTR));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_ENODATA, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_NAPTR));
#endif
@ -85,7 +85,7 @@ TEST_F(LibraryTest, ParseNaptrReplyErrors) {
// Two questions
pkt.add_question(new DNSQuestion("example.com", T_NAPTR));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_EBADRESP, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_NAPTR));
@ -93,7 +93,7 @@ TEST_F(LibraryTest, ParseNaptrReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_SUCCESS, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
EXPECT_EQ(nullptr, naptr);
pkt.answers_.clear();
pkt.add_answer(new DNSNaptrRR("example.com", 100,
@ -102,14 +102,14 @@ TEST_F(LibraryTest, ParseNaptrReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_ENODATA, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
pkt.add_answer(new DNSNaptrRR("example.com", 100,
10, 20, "SP", "service", "regexp", "replace"));
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
int rc = ares_parse_naptr_reply(data.data(), len, &naptr);
int rc = ares_parse_naptr_reply(data.data(), (int)len, &naptr);
EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
}
}
@ -140,7 +140,7 @@ TEST_F(LibraryTest, ParseNaptrReplyTooShort) {
0x00, // Too short: expect 2 x int16 and 3 x name (min 1 byte each)
};
struct ares_naptr_reply* naptr = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_EBADRESP, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
}
TEST_F(LibraryTest, ParseNaptrReplyAllocFail) {
@ -157,7 +157,7 @@ TEST_F(LibraryTest, ParseNaptrReplyAllocFail) {
for (int ii = 1; ii <= 13; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_naptr_reply(data.data(), data.size(), &naptr));
EXPECT_EQ(ARES_ENOMEM, ares_parse_naptr_reply(data.data(), (int)data.size(), &naptr));
}
}

18
test/ares-test-parse-ns.cc vendored
Unescape View File

@ -32,7 +32,7 @@ TEST_F(LibraryTest, ParseNsReplyOK) {
std::vector<byte> data = pkt.data();
struct hostent *host = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_ns_reply(data.data(), data.size(), &host));
EXPECT_EQ(ARES_SUCCESS, ares_parse_ns_reply(data.data(), (int)data.size(), &host));
ASSERT_NE(nullptr, host);
std::stringstream ss;
ss << HostEnt(host);
@ -55,7 +55,7 @@ TEST_F(LibraryTest, ParseNsReplyMultiple) {
std::vector<byte> data = pkt.data();
struct hostent *host = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_ns_reply(data.data(), data.size(), &host));
EXPECT_EQ(ARES_SUCCESS, ares_parse_ns_reply(data.data(), (int)data.size(), &host));
ASSERT_NE(nullptr, host);
std::stringstream ss;
ss << HostEnt(host);
@ -74,7 +74,7 @@ TEST_F(LibraryTest, ParseNsReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), data.size(), &host));
EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), (int)data.size(), &host));
pkt.add_question(new DNSQuestion("example.com", T_NS));
#ifdef DISABLED
@ -82,7 +82,7 @@ TEST_F(LibraryTest, ParseNsReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_NS));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_ns_reply(data.data(), data.size(), &host));
EXPECT_EQ(ARES_ENODATA, ares_parse_ns_reply(data.data(), (int)data.size(), &host));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_NS));
#endif
@ -90,7 +90,7 @@ TEST_F(LibraryTest, ParseNsReplyErrors) {
// Two questions.
pkt.add_question(new DNSQuestion("example.com", T_NS));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), data.size(), &host));
EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), (int)data.size(), &host));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_NS));
@ -98,20 +98,20 @@ TEST_F(LibraryTest, ParseNsReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_ns_reply(data.data(), data.size(), &host));
EXPECT_EQ(ARES_ENODATA, ares_parse_ns_reply(data.data(), (int)data.size(), &host));
pkt.answers_.clear();
pkt.add_answer(new DNSNsRR("example.com", 100, "ns.example.com"));
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_ns_reply(data.data(), data.size(), &host));
EXPECT_EQ(ARES_ENODATA, ares_parse_ns_reply(data.data(), (int)data.size(), &host));
pkt.add_answer(new DNSNsRR("example.com", 100, "ns.example.com"));
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), len, &host));
EXPECT_EQ(ARES_EBADRESP, ares_parse_ns_reply(data.data(), (int)len, &host));
}
}
@ -127,7 +127,7 @@ TEST_F(LibraryTest, ParseNsReplyAllocFail) {
for (int ii = 1; ii <= 8; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_ns_reply(data.data(), data.size(), &host)) << ii;
EXPECT_EQ(ARES_ENOMEM, ares_parse_ns_reply(data.data(), (int)data.size(), &host)) << ii;
}
}

28
test/ares-test-parse-ptr.cc vendored
Unescape View File

@ -33,7 +33,7 @@ TEST_F(LibraryTest, ParsePtrReplyOK) {
std::vector<byte> data = pkt.data();
struct hostent *host = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
ASSERT_NE(nullptr, host);
std::stringstream ss;
@ -52,7 +52,7 @@ TEST_F(LibraryTest, ParsePtrReplyCname) {
std::vector<byte> data = pkt.data();
struct hostent *host = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
ASSERT_NE(nullptr, host);
std::stringstream ss;
@ -86,7 +86,7 @@ TEST_F(LibraryTest, ParsePtrReplyMalformedCname) {
std::vector<byte> data = pkt.data();
struct hostent *host = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
ASSERT_EQ(nullptr, host);
}
@ -109,7 +109,7 @@ TEST_F(LibraryTest, ParseManyPtrReply) {
std::vector<byte> data = pkt.data();
struct hostent *host = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
ASSERT_NE(nullptr, host);
ares_free_hostent(host);
@ -130,7 +130,7 @@ TEST_F(LibraryTest, ParsePtrReplyAdditional) {
std::vector<byte> data = pkt.data();
struct hostent *host = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
ASSERT_NE(nullptr, host);
std::stringstream ss;
@ -151,7 +151,7 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR));
@ -159,7 +159,7 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("99.48.32.16.in-addr.arpa", T_PTR));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
EXPECT_EQ(nullptr, host);
pkt.questions_.clear();
@ -168,7 +168,7 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
// Two questions.
pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
EXPECT_EQ(nullptr, host);
pkt.questions_.clear();
@ -178,7 +178,7 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
EXPECT_EQ(nullptr, host);
pkt.answers_.clear();
@ -187,7 +187,7 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host));
EXPECT_EQ(nullptr, host);
pkt.add_answer(new DNSPtrRR("64.48.32.16.in-addr.arpa", 100, "other.com"));
@ -195,7 +195,7 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), len,
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), (int)len,
addrv4, sizeof(addrv4), AF_INET, &host));
EXPECT_EQ(nullptr, host);
}
@ -204,7 +204,7 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
pkt.add_answer(new DNSCnameRR("64.48.32.16.in-addr.arpa", 50, "64.48.32.8.in-addr.arpa"));
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), len,
EXPECT_EQ(ARES_EBADRESP, ares_parse_ptr_reply(data.data(), (int)len,
addrv4, sizeof(addrv4), AF_INET, &host));
EXPECT_EQ(nullptr, host);
}
@ -225,7 +225,7 @@ TEST_F(LibraryTest, ParsePtrReplyAllocFailSome) {
for (int ii = 1; ii <= 18; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_ptr_reply(data.data(), data.size(),
EXPECT_EQ(ARES_ENOMEM, ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host)) << ii;
}
}
@ -251,7 +251,7 @@ TEST_F(LibraryTest, ParsePtrReplyAllocFailMany) {
for (int ii = 1; ii <= 63; ii++) {
ClearFails();
SetAllocFail(ii);
int rc = ares_parse_ptr_reply(data.data(), data.size(),
int rc = ares_parse_ptr_reply(data.data(), (int)data.size(),
addrv4, sizeof(addrv4), AF_INET, &host);
if (rc != ARES_ENOMEM) {
EXPECT_EQ(ARES_SUCCESS, rc);

16
test/ares-test-parse-soa-any.cc vendored
Unescape View File

@ -37,7 +37,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_soa_reply* soa = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_SUCCESS, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
ASSERT_NE(nullptr, soa);
EXPECT_EQ("soa1.example.com", std::string(soa->nsname));
EXPECT_EQ("fred.example.com", std::string(soa->hostmaster));
@ -62,7 +62,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.add_question(new DNSQuestion("example.com", T_ANY));
#ifdef DISABLED
@ -70,7 +70,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_ANY));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_ANY));
#endif
@ -78,7 +78,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyErrors) {
// Two questions
pkt.add_question(new DNSQuestion("example.com", T_ANY));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_ANY));
@ -86,7 +86,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.answers_.clear();
pkt.add_answer(new DNSSoaRR("example.com", 100,
"soa1.example.com", "fred.example.com",
@ -95,7 +95,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.add_answer(new DNSSoaRR("example.com", 100,
"soa1.example.com", "fred.example.com",
1, 2, 3, 4, 5));
@ -103,7 +103,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyErrors) {
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), len, &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)len, &soa));
}
}
@ -120,7 +120,7 @@ TEST_F(LibraryTest, ParseSoaAnyReplyAllocFail) {
for (int ii = 1; ii <= 5; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_soa_reply(data.data(), data.size(), &soa)) << ii;
EXPECT_EQ(ARES_ENOMEM, ares_parse_soa_reply(data.data(), (int)data.size(), &soa)) << ii;
}
}

16
test/ares-test-parse-soa.cc vendored
Unescape View File

@ -34,7 +34,7 @@ TEST_F(LibraryTest, ParseSoaReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_soa_reply* soa = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_SUCCESS, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
ASSERT_NE(nullptr, soa);
EXPECT_EQ("soa1.example.com", std::string(soa->nsname));
EXPECT_EQ("fred.example.com", std::string(soa->hostmaster));
@ -59,7 +59,7 @@ TEST_F(LibraryTest, ParseSoaReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.add_question(new DNSQuestion("example.com", T_SOA));
#ifdef DISABLED
@ -67,7 +67,7 @@ TEST_F(LibraryTest, ParseSoaReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_SOA));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_SOA));
#endif
@ -75,7 +75,7 @@ TEST_F(LibraryTest, ParseSoaReplyErrors) {
// Two questions
pkt.add_question(new DNSQuestion("example.com", T_SOA));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_SOA));
@ -83,7 +83,7 @@ TEST_F(LibraryTest, ParseSoaReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.answers_.clear();
pkt.add_answer(new DNSSoaRR("example.com", 100,
"soa1.example.com", "fred.example.com",
@ -92,7 +92,7 @@ TEST_F(LibraryTest, ParseSoaReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), data.size(), &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)data.size(), &soa));
pkt.add_answer(new DNSSoaRR("example.com", 100,
"soa1.example.com", "fred.example.com",
1, 2, 3, 4, 5));
@ -100,7 +100,7 @@ TEST_F(LibraryTest, ParseSoaReplyErrors) {
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), len, &soa));
EXPECT_EQ(ARES_EBADRESP, ares_parse_soa_reply(data.data(), (int)len, &soa));
}
}
@ -117,7 +117,7 @@ TEST_F(LibraryTest, ParseSoaReplyAllocFail) {
for (int ii = 1; ii <= 5; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_soa_reply(data.data(), data.size(), &soa)) << ii;
EXPECT_EQ(ARES_ENOMEM, ares_parse_soa_reply(data.data(), (int)data.size(), &soa)) << ii;
}
}

26
test/ares-test-parse-srv.cc vendored
Unescape View File

@ -33,7 +33,7 @@ TEST_F(LibraryTest, ParseSrvReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_srv_reply* srv = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
ASSERT_NE(nullptr, srv);
EXPECT_EQ("srv.example.com", std::string(srv->host));
@ -67,7 +67,7 @@ TEST_F(LibraryTest, ParseSrvReplySingle) {
std::vector<byte> data = pkt.data();
struct ares_srv_reply* srv = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
ASSERT_NE(nullptr, srv);
EXPECT_EQ("example.abc.def.com", std::string(srv->host));
@ -106,7 +106,7 @@ TEST_F(LibraryTest, ParseSrvReplyMalformed) {
};
struct ares_srv_reply* srv = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_EBADRESP, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
ASSERT_EQ(nullptr, srv);
}
@ -129,7 +129,7 @@ TEST_F(LibraryTest, ParseSrvReplyMultiple) {
std::vector<byte> data = pkt.data();
struct ares_srv_reply* srv0 = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), data.size(), &srv0));
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), (int)data.size(), &srv0));
ASSERT_NE(nullptr, srv0);
struct ares_srv_reply* srv = srv0;
@ -172,7 +172,7 @@ TEST_F(LibraryTest, ParseSrvReplyCname) {
std::vector<byte> data = pkt.data();
struct ares_srv_reply* srv = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
ASSERT_NE(nullptr, srv);
EXPECT_EQ("srv.abc.def.com", std::string(srv->host));
@ -204,7 +204,7 @@ TEST_F(LibraryTest, ParseSrvReplyCnameMultiple) {
std::vector<byte> data = pkt.data();
struct ares_srv_reply* srv0 = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), data.size(), &srv0));
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), (int)data.size(), &srv0));
ASSERT_NE(nullptr, srv0);
struct ares_srv_reply* srv = srv0;
@ -242,7 +242,7 @@ TEST_F(LibraryTest, ParseSrvReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_EBADRESP, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
pkt.add_question(new DNSQuestion("example.abc.def.com", T_SRV));
#ifdef DISABLED
@ -250,7 +250,7 @@ TEST_F(LibraryTest, ParseSrvReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_SRV));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_ENODATA, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_SRV));
#endif
@ -258,7 +258,7 @@ TEST_F(LibraryTest, ParseSrvReplyErrors) {
// Two questions.
pkt.add_question(new DNSQuestion("example.abc.def.com", T_SRV));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_EBADRESP, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR));
@ -266,7 +266,7 @@ TEST_F(LibraryTest, ParseSrvReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_SUCCESS, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
EXPECT_EQ(nullptr, srv);
pkt.answers_.clear();
pkt.add_answer(new DNSSrvRR("example.abc.def.com", 180, 0, 10, 8160, "example.abc.def.com"));
@ -274,13 +274,13 @@ TEST_F(LibraryTest, ParseSrvReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_srv_reply(data.data(), data.size(), &srv));
EXPECT_EQ(ARES_ENODATA, ares_parse_srv_reply(data.data(), (int)data.size(), &srv));
pkt.add_answer(new DNSSrvRR("example.abc.def.com", 180, 0, 10, 8160, "example.abc.def.com"));
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
int rc = ares_parse_srv_reply(data.data(), len, &srv);
int rc = ares_parse_srv_reply(data.data(), (int)len, &srv);
EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
}
}
@ -297,7 +297,7 @@ TEST_F(LibraryTest, ParseSrvReplyAllocFail) {
for (int ii = 1; ii <= 5; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_srv_reply(data.data(), data.size(), &srv)) << ii;
EXPECT_EQ(ARES_ENOMEM, ares_parse_srv_reply(data.data(), (int)data.size(), &srv)) << ii;
}
}

24
test/ares-test-parse-txt.cc vendored
Unescape View File

@ -36,7 +36,7 @@ TEST_F(LibraryTest, ParseTxtReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_txt_reply* txt = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_SUCCESS, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
ASSERT_NE(nullptr, txt);
EXPECT_EQ(std::vector<byte>(expected1.data(), expected1.data() + expected1.size()),
std::vector<byte>(txt->txt, txt->txt + txt->length));
@ -63,7 +63,7 @@ TEST_F(LibraryTest, ParseTxtExtReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_txt_ext* txt = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_txt_reply_ext(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_SUCCESS, ares_parse_txt_reply_ext(data.data(), (int)data.size(), &txt));
ASSERT_NE(nullptr, txt);
EXPECT_EQ(std::vector<byte>(expected1.data(), expected1.data() + expected1.size()),
std::vector<byte>(txt->txt, txt->txt + txt->length));
@ -107,7 +107,7 @@ TEST_F(LibraryTest, ParseTxtMalformedReply1) {
};
struct ares_txt_reply* txt = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
ASSERT_EQ(nullptr, txt);
}
@ -135,7 +135,7 @@ TEST_F(LibraryTest, ParseTxtMalformedReply2) {
};
struct ares_txt_reply* txt = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
ASSERT_EQ(nullptr, txt);
}
@ -166,7 +166,7 @@ TEST_F(LibraryTest, ParseTxtMalformedReply3) {
};
struct ares_txt_reply* txt = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
ASSERT_EQ(nullptr, txt);
}
@ -188,7 +188,7 @@ TEST_F(LibraryTest, ParseTxtMalformedReply4) {
};
struct ares_txt_reply* txt = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
ASSERT_EQ(nullptr, txt);
}
@ -209,7 +209,7 @@ TEST_F(LibraryTest, ParseTxtReplyErrors) {
pkt.questions_.clear();
data = pkt.data();
txt = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
EXPECT_EQ(nullptr, txt);
pkt.add_question(new DNSQuestion("example.com", T_MX));
@ -218,7 +218,7 @@ TEST_F(LibraryTest, ParseTxtReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_TXT));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_ENODATA, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_TXT));
#endif
@ -227,7 +227,7 @@ TEST_F(LibraryTest, ParseTxtReplyErrors) {
pkt.add_question(new DNSQuestion("example.com", T_MX));
data = pkt.data();
txt = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_EBADRESP, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
EXPECT_EQ(nullptr, txt);
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_MX));
@ -236,14 +236,14 @@ TEST_F(LibraryTest, ParseTxtReplyErrors) {
pkt.answers_.clear();
data = pkt.data();
txt = nullptr;
EXPECT_EQ(ARES_ENODATA, ares_parse_txt_reply(data.data(), data.size(), &txt));
EXPECT_EQ(ARES_ENODATA, ares_parse_txt_reply(data.data(), (int)data.size(), &txt));
EXPECT_EQ(nullptr, txt);
pkt.add_answer(new DNSTxtRR("example.com", 100, {expected1}));
// Truncated packets.
for (size_t len = 1; len < data.size(); len++) {
txt = nullptr;
EXPECT_NE(ARES_SUCCESS, ares_parse_txt_reply(data.data(), len, &txt));
EXPECT_NE(ARES_SUCCESS, ares_parse_txt_reply(data.data(), (int)len, &txt));
EXPECT_EQ(nullptr, txt);
}
}
@ -265,7 +265,7 @@ TEST_F(LibraryTest, ParseTxtReplyAllocFail) {
for (int ii = 1; ii <= 13; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_txt_reply(data.data(), data.size(), &txt)) << ii;
EXPECT_EQ(ARES_ENOMEM, ares_parse_txt_reply(data.data(), (int)data.size(), &txt)) << ii;
}
}

26
test/ares-test-parse-uri.cc vendored
Unescape View File

@ -33,7 +33,7 @@ TEST_F(LibraryTest, ParseUriReplyOK) {
std::vector<byte> data = pkt.data();
struct ares_uri_reply* uri = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
ASSERT_NE(nullptr, uri);
EXPECT_EQ("uri.example.com", std::string(uri->uri));
@ -67,7 +67,7 @@ TEST_F(LibraryTest, ParseUriReplySingle) {
std::vector<byte> data = pkt.data();
struct ares_uri_reply* uri = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
ASSERT_NE(nullptr, uri);
EXPECT_EQ("example.abc.def.com", std::string(uri->uri));
@ -106,7 +106,7 @@ TEST_F(LibraryTest, ParseUriReplyMalformed) {
};
struct ares_uri_reply* uri = nullptr;
EXPECT_EQ(ARES_EBADRESP, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_EBADRESP, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
ASSERT_EQ(nullptr, uri);
}
@ -129,7 +129,7 @@ TEST_F(LibraryTest, ParseUriReplyMultiple) {
std::vector<byte> data = pkt.data();
struct ares_uri_reply* uri0 = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), data.size(), &uri0));
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), (int)data.size(), &uri0));
ASSERT_NE(nullptr, uri0);
struct ares_uri_reply* uri = uri0;
@ -172,7 +172,7 @@ TEST_F(LibraryTest, ParseUriReplyCname) {
std::vector<byte> data = pkt.data();
struct ares_uri_reply* uri = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
ASSERT_NE(nullptr, uri);
EXPECT_EQ("uri.abc.def.com", std::string(uri->uri));
@ -204,7 +204,7 @@ TEST_F(LibraryTest, ParseUriReplyCnameMultiple) {
std::vector<byte> data = pkt.data();
struct ares_uri_reply* uri0 = nullptr;
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), data.size(), &uri0));
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), (int)data.size(), &uri0));
ASSERT_NE(nullptr, uri0);
struct ares_uri_reply* uri = uri0;
@ -242,7 +242,7 @@ TEST_F(LibraryTest, ParseUriReplyErrors) {
// No question.
pkt.questions_.clear();
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_EBADRESP, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
pkt.add_question(new DNSQuestion("example.abc.def.com", T_URI));
#ifdef DISABLED
@ -250,7 +250,7 @@ TEST_F(LibraryTest, ParseUriReplyErrors) {
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("Axample.com", T_URI));
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_ENODATA, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("example.com", T_URI));
#endif
@ -258,7 +258,7 @@ TEST_F(LibraryTest, ParseUriReplyErrors) {
// Two questions.
pkt.add_question(new DNSQuestion("example.abc.def.com", T_URI));
data = pkt.data();
EXPECT_EQ(ARES_EBADRESP, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_EBADRESP, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
pkt.questions_.clear();
pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR));
@ -266,7 +266,7 @@ TEST_F(LibraryTest, ParseUriReplyErrors) {
pkt.answers_.clear();
pkt.add_answer(new DNSMxRR("example.com", 100, 100, "mx1.example.com"));
data = pkt.data();
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_SUCCESS, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
EXPECT_EQ(nullptr, uri);
pkt.answers_.clear();
pkt.add_answer(new DNSUriRR("example.abc.def.com", 180, 0, 10, "example.abc.def.com"));
@ -274,13 +274,13 @@ TEST_F(LibraryTest, ParseUriReplyErrors) {
// No answer.
pkt.answers_.clear();
data = pkt.data();
EXPECT_EQ(ARES_ENODATA, ares_parse_uri_reply(data.data(), data.size(), &uri));
EXPECT_EQ(ARES_ENODATA, ares_parse_uri_reply(data.data(), (int)data.size(), &uri));
pkt.add_answer(new DNSUriRR("example.abc.def.com", 180, 0, 10, "example.abc.def.com"));
// Truncated packets.
data = pkt.data();
for (size_t len = 1; len < data.size(); len++) {
int rc = ares_parse_uri_reply(data.data(), len, &uri);
int rc = ares_parse_uri_reply(data.data(), (int)len, &uri);
EXPECT_TRUE(rc == ARES_EBADRESP || rc == ARES_EBADNAME);
}
}
@ -297,7 +297,7 @@ TEST_F(LibraryTest, ParseUriReplyAllocFail) {
for (int ii = 1; ii <= 5; ii++) {
ClearFails();
SetAllocFail(ii);
EXPECT_EQ(ARES_ENOMEM, ares_parse_uri_reply(data.data(), data.size(), &uri)) << ii;
EXPECT_EQ(ARES_ENOMEM, ares_parse_uri_reply(data.data(), (int)data.size(), &uri)) << ii;
}
}

8
test/ares-test-parse.cc vendored
Unescape View File

@ -34,7 +34,7 @@ TEST_F(LibraryTest, ParseRootName) {
struct hostent *host = nullptr;
struct ares_addrttl info[2];
int count = 2;
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
std::stringstream ss;
@ -68,7 +68,7 @@ TEST_F(LibraryTest, ParseIndirectRootName) {
struct hostent *host = nullptr;
struct ares_addrttl info[2];
int count = 2;
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
EXPECT_EQ(1, count);
std::stringstream ss;
@ -154,7 +154,7 @@ TEST_F(LibraryTest, ParsePartialCompressedName) {
struct hostent *host = nullptr;
struct ares_addrttl info[2];
int count = 2;
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
ASSERT_NE(nullptr, host);
std::stringstream ss;
@ -190,7 +190,7 @@ TEST_F(LibraryTest, ParseFullyCompressedName) {
struct hostent *host = nullptr;
struct ares_addrttl info[2];
int count = 2;
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), data.size(),
EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
&host, info, &count));
ASSERT_NE(nullptr, host);
std::stringstream ss;

34
test/ares-test.cc vendored
Unescape View File

@ -93,8 +93,8 @@ void ProcessWork(ares_channel_t *channel,
return;
// Add in the extra FDs if present.
std::set<int> extrafds = get_extrafds();
for (int extrafd : extrafds) {
std::set<ares_socket_t> extrafds = get_extrafds();
for (ares_socket_t extrafd : extrafds) {
FD_SET(extrafd, &readers);
if (extrafd >= nfds) {
nfds = extrafd + 1;
@ -116,7 +116,7 @@ void ProcessWork(ares_channel_t *channel,
ares_process(channel, &readers, &writers);
// Let the provided callback process any activity on the extra FD.
for (int extrafd : extrafds) {
for (ares_socket_t extrafd : extrafds) {
if (FD_ISSET(extrafd, &readers)) {
process_extra(extrafd);
}
@ -179,8 +179,8 @@ void LibraryTest::afree(void *ptr) {
free(ptr);
}
std::set<int> NoExtraFDs() {
return std::set<int>();
std::set<ares_socket_t> NoExtraFDs() {
return std::set<ares_socket_t>();
}
void DefaultChannelTest::Process() {
@ -201,7 +201,7 @@ MockServer::MockServer(int family, int port)
tcp_data_ = NULL;
tcp_data_len_ = 0;
tcpfd_ = socket(family, SOCK_STREAM, 0);
EXPECT_NE(-1, tcpfd_);
EXPECT_NE(ARES_SOCKET_BAD, tcpfd_);
int optval = 1;
setsockopt(tcpfd_, SOL_SOCKET, SO_REUSEADDR,
BYTE_CAST &optval , sizeof(int));
@ -211,7 +211,7 @@ MockServer::MockServer(int family, int port)
// Create a UDP socket to receive data on.
udpfd_ = socket(family, SOCK_DGRAM, 0);
EXPECT_NE(-1, udpfd_);
EXPECT_NE(ARES_SOCKET_BAD, udpfd_);
// Bind the sockets to the given port.
if (family == AF_INET) {
@ -280,7 +280,7 @@ MockServer::MockServer(int family, int port)
}
MockServer::~MockServer() {
for (int fd : connfds_) {
for (ares_socket_t fd : connfds_) {
sclose(fd);
}
sclose(tcpfd_);
@ -288,7 +288,7 @@ MockServer::~MockServer() {
free(tcp_data_);
}
void MockServer::ProcessPacket(int fd, struct sockaddr_storage *addr, socklen_t addrlen,
void MockServer::ProcessPacket(ares_socket_t fd, struct sockaddr_storage *addr, socklen_t addrlen,
byte *data, int len) {
// Assume the packet is a well-formed DNS request and extract the request
@ -350,7 +350,7 @@ void MockServer::ProcessPacket(int fd, struct sockaddr_storage *addr, socklen_t
}
void MockServer::ProcessFD(int fd) {
void MockServer::ProcessFD(ares_socket_t fd) {
if (fd != tcpfd_ && fd != udpfd_ && connfds_.find(fd) == connfds_.end()) {
// Not one of our FDs.
return;
@ -407,14 +407,14 @@ void MockServer::ProcessFD(int fd) {
}
std::set<int> MockServer::fds() const {
std::set<int> result = connfds_;
std::set<ares_socket_t> MockServer::fds() const {
std::set<ares_socket_t> result = connfds_;
result.insert(tcpfd_);
result.insert(udpfd_);
return result;
}
void MockServer::ProcessRequest(int fd, struct sockaddr_storage* addr, int addrlen,
void MockServer::ProcessRequest(ares_socket_t fd, struct sockaddr_storage* addr, int addrlen,
int qid, const std::string& name, int rrtype) {
// Before processing, let gMock know the request is happening.
OnRequest(name, rrtype);
@ -559,16 +559,16 @@ MockChannelOptsTest::~MockChannelOptsTest() {
channel_ = nullptr;
}
std::set<int> MockChannelOptsTest::fds() const {
std::set<int> fds;
std::set<ares_socket_t> MockChannelOptsTest::fds() const {
std::set<ares_socket_t> fds;
for (const auto& server : servers_) {
std::set<int> serverfds = server->fds();
std::set<ares_socket_t> serverfds = server->fds();
fds.insert(serverfds.begin(), serverfds.end());
}
return fds;
}
void MockChannelOptsTest::ProcessFD(int fd) {
void MockChannelOptsTest::ProcessFD(ares_socket_t fd) {
for (auto& server : servers_) {
server->ProcessFD(fd);
}

28
test/ares-test.h vendored
Unescape View File

@ -67,10 +67,10 @@ extern std::vector<std::pair<int, bool>> families_modes;
// Process all pending work on ares-owned file descriptors, plus
// optionally the given set-of-FDs + work function.
void ProcessWork(ares_channel_t *channel,
std::function<std::set<int>()> get_extrafds,
std::function<void(int)> process_extra);
std::set<int> NoExtraFDs();
void ProcessWork(ares_channel_t *channel,
std::function<std::set<ares_socket_t>()> get_extrafds,
std::function<void(ares_socket_t)> process_extra);
std::set<ares_socket_t> NoExtraFDs();
// Test fixture that ensures library initialization, and allows
// memory allocations to be failed.
@ -216,7 +216,7 @@ public:
void Disconnect()
{
for (int fd : connfds_) {
for (ares_socket_t fd : connfds_) {
sclose(fd);
}
connfds_.clear();
@ -226,10 +226,10 @@ public:
}
// The set of file descriptors that the server handles.
std::set<int> fds() const;
std::set<ares_socket_t> fds() const;
// Process activity on a file descriptor.
void ProcessFD(int fd);
void ProcessFD(ares_socket_t fd);
// Ports the server is responding to
int udpport() const
@ -243,15 +243,15 @@ public:
}
private:
void ProcessRequest(int fd, struct sockaddr_storage *addr, int addrlen,
void ProcessRequest(ares_socket_t fd, struct sockaddr_storage *addr, int addrlen,
int qid, const std::string &name, int rrtype);
void ProcessPacket(int fd, struct sockaddr_storage *addr, socklen_t addrlen,
void ProcessPacket(ares_socket_t fd, struct sockaddr_storage *addr, socklen_t addrlen,
byte *data, int len);
int udpport_;
int tcpport_;
int udpfd_;
int tcpfd_;
std::set<int> connfds_;
ares_socket_t udpfd_;
ares_socket_t tcpfd_;
std::set<ares_socket_t> connfds_;
std::vector<byte> reply_;
int qid_;
unsigned char *tcp_data_;
@ -274,8 +274,8 @@ protected:
typedef testing::NiceMock<MockServer> NiceMockServer;
typedef std::vector<std::unique_ptr<NiceMockServer>> NiceMockServers;
std::set<int> fds() const;
void ProcessFD(int fd);
std::set<ares_socket_t> fds() const;
void ProcessFD(ares_socket_t fd);
static NiceMockServers BuildServers(int count, int family, int base_port);

38
test/dns-proto.cc vendored
Unescape View File

@ -197,7 +197,7 @@ std::string AddressToString(const void* vaddr, int len) {
std::string PacketToString(const std::vector<byte>& packet) {
const byte* data = packet.data();
int len = packet.size();
int len = (int)packet.size();
std::stringstream ss;
if (len < NS_HFIXEDSZ) {
ss << "(too short, len " << len << ")";
@ -253,7 +253,7 @@ std::string QuestionToString(const std::vector<byte>& packet,
char *name = nullptr;
long enclen;
int rc = ares_expand_name(*data, packet.data(), packet.size(), &name, &enclen);
int rc = ares_expand_name(*data, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
return ss.str();
@ -289,7 +289,7 @@ std::string RRToString(const std::vector<byte>& packet,
char *name = nullptr;
long enclen;
int rc = ares_expand_name(*data, packet.data(), packet.size(), &name, &enclen);
int rc = ares_expand_name(*data, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
return ss.str();
@ -347,7 +347,7 @@ std::string RRToString(const std::vector<byte>& packet,
case T_CNAME:
case T_NS:
case T_PTR: {
int rc = ares_expand_name(*data, packet.data(), packet.size(), &name, &enclen);
int rc = ares_expand_name(*data, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
break;
@ -358,7 +358,7 @@ std::string RRToString(const std::vector<byte>& packet,
}
case T_MX:
if (rdatalen > 2) {
int rc = ares_expand_name(*data + 2, packet.data(), packet.size(), &name, &enclen);
int rc = ares_expand_name(*data + 2, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
break;
@ -376,7 +376,7 @@ std::string RRToString(const std::vector<byte>& packet,
unsigned long weight = DNS__16BIT(p + 2);
unsigned long port = DNS__16BIT(p + 4);
p += 6;
int rc = ares_expand_name(p, packet.data(), packet.size(), &name, &enclen);
int rc = ares_expand_name(p, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
break;
@ -403,7 +403,7 @@ std::string RRToString(const std::vector<byte>& packet,
}
case T_SOA: {
const byte* p = *data;
int rc = ares_expand_name(p, packet.data(), packet.size(), &name, &enclen);
int rc = ares_expand_name(p, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
break;
@ -411,7 +411,7 @@ std::string RRToString(const std::vector<byte>& packet,
ss << " '" << name << "'";
ares_free_string(name);
p += enclen;
rc = ares_expand_name(p, packet.data(), packet.size(), &name, &enclen);
rc = ares_expand_name(p, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
break;
@ -454,7 +454,7 @@ std::string RRToString(const std::vector<byte>& packet,
ss << " '" << regexp << "'";
p += len;
int rc = ares_expand_name(p, packet.data(), packet.size(), &name, &enclen);
int rc = ares_expand_name(p, packet.data(), (int)packet.size(), &name, &enclen);
if (rc != ARES_SUCCESS) {
ss << "(error from ares_expand_name)";
break;
@ -525,7 +525,7 @@ std::vector<byte> DNSRR::data() const {
std::vector<byte> DNSSingleNameRR::data() const {
std::vector<byte> data = DNSRR::data();
std::vector<byte> encname = EncodeString(other_);
int len = encname.size();
size_t len = encname.size();
PushInt16(&data, len);
data.insert(data.end(), encname.begin(), encname.end());
return data;
@ -533,7 +533,7 @@ std::vector<byte> DNSSingleNameRR::data() const {
std::vector<byte> DNSTxtRR::data() const {
std::vector<byte> data = DNSRR::data();
int len = 0;
size_t len = 0;
for (const std::string& txt : txt_) {
len += (1 + txt.size());
}
@ -548,7 +548,7 @@ std::vector<byte> DNSTxtRR::data() const {
std::vector<byte> DNSMxRR::data() const {
std::vector<byte> data = DNSRR::data();
std::vector<byte> encname = EncodeString(other_);
int len = 2 + encname.size();
size_t len = 2 + encname.size();
PushInt16(&data, len);
PushInt16(&data, pref_);
data.insert(data.end(), encname.begin(), encname.end());
@ -558,7 +558,7 @@ std::vector<byte> DNSMxRR::data() const {
std::vector<byte> DNSSrvRR::data() const {
std::vector<byte> data = DNSRR::data();
std::vector<byte> encname = EncodeString(target_);
int len = 6 + encname.size();
size_t len = 6 + encname.size();
PushInt16(&data, len);
PushInt16(&data, prio_);
PushInt16(&data, weight_);
@ -569,7 +569,7 @@ std::vector<byte> DNSSrvRR::data() const {
std::vector<byte> DNSUriRR::data() const {
std::vector<byte> data = DNSRR::data();
int len = 4 + target_.size();
size_t len = 4 + target_.size();
PushInt16(&data, len);
PushInt16(&data, prio_);
PushInt16(&data, weight_);
@ -579,7 +579,7 @@ std::vector<byte> DNSUriRR::data() const {
std::vector<byte> DNSAddressRR::data() const {
std::vector<byte> data = DNSRR::data();
int len = addr_.size();
size_t len = addr_.size();
PushInt16(&data, len);
data.insert(data.end(), addr_.begin(), addr_.end());
return data;
@ -589,7 +589,7 @@ std::vector<byte> DNSSoaRR::data() const {
std::vector<byte> data = DNSRR::data();
std::vector<byte> encname1 = EncodeString(nsname_);
std::vector<byte> encname2 = EncodeString(rname_);
int len = encname1.size() + encname2.size() + 5*4;
size_t len = encname1.size() + encname2.size() + 5*4;
PushInt16(&data, len);
data.insert(data.end(), encname1.begin(), encname1.end());
data.insert(data.end(), encname2.begin(), encname2.end());
@ -603,7 +603,7 @@ std::vector<byte> DNSSoaRR::data() const {
std::vector<byte> DNSOptRR::data() const {
std::vector<byte> data = DNSRR::data();
int len = 0;
size_t len = 0;
for (const DNSOption& opt : opts_) {
len += (4 + opt.data_.size());
}
@ -619,7 +619,7 @@ std::vector<byte> DNSOptRR::data() const {
std::vector<byte> DNSNaptrRR::data() const {
std::vector<byte> data = DNSRR::data();
std::vector<byte> encname = EncodeString(replacement_);
int len = (4 + 1 + flags_.size() + 1 + service_.size() + 1 + regexp_.size() + encname.size());
size_t len = (4 + 1 + flags_.size() + 1 + service_.size() + 1 + regexp_.size() + encname.size());
PushInt16(&data, len);
PushInt16(&data, order_);
PushInt16(&data, pref_);
@ -651,7 +651,7 @@ std::vector<byte> DNSPacket::data() const {
b |= (rcode_ & 0x0f);
data.push_back(b);
int count = questions_.size();
size_t count = questions_.size();
PushInt16(&data, count);
count = answers_.size();
PushInt16(&data, count);

Write Preview
Loading…
Cancel
Save