Invalid flags now result in a GOAWAY

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 <string>
@@ skipping 192 matching lines @@
   // Called when a GOAWAY frame has been parsed.
   virtual void OnGoAway(SpdyStreamId last_accepted_stream_id,
                         SpdyGoAwayStatus status) = 0;
 
   // Called when a WINDOW_UPDATE frame has been parsed.
   virtual void OnWindowUpdate(SpdyStreamId stream_id,
                               int delta_window_size) = 0;
 
   // Called after a control frame has been compressed to allow the visitor
   // to record compression statistics.
+  //
+  // TODO(akalin): Upstream this function.
   virtual void OnControlFrameCompressed(
       const SpdyControlFrame& uncompressed_frame,
       const SpdyControlFrame& compressed_frame) = 0;
 };
 
 // Optionally, and in addition to SpdyFramerVisitorInterface, a class supporting
 // SpdyFramerDebugVisitorInterface may be used in conjunction with SpdyFramer in
 // order to extract debug/internal information about the SpdyFramer as it
 // operates.
 //
@@ skipping 34 matching lines @@
     SPDY_FORWARD_STREAM_FRAME,
     SPDY_CONTROL_FRAME_BEFORE_HEADER_BLOCK,
     SPDY_CONTROL_FRAME_HEADER_BLOCK,
     SPDY_CREDENTIAL_FRAME_PAYLOAD,
     SPDY_SETTINGS_FRAME_PAYLOAD,
   };
 
   // SPDY error codes.
   enum SpdyError {
     SPDY_NO_ERROR,
-    SPDY_INVALID_CONTROL_FRAME,      // Control frame is mal-formatted.
-    SPDY_CONTROL_PAYLOAD_TOO_LARGE,  // Control frame payload was too large.
-    SPDY_ZLIB_INIT_FAILURE,          // The Zlib library could not initialize.
-    SPDY_UNSUPPORTED_VERSION,        // Control frame has unsupported version.
-    SPDY_DECOMPRESS_FAILURE,         // There was an error decompressing.
-    SPDY_COMPRESS_FAILURE,           // There was an error compressing.
-    SPDY_CREDENTIAL_FRAME_CORRUPT,   // CREDENTIAL frame could not be parsed.
-    SPDY_INVALID_DATA_FRAME_FLAGS,   // Data frame has invalid flags.
+    SPDY_INVALID_CONTROL_FRAME,        // Control frame is mal-formatted.
+    SPDY_CONTROL_PAYLOAD_TOO_LARGE,    // Control frame payload was too large.
+    SPDY_ZLIB_INIT_FAILURE,            // The Zlib library could not initialize.
+    SPDY_UNSUPPORTED_VERSION,          // Control frame has unsupported version.
+    SPDY_DECOMPRESS_FAILURE,           // There was an error decompressing.
+    SPDY_COMPRESS_FAILURE,             // There was an error compressing.
+    SPDY_CREDENTIAL_FRAME_CORRUPT,     // CREDENTIAL frame could not be parsed.
+    SPDY_INVALID_DATA_FRAME_FLAGS,     // Data frame has invalid flags.
+    SPDY_INVALID_CONTROL_FRAME_FLAGS,  // Control frame has invalid flags.
 
     LAST_ERROR,  // Must be the last entry in the enum.
   };
 
   // The minimum supported SPDY version that SpdyFramer can speak.
   static const int kMinSpdyVersion;
 
   // The maximum supported SPDY version that SpdyFramer can speak.
   static const int kMaxSpdyVersion;
 
@@ skipping 346 matching lines @@
   // starts with HTTP.  If it does, we likely have an HTTP response.   This
   // isn't guaranteed though: we could have gotten a settings frame and then
   // corrupt data that just looks like HTTP, but deterministic checking requires
   // a lot more state.
   bool probable_http_response_;
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_FRAMER_H_