Implement new websocket handshake based on draft-hixie-thewebsocketprotocol-76

net/websockets/websocket.cc

 // Copyright (c) 2009 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 <algorithm>
 #include <limits>
 
 #include "net/websockets/websocket.h"
 
 #include "base/message_loop.h"
 #include "net/websockets/websocket_handshake.h"
+#include "net/websockets/websocket_handshake_draft75.h"
 
 namespace net {
 
 WebSocket::WebSocket(Request* request, WebSocketDelegate* delegate)
     : ready_state_(INITIALIZED),
       request_(request),
       handshake_(NULL),
       delegate_(delegate),
       origin_loop_(MessageLoop::current()),
       socket_stream_(NULL),
@@ skipping 72 matching lines @@
   DCHECK(socket_stream == socket_stream_);
   max_pending_send_allowed_ = max_pending_send_allowed;
 
   // Use |max_pending_send_allowed| as hint for initial size of read buffer.
   current_read_buf_ = new GrowableIOBuffer();
   current_read_buf_->SetCapacity(max_pending_send_allowed_);
   read_consumed_len_ = 0;
 
   DCHECK(!current_write_buf_);
   DCHECK(!handshake_.get());
-  handshake_.reset(new WebSocketHandshake(
-      request_->url(), request_->origin(), request_->location(),
-      request_->protocol()));
+  switch (request_->version()) {
+    case DEFAULT_VERSION:
+      handshake_.reset(new WebSocketHandshake(
+          request_->url(), request_->origin(), request_->location(),
+          request_->protocol()));
+      break;
+    case DRAFT75:
+      handshake_.reset(new WebSocketHandshakeDraft75(
+          request_->url(), request_->origin(), request_->location(),
+          request_->protocol()));
+      break;
+    default:
+      NOTREACHED() << "Unexpected protocol version:" << request_->version();
+  }
 
   const std::string msg = handshake_->CreateClientHandshakeMessage();
   IOBufferWithSize* buf = new IOBufferWithSize(msg.size());
   memcpy(buf->data(), msg.data(), msg.size());
   pending_write_bufs_.push_back(buf);
   origin_loop_->PostTask(FROM_HERE,
                          NewRunnableMethod(this, &WebSocket::SendPending));
 }
 
 void WebSocket::OnSentData(SocketStream* socket_stream, int amount_sent) {
@@ skipping 186 matching lines @@
   Release();
 }
 
 void WebSocket::DoError(int error) {
   DCHECK(MessageLoop::current() == origin_loop_);
   if (delegate_)
     delegate_->OnError(this, error);
 }
 
 }  // namespace net