feat: add reset every conns

Author: shortcuts

pgpemu-esp32/main/pgp_gap.h

@@ -12,6 +12,9 @@ extern uint8_t adv_config_done;
 // start BT advertising if we have fewer connections than configured
 void advertise_if_needed();
 
+// close every connections
+void pgp_disconnect();
+
 // explicitly start BT advertising
 void pgp_advertise();
 

pgpemu-esp32/main/pgp_gatts.c

@@ -712,6 +712,7 @@ void gatts_profile_event_handler(esp_gatts_cb_event_t event,
         // start sent the update connection parameters to the peer device.
         esp_ble_gap_update_conn_params(&conn_params);
 
+        set_remote_bda(param->connect.conn_id, conn_params.bda);
         esp_ble_set_encryption(param->connect.remote_bda, ESP_BLE_SEC_ENCRYPT_MITM);
         break;
     case ESP_GATTS_DISCONNECT_EVT:

pgpemu-esp32/main/pgp_handshake_multi.c

@@ -1,5 +1,7 @@
 #include "pgp_handshake_multi.h"
 
+#include "esp_bt_defs.h"
+#include "esp_gap_ble_api.h"
 #include "esp_log.h"
 #include "log_tags.h"
 
@@ -79,6 +81,15 @@ int get_cert_state(uint16_t conn_id) {
     return entry->cert_state;
 }
 
+void set_remote_bda(uint16_t conn_id, esp_bd_addr_t remote_bda) {
+    client_state_t* entry = get_or_create_client_state_entry(conn_id);
+    if (!entry) {
+        ESP_LOGE(HANDSHAKE_TAG, "set_remote_bda: conn_id %d unknown", conn_id);
+        return;
+    }
+    memcpy(entry->remote_bda, remote_bda, sizeof(esp_bd_addr_t));
+}
+
 void connection_start(uint16_t conn_id) {
     active_connections++;
 
@@ -170,3 +181,16 @@ void dump_client_states() {
         dump_client_state(i, &client_states[i]);
     }
 }
+
+
+void reset_client_states() {
+    ESP_LOGI(HANDSHAKE_TAG, "active_connections: %d", active_connections);
+    for (int i = 0; i < MAX_CONNECTIONS; i++) {
+        // make sure it's not an empty slot
+        if (conn_id_map[i] != 0xffff) {
+            ESP_LOGI(HANDSHAKE_TAG, "disconnecting %d", i);
+            esp_ble_gap_disconnect(client_states[i].remote_bda);
+            connection_stop(client_states[i].conn_id);
+        }
+    }
+}

pgpemu-esp32/main/pgp_handshake_multi.h

@@ -1,6 +1,7 @@
 #ifndef PGP_HANDSHAKE_MULTI_H
 #define PGP_HANDSHAKE_MULTI_H
 
+#include "esp_bt_defs.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/FreeRTOSConfig.h"
 #include "freertos/task.h"
@@ -14,6 +15,7 @@ static const size_t CERT_BUFFER_LEN = 378;
 typedef struct {
     // esp bt connection id
     uint16_t conn_id;
+    esp_bd_addr_t remote_bda;
     int cert_state;
     // TODO: we probably need to save the remote mac address so that we associate a reconnecting
     // client with its previous client state
@@ -44,8 +46,11 @@ client_state_t* get_client_state_entry(uint16_t conn_id);
 client_state_t* get_or_create_client_state_entry(uint16_t conn_id);
 
 int get_cert_state(uint16_t conn_id);
+void set_remote_bda(uint16_t conn_id, esp_bd_addr_t remote_bda);
 
 void dump_client_states();
+void reset_client_states();
+
 
 void connection_start(uint16_t conn_id);
 void connection_update(uint16_t conn_id);

pgpemu-esp32/main/stats.c

@@ -65,6 +65,12 @@ void increment_spin(uint16_t conn_id) {
 }
 
 void stats_get_runtime() {
+    if (stats_len == 0) {
+        ESP_LOGI(STATS_TAG, "no stats found");
+
+        return;
+    }
+
     for (size_t i = 0; i < stats_len; i++) {
         ESP_LOGI(STATS_TAG,
             "---STATS %d---\n"

pgpemu-esp32/main/uart.c

@@ -79,12 +79,11 @@ void process_char(uint8_t c) {
             "Hardware:\n"
             "- B - toggle input button\n"
             "Secrets:\n"
-            "- x? - help\n"
             "- xq - leave secrets mode\n"
+            "- xl - list slots\n"
+            "- xc - clear slot\n"
             "- x... - select secrets slot\n"
             "- ! - activate selected slot and restart\n"
-            "- l - list slots\n"
-            "- C - clear slot\n"
             "Bluetooth:\n"
             "- bA - start advertising\n"
             "- ba - stop advertising\n"
@@ -285,13 +284,13 @@ static void uart_secrets_handler() {
                 state = buf[0];
                 ESP_LOGW(UART_TAG, "set=%c", state);
                 break;
-            case 'C':
+            case 'c':
                 // clear secret
                 if (slot_chosen) {
                     ESP_LOGW(UART_TAG, "clear=%d", delete_secrets_id(chosen_slot));
                 }
                 break;
-            case 'W':
+            case 'w':
                 // write secret
                 if (slot_chosen) {
                     ESP_LOGW(UART_TAG,
@@ -431,17 +430,16 @@ static void uart_bluetooth_handler() {
 
     switch (buf) {
     case 'A':
-        ESP_LOGI(UART_TAG, "starting advertising");
         pgp_advertise();
         break;
     case 'a':
-        ESP_LOGI(UART_TAG, "stopping advertising");
         pgp_advertise_stop();
         break;
     case 's':
         dump_client_states();
         break;
     case 'r':
+        reset_client_states();
         break;
     case '1':
     case '2':