| Index: net/tools/flip_server/streamer_interface.h
|
| diff --git a/net/tools/flip_server/streamer_interface.h b/net/tools/flip_server/streamer_interface.h
|
| index ef666695ec3135c8a4f1d517cf4f6f423cda878f..f255427c0539fb328584443819517982a09401f4 100644
|
| --- a/net/tools/flip_server/streamer_interface.h
|
| +++ b/net/tools/flip_server/streamer_interface.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef NET_TOOLS_FLIP_SERVER_STREAMER_INTERFACE_H_
|
| #define NET_TOOLS_FLIP_SERVER_STREAMER_INTERFACE_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| @@ -31,7 +34,7 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface {
|
| void AddToOutputOrder(const MemCacheIter& mci) {}
|
|
|
| void InitSMInterface(SMInterface* sm_other_interface,
|
| - int32 server_idx) override;
|
| + int32_t server_idx) override;
|
| void InitSMConnection(SMConnectionPoolInterface* connection_pool,
|
| SMInterface* sm_interface,
|
| EpollServer* epoll_server,
|
| @@ -44,26 +47,27 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface {
|
| size_t ProcessReadInput(const char* data, size_t len) override;
|
| size_t ProcessWriteInput(const char* data, size_t len) override;
|
| bool MessageFullyRead() const override;
|
| - void SetStreamID(uint32 stream_id) override {}
|
| + void SetStreamID(uint32_t stream_id) override {}
|
| bool Error() const override;
|
| const char* ErrorAsString() const override;
|
| void Reset() override;
|
| - void ResetForNewInterface(int32 server_idx) override {}
|
| + void ResetForNewInterface(int32_t server_idx) override {}
|
| void ResetForNewConnection() override;
|
| void Cleanup() override;
|
| int PostAcceptHook() override;
|
| - void NewStream(uint32 stream_id,
|
| - uint32 priority,
|
| + void NewStream(uint32_t stream_id,
|
| + uint32_t priority,
|
| const std::string& filename) override {}
|
| - void SendEOF(uint32 stream_id) override {}
|
| - void SendErrorNotFound(uint32 stream_id) override {}
|
| - virtual void SendOKResponse(uint32 stream_id, const std::string& output) {}
|
| - size_t SendSynStream(uint32 stream_id, const BalsaHeaders& headers) override;
|
| - size_t SendSynReply(uint32 stream_id, const BalsaHeaders& headers) override;
|
| - void SendDataFrame(uint32 stream_id,
|
| + void SendEOF(uint32_t stream_id) override {}
|
| + void SendErrorNotFound(uint32_t stream_id) override {}
|
| + virtual void SendOKResponse(uint32_t stream_id, const std::string& output) {}
|
| + size_t SendSynStream(uint32_t stream_id,
|
| + const BalsaHeaders& headers) override;
|
| + size_t SendSynReply(uint32_t stream_id, const BalsaHeaders& headers) override;
|
| + void SendDataFrame(uint32_t stream_id,
|
| const char* data,
|
| - int64 len,
|
| - uint32 flags,
|
| + int64_t len,
|
| + uint32_t flags,
|
| bool compress) override {}
|
| void set_is_request() override;
|
| static std::string forward_ip_header() { return forward_ip_header_; }
|
| @@ -72,19 +76,19 @@ class StreamerSM : public BalsaVisitorInterface, public SMInterface {
|
| }
|
|
|
| private:
|
| - void SendEOFImpl(uint32 stream_id) {}
|
| - void SendErrorNotFoundImpl(uint32 stream_id) {}
|
| - void SendOKResponseImpl(uint32 stream_id, std::string* output) {}
|
| - size_t SendSynReplyImpl(uint32 stream_id, const BalsaHeaders& headers) {
|
| + void SendEOFImpl(uint32_t stream_id) {}
|
| + void SendErrorNotFoundImpl(uint32_t stream_id) {}
|
| + void SendOKResponseImpl(uint32_t stream_id, std::string* output) {}
|
| + size_t SendSynReplyImpl(uint32_t stream_id, const BalsaHeaders& headers) {
|
| return 0;
|
| }
|
| - size_t SendSynStreamImpl(uint32 stream_id, const BalsaHeaders& headers) {
|
| + size_t SendSynStreamImpl(uint32_t stream_id, const BalsaHeaders& headers) {
|
| return 0;
|
| }
|
| - void SendDataFrameImpl(uint32 stream_id,
|
| + void SendDataFrameImpl(uint32_t stream_id,
|
| const char* data,
|
| - int64 len,
|
| - uint32 flags,
|
| + int64_t len,
|
| + uint32_t flags,
|
| bool compress) {}
|
| void GetOutput() override {}
|
|
|
|
|