summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 00:49:51 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 00:49:51 +0000
commitcf0f29f130b7987ce6e31e20d980fb2e9f0e7ab9 (patch)
treec931c9306e4f3e1e203ae19803e06a83a50a8652 /net/tools
parent11991f45537b943a2457ec57d9c9390b4bae62ad (diff)
downloadchromium_src-cf0f29f130b7987ce6e31e20d980fb2e9f0e7ab9.zip
chromium_src-cf0f29f130b7987ce6e31e20d980fb2e9f0e7ab9.tar.gz
chromium_src-cf0f29f130b7987ce6e31e20d980fb2e9f0e7ab9.tar.bz2
Fix Linux OOL issue that came up since yesterday.
BUG=carnitas TEST=compiles Review URL: http://codereview.chromium.org/6602060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/flip_server/streamer_interface.cc12
-rw-r--r--net/tools/flip_server/streamer_interface.h14
2 files changed, 16 insertions, 10 deletions
diff --git a/net/tools/flip_server/streamer_interface.cc b/net/tools/flip_server/streamer_interface.cc
index 62ca712..9e6e6c8 100644
--- a/net/tools/flip_server/streamer_interface.cc
+++ b/net/tools/flip_server/streamer_interface.cc
@@ -185,6 +185,18 @@ void StreamerSM::ProcessHeaders(const BalsaHeaders& headers) {
sm_other_interface_->ProcessWriteInput(buffer, size);
}
+void StreamerSM::HandleHeaderError(BalsaFrame* framer) {
+ HandleError();
+}
+
+void StreamerSM::HandleChunkingError(BalsaFrame* framer) {
+ HandleError();
+}
+
+void StreamerSM::HandleBodyError(BalsaFrame* framer) {
+ HandleError();
+}
+
void StreamerSM::HandleError() {
VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Error detected";
}
diff --git a/net/tools/flip_server/streamer_interface.h b/net/tools/flip_server/streamer_interface.h
index 39df15e..97ce0e6 100644
--- a/net/tools/flip_server/streamer_interface.h
+++ b/net/tools/flip_server/streamer_interface.h
@@ -61,7 +61,7 @@ class StreamerSM : public BalsaVisitorInterface,
virtual size_t SendSynReply(uint32 stream_id, const BalsaHeaders& headers);
virtual void SendDataFrame(uint32 stream_id, const char* data, int64 len,
uint32 flags, bool compress) {}
- void set_is_request();
+ virtual void set_is_request();
static std::string forward_ip_header() { return forward_ip_header_; }
static void set_forward_ip_header(std::string value) {
forward_ip_header_ = value;
@@ -106,16 +106,10 @@ class StreamerSM : public BalsaVisitorInterface,
virtual void ProcessChunkLength(size_t chunk_length) {}
virtual void ProcessChunkExtensions(const char *input, size_t size) {}
virtual void HeaderDone() {}
- virtual void HandleHeaderError(BalsaFrame* framer) {
- HandleError();
- }
+ virtual void HandleHeaderError(BalsaFrame* framer);
virtual void HandleHeaderWarning(BalsaFrame* framer) {}
- virtual void HandleChunkingError(BalsaFrame* framer) {
- HandleError();
- }
- virtual void HandleBodyError(BalsaFrame* framer) {
- HandleError();
- }
+ virtual void HandleChunkingError(BalsaFrame* framer);
+ virtual void HandleBodyError(BalsaFrame* framer);
void HandleError();
SMConnection* connection_;