| 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 <memory> | 5 #include <memory> |
| 6 #include <ostream> | 6 #include <ostream> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 base::StringPiece data) { | 403 base::StringPiece data) { |
| 404 return server_maker_.MakeDataPacket( | 404 return server_maker_.MakeDataPacket( |
| 405 packet_number, stream_id, should_include_version, fin, offset, data); | 405 packet_number, stream_id, should_include_version, fin, offset, data); |
| 406 } | 406 } |
| 407 | 407 |
| 408 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( | 408 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( |
| 409 QuicPacketNumber packet_number, | 409 QuicPacketNumber packet_number, |
| 410 QuicStreamId stream_id, | 410 QuicStreamId stream_id, |
| 411 bool should_include_version, | 411 bool should_include_version, |
| 412 bool fin, | 412 bool fin, |
| 413 const SpdyHeaderBlock& headers, | 413 SpdyHeaderBlock headers, |
| 414 QuicStreamOffset* offset) { | 414 QuicStreamOffset* offset) { |
| 415 SpdyPriority priority = | 415 SpdyPriority priority = |
| 416 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); | 416 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); |
| 417 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( | 417 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( |
| 418 packet_number, stream_id, should_include_version, fin, priority, | 418 packet_number, stream_id, should_include_version, fin, priority, |
| 419 headers, offset); | 419 headers, offset); |
| 420 } | 420 } |
| 421 | 421 |
| 422 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( | 422 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( |
| 423 QuicPacketNumber packet_number, | 423 QuicPacketNumber packet_number, |
| 424 QuicStreamId stream_id, | 424 QuicStreamId stream_id, |
| 425 bool should_include_version, | 425 bool should_include_version, |
| 426 bool fin, | 426 bool fin, |
| 427 const SpdyHeaderBlock& headers, | 427 SpdyHeaderBlock headers, |
| 428 QuicStreamOffset* offset, | 428 QuicStreamOffset* offset, |
| 429 QuicTestPacketMaker* maker) { | 429 QuicTestPacketMaker* maker) { |
| 430 SpdyPriority priority = | 430 SpdyPriority priority = |
| 431 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); | 431 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); |
| 432 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( | 432 return client_maker_.MakeRequestHeadersPacketWithOffsetTracking( |
| 433 packet_number, stream_id, should_include_version, fin, priority, | 433 packet_number, stream_id, should_include_version, fin, priority, |
| 434 headers, offset); | 434 headers, offset); |
| 435 } | 435 } |
| 436 | 436 |
| 437 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( | 437 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( |
| 438 QuicPacketNumber packet_number, | 438 QuicPacketNumber packet_number, |
| 439 QuicStreamId stream_id, | 439 QuicStreamId stream_id, |
| 440 bool should_include_version, | 440 bool should_include_version, |
| 441 bool fin, | 441 bool fin, |
| 442 const SpdyHeaderBlock& headers) { | 442 SpdyHeaderBlock headers) { |
| 443 return ConstructClientRequestHeadersPacket( | 443 return ConstructClientRequestHeadersPacket( |
| 444 packet_number, stream_id, should_include_version, fin, headers, nullptr, | 444 packet_number, stream_id, should_include_version, fin, |
| 445 &client_maker_); | 445 std::move(headers), nullptr, &client_maker_); |
| 446 } | 446 } |
| 447 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( | 447 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( |
| 448 QuicPacketNumber packet_number, | 448 QuicPacketNumber packet_number, |
| 449 QuicStreamId stream_id, | 449 QuicStreamId stream_id, |
| 450 bool should_include_version, | 450 bool should_include_version, |
| 451 bool fin, | 451 bool fin, |
| 452 const SpdyHeaderBlock& headers, | 452 SpdyHeaderBlock headers, |
| 453 QuicTestPacketMaker* maker) { | 453 QuicTestPacketMaker* maker) { |
| 454 return ConstructClientRequestHeadersPacket(packet_number, stream_id, | 454 return ConstructClientRequestHeadersPacket( |
| 455 should_include_version, fin, | 455 packet_number, stream_id, should_include_version, fin, |
| 456 headers, nullptr, maker); | 456 std::move(headers), nullptr, maker); |
| 457 } | 457 } |
| 458 | 458 |
| 459 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 459 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
| 460 QuicPacketNumber packet_number, | 460 QuicPacketNumber packet_number, |
| 461 QuicStreamId stream_id, | 461 QuicStreamId stream_id, |
| 462 bool should_include_version, | 462 bool should_include_version, |
| 463 bool fin, | 463 bool fin, |
| 464 const SpdyHeaderBlock& headers) { | 464 SpdyHeaderBlock headers) { |
| 465 return ConstructServerResponseHeadersPacket( | 465 return ConstructServerResponseHeadersPacket( |
| 466 packet_number, stream_id, should_include_version, fin, headers, nullptr, | 466 packet_number, stream_id, should_include_version, fin, |
| 467 &server_maker_); | 467 std::move(headers), nullptr, &server_maker_); |
| 468 } | 468 } |
| 469 | 469 |
| 470 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 470 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
| 471 QuicPacketNumber packet_number, | 471 QuicPacketNumber packet_number, |
| 472 QuicStreamId stream_id, | 472 QuicStreamId stream_id, |
| 473 bool should_include_version, | 473 bool should_include_version, |
| 474 bool fin, | 474 bool fin, |
| 475 const SpdyHeaderBlock& headers, | 475 SpdyHeaderBlock headers, |
| 476 QuicTestPacketMaker* maker) { | 476 QuicTestPacketMaker* maker) { |
| 477 return ConstructServerResponseHeadersPacket(packet_number, stream_id, | 477 return ConstructServerResponseHeadersPacket( |
| 478 should_include_version, fin, | 478 packet_number, stream_id, should_include_version, fin, |
| 479 headers, nullptr, maker); | 479 std::move(headers), nullptr, maker); |
| 480 } | 480 } |
| 481 | 481 |
| 482 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 482 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
| 483 QuicPacketNumber packet_number, | 483 QuicPacketNumber packet_number, |
| 484 QuicStreamId stream_id, | 484 QuicStreamId stream_id, |
| 485 bool should_include_version, | 485 bool should_include_version, |
| 486 bool fin, | 486 bool fin, |
| 487 const SpdyHeaderBlock& headers, | 487 SpdyHeaderBlock headers, |
| 488 QuicStreamOffset* offset) { | 488 QuicStreamOffset* offset) { |
| 489 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( | 489 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( |
| 490 packet_number, stream_id, should_include_version, fin, headers, offset); | 490 packet_number, stream_id, should_include_version, fin, headers, offset); |
| 491 } | 491 } |
| 492 | 492 |
| 493 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 493 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
| 494 QuicPacketNumber packet_number, | 494 QuicPacketNumber packet_number, |
| 495 QuicStreamId stream_id, | 495 QuicStreamId stream_id, |
| 496 bool should_include_version, | 496 bool should_include_version, |
| 497 bool fin, | 497 bool fin, |
| 498 const SpdyHeaderBlock& headers, | 498 SpdyHeaderBlock headers, |
| 499 QuicStreamOffset* offset, | 499 QuicStreamOffset* offset, |
| 500 QuicTestPacketMaker* maker) { | 500 QuicTestPacketMaker* maker) { |
| 501 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( | 501 return server_maker_.MakeResponseHeadersPacketWithOffsetTracking( |
| 502 packet_number, stream_id, should_include_version, fin, headers, offset); | 502 packet_number, stream_id, should_include_version, fin, headers, offset); |
| 503 } | 503 } |
| 504 | 504 |
| 505 void CreateSession() { | 505 void CreateSession() { |
| 506 params_.enable_quic = true; | 506 params_.enable_quic = true; |
| 507 params_.quic_clock = clock_; | 507 params_.quic_clock = clock_; |
| 508 params_.quic_random = &random_generator_; | 508 params_.quic_random = &random_generator_; |
| (...skipping 1835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2344 QuicPacketNumber packet_number, | 2344 QuicPacketNumber packet_number, |
| 2345 QuicStreamId stream_id, | 2345 QuicStreamId stream_id, |
| 2346 bool should_include_version, | 2346 bool should_include_version, |
| 2347 QuicStreamOffset* offset, | 2347 QuicStreamOffset* offset, |
| 2348 QuicTestPacketMaker* maker) { | 2348 QuicTestPacketMaker* maker) { |
| 2349 SpdyPriority priority = | 2349 SpdyPriority priority = |
| 2350 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); | 2350 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); |
| 2351 SpdyHeaderBlock headers(maker->GetRequestHeaders("GET", "https", "/")); | 2351 SpdyHeaderBlock headers(maker->GetRequestHeaders("GET", "https", "/")); |
| 2352 return maker->MakeRequestHeadersPacketWithOffsetTracking( | 2352 return maker->MakeRequestHeadersPacketWithOffsetTracking( |
| 2353 packet_number, stream_id, should_include_version, true, priority, | 2353 packet_number, stream_id, should_include_version, true, priority, |
| 2354 headers, offset); | 2354 std::move(headers), offset); |
| 2355 } | 2355 } |
| 2356 | 2356 |
| 2357 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( | 2357 std::unique_ptr<QuicEncryptedPacket> ConstructClientRequestHeadersPacket( |
| 2358 QuicPacketNumber packet_number, | 2358 QuicPacketNumber packet_number, |
| 2359 QuicStreamId stream_id, | 2359 QuicStreamId stream_id, |
| 2360 bool should_include_version, | 2360 bool should_include_version, |
| 2361 QuicTestPacketMaker* maker) { | 2361 QuicTestPacketMaker* maker) { |
| 2362 return ConstructClientRequestHeadersPacket( | 2362 return ConstructClientRequestHeadersPacket( |
| 2363 packet_number, stream_id, should_include_version, nullptr, maker); | 2363 packet_number, stream_id, should_include_version, nullptr, maker); |
| 2364 } | 2364 } |
| 2365 | 2365 |
| 2366 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 2366 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
| 2367 QuicPacketNumber packet_number, | 2367 QuicPacketNumber packet_number, |
| 2368 QuicStreamId stream_id, | 2368 QuicStreamId stream_id, |
| 2369 QuicStreamOffset* offset, | 2369 QuicStreamOffset* offset, |
| 2370 QuicTestPacketMaker* maker) { | 2370 QuicTestPacketMaker* maker) { |
| 2371 SpdyHeaderBlock headers(maker->GetResponseHeaders("200 OK")); | 2371 SpdyHeaderBlock headers(maker->GetResponseHeaders("200 OK")); |
| 2372 return maker->MakeResponseHeadersPacketWithOffsetTracking( | 2372 return maker->MakeResponseHeadersPacketWithOffsetTracking( |
| 2373 packet_number, stream_id, false, false, headers, offset); | 2373 packet_number, stream_id, false, false, std::move(headers), offset); |
| 2374 } | 2374 } |
| 2375 | 2375 |
| 2376 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( | 2376 std::unique_ptr<QuicEncryptedPacket> ConstructServerResponseHeadersPacket( |
| 2377 QuicPacketNumber packet_number, | 2377 QuicPacketNumber packet_number, |
| 2378 QuicStreamId stream_id, | 2378 QuicStreamId stream_id, |
| 2379 QuicTestPacketMaker* maker) { | 2379 QuicTestPacketMaker* maker) { |
| 2380 return ConstructServerResponseHeadersPacket(packet_number, stream_id, | 2380 return ConstructServerResponseHeadersPacket(packet_number, stream_id, |
| 2381 nullptr, maker); | 2381 nullptr, maker); |
| 2382 } | 2382 } |
| 2383 | 2383 |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2671 AddHangingSocketData(); | 2671 AddHangingSocketData(); |
| 2672 | 2672 |
| 2673 SendRequestAndExpectQuicResponse(origin1_); | 2673 SendRequestAndExpectQuicResponse(origin1_); |
| 2674 SendRequestAndExpectQuicResponse(origin2_); | 2674 SendRequestAndExpectQuicResponse(origin2_); |
| 2675 | 2675 |
| 2676 EXPECT_TRUE(AllDataConsumed()); | 2676 EXPECT_TRUE(AllDataConsumed()); |
| 2677 } | 2677 } |
| 2678 | 2678 |
| 2679 } // namespace test | 2679 } // namespace test |
| 2680 } // namespace net | 2680 } // namespace net |
| OLD | NEW |