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

Side by Side Diff: net/quic/quic_protocol.h

Issue 424903002: Remove FixRate congestion frame type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_quic_version_15_71718286
Patch Set: Created 6 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/quic/quic_packet_generator_test.cc ('k') | net/quic/quic_protocol.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) 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 #ifndef NET_QUIC_QUIC_PROTOCOL_H_ 5 #ifndef NET_QUIC_QUIC_PROTOCOL_H_
6 #define NET_QUIC_QUIC_PROTOCOL_H_ 6 #define NET_QUIC_QUIC_PROTOCOL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <limits> 9 #include <limits>
10 #include <map> 10 #include <map>
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 // TODO(ianswett): Inline the fields of received_info. 705 // TODO(ianswett): Inline the fields of received_info.
706 ReceivedPacketInfo received_info; 706 ReceivedPacketInfo received_info;
707 }; 707 };
708 708
709 // Defines for all types of congestion feedback that will be negotiated in QUIC, 709 // Defines for all types of congestion feedback that will be negotiated in QUIC,
710 // kTCP MUST be supported by all QUIC implementations to guarantee 100% 710 // kTCP MUST be supported by all QUIC implementations to guarantee 100%
711 // compatibility. 711 // compatibility.
712 enum CongestionFeedbackType { 712 enum CongestionFeedbackType {
713 kTCP, // Used to mimic TCP. 713 kTCP, // Used to mimic TCP.
714 kInterArrival, // Use additional inter arrival information. 714 kInterArrival, // Use additional inter arrival information.
715 kFixRate, // Provided for testing.
716 }; 715 };
717 716
718 // Defines for all types of congestion control algorithms that can be used in 717 // Defines for all types of congestion control algorithms that can be used in
719 // QUIC. Note that this is separate from the congestion feedback type - 718 // QUIC. Note that this is separate from the congestion feedback type -
720 // some congestion control algorithms may use the same feedback type 719 // some congestion control algorithms may use the same feedback type
721 // (Reno and Cubic are the classic example for that). 720 // (Reno and Cubic are the classic example for that).
722 enum CongestionControlType { 721 enum CongestionControlType {
723 kCubic, 722 kCubic,
724 kReno, 723 kReno,
725 kFixRateCongestionControl, // Provided for testing.
726 kBBR, 724 kBBR,
727 }; 725 };
728 726
729 enum LossDetectionType { 727 enum LossDetectionType {
730 kNack, // Used to mimic TCP's loss detection. 728 kNack, // Used to mimic TCP's loss detection.
731 kTime, // Time based loss detection. 729 kTime, // Time based loss detection.
732 }; 730 };
733 731
734 struct NET_EXPORT_PRIVATE CongestionFeedbackMessageTCP { 732 struct NET_EXPORT_PRIVATE CongestionFeedbackMessageTCP {
735 CongestionFeedbackMessageTCP(); 733 CongestionFeedbackMessageTCP();
736 734
737 QuicByteCount receive_window; 735 QuicByteCount receive_window;
738 }; 736 };
739 737
740 struct NET_EXPORT_PRIVATE CongestionFeedbackMessageInterArrival { 738 struct NET_EXPORT_PRIVATE CongestionFeedbackMessageInterArrival {
741 CongestionFeedbackMessageInterArrival(); 739 CongestionFeedbackMessageInterArrival();
742 ~CongestionFeedbackMessageInterArrival(); 740 ~CongestionFeedbackMessageInterArrival();
743 741
744 // The set of received packets since the last feedback was sent, along with 742 // The set of received packets since the last feedback was sent, along with
745 // their arrival times. 743 // their arrival times.
746 TimeMap received_packet_times; 744 TimeMap received_packet_times;
747 }; 745 };
748 746
749 struct NET_EXPORT_PRIVATE CongestionFeedbackMessageFixRate {
750 CongestionFeedbackMessageFixRate();
751 QuicBandwidth bitrate;
752 };
753
754 struct NET_EXPORT_PRIVATE QuicCongestionFeedbackFrame { 747 struct NET_EXPORT_PRIVATE QuicCongestionFeedbackFrame {
755 QuicCongestionFeedbackFrame(); 748 QuicCongestionFeedbackFrame();
756 ~QuicCongestionFeedbackFrame(); 749 ~QuicCongestionFeedbackFrame();
757 750
758 NET_EXPORT_PRIVATE friend std::ostream& operator<<( 751 NET_EXPORT_PRIVATE friend std::ostream& operator<<(
759 std::ostream& os, const QuicCongestionFeedbackFrame& c); 752 std::ostream& os, const QuicCongestionFeedbackFrame& c);
760 753
761 CongestionFeedbackType type; 754 CongestionFeedbackType type;
762 // This should really be a union, but since the inter arrival struct 755 // This should really be a union, but since the inter arrival struct
763 // is non-trivial, C++ prohibits it. 756 // is non-trivial, C++ prohibits it.
764 CongestionFeedbackMessageTCP tcp; 757 CongestionFeedbackMessageTCP tcp;
765 CongestionFeedbackMessageInterArrival inter_arrival; 758 CongestionFeedbackMessageInterArrival inter_arrival;
766 CongestionFeedbackMessageFixRate fix_rate;
767 }; 759 };
768 760
769 struct NET_EXPORT_PRIVATE QuicRstStreamFrame { 761 struct NET_EXPORT_PRIVATE QuicRstStreamFrame {
770 QuicRstStreamFrame(); 762 QuicRstStreamFrame();
771 QuicRstStreamFrame(QuicStreamId stream_id, 763 QuicRstStreamFrame(QuicStreamId stream_id,
772 QuicRstStreamErrorCode error_code, 764 QuicRstStreamErrorCode error_code,
773 QuicStreamOffset bytes_written); 765 QuicStreamOffset bytes_written);
774 766
775 NET_EXPORT_PRIVATE friend std::ostream& operator<<( 767 NET_EXPORT_PRIVATE friend std::ostream& operator<<(
776 std::ostream& os, const QuicRstStreamFrame& r); 768 std::ostream& os, const QuicRstStreamFrame& r);
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 // Stores the sequence numbers of all transmissions of this packet. 1064 // Stores the sequence numbers of all transmissions of this packet.
1073 // Can never be null. 1065 // Can never be null.
1074 SequenceNumberSet* all_transmissions; 1066 SequenceNumberSet* all_transmissions;
1075 // In flight packets have not been abandoned or lost. 1067 // In flight packets have not been abandoned or lost.
1076 bool in_flight; 1068 bool in_flight;
1077 }; 1069 };
1078 1070
1079 } // namespace net 1071 } // namespace net
1080 1072
1081 #endif // NET_QUIC_QUIC_PROTOCOL_H_ 1073 #endif // NET_QUIC_QUIC_PROTOCOL_H_
OLDNEW
« no previous file with comments | « net/quic/quic_packet_generator_test.cc ('k') | net/quic/quic_protocol.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698