Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <resolv.h> | 5 #include <resolv.h> |
| 6 | 6 |
| 7 #include "base/sys_byteorder.h" | 7 #include "base/sys_byteorder.h" |
| 8 #include "net/dns/dns_config_service_posix.h" | 8 #include "net/dns/dns_config_service_posix.h" |
| 9 | 9 |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 const char* kNameserversIPv6[] = { | 23 const char* kNameserversIPv6[] = { |
| 24 NULL, | 24 NULL, |
| 25 "2001:DB8:0::42", | 25 "2001:DB8:0::42", |
| 26 NULL, | 26 NULL, |
| 27 "::FFFF:129.144.52.38", | 27 "::FFFF:129.144.52.38", |
| 28 }; | 28 }; |
| 29 | 29 |
| 30 // Fills in |res| with sane configuration. | 30 // Fills in |res| with sane configuration. |
| 31 void InitializeResState(res_state res) { | 31 void InitializeResState(res_state res) { |
| 32 memset(res, 0, sizeof(*res)); | 32 memset(res, 0, sizeof(*res)); |
| 33 res->options = RES_INIT | RES_ROTATE; | 33 res->options = RES_INIT | RES_DEFAULT | RES_ROTATE; |
|
mmenke
2012/06/18 17:19:50
Should RES_DEFAULT be manually expanded? I assume
| |
| 34 res->ndots = 2; | 34 res->ndots = 2; |
| 35 res->retrans = 4; | 35 res->retrans = 4; |
| 36 res->retry = 7; | 36 res->retry = 7; |
| 37 | 37 |
| 38 const char kDnsrch[] = "chromium.org" "\0" "example.com"; | 38 const char kDnsrch[] = "chromium.org" "\0" "example.com"; |
| 39 memcpy(res->defdname, kDnsrch, sizeof(kDnsrch)); | 39 memcpy(res->defdname, kDnsrch, sizeof(kDnsrch)); |
| 40 res->dnsrch[0] = res->defdname; | 40 res->dnsrch[0] = res->defdname; |
| 41 res->dnsrch[1] = res->defdname + sizeof("chromium.org"); | 41 res->dnsrch[1] = res->defdname + sizeof("chromium.org"); |
| 42 | 42 |
| 43 for (unsigned i = 0; i < arraysize(kNameserversIPv4) && i < MAXNS; ++i) { | 43 for (unsigned i = 0; i < arraysize(kNameserversIPv4) && i < MAXNS; ++i) { |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 EXPECT_TRUE(config.IsValid()); | 117 EXPECT_TRUE(config.IsValid()); |
| 118 | 118 |
| 119 DnsConfig expected_config; | 119 DnsConfig expected_config; |
| 120 EXPECT_FALSE(expected_config.EqualsIgnoreHosts(config)); | 120 EXPECT_FALSE(expected_config.EqualsIgnoreHosts(config)); |
| 121 InitializeExpectedConfig(&expected_config); | 121 InitializeExpectedConfig(&expected_config); |
| 122 EXPECT_TRUE(expected_config.EqualsIgnoreHosts(config)); | 122 EXPECT_TRUE(expected_config.EqualsIgnoreHosts(config)); |
| 123 } | 123 } |
| 124 | 124 |
| 125 TEST(DnsConfigServicePosixTest, RejectEmptyNameserver) { | 125 TEST(DnsConfigServicePosixTest, RejectEmptyNameserver) { |
| 126 struct __res_state res = {}; | 126 struct __res_state res = {}; |
| 127 res.options = RES_INIT; | 127 res.options = RES_INIT | RES_DEFAULT; |
|
mmenke
2012/06/18 17:19:50
Same comment as above.
| |
| 128 const char kDnsrch[] = "chromium.org"; | 128 const char kDnsrch[] = "chromium.org"; |
| 129 memcpy(res.defdname, kDnsrch, sizeof(kDnsrch)); | 129 memcpy(res.defdname, kDnsrch, sizeof(kDnsrch)); |
| 130 res.dnsrch[0] = res.defdname; | 130 res.dnsrch[0] = res.defdname; |
| 131 | 131 |
| 132 struct sockaddr_in sa = {}; | 132 struct sockaddr_in sa = {}; |
| 133 sa.sin_family = AF_INET; | 133 sa.sin_family = AF_INET; |
| 134 sa.sin_port = base::HostToNet16(NS_DEFAULTPORT); | 134 sa.sin_port = base::HostToNet16(NS_DEFAULTPORT); |
| 135 sa.sin_addr.s_addr = INADDR_ANY; | 135 sa.sin_addr.s_addr = INADDR_ANY; |
| 136 res.nsaddr_list[0] = sa; | 136 res.nsaddr_list[0] = sa; |
| 137 sa.sin_addr.s_addr = 0xCAFE1337; | 137 sa.sin_addr.s_addr = 0xCAFE1337; |
| 138 res.nsaddr_list[1] = sa; | 138 res.nsaddr_list[1] = sa; |
| 139 res.nscount = 2; | 139 res.nscount = 2; |
| 140 | 140 |
| 141 DnsConfig config; | 141 DnsConfig config; |
| 142 EXPECT_FALSE(internal::ConvertResStateToDnsConfig(res, &config)); | 142 EXPECT_FALSE(internal::ConvertResStateToDnsConfig(res, &config)); |
| 143 | 143 |
| 144 sa.sin_addr.s_addr = 0xDEADBEEF; | 144 sa.sin_addr.s_addr = 0xDEADBEEF; |
| 145 res.nsaddr_list[0] = sa; | 145 res.nsaddr_list[0] = sa; |
| 146 EXPECT_TRUE(internal::ConvertResStateToDnsConfig(res, &config)); | 146 EXPECT_TRUE(internal::ConvertResStateToDnsConfig(res, &config)); |
| 147 } | 147 } |
| 148 | 148 |
| 149 } // namespace | 149 } // namespace |
| 150 } // namespace net | 150 } // namespace net |
| OLD | NEW |