Index: net/spdy/spdy_protocol.h |
diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h |
index fbd922475b1348e37e5068b82ecde21ea0f57154..a2f4832665cdf58df7270ac3a44b73b25073e3c0 100644 |
--- a/net/spdy/spdy_protocol.h |
+++ b/net/spdy/spdy_protocol.h |
@@ -287,12 +287,13 @@ enum SpdyFrameType { |
BLOCKED, |
PUSH_PROMISE, |
CONTINUATION, |
- LAST_CONTROL_TYPE = CONTINUATION |
+ ALTSVC, |
+ LAST_CONTROL_TYPE = ALTSVC |
}; |
// Flags on data packets. |
enum SpdyDataFlags { |
-DATA_FLAG_NONE = 0x00, |
+ DATA_FLAG_NONE = 0x00, |
DATA_FLAG_FIN = 0x01, |
DATA_FLAG_END_SEGMENT = 0x02, |
DATA_FLAG_PAD_LOW = 0x10, |
@@ -408,6 +409,8 @@ typedef std::map<std::string, std::string> SpdyNameValueBlock; |
typedef uint64 SpdyPingId; |
+typedef std::string SpdyProtocolId; |
+ |
// TODO(hkhalil): Add direct testing for this? It won't increase coverage any, |
// but is good to do anyway. |
class NET_EXPORT_PRIVATE SpdyConstants { |
@@ -915,6 +918,41 @@ class NET_EXPORT_PRIVATE SpdyContinuationIR |
DISALLOW_COPY_AND_ASSIGN(SpdyContinuationIR); |
}; |
+class NET_EXPORT_PRIVATE SpdyAltSvcIR : public SpdyFrameWithStreamIdIR { |
+ public: |
+ explicit SpdyAltSvcIR(SpdyStreamId stream_id); |
+ |
+ uint32 max_age() const { return max_age_; } |
+ uint16 port() const { return port_; } |
+ SpdyProtocolId protocol_id() const { |
+ return protocol_id_; |
+ } |
+ std::string host() const { return host_; } |
+ std::string origin() const { return origin_; } |
+ |
+ void set_max_age(uint32 max_age) { max_age_ = max_age; } |
+ void set_port(uint16 port) { port_ = port; } |
+ void set_protocol_id(SpdyProtocolId protocol_id) { |
+ protocol_id_ = protocol_id; |
+ } |
+ void set_host(std::string host) { |
+ host_ = host; |
+ } |
+ void set_origin(std::string origin) { |
+ origin_ = origin; |
+ } |
+ |
+ virtual void Visit(SpdyFrameVisitor* visitor) const OVERRIDE; |
+ |
+ private: |
+ uint32 max_age_; |
+ uint16 port_; |
+ SpdyProtocolId protocol_id_; |
+ std::string host_; |
+ std::string origin_; |
+ DISALLOW_COPY_AND_ASSIGN(SpdyAltSvcIR); |
+}; |
+ |
// ------------------------------------------------------------------------- |
// Wrapper classes for various SPDY frames. |
@@ -975,6 +1013,7 @@ class SpdyFrameVisitor { |
virtual void VisitBlocked(const SpdyBlockedIR& blocked) = 0; |
virtual void VisitPushPromise(const SpdyPushPromiseIR& push_promise) = 0; |
virtual void VisitContinuation(const SpdyContinuationIR& continuation) = 0; |
+ virtual void VisitAltSvc(const SpdyAltSvcIR& altsvc) = 0; |
virtual void VisitData(const SpdyDataIR& data) = 0; |
protected: |