Add tcp socket for control

Author: pipe01

.gitignore

@@ -20,3 +20,5 @@ vgcore.*
 
 *.pcap
 *.pcapng
+
+/*.log

.vscode/c_cpp_properties.json

@@ -6,7 +6,8 @@
                 "${workspaceFolder}/include",
                 "${workspaceFolder}/lib",
                 "${workspaceFolder}/lib/capstone/include",
-                "${workspaceFolder}"
+                "${workspaceFolder}",
+                "${workspaceFolder}/include/bluetooth"
             ],
             "defines": [
                 "_POSIX_C_SOURCE=200809L"

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 
+include(FetchContent)
+
 project(infiniemu)
 
 if(CMAKE_TOOLCHAIN_FILE MATCHES "Emscripten.cmake")
@@ -25,4 +27,8 @@ add_subdirectory(lib/capstone)
 add_library(lua STATIC lib/lua/onelua.c)
 target_compile_options(lua PRIVATE -DMAKE_LIB)
 
+cmake_policy(SET CMP0135 NEW)
+FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.12.0/json.tar.xz)
+FetchContent_MakeAvailable(json)
+
 add_subdirectory(src)

include/binary_buffer.hpp

@@ -0,0 +1,111 @@
+#pragma once
+
+#include <array>
+#include <format>
+#include <type_traits>
+#include <string>
+
+#include <vector>
+#include <string.h>
+#include <stdint.h>
+
+using byte = uint8_t;
+template <std::size_t N>
+using bytes = std::array<byte, N>;
+using any_bytes = std::vector<byte>;
+
+inline std::string ShowHex(any_bytes b)
+{
+    std::string result;
+    result.reserve(b.size() * 5);
+
+    for (size_t i = 0; i < b.size(); ++i)
+    {
+        result += std::format("0x{:02X}", b[i]);
+        if (i + 1 < b.size())
+            result += " ";
+    }
+    return result;
+}
+
+class BinaryBuffer
+{
+    std::vector<uint8_t> data;
+    size_t position = 0;
+
+public:
+    BinaryBuffer() = default;
+    BinaryBuffer(size_t size) : data(size) {}
+    BinaryBuffer(const std::vector<uint8_t> &data) : data(data) {}
+    BinaryBuffer(const uint8_t *data, size_t size) : data(data, data + size) {}
+
+    const std::vector<uint8_t> &get_data() const
+    {
+        return data;
+    }
+
+    size_t get_position() { return position; }
+
+    void write(uint8_t value)
+    {
+        data.push_back(value);
+    }
+    void write(uint16_t value)
+    {
+        data.push_back(value & 0xFF);
+        data.push_back((value >> 8) & 0xFF);
+    }
+    template <auto N>
+    void write(const std::array<uint8_t, N> data)
+    {
+        for (size_t i = 0; i < N; ++i)
+            this->data.push_back(data[i]);
+    }
+    void write(const any_bytes data)
+    {
+        this->data.insert(this->data.end(), data.begin(), data.end());
+    }
+    template <typename T>
+    void write(const T &value)
+    {
+        const uint8_t *data = reinterpret_cast<const uint8_t *>(&value);
+        for (size_t i = 0; i < sizeof(T); ++i)
+            this->data.push_back(data[i]);
+    }
+
+    template <auto N>
+    void fill(bytes<N> &data)
+    {
+        for (size_t i = 0; i < N; ++i)
+            data[i] = u8();
+    }
+    void fill(any_bytes &data, size_t size)
+    {
+        data.resize(size);
+        for (size_t i = 0; i < size; ++i)
+            data[i] = u8();
+    }
+    void fill_remaining(any_bytes &data)
+    {
+        size_t remaining = this->data.size() - position;
+        fill(data, remaining);
+    }
+
+    template <typename T>
+    void read(T &value)
+    {
+        memcpy(&value, &data[position], sizeof(T));
+        position += sizeof(T);
+    }
+
+    uint8_t u8()
+    {
+        return data[position++];
+    }
+    uint16_t u16()
+    {
+        uint16_t value = data[position] | (data[position + 1] << 8);
+        position += 2;
+        return value;
+    }
+};

include/bluetooth.h

@@ -1,112 +1,8 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #include "pinetime.h"
-#include "peripherals/nrf52832/radio.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-namespace BLE
-{
-    class Packet;
-};
-
-#include <array>
-#include <memory>
-#include <queue>
-#include <map>
-
-constexpr uint32_t ConnIntervalMS = 100;
-constexpr uint32_t ConnPeripheralLatency = 0;
-constexpr uint32_t TransmitWindowSizeMS = 10; // Must be at most 10
-constexpr uint32_t ConnSupervisionTimeoutMS = (1 + ConnPeripheralLatency) * ConnIntervalMS * 2 + 100;
-constexpr std::array<uint8_t, 3> FakeCRC = {0xFF, 0xFF, 0xFF};
-
-constexpr uint16_t WantATT_MTU = 247;
-
-enum Stage
-{
-    NONE,
-    CONNECTED,
-    EXCHANGED_MTU,
-    REQUESTED_INFO,
-};
-
-struct pending_packet_t
-{
-    uint64_t send_at;
-    std::unique_ptr<BLE::Packet> packet;
-};
-
-class PendingCompare
-{
-public:
-    bool operator()(pending_packet_t &a, pending_packet_t &b)
-    {
-        // Lower send_at should come first
-        return a.send_at > b.send_at;
-    }
-};
-
-struct bluetooth_t
-{
-    RADIO_t *radio;
-    event_queue_t *ev_queue;
-    NRF52832_t *nrf;
-    bool connected = false;
 
-    bool sent_req = false;
-    Stage stage = NONE;
-    uint16_t att_mtu = 23; // Default MTU
-
-    struct
-    {
-        bool in_fragmented = false;
-        uint32_t total_length;
-        uint8_t channel;
-        std::vector<uint8_t> buffer;
-    } l2cap_frag;
-
-    uint64_t last_conn_event_cycles = 0;
-
-    unsigned int transmitSeqNum : 1;
-    unsigned int nextExpectedSeqNum : 1;
-
-    std::map<uint16_t, uint16_t> attrs16;
-
-    std::priority_queue<pending_packet_t, std::vector<pending_packet_t>, PendingCompare> pending_packets;
-
-    bluetooth_t(pinetime_t *pt) : radio(static_cast<RADIO_t *>(nrf52832_get_peripheral(pinetime_get_nrf52832(pt), INSTANCE_RADIO))),
-                                  ev_queue(pinetime_get_event_queue(pt)),
-                                  nrf(pinetime_get_nrf52832(pt))
-    {
-    }
-
-    void Send(const BLE::Packet &packet);
-
-    void Enqueue(std::unique_ptr<BLE::Packet> packet, size_t delay_ms);
-    void Enqueue(std::unique_ptr<BLE::Packet> packet)
-    {
-        Enqueue(std::move(packet), 0);
-    }
-};
-
-extern "C"
-{
-#else
 typedef struct bluetooth_t bluetooth_t;
-#endif
-
-    bluetooth_t *bluetooth_new(pinetime_t *pt);
-    void bluetooth_run(bluetooth_t *);
 
-#ifdef __cplusplus
-}
-#endif
+bluetooth_t *bluetooth_new(pinetime_t *pt);
+void bluetooth_run(bluetooth_t *);