Code cleanup of control frame size enforcement.

net/spdy/spdy_framer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SPDY_SPDY_FRAMER_H_
 #define NET_SPDY_SPDY_FRAMER_H_
 
 #include <list>
 #include <map>
 #include <memory>
@@ skipping 691 matching lines @@
       const SpdyNameValueBlock& name_value_block) const;
 
   // Compresses automatically according to enable_compression_.
   void SerializeNameValueBlock(
       SpdyFrameBuilder* builder,
       const SpdyFrameWithNameValueBlockIR& frame);
 
   // Set the error code and moves the framer into the error state.
   void set_error(SpdyError error);
 
-  // The maximum size of the control frames that we support.
-  // This limit is arbitrary. We can enforce it here or at the application
-  // layer. We chose the framing layer, but this can be changed (or removed)
-  // if necessary later down the line.
-  size_t GetControlFrameBufferMaxSize() const {
-    // The theoretical maximum for SPDY3 and earlier is (2^24 - 1) +
-    // 8, since the length field does not count the size of the
-    // header.
-    if (spdy_version_ == SPDY2) {
-      return 64 * 1024;
-    }
-    if (spdy_version_ == SPDY3) {
-      return 16 * 1024 * 1024;
-    }
-    // Absolute maximum size of HTTP2 frame payload (section 4.2 "Frame size").
-    return (1<<14) - 1;
-  }
-
-  // TODO(jgraettinger): For h2-13 interop testing coverage,
-  // fragment at smaller payload boundaries.

[Bence, 2016/02/09 15:28:09]

Okay, so this was the original motivation for fragmenting at 1 kB.  I guess it
is reasonable now to raise it.

-  size_t GetHeaderFragmentMaxSize() const {
-    return GetControlFrameBufferMaxSize() >> 4;  // 1023 bytes.
-  }
-
   // The size of the control frame buffer.
   // Since this is only used for control frame headers, the maximum control
   // frame header size (SYN_STREAM) is sufficient; all remaining control
   // frame data is streamed to the visitor.
   static const size_t kControlFrameBufferSize;
 
+  // The maximum size of the control frames that we support.
+  // This limit is arbitrary. We can enforce it here or at the application
+  // layer. We chose the framing layer, but this can be changed (or removed)
+  // if necessary later down the line.
+  static const size_t kMaxControlFrameSize;
+
   SpdyState state_;
   SpdyState previous_state_;
   SpdyError error_code_;
 
   // Note that for DATA frame, remaining_data_length_ is sum of lengths of
   // frame header, padding length field (optional), data payload (optional) and
   // padding payload (optional).
   size_t remaining_data_length_;
 
   // The length (in bytes) of the padding payload to be processed.
@@ skipping 67 matching lines @@
   // If a HEADERS frame is followed by a CONTINUATION frame, the FIN/END_STREAM
   // flag is still carried in the HEADERS frame. If it's set, flip this so that
   // we know to terminate the stream when the entire header block has been
   // processed.
   bool end_stream_when_done_;
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_FRAMER_H_