Refactor RST_STREAM status code handling.

net/spdy/spdy_framer.cc

 // 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.
 
 // TODO(rtenhove) clean up frame buffer size calculations so that we aren't
 // constantly adding and subtracting header sizes; this is ugly and error-
 // prone.
 
 #include "net/spdy/spdy_framer.h"
 
@@ skipping 420 matching lines @@
     case RST_STREAM_FLOW_CONTROL_ERROR:
       return "FLOW_CONTROL_ERROR";
     case RST_STREAM_STREAM_IN_USE:
       return "STREAM_IN_USE";
     case RST_STREAM_STREAM_ALREADY_CLOSED:
       return "STREAM_ALREADY_CLOSED";
     case RST_STREAM_INVALID_CREDENTIALS:
       return "INVALID_CREDENTIALS";
     case RST_STREAM_FRAME_TOO_LARGE:
       return "FRAME_TOO_LARGE";
+    case RST_STREAM_CONNECT_ERROR:
+      return "CONNECT_ERROR";
+    case RST_STREAM_ENHANCE_YOUR_CALM:
+      return "ENHANCE_YOUR_CALM";
   }
   return "UNKNOWN_STATUS";
 }
 
 const char* SpdyFramer::FrameTypeToString(SpdyFrameType type) {
   switch (type) {
     case DATA:
       return "DATA";
     case SYN_STREAM:
       return "SYN_STREAM";
@@ skipping 1358 matching lines @@
       reader.Seek(GetControlFrameHeaderSize());  // Seek past frame header.
       if (protocol_version() <= SPDY3) {
         bool successful_read = reader.ReadUInt31(&current_frame_stream_id_);
         DCHECK(successful_read);
       }
 
       SpdyRstStreamStatus status = RST_STREAM_INVALID;
       uint32 status_raw = status;
       bool successful_read = reader.ReadUInt32(&status_raw);
       DCHECK(successful_read);
-      // We've read an unsigned integer, so it's enough to only check
-      // upper bound to ensure the value is in valid range.
-      if (status_raw > RST_STREAM_INVALID &&
-          status_raw < RST_STREAM_NUM_STATUS_CODES) {
+      if (SpdyConstants::IsValidRstStreamStatus(protocol_version(),
+                                                status_raw)) {
         status = static_cast<SpdyRstStreamStatus>(status_raw);
       } else {
         // TODO(hkhalil): Probably best to OnError here, depending on
         // our interpretation of the spec. Keeping with existing liberal
         // behavior for now.
       }
       // Finished parsing the RST_STREAM header, call frame handler.
       visitor_->OnRstStream(current_frame_stream_id_, status);
     }
   }
@@ skipping 1008 matching lines @@
   builder->Seek(compressed_size);
   builder->RewriteLength(*this);
 
   pre_compress_bytes.Add(uncompressed_len);
   post_compress_bytes.Add(compressed_size);
 
   compressed_frames.Increment();
 }
 
 }  // namespace net