Remove code as it was moved to github
This commit is contained in:
Florian Hoss
parent
f705ce2f39
commit
ca76cbd7e4
22 changed files with 0 additions and 4626 deletions
4
ESP32Firewall/.gitignore
vendored
4
ESP32Firewall/.gitignore
vendored
|
|
@ -1,4 +0,0 @@
|
||||||
.pio
|
|
||||||
.vscode
|
|
||||||
include/theSecrets.h
|
|
||||||
components/arduino
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
cmake_minimum_required(VERSION 3.16.0)
|
|
||||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
|
||||||
project(ESP32Firewall)
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
#ifndef _LWIP_HOOKS_H_
|
|
||||||
#define _LWIP_HOOKS_H_
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int lwip_hook_ip4_input(struct pbuf *pbuf, struct netif *input_netif);
|
|
||||||
#define LWIP_HOOK_IP4_INPUT lwip_hook_ip4_input
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _LWIP_HOOKS_H_ */
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
#ifndef _THE_SECRETS_H_
|
|
||||||
#define _THE_SECRETS_H_
|
|
||||||
|
|
||||||
const char *ssid = "Wifi";
|
|
||||||
const char *psk = "password";
|
|
||||||
const char *username = "username";
|
|
||||||
const char *password = "password";
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
; PlatformIO Project Configuration File
|
|
||||||
;
|
|
||||||
; Build options: build flags, source filter
|
|
||||||
; Upload options: custom upload port, speed and extra flags
|
|
||||||
; Library options: dependencies, extra library storages
|
|
||||||
; Advanced options: extra scripting
|
|
||||||
;
|
|
||||||
; Please visit documentation for the other options and examples
|
|
||||||
; https://docs.platformio.org/page/projectconf.html
|
|
||||||
|
|
||||||
[platformio]
|
|
||||||
default_envs = esp32
|
|
||||||
|
|
||||||
[env:esp32]
|
|
||||||
platform = espressif32
|
|
||||||
board = az-delivery-devkit-v4
|
|
||||||
framework = espidf
|
|
||||||
monitor_speed = 115200
|
|
||||||
lib_compat_mode = off
|
|
||||||
build_flags =
|
|
||||||
'-Iinclude'
|
|
||||||
'-DESP_IDF_LWIP_HOOK_FILENAME="lwip_hooks.h"'
|
|
||||||
lib_deps = https://github.com/flohoss/esp32_firewall_api
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +0,0 @@
|
||||||
# This file was automatically generated for projects
|
|
||||||
# without default 'CMakeLists.txt' file.
|
|
||||||
|
|
||||||
FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
|
|
||||||
|
|
||||||
idf_component_register(SRCS ${app_sources})
|
|
||||||
|
|
@ -1,76 +0,0 @@
|
||||||
#include "Arduino.h"
|
|
||||||
#include "theSecrets.h"
|
|
||||||
#include "WiFi.h"
|
|
||||||
#include "lwip_hooks.h"
|
|
||||||
|
|
||||||
#include "Firewall.hpp"
|
|
||||||
#include "API.hpp"
|
|
||||||
|
|
||||||
fw::Firewall *firewall;
|
|
||||||
fw::API *firewallApi;
|
|
||||||
|
|
||||||
int lwip_hook_ip4_input(struct pbuf *pbuf, struct netif *input_netif)
|
|
||||||
{
|
|
||||||
// Firewall is not setup yet
|
|
||||||
if (firewall != NULL)
|
|
||||||
{
|
|
||||||
if (firewall->is_packet_allowed(pbuf))
|
|
||||||
return 0;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
pbuf_free(pbuf);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void initFirewall(const String ip)
|
|
||||||
{
|
|
||||||
firewall = new fw::Firewall();
|
|
||||||
firewallApi = new fw::API(firewall, username, password, ip);
|
|
||||||
}
|
|
||||||
|
|
||||||
void handle_wifi_events(WiFiEvent_t event, WiFiEventInfo_t info)
|
|
||||||
{
|
|
||||||
String ip;
|
|
||||||
Serial.print("[WiFi] ");
|
|
||||||
switch (event)
|
|
||||||
{
|
|
||||||
case ARDUINO_EVENT_WIFI_STA_START:
|
|
||||||
Serial.println("connecting...");
|
|
||||||
break;
|
|
||||||
case ARDUINO_EVENT_WIFI_STA_CONNECTED:
|
|
||||||
Serial.println("connected");
|
|
||||||
break;
|
|
||||||
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
|
|
||||||
Serial.println("disconnected");
|
|
||||||
break;
|
|
||||||
case ARDUINO_EVENT_WIFI_STA_GOT_IP:
|
|
||||||
ip = WiFi.localIP().toString();
|
|
||||||
Serial.print("IP: ");
|
|
||||||
Serial.println(ip);
|
|
||||||
initFirewall(ip);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
Serial.print("other event: ");
|
|
||||||
Serial.println(event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup()
|
|
||||||
{
|
|
||||||
Serial.begin(115200);
|
|
||||||
WiFi.mode(WIFI_STA);
|
|
||||||
WiFi.onEvent(handle_wifi_events, ARDUINO_EVENT_MAX);
|
|
||||||
WiFi.begin(ssid, psk);
|
|
||||||
|
|
||||||
// fix for https://github.com/espressif/arduino-esp32/issues/4732
|
|
||||||
WiFi.config(((u32_t)0x0UL), ((u32_t)0x0UL), ((u32_t)0x0UL));
|
|
||||||
}
|
|
||||||
|
|
||||||
void loop()
|
|
||||||
{
|
|
||||||
// https://docs.espressif.com/projects/arduino-esp32/en/latest/esp-idf_component.html
|
|
||||||
sleep(1);
|
|
||||||
}
|
|
||||||
7
ESPTest/.gitignore
vendored
7
ESPTest/.gitignore
vendored
|
|
@ -1,7 +0,0 @@
|
||||||
.pio
|
|
||||||
.vscode/.browse.c_cpp.db*
|
|
||||||
.vscode/c_cpp_properties.json
|
|
||||||
.vscode/launch.json
|
|
||||||
.vscode/ipch
|
|
||||||
|
|
||||||
include/theSecrets.h
|
|
||||||
10
ESPTest/.vscode/extensions.json
vendored
10
ESPTest/.vscode/extensions.json
vendored
|
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
|
||||||
// for the documentation about the extensions.json format
|
|
||||||
"recommendations": [
|
|
||||||
"platformio.platformio-ide"
|
|
||||||
],
|
|
||||||
"unwantedRecommendations": [
|
|
||||||
"ms-vscode.cpptools-extension-pack"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
7
ESPTest/.vscode/settings.json
vendored
7
ESPTest/.vscode/settings.json
vendored
|
|
@ -1,7 +0,0 @@
|
||||||
{
|
|
||||||
"files.associations": {
|
|
||||||
"esp_wifi_default.h": "c",
|
|
||||||
"esp_log.h": "c",
|
|
||||||
"lwip_hooks.h": "c"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
cmake_minimum_required(VERSION 3.16.0)
|
|
||||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
|
||||||
project(ESPTest)
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
|
|
||||||
This directory is intended for project header files.
|
|
||||||
|
|
||||||
A header file is a file containing C declarations and macro definitions
|
|
||||||
to be shared between several project source files. You request the use of a
|
|
||||||
header file in your project source file (C, C++, etc) located in `src` folder
|
|
||||||
by including it, with the C preprocessing directive `#include'.
|
|
||||||
|
|
||||||
```src/main.c
|
|
||||||
|
|
||||||
#include "header.h"
|
|
||||||
|
|
||||||
int main (void)
|
|
||||||
{
|
|
||||||
...
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Including a header file produces the same results as copying the header file
|
|
||||||
into each source file that needs it. Such copying would be time-consuming
|
|
||||||
and error-prone. With a header file, the related declarations appear
|
|
||||||
in only one place. If they need to be changed, they can be changed in one
|
|
||||||
place, and programs that include the header file will automatically use the
|
|
||||||
new version when next recompiled. The header file eliminates the labor of
|
|
||||||
finding and changing all the copies as well as the risk that a failure to
|
|
||||||
find one copy will result in inconsistencies within a program.
|
|
||||||
|
|
||||||
In C, the usual convention is to give header files names that end with `.h'.
|
|
||||||
It is most portable to use only letters, digits, dashes, and underscores in
|
|
||||||
header file names, and at most one dot.
|
|
||||||
|
|
||||||
Read more about using header files in official GCC documentation:
|
|
||||||
|
|
||||||
* Include Syntax
|
|
||||||
* Include Operation
|
|
||||||
* Once-Only Headers
|
|
||||||
* Computed Includes
|
|
||||||
|
|
||||||
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
#ifndef _LWIP_HOOKS_H_
|
|
||||||
#define _LWIP_HOOKS_H_
|
|
||||||
|
|
||||||
#include "lwip/netif.h"
|
|
||||||
#include "lwip/pbuf.h"
|
|
||||||
#include "lwip/ip4.h"
|
|
||||||
|
|
||||||
#include "esp_log.h"
|
|
||||||
#include "esp_err.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int lwip_hook_ip4_input(struct pbuf *pbuf, struct netif *input_netif);
|
|
||||||
#define LWIP_HOOK_IP4_INPUT lwip_hook_ip4_input
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _LWIP_HOOKS_H_ */
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
|
|
||||||
This directory is intended for project specific (private) libraries.
|
|
||||||
PlatformIO will compile them to static libraries and link into executable file.
|
|
||||||
|
|
||||||
The source code of each library should be placed in a an own separate directory
|
|
||||||
("lib/your_library_name/[here are source files]").
|
|
||||||
|
|
||||||
For example, see a structure of the following two libraries `Foo` and `Bar`:
|
|
||||||
|
|
||||||
|--lib
|
|
||||||
| |
|
|
||||||
| |--Bar
|
|
||||||
| | |--docs
|
|
||||||
| | |--examples
|
|
||||||
| | |--src
|
|
||||||
| | |- Bar.c
|
|
||||||
| | |- Bar.h
|
|
||||||
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
|
|
||||||
| |
|
|
||||||
| |--Foo
|
|
||||||
| | |- Foo.c
|
|
||||||
| | |- Foo.h
|
|
||||||
| |
|
|
||||||
| |- README --> THIS FILE
|
|
||||||
|
|
|
||||||
|- platformio.ini
|
|
||||||
|--src
|
|
||||||
|- main.c
|
|
||||||
|
|
||||||
and a contents of `src/main.c`:
|
|
||||||
```
|
|
||||||
#include <Foo.h>
|
|
||||||
#include <Bar.h>
|
|
||||||
|
|
||||||
int main (void)
|
|
||||||
{
|
|
||||||
...
|
|
||||||
}
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
PlatformIO Library Dependency Finder will find automatically dependent
|
|
||||||
libraries scanning project source files.
|
|
||||||
|
|
||||||
More information about PlatformIO Library Dependency Finder
|
|
||||||
- https://docs.platformio.org/page/librarymanager/ldf.html
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
; PlatformIO Project Configuration File
|
|
||||||
;
|
|
||||||
; Build options: build flags, source filter
|
|
||||||
; Upload options: custom upload port, speed and extra flags
|
|
||||||
; Library options: dependencies, extra library storages
|
|
||||||
; Advanced options: extra scripting
|
|
||||||
;
|
|
||||||
; Please visit documentation for the other options and examples
|
|
||||||
; https://docs.platformio.org/page/projectconf.html
|
|
||||||
|
|
||||||
[env:az-delivery-devkit-v4]
|
|
||||||
platform = espressif32
|
|
||||||
board = az-delivery-devkit-v4
|
|
||||||
framework = espidf
|
|
||||||
monitor_speed = 115200
|
|
||||||
build_flags =
|
|
||||||
'-Iinclude'
|
|
||||||
'-DESP_IDF_LWIP_HOOK_FILENAME="lwip_hooks.h"'
|
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +0,0 @@
|
||||||
# This file was automatically generated for projects
|
|
||||||
# without default 'CMakeLists.txt' file.
|
|
||||||
|
|
||||||
FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
|
|
||||||
|
|
||||||
idf_component_register(SRCS ${app_sources})
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
#include "lwip_hooks.h"
|
|
||||||
|
|
||||||
const char *get_protocol(u16_t type)
|
|
||||||
{
|
|
||||||
switch (type)
|
|
||||||
{
|
|
||||||
case 1:
|
|
||||||
return "ICMP";
|
|
||||||
case 6:
|
|
||||||
return "TCP";
|
|
||||||
case 17:
|
|
||||||
return "UDP";
|
|
||||||
default:
|
|
||||||
return "-";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int lwip_hook_ip4_input(struct pbuf *pbuf, struct netif *input_netif)
|
|
||||||
{
|
|
||||||
const struct ip_hdr *iphdr;
|
|
||||||
char ip_address[IP_HLEN];
|
|
||||||
|
|
||||||
iphdr = (struct ip_hdr *)pbuf->payload;
|
|
||||||
sprintf(ip_address, "%d.%d.%d.%d", ip4_addr1_16_val(iphdr->src), ip4_addr2_16_val(iphdr->src), ip4_addr3_16_val(iphdr->src), ip4_addr4_16_val(iphdr->src));
|
|
||||||
ESP_LOGI("HOOK", "%s: %s",
|
|
||||||
get_protocol((u16_t)IPH_PROTO(iphdr)), ip_address);
|
|
||||||
return ESP_OK;
|
|
||||||
}
|
|
||||||
|
|
@ -1,132 +0,0 @@
|
||||||
#include "theSecrets.h"
|
|
||||||
#include <string.h>
|
|
||||||
#include "freertos/FreeRTOS.h"
|
|
||||||
#include "freertos/task.h"
|
|
||||||
#include "freertos/event_groups.h"
|
|
||||||
#include "esp_system.h"
|
|
||||||
#include "esp_wifi.h"
|
|
||||||
#include "esp_event.h"
|
|
||||||
#include "esp_log.h"
|
|
||||||
#include "nvs_flash.h"
|
|
||||||
#include <esp_http_server.h>
|
|
||||||
|
|
||||||
#include "lwip/err.h"
|
|
||||||
#include "lwip/sys.h"
|
|
||||||
|
|
||||||
static const char *WIFI_TAG = "wifi station";
|
|
||||||
|
|
||||||
/* FreeRTOS event group to signal when we are connected*/
|
|
||||||
static EventGroupHandle_t s_wifi_event_group;
|
|
||||||
|
|
||||||
/* The event group allows multiple bits for each event, but we only care about two events:
|
|
||||||
* - we are connected to the AP with an IP
|
|
||||||
* - we failed to connect after the maximum amount of retries */
|
|
||||||
#define WIFI_CONNECTED_BIT BIT0
|
|
||||||
#define WIFI_FAIL_BIT BIT1
|
|
||||||
|
|
||||||
static int s_retry_num = 0;
|
|
||||||
|
|
||||||
static void 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)
|
|
||||||
{
|
|
||||||
esp_wifi_connect();
|
|
||||||
}
|
|
||||||
else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED)
|
|
||||||
{
|
|
||||||
if (s_retry_num < 10)
|
|
||||||
{
|
|
||||||
esp_wifi_connect();
|
|
||||||
s_retry_num++;
|
|
||||||
ESP_LOGI(WIFI_TAG, "retry to connect to the AP");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT);
|
|
||||||
}
|
|
||||||
ESP_LOGI(WIFI_TAG, "connect to the AP fail");
|
|
||||||
}
|
|
||||||
else 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(WIFI_TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip));
|
|
||||||
s_retry_num = 0;
|
|
||||||
xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void wifi_init_sta(void)
|
|
||||||
{
|
|
||||||
s_wifi_event_group = xEventGroupCreate();
|
|
||||||
|
|
||||||
ESP_ERROR_CHECK(esp_netif_init());
|
|
||||||
|
|
||||||
ESP_ERROR_CHECK(esp_event_loop_create_default());
|
|
||||||
esp_netif_create_default_wifi_sta();
|
|
||||||
|
|
||||||
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
|
|
||||||
ESP_ERROR_CHECK(esp_wifi_init(&cfg));
|
|
||||||
|
|
||||||
esp_event_handler_instance_t instance_any_id;
|
|
||||||
esp_event_handler_instance_t instance_got_ip;
|
|
||||||
ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
|
|
||||||
ESP_EVENT_ANY_ID,
|
|
||||||
&event_handler,
|
|
||||||
NULL,
|
|
||||||
&instance_any_id));
|
|
||||||
ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT,
|
|
||||||
IP_EVENT_STA_GOT_IP,
|
|
||||||
&event_handler,
|
|
||||||
NULL,
|
|
||||||
&instance_got_ip));
|
|
||||||
|
|
||||||
wifi_config_t wifi_config = {
|
|
||||||
.sta = {
|
|
||||||
.ssid = SSID,
|
|
||||||
.password = PSK,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
|
|
||||||
ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
|
|
||||||
ESP_ERROR_CHECK(esp_wifi_start());
|
|
||||||
|
|
||||||
ESP_LOGI(WIFI_TAG, "wifi_init_sta finished.");
|
|
||||||
|
|
||||||
/* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum
|
|
||||||
* number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */
|
|
||||||
EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,
|
|
||||||
WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,
|
|
||||||
pdFALSE,
|
|
||||||
pdFALSE,
|
|
||||||
portMAX_DELAY);
|
|
||||||
|
|
||||||
/* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
|
|
||||||
* happened. */
|
|
||||||
if (bits & WIFI_CONNECTED_BIT)
|
|
||||||
{
|
|
||||||
ESP_LOGI(WIFI_TAG, "connected to ap");
|
|
||||||
}
|
|
||||||
else if (bits & WIFI_FAIL_BIT)
|
|
||||||
{
|
|
||||||
ESP_LOGI(WIFI_TAG, "Failed to connect");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ESP_LOGE(WIFI_TAG, "UNEXPECTED EVENT");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void app_main(void)
|
|
||||||
{
|
|
||||||
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_LOGI(WIFI_TAG, "ESP_WIFI_MODE_STA");
|
|
||||||
wifi_init_sta();
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
|
|
||||||
This directory is intended for PlatformIO Test Runner and project tests.
|
|
||||||
|
|
||||||
Unit Testing is a software testing method by which individual units of
|
|
||||||
source code, sets of one or more MCU program modules together with associated
|
|
||||||
control data, usage procedures, and operating procedures, are tested to
|
|
||||||
determine whether they are fit for use. Unit testing finds problems early
|
|
||||||
in the development cycle.
|
|
||||||
|
|
||||||
More information about PlatformIO Unit Testing:
|
|
||||||
- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html
|
|
||||||
Reference in a new issue