Remove SpdyRstStreamControlFrame struct. Useful for SPDY 4 development.

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 1190 matching lines @@
             uint32 delta_window_size = 0;
             bool successful_read = reader.ReadUInt31(&stream_id);
             DCHECK(successful_read);
             successful_read = reader.ReadUInt32(&delta_window_size);
             DCHECK(successful_read);
             DCHECK(reader.IsDoneReading());
             visitor_->OnWindowUpdate(stream_id, delta_window_size);
           }
           break;
         case RST_STREAM: {
-            SpdyRstStreamControlFrame* rst_stream_frame =
-                reinterpret_cast<SpdyRstStreamControlFrame*>(&control_frame);
-            visitor_->OnRstStream(rst_stream_frame->stream_id(),
-                                  rst_stream_frame->status());
+            SpdyFrameReader reader(current_frame_buffer_.get(),
+                                   current_frame_len_);
+            reader.Seek(GetControlFrameMinimumSize());  // Skip frame header.
+            SpdyStreamId stream_id = kInvalidStream;
+            bool successful_read = reader.ReadUInt32(&stream_id);
+            DCHECK(successful_read);
+            SpdyRstStreamStatus status = RST_STREAM_INVALID;
+            uint32 status_raw = status;
+            successful_read = reader.ReadUInt32(&status_raw);
+            DCHECK(successful_read);
+            if (status_raw > RST_STREAM_INVALID &&
+                status_raw < RST_STREAM_NUM_STATUS_CODES) {
+              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.
+            }
+            DCHECK(reader.IsDoneReading());
+            visitor_->OnRstStream(stream_id, status);
           }
           break;
         case GOAWAY: {
             SpdyFrameReader reader(current_frame_buffer_.get(),
                                    current_frame_len_);
             reader.Seek(GetControlFrameMinimumSize());  // Skip frame header.
             SpdyStreamId last_accepted_stream_id = kInvalidStream;
             bool successful_read = reader.ReadUInt31(&last_accepted_stream_id);
             DCHECK(successful_read);
             SpdyGoAwayStatus status = GOAWAY_OK;
@@ skipping 279 matching lines @@
   builder.WriteUInt32(syn_reply.stream_id());
   if (protocol_version() < 3) {
     builder.WriteUInt16(0);  // Unused.
   }
   DCHECK_EQ(GetSynReplyMinimumSize(), builder.length());
   SerializeNameValueBlock(&builder, syn_reply);
 
   return builder.take();
 }
 
-SpdyRstStreamControlFrame* SpdyFramer::CreateRstStream(
+SpdyFrame* SpdyFramer::CreateRstStream(
     SpdyStreamId stream_id,
     SpdyRstStreamStatus status) const {
   SpdyRstStreamIR rst_stream(stream_id, status);
-  return reinterpret_cast<SpdyRstStreamControlFrame*>(
-      SerializeRstStream(rst_stream));
+  return SerializeRstStream(rst_stream);
 }
 
 SpdySerializedFrame* SpdyFramer::SerializeRstStream(
     const SpdyRstStreamIR& rst_stream) const {
   SpdyFrameBuilder builder(RST_STREAM,
                            kNoFlags,
                            protocol_version(),
                            GetRstStreamSize());
   builder.WriteUInt32(rst_stream.stream_id());
   builder.WriteUInt32(rst_stream.status());
@@ skipping 541 matching lines @@
       builder->WriteString(it->first);
       builder->WriteString(it->second);
     } else {
       builder->WriteStringPiece32(it->first);
       builder->WriteStringPiece32(it->second);
     }
   }
 }
 
 }  // namespace net