diff options
| author | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-25 05:42:05 +0000 |
|---|---|---|
| committer | jgraettinger@chromium.org <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-25 05:42:05 +0000 |
| commit | 53669f6067d653bd701a145e0bde26edfa074605 (patch) | |
| tree | 6e0cb51106b8ee6a1a421ac24f51794474527b07 /net/tools/flip_server | |
| parent | 1214b853e84214f7e908a61272eefebe82b7303d (diff) | |
| download | chromium_src-53669f6067d653bd701a145e0bde26edfa074605.zip chromium_src-53669f6067d653bd701a145e0bde26edfa074605.tar.gz chromium_src-53669f6067d653bd701a145e0bde26edfa074605.tar.bz2 | |
Implements the ACK flag for SPDY4/HTTP2 PING frames
This lands server change 61378132 by birenroy.
Also update SpdySession, BufferedSpdyFramer, etc to accept and pass
the |is_ack| flag.
BUG=345769
Review URL: https://codereview.chromium.org/169283012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
| -rw-r--r-- | net/tools/flip_server/spdy_interface.h | 2 | ||||
| -rw-r--r-- | net/tools/flip_server/spdy_interface_test.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h index c12a895..5ab8cba 100644 --- a/net/tools/flip_server/spdy_interface.h +++ b/net/tools/flip_server/spdy_interface.h @@ -111,7 +111,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface { uint32 value) OVERRIDE {} // Called when a PING frame has been parsed. - virtual void OnPing(SpdyPingId unique_id) OVERRIDE {} + virtual void OnPing(SpdyPingId unique_id, bool is_ack) OVERRIDE {} // Called when a RST_STREAM frame has been parsed. virtual void OnRstStream(SpdyStreamId stream_id, diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc index dd1980d..8b340a8 100644 --- a/net/tools/flip_server/spdy_interface_test.cc +++ b/net/tools/flip_server/spdy_interface_test.cc @@ -60,7 +60,7 @@ class SpdyFramerVisitor : public BufferedSpdyFramerVisitorInterface { bool)); MOCK_METHOD1(OnSettings, void(bool clear_persisted)); MOCK_METHOD3(OnSetting, void(SpdySettingsIds, uint8, uint32)); - MOCK_METHOD1(OnPing, void(SpdyPingId unique_id)); + MOCK_METHOD2(OnPing, void(SpdyPingId unique_id, bool is_ack)); MOCK_METHOD2(OnRstStream, void(SpdyStreamId, SpdyRstStreamStatus)); MOCK_METHOD2(OnGoAway, void(SpdyStreamId, SpdyGoAwayStatus)); MOCK_METHOD2(OnWindowUpdate, void(SpdyStreamId, uint32)); @@ -292,7 +292,7 @@ TEST_P(SpdySMProxyTest, OnStreamFrameData_SPDY2) { SpdyHeaderBlock block; testing::MockFunction<void(int)> checkpoint; // NOLINT - scoped_ptr<SpdyFrame> frame(spdy_framer_->CreatePingFrame(12)); + scoped_ptr<SpdyFrame> frame(spdy_framer_->CreatePingFrame(12, false)); block["method"] = "GET"; block["url"] = "http://www.example.com/path"; block["scheme"] = "http"; @@ -325,7 +325,7 @@ TEST_P(SpdySMProxyTest, OnStreamFrameData) { SpdyHeaderBlock block; testing::MockFunction<void(int)> checkpoint; // NOLINT - scoped_ptr<SpdyFrame> frame(spdy_framer_->CreatePingFrame(12)); + scoped_ptr<SpdyFrame> frame(spdy_framer_->CreatePingFrame(12, false)); block[":method"] = "GET"; block[":host"] = "www.example.com"; block[":path"] = "/path"; |