| Index: components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h
|
| diff --git a/components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h b/components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h
|
| index eb3204ca91bab4fc900e096dfb2f576225f34363..ac04f7b36b7938fbb49d33a48e5ca3d2f94be004 100644
|
| --- a/components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h
|
| +++ b/components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h
|
| @@ -12,9 +12,11 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "components/proximity_auth/ble/bluetooth_low_energy_weave_packet.h"
|
| #include "build/build_config.h"
|
|
|
| namespace proximity_auth {
|
| +
|
| // Generates the messages sent using the uWeave protocol.
|
| class BluetoothLowEnergyWeavePacketGenerator {
|
| public:
|
| @@ -35,48 +37,32 @@ class BluetoothLowEnergyWeavePacketGenerator {
|
| static Factory* factory_instance_;
|
| };
|
|
|
| - // Determine whether a packet is a control packet or a data packet.
|
| - enum PacketType { DATA = 0x00, CONTROL = 0x01 };
|
| -
|
| - // Identify the action intended by the control packet.
|
| - enum ControlCommand {
|
| - CONNECTION_REQUEST = 0x00,
|
| - CONNECTION_RESPONSE = 0x01,
|
| - CONNECTION_CLOSE = 0x02
|
| - };
|
| -
|
| - // Sent with the ConnectionClose control packet.
|
| - // Identify why the client/server wished to close the connection.
|
| - enum ReasonForClose {
|
| - CLOSE_WITHOUT_ERROR = 0x00,
|
| - UNKNOWN_ERROR = 0x01,
|
| - NO_COMMON_VERSION_SUPPORTED = 0x02,
|
| - RECEIVED_PACKET_OUT_OF_SEQUENCE = 0x03,
|
| - APPLICATION_ERROR = 0x80
|
| - };
|
| -
|
| - typedef std::vector<uint8_t> Packet;
|
| -
|
| - Packet CreateConnectionRequest();
|
| - Packet CreateConnectionResponse();
|
| - Packet CreateConnectionClose(ReasonForClose reason_for_close);
|
| + BluetoothLowEnergyWeavePacket::Packet CreateConnectionRequest();
|
| + BluetoothLowEnergyWeavePacket::Packet CreateConnectionResponse();
|
| + BluetoothLowEnergyWeavePacket::Packet CreateConnectionClose(
|
| + BluetoothLowEnergyWeavePacket::ReasonForClose reason_for_close);
|
|
|
| // Packet size must be greater than or equal to 20.
|
| void SetMaxPacketSize(uint32_t size);
|
|
|
| // Will crash if message is empty.
|
| - std::vector<Packet> EncodeDataMessage(std::string message);
|
| + std::vector<BluetoothLowEnergyWeavePacket::Packet> EncodeDataMessage(
|
| + std::string message);
|
|
|
| protected:
|
| BluetoothLowEnergyWeavePacketGenerator();
|
|
|
| private:
|
| - void SetShortField(uint32_t byte_offset, uint16_t val, Packet* packet);
|
| - void SetPacketTypeBit(PacketType val, Packet* packet);
|
| - void SetControlCommand(ControlCommand val, Packet* packet);
|
| - void SetPacketCounter(Packet* packet);
|
| - void SetDataFirstBit(Packet* packet);
|
| - void SetDataLastBit(Packet* packet);
|
| + void SetShortField(uint32_t byte_offset,
|
| + uint16_t val,
|
| + BluetoothLowEnergyWeavePacket::Packet* packet);
|
| + void SetPacketTypeBit(BluetoothLowEnergyWeavePacket::PacketType val,
|
| + BluetoothLowEnergyWeavePacket::Packet* packet);
|
| + void SetControlCommand(BluetoothLowEnergyWeavePacket::ControlCommand val,
|
| + BluetoothLowEnergyWeavePacket::Packet* packet);
|
| + void SetPacketCounter(BluetoothLowEnergyWeavePacket::Packet* packet);
|
| + void SetDataFirstBit(BluetoothLowEnergyWeavePacket::Packet* packet);
|
| + void SetDataLastBit(BluetoothLowEnergyWeavePacket::Packet* packet);
|
|
|
| // The default max packet length is 20 unless SetDataPacketLength() is called
|
| // and specified otherwise.
|
|
|