OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef NET_SPDY_SPDY_FRAMER_H_ | 5 #ifndef NET_SPDY_SPDY_FRAMER_H_ |
6 #define NET_SPDY_SPDY_FRAMER_H_ | 6 #define NET_SPDY_SPDY_FRAMER_H_ |
7 | 7 |
8 #include <list> | 8 #include <list> |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 uint8 flags() const { return flags_; } | 61 uint8 flags() const { return flags_; } |
62 | 62 |
63 private: | 63 private: |
64 static void ConvertFlagsAndIdForSpdy2(uint32* val); | 64 static void ConvertFlagsAndIdForSpdy2(uint32* val); |
65 | 65 |
66 uint8 flags_; | 66 uint8 flags_; |
67 uint32 id_; | 67 uint32 id_; |
68 }; | 68 }; |
69 | 69 |
70 // SettingsMap has unique (flags, value) pair for given SpdySettingsIds ID. | 70 // SettingsMap has unique (flags, value) pair for given SpdySettingsIds ID. |
71 typedef std::pair<SpdySettingsFlags, uint32> SettingsFlagsAndValue; | 71 typedef std::pair<SpdySettingsFlags, size_t> SettingsFlagsAndValue; |
Ryan Hamilton
2013/01/10 17:46:06
I don't believe that this change is correct. The
jschuh
2013/01/10 17:49:33
Gotcha, I traced it through and I thought this one
| |
72 typedef std::map<SpdySettingsIds, SettingsFlagsAndValue> SettingsMap; | 72 typedef std::map<SpdySettingsIds, SettingsFlagsAndValue> SettingsMap; |
73 | 73 |
74 // A datastrcture for holding the contents of a CREDENTIAL frame. | 74 // A datastrcture for holding the contents of a CREDENTIAL frame. |
75 struct NET_EXPORT_PRIVATE SpdyCredential { | 75 struct NET_EXPORT_PRIVATE SpdyCredential { |
76 SpdyCredential(); | 76 SpdyCredential(); |
77 ~SpdyCredential(); | 77 ~SpdyCredential(); |
78 | 78 |
79 uint16 slot; | 79 uint16 slot; |
80 std::vector<std::string> certs; | 80 std::vector<std::string> certs; |
81 std::string proof; | 81 std::string proof; |
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
600 // starts with HTTP. If it does, we likely have an HTTP response. This | 600 // starts with HTTP. If it does, we likely have an HTTP response. This |
601 // isn't guaranteed though: we could have gotten a settings frame and then | 601 // isn't guaranteed though: we could have gotten a settings frame and then |
602 // corrupt data that just looks like HTTP, but deterministic checking requires | 602 // corrupt data that just looks like HTTP, but deterministic checking requires |
603 // a lot more state. | 603 // a lot more state. |
604 bool probable_http_response_; | 604 bool probable_http_response_; |
605 }; | 605 }; |
606 | 606 |
607 } // namespace net | 607 } // namespace net |
608 | 608 |
609 #endif // NET_SPDY_SPDY_FRAMER_H_ | 609 #endif // NET_SPDY_SPDY_FRAMER_H_ |
OLD | NEW |