github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-06 10:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wifi] Eliminate heap allocations in IP address logging

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-05 19:23:46 -10:00
parent 22cb0da903
commit 43e0f1fb35
3 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/wifi/wifi_component.cpp
+2 -2
View File
@@ -644,13 +644,13 @@ void WiFiComponent::setup_ap_config_() {
} }
this->ap_setup_ = this->wifi_start_ap_(this->ap_); this->ap_setup_ = this->wifi_start_ap_(this->ap_);
auto ip_address = this->wifi_soft_ap_ip().str(); char ip_buf[network::IP_ADDRESS_BUFFER_SIZE];
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
"Setting up AP:\n" "Setting up AP:\n"
" AP SSID: '%s'\n" " AP SSID: '%s'\n"
" AP Password: '%s'\n" " AP Password: '%s'\n"
" IP Address: %s", " IP Address: %s",
this->ap_.get_ssid().c_str(), this->ap_.get_password().c_str(), ip_address.c_str()); this->ap_.get_ssid().c_str(), this->ap_.get_password().c_str(), this->wifi_soft_ap_ip().str_to(ip_buf));
#ifdef USE_WIFI_MANUAL_IP #ifdef USE_WIFI_MANUAL_IP
auto manual_ip = this->ap_.get_manual_ip(); auto manual_ip = this->ap_.get_manual_ip();
esphome/components/wifi/wifi_component_esp8266.cpp
+18 -14
View File
@@ -8,6 +8,7 @@
#include <utility> #include <utility>
#include <algorithm> #include <algorithm>
#include <span>
#ifdef USE_WIFI_WPA2_EAP #ifdef USE_WIFI_WPA2_EAP
#include <wpa2_enterprise.h> #include <wpa2_enterprise.h>
#endif #endif
@@ -371,7 +372,8 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
while (!connected) { while (!connected) {
uint8_t ipv6_addr_count = 0; uint8_t ipv6_addr_count = 0;
for (auto addr : addrList) { for (auto addr : addrList) {
ESP_LOGV(TAG, "Address %s", addr.toString().c_str()); char ip_buf[network::IP_ADDRESS_BUFFER_SIZE];
ESP_LOGV(TAG, "Address %s", network::IPAddress(addr.ipFromNetifNum()).str_to(ip_buf));
if (addr.isV6()) { if (addr.isV6()) {
ipv6_addr_count++; ipv6_addr_count++;
} }
@@ -413,19 +415,18 @@ const LogString *get_auth_mode_str(uint8_t mode) {
return LOG_STR("UNKNOWN"); return LOG_STR("UNKNOWN");
} }
} }
// Format IP address to provided buffer, returns pointer to buf for convenience
#ifdef ipv4_addr #ifdef ipv4_addr
std::string format_ip_addr(struct ipv4_addr ip) { char *format_ip_addr_to(struct ipv4_addr ip, std::span<char, network::IP_ADDRESS_BUFFER_SIZE> buf) {
char buf[20]; snprintf(buf.data(), buf.size(), "%u.%u.%u.%u", uint8_t(ip.addr >> 0), uint8_t(ip.addr >> 8), uint8_t(ip.addr >> 16),
sprintf(buf, "%u.%u.%u.%u", uint8_t(ip.addr >> 0), uint8_t(ip.addr >> 8), uint8_t(ip.addr >> 16), uint8_t(ip.addr >> 24));
uint8_t(ip.addr >> 24)); return buf.data();
return buf;
} }
#else #else
std::string format_ip_addr(struct ip_addr ip) { char *format_ip_addr_to(struct ip_addr ip, std::span<char, network::IP_ADDRESS_BUFFER_SIZE> buf) {
char buf[20]; snprintf(buf.data(), buf.size(), "%u.%u.%u.%u", uint8_t(ip.addr >> 0), uint8_t(ip.addr >> 8), uint8_t(ip.addr >> 16),
sprintf(buf, "%u.%u.%u.%u", uint8_t(ip.addr >> 0), uint8_t(ip.addr >> 8), uint8_t(ip.addr >> 16), uint8_t(ip.addr >> 24));
uint8_t(ip.addr >> 24)); return buf.data();
return buf;
} }
#endif #endif
const LogString *get_op_mode_str(uint8_t mode) { const LogString *get_op_mode_str(uint8_t mode) {
@@ -582,8 +583,10 @@ void WiFiComponent::wifi_event_callback(System_Event_t *event) {
} }
case EVENT_STAMODE_GOT_IP: { case EVENT_STAMODE_GOT_IP: {
auto it = event->event_info.got_ip; auto it = event->event_info.got_ip;
ESP_LOGV(TAG, "static_ip=%s gateway=%s netmask=%s", format_ip_addr(it.ip).c_str(), format_ip_addr(it.gw).c_str(), char ip_buf[network::IP_ADDRESS_BUFFER_SIZE], gw_buf[network::IP_ADDRESS_BUFFER_SIZE],
format_ip_addr(it.mask).c_str()); mask_buf[network::IP_ADDRESS_BUFFER_SIZE];
ESP_LOGV(TAG, "static_ip=%s gateway=%s netmask=%s", format_ip_addr_to(it.ip, ip_buf),
format_ip_addr_to(it.gw, gw_buf), format_ip_addr_to(it.mask, mask_buf));
s_sta_got_ip = true; s_sta_got_ip = true;
#ifdef USE_WIFI_LISTENERS #ifdef USE_WIFI_LISTENERS
for (auto *listener : global_wifi_component->ip_state_listeners_) { for (auto *listener : global_wifi_component->ip_state_listeners_) {
@@ -635,8 +638,9 @@ void WiFiComponent::wifi_event_callback(System_Event_t *event) {
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
auto it = event->event_info.distribute_sta_ip; auto it = event->event_info.distribute_sta_ip;
char mac_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE]; char mac_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
char ip_buf[network::IP_ADDRESS_BUFFER_SIZE];
format_mac_addr_upper(it.mac, mac_buf); format_mac_addr_upper(it.mac, mac_buf);
ESP_LOGV(TAG, "AP Distribute Station IP MAC=%s IP=%s aid=%u", mac_buf, format_ip_addr(it.ip).c_str(), it.aid); ESP_LOGV(TAG, "AP Distribute Station IP MAC=%s IP=%s aid=%u", mac_buf, format_ip_addr_to(it.ip, ip_buf), it.aid);
#endif #endif
break; break;
} }
esphome/components/wifi/wifi_component_libretiny.cpp
+9 -6
View File
@@ -6,6 +6,7 @@
#include <cinttypes> #include <cinttypes>
#include <utility> #include <utility>
#include <algorithm> #include <algorithm>
#include <span>
#include "lwip/ip_addr.h" #include "lwip/ip_addr.h"
#include "lwip/err.h" #include "lwip/err.h"
#include "lwip/dns.h" #include "lwip/dns.h"
@@ -233,11 +234,12 @@ const char *get_auth_mode_str(uint8_t mode) {
using esphome_ip4_addr_t = IPAddress; using esphome_ip4_addr_t = IPAddress;
std::string format_ip4_addr(const esphome_ip4_addr_t &ip) { // Format IP address to provided buffer, returns pointer to buf for convenience
char buf[20]; char *format_ip4_addr_to(const esphome_ip4_addr_t &ip, std::span<char, network::IP_ADDRESS_BUFFER_SIZE> buf) {
uint32_t addr = ip; uint32_t addr = ip;
sprintf(buf, "%u.%u.%u.%u", uint8_t(addr >> 0), uint8_t(addr >> 8), uint8_t(addr >> 16), uint8_t(addr >> 24)); snprintf(buf.data(), buf.size(), "%u.%u.%u.%u", uint8_t(addr >> 0), uint8_t(addr >> 8), uint8_t(addr >> 16),
return buf; uint8_t(addr >> 24));
return buf.data();
} }
const char *get_op_mode_str(uint8_t mode) { const char *get_op_mode_str(uint8_t mode) {
switch (mode) { switch (mode) {
@@ -530,8 +532,9 @@ void WiFiComponent::wifi_process_event_(LTWiFiEvent *event) {
break; break;
} }
case ESPHOME_EVENT_ID_WIFI_STA_GOT_IP: { case ESPHOME_EVENT_ID_WIFI_STA_GOT_IP: {
ESP_LOGV(TAG, "static_ip=%s gateway=%s", format_ip4_addr(WiFi.localIP()).c_str(), char ip_buf[network::IP_ADDRESS_BUFFER_SIZE], gw_buf[network::IP_ADDRESS_BUFFER_SIZE];
format_ip4_addr(WiFi.gatewayIP()).c_str()); ESP_LOGV(TAG, "static_ip=%s gateway=%s", format_ip4_addr_to(WiFi.localIP(), ip_buf),
format_ip4_addr_to(WiFi.gatewayIP(), gw_buf));
s_sta_state = LTWiFiSTAState::CONNECTED; s_sta_state = LTWiFiSTAState::CONNECTED;
#ifdef USE_WIFI_LISTENERS #ifdef USE_WIFI_LISTENERS
for (auto *listener : this->ip_state_listeners_) { for (auto *listener : this->ip_state_listeners_) {