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

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

Issue 14850012: Add missing status codes to WebSocketError enum. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove other mux status codes. Created 7 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
« no previous file with comments | « net/websockets/websocket_frame.h ('k') | net/websockets/websocket_frame_parser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "net/base/big_endian.h" 10 #include "net/base/big_endian.h"
(...skipping 26 matching lines...) Expand all
37 37
38 } // Unnamed namespace. 38 } // Unnamed namespace.
39 39
40 namespace net { 40 namespace net {
41 41
42 // Definitions for in-struct constants. 42 // Definitions for in-struct constants.
43 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeContinuation = 43 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeContinuation =
44 0x0; 44 0x0;
45 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeText = 0x1; 45 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeText = 0x1;
46 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeBinary = 0x2; 46 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeBinary = 0x2;
47 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeDataUnused =
48 0x3;
47 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeClose = 0x8; 49 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeClose = 0x8;
48 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePing = 0x9; 50 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePing = 0x9;
49 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePong = 0xA; 51 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePong = 0xA;
52 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeControlUnused =
53 0xB;
54
55 scoped_ptr<WebSocketFrameHeader> WebSocketFrameHeader::Clone() {
56 scoped_ptr<WebSocketFrameHeader> ret(new WebSocketFrameHeader(opcode));
57 ret->final = final;
58 ret->reserved1 = reserved1;
59 ret->reserved2 = reserved2;
60 ret->reserved3 = reserved3;
61 ret->opcode = opcode;
62 ret->masked = masked;
63 ret->payload_length = payload_length;
64 return ret.Pass();
65 }
50 66
51 WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) { 67 WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) {
52 } 68 }
53 69
54 WebSocketFrameChunk::~WebSocketFrameChunk() { 70 WebSocketFrameChunk::~WebSocketFrameChunk() {
55 } 71 }
56 72
57 int GetWebSocketFrameHeaderSize(const WebSocketFrameHeader& header) { 73 int GetWebSocketFrameHeaderSize(const WebSocketFrameHeader& header) {
58 int extended_length_size = 0; 74 int extended_length_size = 0;
59 if (header.payload_length > kMaxPayloadLengthWithoutExtendedLengthField && 75 if (header.payload_length > kMaxPayloadLengthWithoutExtendedLengthField &&
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 *reinterpret_cast<PackedMaskType*>(merged) ^= packed_mask_key; 237 *reinterpret_cast<PackedMaskType*>(merged) ^= packed_mask_key;
222 } 238 }
223 239
224 MaskWebSocketFramePayloadByBytes(masking_key, 240 MaskWebSocketFramePayloadByBytes(masking_key,
225 (frame_offset + (aligned_end - data)) 241 (frame_offset + (aligned_end - data))
226 % kMaskingKeyLength, 242 % kMaskingKeyLength,
227 aligned_end, end); 243 aligned_end, end);
228 } 244 }
229 245
230 } // namespace net 246 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_frame.h ('k') | net/websockets/websocket_frame_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698