jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 03:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wireguard default values (#23349)

Browse Source
This commit is contained in:
s-hadinger 2025-04-27 23:12:18 +02:00 committed by GitHub
parent 2c2f7f1149
commit 7e7f237292
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/lib_ssl/IniFile-Tasmota/src/IniFile.cpp
View File

@ -257,13 +257,17 @@ bool IniFile::getCIDR(const char* section, const char* key, ip_addr_t *ip, ip_ad
return parseCIDR(cidr, ip, mask); return parseCIDR(cidr, ip, mask);
} }
bool IniFile::getDomainPort(const char* section, const char* key, String &domain, uint16_t &port) bool IniFile::getDomainPort(const char* section, const char* key, String &domain, uint16_t &port, uint16_t default_port)
{ {
if (!getValueString(section, key, domain)) return false; // error if (!getValueString(section, key, domain)) return false; // error
int32_t colon = domain.indexOf(':'); int32_t colon = domain.indexOf(':');
if (colon < 0) { return false; } if (colon == 0) { return false; } // having an empty domain is wrong
port = domain.substring(colon + 1).toInt(); if (colon > 0) {
domain = domain.substring(0, colon); port = domain.substring(colon + 1).toInt();
domain = domain.substring(0, colon);
} else {
port = default_port;
}
return true; return true;
} }

2
lib/lib_ssl/IniFile-Tasmota/src/IniFile.h
View File

@ -68,7 +68,7 @@ public:
static bool parseCIDR(String& str, ip_addr_t *ip, ip_addr_t *mask); static bool parseCIDR(String& str, ip_addr_t *ip, ip_addr_t *mask);
bool getCIDR(const char* section, const char* key, ip_addr_t *ip, ip_addr_t *mask); bool getCIDR(const char* section, const char* key, ip_addr_t *ip, ip_addr_t *mask);
bool getDomainPort(const char* section, const char* key, String &domain, uint16_t &port); bool getDomainPort(const char* section, const char* key, String &domain, uint16_t &port, uint16_t default_port);
// From the file location saved in 'state' look for the next section and read its name. // From the file location saved in 'state' look for the next section and read its name.
// The name will be in the buffer. Returns false if no section found. // The name will be in the buffer. Returns false if no section found.

22
tasmota/tasmota_xdrv_driver/xdrv_80_wireguard_client.ino
View File

@ -85,7 +85,7 @@ bool WireguardLoadConfig(const char *filename) {
valconf = valconf && ini.getCIDR("Interface", "Address", &config.address2, &config.subnet); valconf = valconf && ini.getCIDR("Interface", "Address", &config.address2, &config.subnet);
valconf = valconf && ini.getValueBase64("Peer", "PublicKey", config.public_key2, sizeof(config.public_key2)); valconf = valconf && ini.getValueBase64("Peer", "PublicKey", config.public_key2, sizeof(config.public_key2));
valconf = valconf && ini.getValueBase64("Peer", "PresharedKey", config.preshared_key2, sizeof(config.preshared_key2)); valconf = valconf && ini.getValueBase64("Peer", "PresharedKey", config.preshared_key2, sizeof(config.preshared_key2));
valconf = valconf && ini.getDomainPort("Peer", "Endpoint", Wireguard.endpoint, Wireguard.config.port); valconf = valconf && ini.getDomainPort("Peer", "Endpoint", Wireguard.endpoint, Wireguard.config.port, 51820 /*default port*/);
// read optional NetMask // read optional NetMask
ipaddr_aton(WIREGUARD_NETMASK, &config.netmask2); ipaddr_aton(WIREGUARD_NETMASK, &config.netmask2);
ini.getIPAddress("Tasmota", "Netmask", &Wireguard.config.netmask2); ini.getIPAddress("Tasmota", "Netmask", &Wireguard.config.netmask2);
@ -147,13 +147,21 @@ bool WireguardConnect(void) {
esp_err_t err = esp_wireguard_connect(&Wireguard.ctx); esp_err_t err = esp_wireguard_connect(&Wireguard.ctx);
if (err == ESP_OK) { if (err == ESP_OK) {
Wireguard.started = true; Wireguard.started = true;
for (const allowed_ips_t & allowedip : Wireguard.allowed_ips) { if (!Wireguard.allowed_ips.isEmpty()) {
err = esp_wireguard_add_allowed_ip(&Wireguard.ctx, allowedip.addr, allowedip.mask); for (const allowed_ips_t & allowedip : Wireguard.allowed_ips) {
if (err != ESP_OK) { err = esp_wireguard_add_allowed_ip(&Wireguard.ctx, allowedip.addr, allowedip.mask);
AddLog(LOG_LEVEL_INFO, PSTR("WG : Failed to add allowed_ips %_I/%_I, no space left"), allowedip.addr, allowedip.mask); if (err != ESP_OK) {
break; AddLog(LOG_LEVEL_INFO, PSTR("WG : Failed to add allowed_ips, no space left"));
break;
}
AddLog(LOG_LEVEL_DEBUG, PSTR("WG : Added allowed_ips %s/%s"), IPAddress(&allowedip.addr).toString().c_str(),
IPAddress(&allowedip.mask).toString().c_str());
} }
AddLog(LOG_LEVEL_DEBUG, PSTR("WG : Added allowed_ips %_I/%_I"), allowedip.addr, allowedip.mask); } else {
// allowed_ips is empty, so we add 0.0.0.0/0.0.0.0
ip_addr_t ip_zero = IPADDR4_INIT_BYTES(0, 0, 0, 0);
err = esp_wireguard_add_allowed_ip(&Wireguard.ctx, ip_zero, ip_zero);
AddLog(LOG_LEVEL_DEBUG, PSTR("WG : Added default allowed_ips 0.0.0.0/0.0.0.0"));
} }
return true; return true;
} }