SPDY: Add WriteHeaders interface to SpdySession and SpdyStream

net/spdy/spdy_session.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.
 
 #include "net/spdy/spdy_session.h"
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 640 matching lines @@
   QueueFrame(credential_frame.get(), HIGHEST, NULL);
 
   if (net_log().IsLoggingAllEvents()) {
     net_log().AddEvent(
         NetLog::TYPE_SPDY_SESSION_SEND_CREDENTIAL,
         base::Bind(&NetLogSpdyCredentialCallback, credential.slot, &origin));
   }
   return ERR_IO_PENDING;
 }
 
+int SpdySession::WriteHeaders(SpdyStreamId stream_id,
+                              const SpdyHeaderBlock& headers,
+                              SpdyControlFlags flags) {
+  // Find our stream
+  CHECK(IsStreamActive(stream_id));
+  scoped_refptr<SpdyStream> stream = active_streams_[stream_id];
+  CHECK_EQ(stream->stream_id(), stream_id);
+
+  // Create and send a HEADER frame.
+  scoped_ptr<SpdyHeadersControlFrame> frame(
+      buffered_spdy_framer_->CreateHeaders(stream_id, flags, true, &headers));

[Ryan Hamilton, 2012/07/24 17:53:03]

is "true" the the boolean for compressed?  If so, I think there's a bug here. 
(I'm working on a CL to re-jigger this, but until then...)  QueueFrame sticks a
frame into a queue ordered by priority.  As such, it is possible to enqueue a
HEADERS frame now, then a higher priority SYN_STREAM frame later.  But the
SYN_STREAM frame will be removed from the queue first (because of priority).  We
need to compress the frames in the order they are written to the wire, not the
order they are created.  I think you want compressed to be false here, and let
SpdySession::WriteSocket() actually do the compression.

[Takashi Toyoshima, 2012/07/25 08:44:24]

OK, I see the current issue.
I change this flag to false.

+  QueueFrame(frame.get(), stream->priority(), stream);
+
+  if (net_log().IsLoggingAllEvents()) {
+    bool fin = flags & CONTROL_FLAG_FIN;
+    net_log().AddEvent(
+        NetLog::TYPE_SPDY_SESSION_HEADERS,

[mmenke, 2012/07/24 16:42:41]

This is what's logged when we receive headers before, right?  Think we probably
want a new event for sending headers.

[Ryan Hamilton, 2012/07/24 17:53:03]

Yes, I think we should add a new TYPE_SPDY_SESSION_SEND_HEADERS

[Takashi Toyoshima, 2012/07/25 08:44:24]

Done.

+        base::Bind(&NetLogSpdySynCallback,
+                   &headers, fin, /*unidirectional=*/false,
+                   stream_id, 0));
+  }
+  return ERR_IO_PENDING;
+}
+
 int SpdySession::WriteStreamData(SpdyStreamId stream_id,
                                  net::IOBuffer* data, int len,
                                  SpdyDataFlags flags) {
   // Find our stream
   CHECK(IsStreamActive(stream_id));
   scoped_refptr<SpdyStream> stream = active_streams_[stream_id];
   CHECK_EQ(stream->stream_id(), stream_id);
 
   if (len > kMaxSpdyFrameChunkSize) {
     len = kMaxSpdyFrameChunkSize;
@@ skipping 1241 matching lines @@
 SSLClientSocket* SpdySession::GetSSLClientSocket() const {
   if (!is_secure_)
     return NULL;
   SSLClientSocket* ssl_socket =
       reinterpret_cast<SSLClientSocket*>(connection_->socket());
   DCHECK(ssl_socket);
   return ssl_socket;
 }
 
 }  // namespace net