Add support for OpenSSL Next Protocol Negotiation

net/socket/ssl_client_socket_openssl.h

 // Copyright (c) 2010 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #pragma once
 
+#include <string>
+
 #include "base/scoped_ptr.h"
 #include "net/base/cert_verify_result.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ssl_config_service.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/client_socket_handle.h"
 
 typedef struct bio_st BIO;
 typedef struct evp_pkey_st EVP_PKEY;
@@ skipping 41 matching lines @@
   virtual void SetOmniboxSpeculation();
   virtual bool WasEverUsed() const;
   virtual bool UsingTCPFastOpen() const;
 
   // Socket methods:
   virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback);
   virtual int Write(IOBuffer* buf, int buf_len, CompletionCallback* callback);
   virtual bool SetReceiveBufferSize(int32 size);
   virtual bool SetSendBufferSize(int32 size);
 
+  void set_npn_status(NextProtoStatus status) { npn_status_ = status; }

[joth, 2010/12/02 17:46:55]

could you put these up next to host_and_port(), as the section down here is for
virtual overrides.

[Kristian_, 2010/12/03 14:58:56]

Done, actually removed.

+  void set_npn_proto(const char* proto, int len) {
+    npn_proto_.assign(proto, len);
+  }
+
  private:
   bool Init();
   void DoReadCallback(int result);
   void DoWriteCallback(int result);
 
   bool DoTransportIO();
   int DoHandshake();
   int DoVerifyCert(int result);
   int DoVerifyCertComplete(int result);
   void DoConnectCallback(int result);
@@ skipping 59 matching lines @@
   // Used for session cache diagnostics.
   bool trying_cached_session_;
 
   enum State {
     STATE_NONE,
     STATE_HANDSHAKE,
     STATE_VERIFY_CERT,
     STATE_VERIFY_CERT_COMPLETE,
   };
   State next_handshake_state_;
+  NextProtoStatus npn_status_;
+  std::string npn_proto_;
   BoundNetLog net_log_;
 };
 
 }  // namespace net
 
 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_