SPDY - replaced SpdySettings (list) with SettingsMap

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 993 matching lines @@
     }
 
     // Store header.
     (*block)[name] = value;
   }
   return true;
 }
 
 /* static */
 bool SpdyFramer::ParseSettings(const SpdySettingsControlFrame* frame,
-                               SpdySettings* settings) {
+                               SettingsMap* settings) {
   DCHECK_EQ(frame->type(), SETTINGS);
-  DCHECK(settings);

[Ryan Hamilton, 2012/04/12 17:11:21]

Did you mean to remove this DCHECK?

[ramant (doing other things), 2012/04/12 18:35:59]

(my fault. deleted it by mistake)
Done.

 
   SpdyFrameReader parser(frame->header_block(), frame->header_block_len());
   for (size_t index = 0; index < frame->num_entries(); ++index) {
     uint32 id_and_flags_wire;
     uint32 value;
     // SettingsFlagsAndId accepts off-the-wire (network byte order) data, so we
     // use ReadBytes() instead of ReadUInt32() as the latter calls ntohl().
     if (!parser.ReadBytes(&id_and_flags_wire, 4)) {
       return false;
     }
     if (!parser.ReadUInt32(&value))
       return false;
-    SettingsFlagsAndId id_and_flags =
+    SettingsFlagsAndId flags_and_id =
         SettingsFlagsAndId::FromWireFormat(frame->version(), id_and_flags_wire);
-    settings->insert(settings->end(), std::make_pair(id_and_flags, value));
+    SpdySettingsIds id = static_cast<SpdySettingsIds>(flags_and_id.id());
+    SpdySettingsFlags flags =
+        static_cast<SpdySettingsFlags>(flags_and_id.flags());
+    settings->insert(std::make_pair(id, SettingsFlagsAndValue(flags, value)));
   }
   return true;
 }
 
 /* static */
 bool SpdyFramer::ParseCredentialData(const char* data, size_t len,
                                      SpdyCredential* credential) {
   DCHECK(credential);
 
   SpdyFrameReader parser(data, len);
@@ skipping 114 matching lines @@
   SpdyFrameBuilder frame(SpdyRstStreamControlFrame::size());
   frame.WriteUInt16(kControlFlagMask | spdy_version_);
   frame.WriteUInt16(RST_STREAM);
   frame.WriteUInt32(8);
   frame.WriteUInt32(stream_id);
   frame.WriteUInt32(status);
   return reinterpret_cast<SpdyRstStreamControlFrame*>(frame.take());
 }
 
 SpdySettingsControlFrame* SpdyFramer::CreateSettings(
-    const SpdySettings& values) const {
+    const SettingsMap& values) const {
   SpdyFrameBuilder frame(SpdySettingsControlFrame::size() + 8 * values.size());
   frame.WriteUInt16(kControlFlagMask | spdy_version_);
   frame.WriteUInt16(SETTINGS);
   size_t settings_size =
       SpdySettingsControlFrame::size() - SpdyFrame::kHeaderSize +
       8 * values.size();
   frame.WriteUInt32(settings_size);
   frame.WriteUInt32(values.size());
-  SpdySettings::const_iterator it = values.begin();
+  SettingsMap::const_iterator it = values.begin();
   while (it != values.end()) {
-    uint32 id_and_flags_wire = it->first.GetWireFormat(spdy_version_);
+    SettingsFlagsAndId flags_and_id(it->second.first, it->first);
+    uint32 id_and_flags_wire = flags_and_id.GetWireFormat(spdy_version_);
     frame.WriteBytes(&id_and_flags_wire, 4);
-    frame.WriteUInt32(it->second);
+    frame.WriteUInt32(it->second.second);
     ++it;
   }
   return reinterpret_cast<SpdySettingsControlFrame*>(frame.take());
 }
 
 SpdyPingControlFrame* SpdyFramer::CreatePingFrame(uint32 unique_id) const {
   SpdyFrameBuilder frame(SpdyPingControlFrame::size());
   frame.WriteUInt16(kControlFlagMask | spdy_version_);
   frame.WriteUInt16(PING);
   size_t ping_size = SpdyPingControlFrame::size() - SpdyFrame::kHeaderSize;
@@ skipping 612 matching lines @@
 
 void SpdyFramer::set_validate_control_frame_sizes(bool value) {
   validate_control_frame_sizes_ = value;
 }
 
 void SpdyFramer::set_enable_compression_default(bool value) {
   g_enable_compression_default = value;
 }
 
 }  // namespace net