8 files changed, 17 insertions, 33 deletions

diff --git a/components/tollgate_core/src/tollgate_core.c b/components/tollgate_core/src/tollgate_core.c
index 3813258..666d2e0 100644
--- a/components/tollgate_core/src/tollgate_core.c
+++ b/components/tollgate_core/src/tollgate_core.c
@@ -45,11 +45,6 @@ esp_err_t tollgate_core_dns_start(esp_ip4_addr_t upstream_dns)
     return tollgate_core_dns_start_internal(s_ap_ip, upstream_dns);
 }
 
-void tollgate_core_dns_stop(void)
-{
-    tollgate_core_dns_stop_internal();
-}
-
 esp_err_t tollgate_core_process_payment(uint32_t client_ip, const char *token_str)
 {
     if (!s_platform || !token_str) return ESP_FAIL;
diff --git a/components/tollgate_core/src/tollgate_core_session.h b/components/tollgate_core/src/tollgate_core_session.h
index 95b5c48..444b9fa 100644
--- a/components/tollgate_core/src/tollgate_core_session.h
+++ b/components/tollgate_core/src/tollgate_core_session.h
@@ -2,6 +2,7 @@
 #define TOLLGATE_CORE_SESSION_H
 
 #include "esp_err.h"
+#include "tollgate_platform.h"
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -19,6 +20,7 @@ typedef struct {
 } tg_session_t;
 
 esp_err_t tollgate_core_session_init(void);
+void tollgate_core_session_set_platform(const tollgate_platform_t *platform);
 
 tg_session_t *tollgate_core_session_create(uint32_t client_ip, uint64_t allotment_ms);
 tg_session_t *tollgate_core_session_create_bytes(uint32_t client_ip, uint64_t allotment_bytes);
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 5f195c3..c3f8019 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -12,12 +12,9 @@ idf_component_register(SRCS "tollgate_main.c"
                             "lightning_payout.c"
                             "nip04.c"
                             "mcp_handler.c"
-                            "cvm_server.c"
-                            "display.c"
-                            "font.c"
                     INCLUDE_DIRS "."
                     REQUIRES esp_wifi esp_event esp_netif nvs_flash esp_http_server
                              lwip json esp_http_client mbedtls esp-tls log spiffs
-                             nucula_lib secp256k1 axs15231b qrcode
+                             nucula_lib secp256k1
                              tollgate_core
                     PRIV_REQUIRES esp-tls)
diff --git a/main/captive_portal.c b/main/captive_portal.c
index 1a3d5ce..98dc637 100644
--- a/main/captive_portal.c
+++ b/main/captive_portal.c
@@ -1,6 +1,7 @@
 #include "captive_portal.h"
-#include "firewall.h"
-#include "session.h"
+#include "tollgate_core.h"
+#include "tollgate_core_firewall.h"
+#include "tollgate_core_session.h"
 #include "config.h"
 #include "esp_log.h"
 #include "esp_wifi.h"
@@ -182,7 +183,7 @@ static esp_err_t grant_access_handler(httpd_req_t *req)
 {
     uint32_t client_ip;
     if (get_client_ip(req, &client_ip) == ESP_OK) {
-        firewall_grant_access(client_ip);
+        tollgate_core_fw_grant(client_ip);
     }
     const char *resp = "{\"status\":\"granted\"}";
     httpd_resp_set_type(req, "application/json");
@@ -211,7 +212,7 @@ static esp_err_t whoami_handler(httpd_req_t *req)
     if (get_client_ip(req, &client_ip) == ESP_OK) {
         char mac[18] = {0};
         esp_ip4_addr_t ip = { .addr = client_ip };
-        if (firewall_get_mac_for_ip(client_ip, mac, sizeof(mac)) == ESP_OK) {
+        if (tollgate_core_fw_get_mac_for_ip(client_ip, mac, sizeof(mac)) == ESP_OK) {
             snprintf(resp, sizeof(resp), "ip=" IPSTR " mac=%s", IP2STR(&ip), mac);
         } else {
             snprintf(resp, sizeof(resp), "ip=" IPSTR " mac=unknown", IP2STR(&ip));
@@ -233,7 +234,7 @@ static esp_err_t usage_handler(httpd_req_t *req)
         return ESP_OK;
     }
 
-    session_t *session = session_find_by_ip(client_ip);
+    tg_session_t *session = tollgate_core_session_find_by_ip(client_ip);
     if (!session || !session->active) {
         httpd_resp_set_type(req, "text/plain");
         httpd_resp_send(req, "-1/-1", 5);
@@ -261,8 +262,8 @@ static esp_err_t usage_handler(httpd_req_t *req)
 
 static esp_err_t reset_auth_handler(httpd_req_t *req)
 {
-    session_revoke_all();
-    firewall_revoke_all();
+    tollgate_core_session_revoke_all();
+    tollgate_core_fw_revoke_all();
     const char *resp = "{\"status\":\"reset\"}";
     httpd_resp_set_type(req, "application/json");
     httpd_resp_send(req, resp, strlen(resp));
diff --git a/main/config.h b/main/config.h
index fa4d95c..b8a3136 100644
--- a/main/config.h
+++ b/main/config.h
@@ -4,6 +4,7 @@
 #include "esp_err.h"
 #include "esp_wifi.h"
 #include "esp_netif.h"
+#include "tollgate_platform.h"
 #include <stdbool.h>
 
 #include "lightning_payout.h"
@@ -72,4 +73,6 @@ const tollgate_config_t *tollgate_config_get(void);
 esp_err_t tollgate_config_get_wifi(wifi_config_t *wifi_config);
 esp_err_t tollgate_config_get_next_wifi(wifi_config_t *wifi_config);
 
+const tollgate_platform_t *tollgate_get_platform(void);
+
 #endif
diff --git a/main/tollgate_main.c b/main/tollgate_main.c
index 697dae3..f8998bd 100644
--- a/main/tollgate_main.c
+++ b/main/tollgate_main.c
@@ -20,8 +20,6 @@
 #include "wifistr.h"
 #include "tollgate_client.h"
 #include "lightning_payout.h"
-#include "cvm_server.h"
-#include "display.h"
 
 #define MAX_STA_RETRY 5
 static const char *TAG = "tollgate_main";
@@ -152,19 +150,9 @@ static void start_services(void)
 
     xTaskCreate(publish_wifistr_task, "wifistr_init", 16384, NULL, 3, NULL);
 
-    if (cfg->cvm_enabled) {
-        cvm_server_init();
-        cvm_server_start();
-    }
-
     s_services_running = true;
     if (s_services_mutex) xSemaphoreGive(s_services_mutex);
     ESP_LOGI(TAG, "=== TollGate services started ===");
-
-    display_set_state(DISPLAY_READY);
-    char portal_url[128];
-    snprintf(portal_url, sizeof(portal_url), "http://%s/", cfg->ap_ip_str);
-    display_update(cfg->ap_ssid, 0, 0, portal_url);
 }
 
 static void stop_services(void)
@@ -178,7 +166,6 @@ static void stop_services(void)
     captive_portal_stop();
     tollgate_api_stop();
     tollgate_core_dns_stop();
-    cvm_server_stop();
     s_services_running = false;
     if (s_services_mutex) xSemaphoreGive(s_services_mutex);
     ESP_LOGI(TAG, "=== TollGate services stopped ===");
@@ -244,9 +231,6 @@ void app_main(void)
 {
     ESP_LOGI(TAG, "=== TollGate ESP32 Starting ===");
 
-    display_init();
-    display_set_state(DISPLAY_BOOT);
-
     esp_err_t ret = nvs_flash_init();
     if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
         ESP_ERROR_CHECK(nvs_flash_erase());
diff --git a/main/tollgate_platform.c b/main/tollgate_platform.c
index c992ea1..4083c4e 100644
--- a/main/tollgate_platform.c
+++ b/main/tollgate_platform.c
@@ -2,7 +2,6 @@
 #include "tollgate_core.h"
 #include "config.h"
 #include "esp_log.h"
-#include "esp_timer.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 7ebc3b2..ebf8d0f 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -14,6 +14,9 @@ CFLAGS := -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-sign-com
           -DECMULT_WINDOW_SIZE=8 -DECMULT_GEN_PREC_BITS=4 \
           -include stubs/esp_err.h \
           -I stubs \
+          -I $(REPO_ROOT)/components/tollgate_core/include \
+          -I $(REPO_ROOT)/components/tollgate_core/src \
+          -I $(REPO_ROOT)/main \
           -I $(SECP256K1_INC) \
           -I $(SECP256K1_CFG) \
           -I /usr/include/cjson