| Index: net/dns/dns_test_util.h
|
| diff --git a/net/dns/dns_test_util.h b/net/dns/dns_test_util.h
|
| index d0b8e81b7ed2dc85b497da897101e44a27c52a50..644d7007dfef42ae2ea0d7d117a9a1eee62c84e3 100644
|
| --- a/net/dns/dns_test_util.h
|
| +++ b/net/dns/dns_test_util.h
|
| @@ -20,38 +20,26 @@ namespace net {
|
| // Query/response set for www.google.com, ID is fixed to 0.
|
| static const char kT0HostName[] = "www.google.com";
|
| static const uint16 kT0Qtype = dns_protocol::kTypeA;
|
| -static const char kT0DnsName[] = {
|
| - 0x03, 'w', 'w', 'w',
|
| - 0x06, 'g', 'o', 'o', 'g', 'l', 'e',
|
| - 0x03, 'c', 'o', 'm',
|
| - 0x00
|
| -};
|
| +static const char kT0DnsName[] = {0x03, 'w', 'w', 'w', 0x06, 'g', 'o', 'o',
|
| + 'g', 'l', 'e', 0x03, 'c', 'o', 'm', 0x00};
|
| static const size_t kT0QuerySize = 32;
|
| static const uint8 kT0ResponseDatagram[] = {
|
| - // response contains one CNAME for www.l.google.com and the following
|
| - // IP addresses: 74.125.226.{179,180,176,177,178}
|
| - 0x00, 0x00, 0x81, 0x80, 0x00, 0x01, 0x00, 0x06,
|
| - 0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
|
| - 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03,
|
| - 0x63, 0x6f, 0x6d, 0x00, 0x00, 0x01, 0x00, 0x01,
|
| - 0xc0, 0x0c, 0x00, 0x05, 0x00, 0x01, 0x00, 0x01,
|
| - 0x4d, 0x13, 0x00, 0x08, 0x03, 0x77, 0x77, 0x77,
|
| - 0x01, 0x6c, 0xc0, 0x10, 0xc0, 0x2c, 0x00, 0x01,
|
| - 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04,
|
| - 0x4a, 0x7d, 0xe2, 0xb3, 0xc0, 0x2c, 0x00, 0x01,
|
| - 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04,
|
| - 0x4a, 0x7d, 0xe2, 0xb4, 0xc0, 0x2c, 0x00, 0x01,
|
| - 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04,
|
| - 0x4a, 0x7d, 0xe2, 0xb0, 0xc0, 0x2c, 0x00, 0x01,
|
| - 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04,
|
| - 0x4a, 0x7d, 0xe2, 0xb1, 0xc0, 0x2c, 0x00, 0x01,
|
| - 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04,
|
| - 0x4a, 0x7d, 0xe2, 0xb2
|
| -};
|
| -static const char* const kT0IpAddresses[] = {
|
| - "74.125.226.179", "74.125.226.180", "74.125.226.176",
|
| - "74.125.226.177", "74.125.226.178"
|
| -};
|
| + // response contains one CNAME for www.l.google.com and the following
|
| + // IP addresses: 74.125.226.{179,180,176,177,178}
|
| + 0x00, 0x00, 0x81, 0x80, 0x00, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
|
| + 0x03, 0x77, 0x77, 0x77, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03,
|
| + 0x63, 0x6f, 0x6d, 0x00, 0x00, 0x01, 0x00, 0x01, 0xc0, 0x0c, 0x00, 0x05,
|
| + 0x00, 0x01, 0x00, 0x01, 0x4d, 0x13, 0x00, 0x08, 0x03, 0x77, 0x77, 0x77,
|
| + 0x01, 0x6c, 0xc0, 0x10, 0xc0, 0x2c, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
|
| + 0x00, 0xe4, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb3, 0xc0, 0x2c, 0x00, 0x01,
|
| + 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb4,
|
| + 0xc0, 0x2c, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04,
|
| + 0x4a, 0x7d, 0xe2, 0xb0, 0xc0, 0x2c, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
|
| + 0x00, 0xe4, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb1, 0xc0, 0x2c, 0x00, 0x01,
|
| + 0x00, 0x01, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb2};
|
| +static const char* const kT0IpAddresses[] = {"74.125.226.179", "74.125.226.180",
|
| + "74.125.226.176", "74.125.226.177",
|
| + "74.125.226.178"};
|
| static const char kT0CanonName[] = "www.l.google.com";
|
| static const int kT0TTL = 0x000000e4;
|
| // +1 for the CNAME record.
|
| @@ -61,31 +49,22 @@ static const unsigned kT0RecordCount = arraysize(kT0IpAddresses) + 1;
|
| // Query/response set for codereview.chromium.org, ID is fixed to 1.
|
| static const char kT1HostName[] = "codereview.chromium.org";
|
| static const uint16 kT1Qtype = dns_protocol::kTypeA;
|
| -static const char kT1DnsName[] = {
|
| - 0x0a, 'c', 'o', 'd', 'e', 'r', 'e', 'v', 'i', 'e', 'w',
|
| - 0x08, 'c', 'h', 'r', 'o', 'm', 'i', 'u', 'm',
|
| - 0x03, 'o', 'r', 'g',
|
| - 0x00
|
| -};
|
| +static const char kT1DnsName[] = {0x0a, 'c', 'o', 'd', 'e', 'r', 'e', 'v', 'i',
|
| + 'e', 'w', 0x08, 'c', 'h', 'r', 'o', 'm', 'i',
|
| + 'u', 'm', 0x03, 'o', 'r', 'g', 0x00};
|
| static const size_t kT1QuerySize = 41;
|
| static const uint8 kT1ResponseDatagram[] = {
|
| - // response contains one CNAME for ghs.l.google.com and the following
|
| - // IP address: 64.233.169.121
|
| - 0x00, 0x01, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02,
|
| - 0x00, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f, 0x64,
|
| - 0x65, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x08,
|
| - 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x69, 0x75, 0x6d,
|
| - 0x03, 0x6f, 0x72, 0x67, 0x00, 0x00, 0x01, 0x00,
|
| - 0x01, 0xc0, 0x0c, 0x00, 0x05, 0x00, 0x01, 0x00,
|
| - 0x01, 0x41, 0x75, 0x00, 0x12, 0x03, 0x67, 0x68,
|
| - 0x73, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67,
|
| - 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0,
|
| - 0x35, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01,
|
| - 0x0b, 0x00, 0x04, 0x40, 0xe9, 0xa9, 0x79
|
| -};
|
| -static const char* const kT1IpAddresses[] = {
|
| - "64.233.169.121"
|
| -};
|
| + // response contains one CNAME for ghs.l.google.com and the following
|
| + // IP address: 64.233.169.121
|
| + 0x00, 0x01, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00,
|
| + 0x00, 0x0a, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x65, 0x76, 0x69, 0x65,
|
| + 0x77, 0x08, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x69, 0x75, 0x6d, 0x03,
|
| + 0x6f, 0x72, 0x67, 0x00, 0x00, 0x01, 0x00, 0x01, 0xc0, 0x0c, 0x00,
|
| + 0x05, 0x00, 0x01, 0x00, 0x01, 0x41, 0x75, 0x00, 0x12, 0x03, 0x67,
|
| + 0x68, 0x73, 0x01, 0x6c, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
|
| + 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0, 0x35, 0x00, 0x01, 0x00, 0x01,
|
| + 0x00, 0x00, 0x01, 0x0b, 0x00, 0x04, 0x40, 0xe9, 0xa9, 0x79};
|
| +static const char* const kT1IpAddresses[] = {"64.233.169.121"};
|
| static const char kT1CanonName[] = "ghs.l.google.com";
|
| static const int kT1TTL = 0x0000010b;
|
| // +1 for the CNAME record.
|
| @@ -95,30 +74,20 @@ static const unsigned kT1RecordCount = arraysize(kT1IpAddresses) + 1;
|
| // Query/response set for www.ccs.neu.edu, ID is fixed to 2.
|
| static const char kT2HostName[] = "www.ccs.neu.edu";
|
| static const uint16 kT2Qtype = dns_protocol::kTypeA;
|
| -static const char kT2DnsName[] = {
|
| - 0x03, 'w', 'w', 'w',
|
| - 0x03, 'c', 'c', 's',
|
| - 0x03, 'n', 'e', 'u',
|
| - 0x03, 'e', 'd', 'u',
|
| - 0x00
|
| -};
|
| +static const char kT2DnsName[] = {0x03, 'w', 'w', 'w', 0x03, 'c',
|
| + 'c', 's', 0x03, 'n', 'e', 'u',
|
| + 0x03, 'e', 'd', 'u', 0x00};
|
| static const size_t kT2QuerySize = 33;
|
| static const uint8 kT2ResponseDatagram[] = {
|
| - // response contains one CNAME for vulcan.ccs.neu.edu and the following
|
| - // IP address: 129.10.116.81
|
| - 0x00, 0x02, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02,
|
| - 0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
|
| - 0x03, 0x63, 0x63, 0x73, 0x03, 0x6e, 0x65, 0x75,
|
| - 0x03, 0x65, 0x64, 0x75, 0x00, 0x00, 0x01, 0x00,
|
| - 0x01, 0xc0, 0x0c, 0x00, 0x05, 0x00, 0x01, 0x00,
|
| - 0x00, 0x01, 0x2c, 0x00, 0x09, 0x06, 0x76, 0x75,
|
| - 0x6c, 0x63, 0x61, 0x6e, 0xc0, 0x10, 0xc0, 0x2d,
|
| - 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x2c,
|
| - 0x00, 0x04, 0x81, 0x0a, 0x74, 0x51
|
| -};
|
| -static const char* const kT2IpAddresses[] = {
|
| - "129.10.116.81"
|
| -};
|
| + // response contains one CNAME for vulcan.ccs.neu.edu and the following
|
| + // IP address: 129.10.116.81
|
| + 0x00, 0x02, 0x81, 0x80, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
| + 0x03, 0x77, 0x77, 0x77, 0x03, 0x63, 0x63, 0x73, 0x03, 0x6e, 0x65, 0x75,
|
| + 0x03, 0x65, 0x64, 0x75, 0x00, 0x00, 0x01, 0x00, 0x01, 0xc0, 0x0c, 0x00,
|
| + 0x05, 0x00, 0x01, 0x00, 0x00, 0x01, 0x2c, 0x00, 0x09, 0x06, 0x76, 0x75,
|
| + 0x6c, 0x63, 0x61, 0x6e, 0xc0, 0x10, 0xc0, 0x2d, 0x00, 0x01, 0x00, 0x01,
|
| + 0x00, 0x00, 0x01, 0x2c, 0x00, 0x04, 0x81, 0x0a, 0x74, 0x51};
|
| +static const char* const kT2IpAddresses[] = {"129.10.116.81"};
|
| static const char kT2CanonName[] = "vulcan.ccs.neu.edu";
|
| static const int kT2TTL = 0x0000012c;
|
| // +1 for the CNAME record.
|
| @@ -128,48 +97,34 @@ static const unsigned kT2RecordCount = arraysize(kT2IpAddresses) + 1;
|
| // Query/response set for www.google.az, ID is fixed to 3.
|
| static const char kT3HostName[] = "www.google.az";
|
| static const uint16 kT3Qtype = dns_protocol::kTypeA;
|
| -static const char kT3DnsName[] = {
|
| - 0x03, 'w', 'w', 'w',
|
| - 0x06, 'g', 'o', 'o', 'g', 'l', 'e',
|
| - 0x02, 'a', 'z',
|
| - 0x00
|
| -};
|
| +static const char kT3DnsName[] = {0x03, 'w', 'w', 'w', 0x06, 'g', 'o', 'o',
|
| + 'g', 'l', 'e', 0x02, 'a', 'z', 0x00};
|
| static const size_t kT3QuerySize = 31;
|
| static const uint8 kT3ResponseDatagram[] = {
|
| - // response contains www.google.com as CNAME for www.google.az and
|
| - // www.l.google.com as CNAME for www.google.com and the following
|
| - // IP addresses: 74.125.226.{178,179,180,176,177}
|
| - // The TTLs on the records are: 0x00015099, 0x00025099, 0x00000415,
|
| - // 0x00003015, 0x00002015, 0x00000015, 0x00001015.
|
| - // The last record is an imaginary TXT record for t.google.com.
|
| - 0x00, 0x03, 0x81, 0x80, 0x00, 0x01, 0x00, 0x08,
|
| - 0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
|
| - 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x02,
|
| - 0x61, 0x7a, 0x00, 0x00, 0x01, 0x00, 0x01, 0xc0,
|
| - 0x0c, 0x00, 0x05, 0x00, 0x01, 0x00, 0x01, 0x50,
|
| - 0x99, 0x00, 0x10, 0x03, 0x77, 0x77, 0x77, 0x06,
|
| - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63,
|
| - 0x6f, 0x6d, 0x00, 0xc0, 0x2b, 0x00, 0x05, 0x00,
|
| - 0x01, 0x00, 0x02, 0x50, 0x99, 0x00, 0x08, 0x03,
|
| - 0x77, 0x77, 0x77, 0x01, 0x6c, 0xc0, 0x2f, 0xc0,
|
| - 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x04,
|
| - 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb2, 0xc0,
|
| - 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x30,
|
| - 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb3, 0xc0,
|
| - 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x20,
|
| - 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb4, 0xc0,
|
| - 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
|
| - 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb0, 0xc0,
|
| - 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x10,
|
| - 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb1, 0x01,
|
| - 0x74, 0xc0, 0x2f, 0x00, 0x10, 0x00, 0x01, 0x00,
|
| - 0x00, 0x00, 0x01, 0x00, 0x04, 0xde, 0xad, 0xfe,
|
| - 0xed
|
| -};
|
| -static const char* const kT3IpAddresses[] = {
|
| - "74.125.226.178", "74.125.226.179", "74.125.226.180",
|
| - "74.125.226.176", "74.125.226.177"
|
| -};
|
| + // response contains www.google.com as CNAME for www.google.az and
|
| + // www.l.google.com as CNAME for www.google.com and the following
|
| + // IP addresses: 74.125.226.{178,179,180,176,177}
|
| + // The TTLs on the records are: 0x00015099, 0x00025099, 0x00000415,
|
| + // 0x00003015, 0x00002015, 0x00000015, 0x00001015.
|
| + // The last record is an imaginary TXT record for t.google.com.
|
| + 0x00, 0x03, 0x81, 0x80, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
|
| + 0x03, 0x77, 0x77, 0x77, 0x06, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x02,
|
| + 0x61, 0x7a, 0x00, 0x00, 0x01, 0x00, 0x01, 0xc0, 0x0c, 0x00, 0x05, 0x00,
|
| + 0x01, 0x00, 0x01, 0x50, 0x99, 0x00, 0x10, 0x03, 0x77, 0x77, 0x77, 0x06,
|
| + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, 0xc0,
|
| + 0x2b, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x50, 0x99, 0x00, 0x08, 0x03,
|
| + 0x77, 0x77, 0x77, 0x01, 0x6c, 0xc0, 0x2f, 0xc0, 0x47, 0x00, 0x01, 0x00,
|
| + 0x01, 0x00, 0x00, 0x04, 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb2, 0xc0,
|
| + 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x30, 0x15, 0x00, 0x04, 0x4a,
|
| + 0x7d, 0xe2, 0xb3, 0xc0, 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x20,
|
| + 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb4, 0xc0, 0x47, 0x00, 0x01, 0x00,
|
| + 0x01, 0x00, 0x00, 0x00, 0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb0, 0xc0,
|
| + 0x47, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x10, 0x15, 0x00, 0x04, 0x4a,
|
| + 0x7d, 0xe2, 0xb1, 0x01, 0x74, 0xc0, 0x2f, 0x00, 0x10, 0x00, 0x01, 0x00,
|
| + 0x00, 0x00, 0x01, 0x00, 0x04, 0xde, 0xad, 0xfe, 0xed};
|
| +static const char* const kT3IpAddresses[] = {"74.125.226.178", "74.125.226.179",
|
| + "74.125.226.180", "74.125.226.176",
|
| + "74.125.226.177"};
|
| static const char kT3CanonName[] = "www.l.google.com";
|
| static const int kT3TTL = 0x00000015;
|
| // +2 for the CNAME records, +1 for TXT record.
|
| @@ -193,7 +148,9 @@ struct MockDnsClientRule {
|
| uint16 qtype_arg,
|
| Result result_arg,
|
| bool delay)
|
| - : result(result_arg), prefix(prefix_arg), qtype(qtype_arg),
|
| + : result(result_arg),
|
| + prefix(prefix_arg),
|
| + qtype(qtype_arg),
|
| delay(delay) {}
|
|
|
| Result result;
|
|
|