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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/quic_address_mismatch_test.cc

Issue 294823002: Treat IPv4-mapped IPv6 addresses as IPv4 addresses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_address_mismatch.cc ('k') | net/quic/quic_connection_logger.cc » ('j') | net/quic/quic_connection_logger.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_address_mismatch_test.cc
===================================================================
--- net/quic/quic_address_mismatch_test.cc (revision 271511)
+++ net/quic/quic_address_mismatch_test.cc (working copy)
@@ -17,12 +17,17 @@
IPAddressNumber ip4_2;
IPAddressNumber ip6_1;
IPAddressNumber ip6_2;
+ IPAddressNumber ip4_mapped_1;
+ IPAddressNumber ip4_mapped_2;
ASSERT_TRUE(ParseIPLiteralToNumber("1.2.3.4", &ip4_1));
ASSERT_TRUE(ParseIPLiteralToNumber("5.6.7.8", &ip4_2));
ASSERT_TRUE(ParseIPLiteralToNumber("1234::1", &ip6_1));
ASSERT_TRUE(ParseIPLiteralToNumber("1234::2", &ip6_2));
+ ip4_mapped_1 = ConvertIPv4NumberToIPv6Number(ip4_1);
+ ip4_mapped_2 = ConvertIPv4NumberToIPv6Number(ip4_2);
ASSERT_NE(ip4_1, ip4_2);
ASSERT_NE(ip6_1, ip6_2);
+ ASSERT_NE(ip4_mapped_1, ip4_mapped_2);
EXPECT_EQ(-1, GetAddressMismatch(IPEndPoint(), IPEndPoint()));
EXPECT_EQ(-1, GetAddressMismatch(IPEndPoint(), IPEndPoint(ip4_1, 443)));
@@ -31,6 +36,12 @@
EXPECT_EQ(QUIC_ADDRESS_AND_PORT_MATCH_V4_V4,
GetAddressMismatch(IPEndPoint(ip4_1, 443),
IPEndPoint(ip4_1, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_AND_PORT_MATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_1, 443),
+ IPEndPoint(ip4_mapped_1, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_AND_PORT_MATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_mapped_1, 443),
+ IPEndPoint(ip4_mapped_1, 443)));
EXPECT_EQ(QUIC_ADDRESS_AND_PORT_MATCH_V6_V6,
GetAddressMismatch(IPEndPoint(ip6_1, 443),
IPEndPoint(ip6_1, 443)));
@@ -38,6 +49,12 @@
EXPECT_EQ(QUIC_PORT_MISMATCH_V4_V4,
GetAddressMismatch(IPEndPoint(ip4_1, 80),
IPEndPoint(ip4_1, 443)));
+ EXPECT_EQ(QUIC_PORT_MISMATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_1, 80),
+ IPEndPoint(ip4_mapped_1, 443)));
+ EXPECT_EQ(QUIC_PORT_MISMATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_mapped_1, 80),
+ IPEndPoint(ip4_mapped_1, 443)));
EXPECT_EQ(QUIC_PORT_MISMATCH_V6_V6,
GetAddressMismatch(IPEndPoint(ip6_1, 80),
IPEndPoint(ip6_1, 443)));
@@ -46,8 +63,20 @@
GetAddressMismatch(IPEndPoint(ip4_1, 443),
IPEndPoint(ip4_2, 443)));
EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_1, 443),
+ IPEndPoint(ip4_mapped_2, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_mapped_1, 443),
+ IPEndPoint(ip4_mapped_2, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V4,
GetAddressMismatch(IPEndPoint(ip4_1, 80),
IPEndPoint(ip4_2, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_1, 80),
+ IPEndPoint(ip4_mapped_2, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V4,
+ GetAddressMismatch(IPEndPoint(ip4_mapped_1, 80),
+ IPEndPoint(ip4_mapped_2, 443)));
EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V6_V6,
GetAddressMismatch(IPEndPoint(ip6_1, 443),
IPEndPoint(ip6_2, 443)));
@@ -58,14 +87,26 @@
GetAddressMismatch(IPEndPoint(ip4_1, 443),
IPEndPoint(ip6_1, 443)));
EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V6,
+ GetAddressMismatch(IPEndPoint(ip4_mapped_1, 443),
+ IPEndPoint(ip6_1, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V6,
GetAddressMismatch(IPEndPoint(ip4_1, 80),
IPEndPoint(ip6_1, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V4_V6,
+ GetAddressMismatch(IPEndPoint(ip4_mapped_1, 80),
+ IPEndPoint(ip6_1, 443)));
EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V6_V4,
GetAddressMismatch(IPEndPoint(ip6_1, 443),
IPEndPoint(ip4_1, 443)));
EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V6_V4,
+ GetAddressMismatch(IPEndPoint(ip6_1, 443),
+ IPEndPoint(ip4_mapped_1, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V6_V4,
GetAddressMismatch(IPEndPoint(ip6_1, 80),
IPEndPoint(ip4_1, 443)));
+ EXPECT_EQ(QUIC_ADDRESS_MISMATCH_V6_V4,
+ GetAddressMismatch(IPEndPoint(ip6_1, 80),
+ IPEndPoint(ip4_mapped_1, 443)));
}
} // namespace test
« no previous file with comments | « net/quic/quic_address_mismatch.cc ('k') | net/quic/quic_connection_logger.cc » ('j') | net/quic/quic_connection_logger.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698