Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: net/websockets/websocket_frame.cc

Issue 10384180: Add functions used for building WebSocket frame data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove class, add free functions. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #include "net/websockets/websocket_frame.h" 5 #include "net/websockets/websocket_frame.h"
6 6
7 #include <vector>
8
9 #include "base/basictypes.h"
10 #include "base/logging.h"
11 #include "base/rand_util.h"
12 #include "net/base/big_endian.h"
13
14 namespace {
15
16 const uint8 kFinalBit = 0x80;
17 const uint8 kReserved1Bit = 0x40;
18 const uint8 kReserved2Bit = 0x20;
19 const uint8 kReserved3Bit = 0x10;
20 const uint8 kOpCodeMask = 0xF;
21 const uint8 kMaskBit = 0x80;
22 const uint64 kMaxPayloadLengthWithoutExtendedLengthField = 125;
23 const uint64 kPayloadLengthWithTwoByteExtendedLengthField = 126;
24 const uint64 kPayloadLengthWithEightByteExtendedLengthField = 127;
25
26 } // Unnamed namespace.
27
7 namespace net { 28 namespace net {
8 29
9 // Definitions for in-struct constants. 30 // Definitions for in-struct constants.
10 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeContinuation = 31 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeContinuation =
11 0x0; 32 0x0;
12 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeText = 0x1; 33 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeText = 0x1;
13 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeBinary = 0x2; 34 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeBinary = 0x2;
14 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeClose = 0x8; 35 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeClose = 0x8;
15 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePing = 0x9; 36 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePing = 0x9;
16 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePong = 0xA; 37 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePong = 0xA;
mmenke 2012/05/21 15:08:37 Seems like web_socket.cc should be using these. S
Yuta Kitamura 2012/05/22 10:29:35 Will do in another change, because web_socket.cc i
mmenke 2012/05/22 17:12:41 Sorry about that, I actually meant what you landed
Yuta Kitamura 2012/06/06 18:06:47 OK, but I realized that this cleanup causes many d
17 38
18 WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) { 39 WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) {
19 } 40 }
20 41
21 WebSocketFrameChunk::~WebSocketFrameChunk() { 42 WebSocketFrameChunk::~WebSocketFrameChunk() {
22 } 43 }
23 44
45 void WriteWebSocketFrameHeader(const WebSocketFrameHeader* header,
46 const char* masking_key,
47 std::vector<char>* output) {
willchan no longer on Chromium 2012/05/21 19:19:52 I think this interface is not correct. The use of
Yuta Kitamura 2012/05/22 10:29:35 The problem here is the header size varies (2 - 14
48 DCHECK(header);
49 DCHECK((header->opcode & kOpCodeMask) == header->opcode)
50 << "header->opcode must fit to kOpCodeMask.";
51 DCHECK(header->payload_length <= static_cast<uint64>(kint64max))
52 << "WebSocket specification doesn't allow a frame longer than "
53 << "kint64max (0x7FFFFFFFFFFFFFFF) bytes.";
54
55 // WebSocket frame format is as follows:
56 // - Common header (2 bytes)
57 // - Optional extended payload length
58 // (2 or 8 bytes, present if actual payload length is more than 125 bytes)
59 // - Optional masking key (4 bytes, present if MASK bit is on)
60 // - Actual payload (XOR masked with masking key if MASK bit is on)
61 //
62 // This function constructs frame header (the first three in the list
63 // above).
64
65 uint8 first_byte = 0u;
66 first_byte |= header->final ? kFinalBit : 0u;
67 first_byte |= header->reserved1 ? kReserved1Bit : 0u;
68 first_byte |= header->reserved2 ? kReserved2Bit : 0u;
69 first_byte |= header->reserved3 ? kReserved3Bit : 0u;
70 first_byte |= header->opcode;
71
72 uint8 second_byte = 0u;
73 second_byte |= header->masked ? kMaskBit : 0u;
74 if (header->payload_length <=
75 kMaxPayloadLengthWithoutExtendedLengthField) {
76 second_byte |= header->payload_length;
77 } else if (header->payload_length <= kuint16max) {
78 second_byte |= kPayloadLengthWithTwoByteExtendedLengthField;
79 } else {
80 second_byte |= kPayloadLengthWithEightByteExtendedLengthField;
81 }
82
83 output->push_back(first_byte);
84 output->push_back(second_byte);
85
86 // Writes "extended payload length" field.
87 if (header->payload_length > kMaxPayloadLengthWithoutExtendedLengthField &&
88 header->payload_length <= kuint16max) {
89 uint16 payload_length_16 = static_cast<uint16>(header->payload_length);
90 char encoded[sizeof(uint16)];
91 WriteBigEndian(encoded, payload_length_16);
92 output->insert(output->end(), encoded, encoded + sizeof(uint16));
93 } else if (header->payload_length > kuint16max) {
94 char encoded[sizeof(uint64)];
95 WriteBigEndian(encoded, header->payload_length);
96 output->insert(output->end(), encoded, encoded + sizeof(uint64));
97 }
98
99 // Writes "masking key" field, if needed.
100 if (header->masked) {
101 DCHECK(masking_key);
102 output->insert(output->end(), masking_key,
103 masking_key + WebSocketFrameHeader::kMaskingKeyLength);
104 } else {
105 DCHECK(!masking_key);
106 }
107 }
108
109 void GenerateWebSocketMaskingKey(char* masking_key) {
110 // Masking keys should be generated from a cryptographically secure random
111 // number generator, which means web application authors should not be able
112 // to guess the next value of masking key.
113 base::RandBytes(masking_key, WebSocketFrameHeader::kMaskingKeyLength);
114 }
115
116 void MaskWebSocketFramePayload(const char* masking_key,
117 uint64 frame_offset,
118 std::vector<char>* frame_data) {
119 static const size_t kMaskingKeyLength =
120 WebSocketFrameHeader::kMaskingKeyLength;
121
122 // TODO(yutak): Make masking more efficient by XOR'ing every machine word
123 // (4 or 8 bytes), instead of XOR'ing every byte.
124 size_t masking_key_offset = frame_offset % kMaskingKeyLength;
125 for (std::vector<char>::iterator iter = frame_data->begin();
126 iter != frame_data->end(); ++iter) {
127 *iter ^= masking_key[masking_key_offset++];
128 if (masking_key_offset == kMaskingKeyLength)
129 masking_key_offset = 0;
130 }
131 }
132
24 } // namespace net 133 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698