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

Side by Side Diff: net/quic/core/quic_versions.cc

Issue 2823293002: deprecate -FLAGS_quic_reloadable_flag_quic_disable_version_34 and remove support for QUIC v34. (Closed)
Patch Set: Created 3 years, 8 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/core/quic_versions.h ('k') | net/quic/core/quic_versions_test.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 #include "net/quic/core/quic_versions.h" 5 #include "net/quic/core/quic_versions.h"
6 6
7 #include "net/quic/core/quic_error_codes.h" 7 #include "net/quic/core/quic_error_codes.h"
8 #include "net/quic/core/quic_flags.h" 8 #include "net/quic/core/quic_flags.h"
9 #include "net/quic/core/quic_tag.h" 9 #include "net/quic/core/quic_tag.h"
10 #include "net/quic/core/quic_types.h" 10 #include "net/quic/core/quic_types.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 } else if (version == QUIC_VERSION_37) { 46 } else if (version == QUIC_VERSION_37) {
47 if (FLAGS_quic_reloadable_flag_quic_enable_version_37 && 47 if (FLAGS_quic_reloadable_flag_quic_enable_version_37 &&
48 FLAGS_quic_reloadable_flag_quic_enable_version_36_v3) { 48 FLAGS_quic_reloadable_flag_quic_enable_version_36_v3) {
49 filtered_versions.push_back(version); 49 filtered_versions.push_back(version);
50 } 50 }
51 } else if (version == QUIC_VERSION_36) { 51 } else if (version == QUIC_VERSION_36) {
52 if (FLAGS_quic_reloadable_flag_quic_enable_version_36_v3) { 52 if (FLAGS_quic_reloadable_flag_quic_enable_version_36_v3) {
53 filtered_versions.push_back(version); 53 filtered_versions.push_back(version);
54 } 54 }
55 } else if (version == QUIC_VERSION_34) {
56 if (!FLAGS_quic_reloadable_flag_quic_disable_version_34) {
57 filtered_versions.push_back(version);
58 }
59 } else { 55 } else {
60 filtered_versions.push_back(version); 56 filtered_versions.push_back(version);
61 } 57 }
62 } 58 }
63 return filtered_versions; 59 return filtered_versions;
64 } 60 }
65 61
66 QuicVersionVector VersionOfIndex(const QuicVersionVector& versions, int index) { 62 QuicVersionVector VersionOfIndex(const QuicVersionVector& versions, int index) {
67 QuicVersionVector version; 63 QuicVersionVector version;
68 int version_count = versions.size(); 64 int version_count = versions.size();
69 if (index >= 0 && index < version_count) { 65 if (index >= 0 && index < version_count) {
70 version.push_back(versions[index]); 66 version.push_back(versions[index]);
71 } else { 67 } else {
72 version.push_back(QUIC_VERSION_UNSUPPORTED); 68 version.push_back(QUIC_VERSION_UNSUPPORTED);
73 } 69 }
74 return version; 70 return version;
75 } 71 }
76 72
77 QuicTag QuicVersionToQuicTag(const QuicVersion version) { 73 QuicTag QuicVersionToQuicTag(const QuicVersion version) {
78 switch (version) { 74 switch (version) {
79 case QUIC_VERSION_34:
80 return MakeQuicTag('Q', '0', '3', '4');
81 case QUIC_VERSION_35: 75 case QUIC_VERSION_35:
82 return MakeQuicTag('Q', '0', '3', '5'); 76 return MakeQuicTag('Q', '0', '3', '5');
83 case QUIC_VERSION_36: 77 case QUIC_VERSION_36:
84 return MakeQuicTag('Q', '0', '3', '6'); 78 return MakeQuicTag('Q', '0', '3', '6');
85 case QUIC_VERSION_37: 79 case QUIC_VERSION_37:
86 return MakeQuicTag('Q', '0', '3', '7'); 80 return MakeQuicTag('Q', '0', '3', '7');
87 case QUIC_VERSION_38: 81 case QUIC_VERSION_38:
88 return MakeQuicTag('Q', '0', '3', '8'); 82 return MakeQuicTag('Q', '0', '3', '8');
89 case QUIC_VERSION_39: 83 case QUIC_VERSION_39:
90 return MakeQuicTag('Q', '0', '3', '9'); 84 return MakeQuicTag('Q', '0', '3', '9');
(...skipping 16 matching lines...) Expand all
107 << QuicTagToString(version_tag); 101 << QuicTagToString(version_tag);
108 return QUIC_VERSION_UNSUPPORTED; 102 return QUIC_VERSION_UNSUPPORTED;
109 } 103 }
110 104
111 #define RETURN_STRING_LITERAL(x) \ 105 #define RETURN_STRING_LITERAL(x) \
112 case x: \ 106 case x: \
113 return #x 107 return #x
114 108
115 string QuicVersionToString(const QuicVersion version) { 109 string QuicVersionToString(const QuicVersion version) {
116 switch (version) { 110 switch (version) {
117 RETURN_STRING_LITERAL(QUIC_VERSION_34);
118 RETURN_STRING_LITERAL(QUIC_VERSION_35); 111 RETURN_STRING_LITERAL(QUIC_VERSION_35);
119 RETURN_STRING_LITERAL(QUIC_VERSION_36); 112 RETURN_STRING_LITERAL(QUIC_VERSION_36);
120 RETURN_STRING_LITERAL(QUIC_VERSION_37); 113 RETURN_STRING_LITERAL(QUIC_VERSION_37);
121 RETURN_STRING_LITERAL(QUIC_VERSION_38); 114 RETURN_STRING_LITERAL(QUIC_VERSION_38);
122 RETURN_STRING_LITERAL(QUIC_VERSION_39); 115 RETURN_STRING_LITERAL(QUIC_VERSION_39);
123 default: 116 default:
124 return "QUIC_VERSION_UNSUPPORTED"; 117 return "QUIC_VERSION_UNSUPPORTED";
125 } 118 }
126 } 119 }
127 120
128 string QuicVersionVectorToString(const QuicVersionVector& versions) { 121 string QuicVersionVectorToString(const QuicVersionVector& versions) {
129 string result = ""; 122 string result = "";
130 for (size_t i = 0; i < versions.size(); ++i) { 123 for (size_t i = 0; i < versions.size(); ++i) {
131 if (i != 0) { 124 if (i != 0) {
132 result.append(","); 125 result.append(",");
133 } 126 }
134 result.append(QuicVersionToString(versions[i])); 127 result.append(QuicVersionToString(versions[i]));
135 } 128 }
136 return result; 129 return result;
137 } 130 }
138 131
139 } // namespace net 132 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/core/quic_versions.h ('k') | net/quic/core/quic_versions_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698