From a7d0a672d59bf8985a6fc0e61b49015fabd96513 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 15 May 2026 17:03:40 +0530 Subject: Phase 1 working: captive portal, DNS hijack, NAT-based access control - Fix WiFi init order: netif creation before esp_wifi_init, set mode before set_config - Replace broken netif input filter with NAPT on/off per authentication state - NAPT disabled by default, enabled when client granted, disabled on revoke - Fix test helpers: use -I wlp59s0 for ping, handle nslookup exit code 1 - All 20 API tests pass, all 6 smoke tests pass --- main/tollgate_main.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 main/tollgate_main.c (limited to 'main/tollgate_main.c') diff --git a/main/tollgate_main.c b/main/tollgate_main.c new file mode 100644 index 0000000..9eba61f --- /dev/null +++ b/main/tollgate_main.c @@ -0,0 +1,221 @@ +#include +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "freertos/event_groups.h" +#include "esp_wifi.h" +#include "esp_event.h" +#include "esp_log.h" +#include "nvs_flash.h" +#include "esp_netif.h" +#include "lwip/netif.h" +#include "lwip/dns.h" +#include "dhcpserver/dhcpserver.h" +#include "config.h" +#include "dns_server.h" +#include "captive_portal.h" +#include "firewall.h" + +#define MAX_STA_RETRY 5 +#define AP_IP_ADDR "192.168.4.1" +#define AP_SUBNET "255.255.255.0" + +static const char *TAG = "tollgate_main"; + +static EventGroupHandle_t s_wifi_event_group; +static const int WIFI_CONNECTED_BIT = BIT0; + +static esp_netif_t *s_sta_netif = NULL; +static esp_netif_t *s_ap_netif = NULL; +static int s_retry_count = 0; +static bool s_services_running = false; +static SemaphoreHandle_t s_services_mutex = NULL; + +static void start_services(void); +static void stop_services(void); + +static void wifi_event_handler(void *arg, esp_event_base_t event_base, + int32_t event_id, void *event_data) +{ + if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) { + wifi_config_t wifi_cfg; + if (tollgate_config_get_wifi(&wifi_cfg) == ESP_OK) { + esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg); + } + esp_wifi_connect(); + } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) { + s_retry_count++; + ESP_LOGW(TAG, "WiFi disconnected, retry %d/%d", s_retry_count, MAX_STA_RETRY); + if (s_services_running) stop_services(); + if (s_retry_count < MAX_STA_RETRY) { + esp_wifi_connect(); + } else { + wifi_config_t wifi_cfg; + if (tollgate_config_get_next_wifi(&wifi_cfg) == ESP_OK) { + esp_wifi_set_config(WIFI_IF_STA, &wifi_cfg); + const tollgate_config_t *cfg = tollgate_config_get(); + int idx = cfg->current_network; + ESP_LOGI(TAG, "Trying WiFi network %d: %s", idx, cfg->networks[idx].ssid); + s_retry_count = 0; + esp_wifi_connect(); + } + } + } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_AP_STACONNECTED) { + wifi_event_ap_staconnected_t *event = (wifi_event_ap_staconnected_t *)event_data; + ESP_LOGI(TAG, "Station connected: MAC=%02x:%02x:%02x:%02x:%02x:%02x", + event->mac[0], event->mac[1], event->mac[2], + event->mac[3], event->mac[4], event->mac[5]); + } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_AP_STADISCONNECTED) { + wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *)event_data; + ESP_LOGI(TAG, "Station disconnected: MAC=%02x:%02x:%02x:%02x:%02x:%02x", + event->mac[0], event->mac[1], event->mac[2], + event->mac[3], event->mac[4], event->mac[5]); + } +} + +static void ip_event_handler(void *arg, esp_event_base_t event_base, + int32_t event_id, void *event_data) +{ + if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) { + ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data; + ESP_LOGI(TAG, "Got IP:" IPSTR, IP2STR(&event->ip_info.ip)); + s_retry_count = 0; + xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT); + start_services(); + } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_LOST_IP) { + ESP_LOGW(TAG, "Lost IP address"); + xEventGroupClearBits(s_wifi_event_group, WIFI_CONNECTED_BIT); + stop_services(); + } +} + +static void start_services(void) +{ + if (s_services_mutex) xSemaphoreTake(s_services_mutex, portMAX_DELAY); + if (s_services_running) { + if (s_services_mutex) xSemaphoreGive(s_services_mutex); + return; + } + + esp_netif_get_ip_info(s_ap_netif, &(esp_netif_ip_info_t){0}); + esp_netif_ip_info_t ap_ip_info; + esp_netif_get_ip_info(s_ap_netif, &ap_ip_info); + + esp_ip4_addr_t upstream_dns; + const ip_addr_t *dns_addr = dns_getserver(0); + upstream_dns.addr = dns_addr->addr; + + firewall_init(ap_ip_info.ip); + + dns_server_start(ap_ip_info.ip, upstream_dns); + captive_portal_start(); + + s_services_running = true; + if (s_services_mutex) xSemaphoreGive(s_services_mutex); + ESP_LOGI(TAG, "=== TollGate services started ==="); +} + +static void stop_services(void) +{ + if (s_services_mutex) xSemaphoreTake(s_services_mutex, portMAX_DELAY); + if (!s_services_running) { + if (s_services_mutex) xSemaphoreGive(s_services_mutex); + return; + } + + captive_portal_stop(); + dns_server_stop(); + firewall_disable_nat(); + firewall_revoke_all(); + s_services_running = false; + if (s_services_mutex) xSemaphoreGive(s_services_mutex); + ESP_LOGI(TAG, "=== TollGate services stopped ==="); +} + +static void wifi_create_ap_netif(void) +{ + s_ap_netif = esp_netif_create_default_wifi_ap(); + + esp_netif_ip_info_t ip_info = { + .ip.addr = esp_ip4addr_aton(AP_IP_ADDR), + .gw.addr = esp_ip4addr_aton(AP_IP_ADDR), + .netmask.addr = esp_ip4addr_aton(AP_SUBNET), + }; + ESP_ERROR_CHECK(esp_netif_dhcps_stop(s_ap_netif)); + ESP_ERROR_CHECK(esp_netif_set_ip_info(s_ap_netif, &ip_info)); + ESP_ERROR_CHECK(esp_netif_dhcps_start(s_ap_netif)); + + dhcps_offer_t offer_dns = true; + esp_netif_dhcps_option(s_ap_netif, ESP_NETIF_OP_SET, ESP_NETIF_DOMAIN_NAME_SERVER, + &offer_dns, sizeof(offer_dns)); +} + +static void wifi_configure_ap(void) +{ + const tollgate_config_t *cfg = tollgate_config_get(); + wifi_config_t ap_config = {0}; + strncpy((char *)ap_config.ap.ssid, cfg->ap_ssid, sizeof(ap_config.ap.ssid) - 1); + if (strlen(cfg->ap_password) > 0) { + strncpy((char *)ap_config.ap.password, cfg->ap_password, sizeof(ap_config.ap.password) - 1); + ap_config.ap.authmode = WIFI_AUTH_WPA2_PSK; + } else { + ap_config.ap.authmode = WIFI_AUTH_OPEN; + } + ap_config.ap.channel = cfg->ap_channel; + ap_config.ap.max_connection = cfg->ap_max_conn; + ap_config.ap.ssid_hidden = 0; + + ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_AP, &ap_config)); + ESP_LOGI(TAG, "AP configured: SSID='%s', channel=%d", cfg->ap_ssid, cfg->ap_channel); +} + +static void wifi_init_sta(void) +{ + s_sta_netif = esp_netif_create_default_wifi_sta(); +} + +void app_main(void) +{ + ESP_LOGI(TAG, "=== TollGate ESP32 Starting ==="); + + 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()); + ret = nvs_flash_init(); + } + ESP_ERROR_CHECK(ret); + + ESP_ERROR_CHECK(tollgate_config_init()); + ESP_ERROR_CHECK(esp_netif_init()); + ESP_ERROR_CHECK(esp_event_loop_create_default()); + + s_wifi_event_group = xEventGroupCreate(); + s_services_mutex = xSemaphoreCreateMutex(); + + wifi_init_sta(); + wifi_create_ap_netif(); + + wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); + ESP_ERROR_CHECK(esp_wifi_init(&cfg)); + + ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT, ESP_EVENT_ANY_ID, + &wifi_event_handler, NULL, NULL)); + ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT, IP_EVENT_STA_GOT_IP, + &ip_event_handler, NULL, NULL)); + ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT, IP_EVENT_STA_LOST_IP, + &ip_event_handler, NULL, NULL)); + + ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_APSTA)); + + wifi_configure_ap(); + + wifi_config_t sta_config; + if (tollgate_config_get_wifi(&sta_config) == ESP_OK) { + ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &sta_config)); + const tollgate_config_t *tcfg = tollgate_config_get(); + ESP_LOGI(TAG, "STA configured for SSID: %s", tcfg->networks[tcfg->current_network].ssid); + } + + ESP_ERROR_CHECK(esp_wifi_start()); + + ESP_LOGI(TAG, "WiFi AP+STA started, waiting for connection..."); +} -- cgit v1.2.3