Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: net/spdy/spdy_session.h

Issue 9618002: SPDY - integration of spdy/3 code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/spdy/spdy_session.h
===================================================================
--- net/spdy/spdy_session.h (revision 125802)
+++ net/spdy/spdy_session.h (working copy)
@@ -174,6 +174,9 @@
// CLIENT_CERT_INVALID_TYPE if none was sent.
SSLClientCertType GetOriginBoundCertType() const;
+ // Reset all static settings to initialized values. Used to init test suite.
+ static void ResetStaticSettingsToInit();
+
// Enable or disable SSL.
static void SetSSLMode(bool enable) { use_ssl_ = enable; }
static bool SSLMode() { return use_ssl_; }
@@ -184,6 +187,13 @@
use_flow_control_ = flow_control;
}
+ // Specify the SPDY protocol to be used for SPDY session which do not use NPN
+ // to negotiate a particular protocol. This is only called from unit tests.
Ryan Hamilton 2012/03/10 03:23:02 Actually, looks like this is called by both comman
ramant (doing other things) 2012/03/10 19:45:29 Done.
+ static void set_default_protocol(
+ SSLClientSocket::NextProto default_protocol) {
+ default_protocol_ = default_protocol;
+ }
+
// Sets the max concurrent streams per session, as a ceiling on any server
// specific SETTINGS value.
static void set_max_concurrent_streams(size_t value) {
@@ -354,6 +364,7 @@
// Handle SETTINGS. Either when we send settings, or when we receive a
// SETTINGS control frame, update our SpdySession accordingly.
void HandleSettings(const spdy::SpdySettings& settings);
+ void HandleSetting(uint32 id, uint32 value);
// Adjust the send window size of all ActiveStreams and PendingCreateStreams.
void UpdateStreamsSendWindowSize(int32 delta_window_size);
@@ -437,12 +448,13 @@
const spdy::SpdyRstStreamControlFrame& frame) OVERRIDE;
virtual void OnGoAway(const spdy::SpdyGoAwayControlFrame& frame) OVERRIDE;
virtual void OnPing(const spdy::SpdyPingControlFrame& frame) OVERRIDE;
- virtual void OnSettings(const spdy::SpdySettingsControlFrame& frame) OVERRIDE;
virtual void OnWindowUpdate(
const spdy::SpdyWindowUpdateControlFrame& frame) OVERRIDE;
virtual void OnStreamFrameData(spdy::SpdyStreamId stream_id,
const char* data,
size_t len) OVERRIDE;
+ virtual void OnSetting(
+ spdy::SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE;
virtual void OnSynStream(
const spdy::SpdySynStreamControlFrame& frame,
const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE;
@@ -623,6 +635,7 @@
static bool use_ssl_;
static FlowControl use_flow_control_;
+ static SSLClientSocket::NextProto default_protocol_;
static size_t init_max_concurrent_streams_;
static size_t max_concurrent_stream_limit_;

Powered by Google App Engine
This is Rietveld 408576698