Move weave packet to common location b/t generator and receiver

components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.cc

 // Copyright 2016 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 "components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h"
 
 #ifdef OS_WIN
 #include <winsock2.h>
 #else
 #include <netinet/in.h>
 #endif
 
 #include <string.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 
-namespace {
-
-typedef proximity_auth::BluetoothLowEnergyWeavePacketGenerator::Packet Packet;
-
-const uint16_t kMinSupportedWeaveVersion = 1;
-const uint16_t kMaxSupportedWeaveVersion = 1;
-const uint16_t kServerWeaveVersion = 1;
-const uint16_t kMinConnectionRequestSize = 7;
-const uint16_t kMinConnectionResponseSize = 5;
-const uint16_t kMinConnectionCloseSize = 3;
-const uint32_t kDefaultMaxPacketSize = 20;
-// Max packet size is 0, which means defer the decision to the server.
-const uint16_t kMaxSupportedPacketSize = 0;
-const uint8_t kMaxPacketCounter = 8;
-
-}  // namespace
-
 namespace proximity_auth {
+namespace weave {
 
 // static.
 BluetoothLowEnergyWeavePacketGenerator::Factory*
     BluetoothLowEnergyWeavePacketGenerator::Factory::factory_instance_ =
         nullptr;
 
 // static.
 std::unique_ptr<BluetoothLowEnergyWeavePacketGenerator>
 BluetoothLowEnergyWeavePacketGenerator::Factory::NewInstance() {
   if (factory_instance_ == nullptr) {
@@ skipping 18 matching lines @@
     : max_packet_size_(kDefaultMaxPacketSize), next_packet_counter_(0) {}
 
 Packet BluetoothLowEnergyWeavePacketGenerator::CreateConnectionRequest() {
   Packet packet(kMinConnectionRequestSize, 0);
 
   SetPacketTypeBit(PacketType::CONTROL, &packet);
   // Since it only make sense for connection request to be the 0th packet,
   // resets the packet counter.
   next_packet_counter_ = 1;
   SetControlCommand(ControlCommand::CONNECTION_REQUEST, &packet);
-  SetShortField(1, kMinSupportedWeaveVersion, &packet);
-  SetShortField(3, kMaxSupportedWeaveVersion, &packet);
-  SetShortField(5, kMaxSupportedPacketSize, &packet);
+  SetShortField(1, kWeaveVersion, &packet);
+  SetShortField(3, kWeaveVersion, &packet);
+  SetShortField(5, kSelectMaxPacketSize, &packet);
 
   return packet;
 }
 
 Packet BluetoothLowEnergyWeavePacketGenerator::CreateConnectionResponse() {
   Packet packet(kMinConnectionResponseSize, 0);
 
   SetPacketTypeBit(PacketType::CONTROL, &packet);
   // Since it only make sense for connection response to be the 0th packet,
   // resets the next packet counter.
   next_packet_counter_ = 1;
   SetControlCommand(ControlCommand::CONNECTION_RESPONSE, &packet);
-  SetShortField(1, kServerWeaveVersion, &packet);
+  SetShortField(1, kWeaveVersion, &packet);
   SetShortField(3, max_packet_size_, &packet);
 
   return packet;
 }
 
 Packet BluetoothLowEnergyWeavePacketGenerator::CreateConnectionClose(
     ReasonForClose reason_for_close) {
-  Packet packet(kMinConnectionCloseSize, 0);
+  Packet packet(kMaxConnectionCloseSize, 0);
 
   SetPacketTypeBit(PacketType::CONTROL, &packet);
   SetPacketCounter(&packet);
   SetControlCommand(ControlCommand::CONNECTION_CLOSE, &packet);
   SetShortField(1, reason_for_close, &packet);
 
   return packet;
 }
 
-void BluetoothLowEnergyWeavePacketGenerator::SetMaxPacketSize(uint32_t size) {
+void BluetoothLowEnergyWeavePacketGenerator::SetMaxPacketSize(uint16_t size) {
   DCHECK(size >= kDefaultMaxPacketSize);
   max_packet_size_ = size;
 }
 
 std::vector<Packet> BluetoothLowEnergyWeavePacketGenerator::EncodeDataMessage(
     std::string message) {
   DCHECK(!message.empty());
 
   // The first byte of a packet is used by the uWeave protocol,
   // hence the payload is 1 byte smaller than the packet size.
@@ skipping 86 matching lines @@
 }
 
 void BluetoothLowEnergyWeavePacketGenerator::SetDataLastBit(Packet* packet) {
   DCHECK(packet);
   DCHECK(!packet->empty());
 
   // Last bit is the bit 2 of the packet's first byte and set it to 1.
   packet->at(0) = packet->at(0) | (1 << 2);
 }
 
+}  // namespace weave
+
 }  // namespace proximity_auth