Add a function that calculates the size of WebSocket frame header.

net/websockets/websocket_frame.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/websockets/websocket_frame.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "net/base/big_endian.h"
@@ skipping 24 matching lines @@
 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodeClose = 0x8;
 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePing = 0x9;
 const WebSocketFrameHeader::OpCode WebSocketFrameHeader::kOpCodePong = 0xA;
 
 WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) {
 }
 
 WebSocketFrameChunk::~WebSocketFrameChunk() {
 }
 
+int GetWebSocketFrameHeaderSize(const WebSocketFrameHeader& header) {
+  int extended_length_size = 0;
+  if (header.payload_length > kMaxPayloadLengthWithoutExtendedLengthField &&
+      header.payload_length <= kuint16max) {
+    extended_length_size = 2;
+  } else if (header.payload_length > kuint16max) {
+    extended_length_size = 8;
+  }
+
+  int header_size =

[mmenke, 2012/08/20 16:33:46]

optional:  May want to just return this, rather than assigning it to a variable
and then returning it on the next line.

[Yuta Kitamura, 2012/08/21 04:22:21]

Done.

+      WebSocketFrameHeader::kBaseHeaderSize +
+      extended_length_size +
+      (header.masked ? WebSocketFrameHeader::kMaskingKeyLength : 0);
+  return header_size;
+}
+
 int WriteWebSocketFrameHeader(const WebSocketFrameHeader& header,
                               const WebSocketMaskingKey* masking_key,
                               char* buffer,
                               int buffer_size) {
   DCHECK((header.opcode & kOpCodeMask) == header.opcode)
       << "header.opcode must fit to kOpCodeMask.";
   DCHECK(header.payload_length <= static_cast<uint64>(kint64max))
       << "WebSocket specification doesn't allow a frame longer than "
       << "kint64max (0x7FFFFFFFFFFFFFFF) bytes.";
   DCHECK_GE(buffer_size, 0);
 
   // WebSocket frame format is as follows:
   // - Common header (2 bytes)
   // - Optional extended payload length
   //   (2 or 8 bytes, present if actual payload length is more than 125 bytes)
   // - Optional masking key (4 bytes, present if MASK bit is on)
   // - Actual payload (XOR masked with masking key if MASK bit is on)
   //
   // This function constructs frame header (the first three in the list
   // above).
 
-  size_t extended_length_size = 0;
-  if (header.payload_length > kMaxPayloadLengthWithoutExtendedLengthField &&
-      header.payload_length <= kuint16max) {
-    extended_length_size = 2;
-  } else if (header.payload_length > kuint16max) {
-    extended_length_size = 8;
-  }
-  int header_size =
-      WebSocketFrameHeader::kBaseHeaderSize +
-      extended_length_size +
-      (header.masked ? WebSocketFrameHeader::kMaskingKeyLength : 0);
+  int header_size = GetWebSocketFrameHeaderSize(header);
   if (header_size > buffer_size)
     return ERR_INVALID_ARGUMENT;
 
   int buffer_index = 0;
 
   uint8 first_byte = 0u;
   first_byte |= header.final ? kFinalBit : 0u;
   first_byte |= header.reserved1 ? kReserved1Bit : 0u;
   first_byte |= header.reserved2 ? kReserved2Bit : 0u;
   first_byte |= header.reserved3 ? kReserved3Bit : 0u;
   first_byte |= header.opcode & kOpCodeMask;
   buffer[buffer_index++] = first_byte;
 
+  int extended_length_size = 0;
   uint8 second_byte = 0u;
   second_byte |= header.masked ? kMaskBit : 0u;
   if (header.payload_length <=
       kMaxPayloadLengthWithoutExtendedLengthField) {
     second_byte |= header.payload_length;
   } else if (header.payload_length <= kuint16max) {
     second_byte |= kPayloadLengthWithTwoByteExtendedLengthField;
+    extended_length_size = 2;
   } else {
     second_byte |= kPayloadLengthWithEightByteExtendedLengthField;
+    extended_length_size = 8;
   }
   buffer[buffer_index++] = second_byte;
 
   // Writes "extended payload length" field.
-  if (extended_length_size == 2u) {
+  if (extended_length_size == 2) {
     uint16 payload_length_16 = static_cast<uint16>(header.payload_length);
     WriteBigEndian(buffer + buffer_index, payload_length_16);
     buffer_index += sizeof(uint16);
-  } else if (extended_length_size == 8u) {
+  } else if (extended_length_size == 8) {
     WriteBigEndian(buffer + buffer_index, header.payload_length);
     buffer_index += sizeof(uint64);
   }
 
   // Writes "masking key" field, if needed.
   if (header.masked) {
     DCHECK(masking_key);
     std::copy(masking_key->key,
               masking_key->key + WebSocketFrameHeader::kMaskingKeyLength,
               buffer + buffer_index);
@@ skipping 28 matching lines @@
   // (4 or 8 bytes), instead of XOR'ing every byte.
   size_t masking_key_offset = frame_offset % kMaskingKeyLength;
   for (int i = 0; i < data_size; ++i) {
     data[i] ^= masking_key.key[masking_key_offset++];
     if (masking_key_offset == kMaskingKeyLength)
       masking_key_offset = 0;
   }
 }
 
 }  // namespace net