Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: net/base/host_resolver_impl_unittest.cc

Issue 3023048: Don't resolve IP literals. (Closed)
Patch Set: Rebase again Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/base/host_resolver_impl.cc ('k') | net/base/mock_host_resolver.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "net/base/host_resolver_impl.h" 5 #include "net/base/host_resolver_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 resolver_proc->AllowDirectLookup("*"); 392 resolver_proc->AllowDirectLookup("*");
393 393
394 // Resolve a plain IPv6 address. Don't worry about [brackets], because 394 // Resolve a plain IPv6 address. Don't worry about [brackets], because
395 // the caller should have removed them. 395 // the caller should have removed them.
396 scoped_refptr<HostResolver> host_resolver( 396 scoped_refptr<HostResolver> host_resolver(
397 CreateHostResolverImpl(resolver_proc)); 397 CreateHostResolverImpl(resolver_proc));
398 AddressList adrlist; 398 AddressList adrlist;
399 const int kPortnum = 5555; 399 const int kPortnum = 5555;
400 HostResolver::RequestInfo info("2001:db8::1", kPortnum); 400 HostResolver::RequestInfo info("2001:db8::1", kPortnum);
401 int err = host_resolver->Resolve(info, &adrlist, NULL, NULL, BoundNetLog()); 401 int err = host_resolver->Resolve(info, &adrlist, NULL, NULL, BoundNetLog());
402 // On computers without IPv6 support, getaddrinfo cannot convert IPv6
403 // address literals to addresses (getaddrinfo returns EAI_NONAME). So this
404 // test has to allow host_resolver->Resolve to fail.
405 if (err == ERR_NAME_NOT_RESOLVED)
406 return;
407 EXPECT_EQ(OK, err); 402 EXPECT_EQ(OK, err);
408 403
409 const struct addrinfo* ainfo = adrlist.head(); 404 const struct addrinfo* ainfo = adrlist.head();
410 EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next); 405 EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next);
411 EXPECT_EQ(sizeof(struct sockaddr_in6), ainfo->ai_addrlen); 406 EXPECT_EQ(sizeof(struct sockaddr_in6), ainfo->ai_addrlen);
412 407
413 const struct sockaddr* sa = ainfo->ai_addr; 408 const struct sockaddr* sa = ainfo->ai_addr;
414 const struct sockaddr_in6* sa_in6 = (const struct sockaddr_in6*) sa; 409 const struct sockaddr_in6* sa_in6 = (const struct sockaddr_in6*) sa;
415 EXPECT_TRUE(htons(kPortnum) == sa_in6->sin6_port); 410 EXPECT_TRUE(htons(kPortnum) == sa_in6->sin6_port);
416 411
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
1495 EXPECT_EQ("192.1.98.2", NetAddressToString(addrlist[1].head())); 1490 EXPECT_EQ("192.1.98.2", NetAddressToString(addrlist[1].head()));
1496 EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[2].head())); 1491 EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[2].head()));
1497 EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[3].head())); 1492 EXPECT_EQ("192.1.98.1", NetAddressToString(addrlist[3].head()));
1498 } 1493 }
1499 1494
1500 // TODO(cbentzel): Test a mix of requests with different HostResolverFlags. 1495 // TODO(cbentzel): Test a mix of requests with different HostResolverFlags.
1501 1496
1502 } // namespace 1497 } // namespace
1503 1498
1504 } // namespace net 1499 } // namespace net
OLDNEW
« no previous file with comments | « net/base/host_resolver_impl.cc ('k') | net/base/mock_host_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698