Skip to content

Commit 20a28b5

Browse files
committed
fix(net): Do not use netif_index_to_name
Causes error on recent IDF builds
1 parent 8ac076c commit 20a28b5

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

cores/esp32/IPAddress.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,13 @@ size_t IPAddress::printTo(Print &p, bool includeZone) const {
344344
n += p.print(':');
345345
}
346346
}
347-
// add a zone if zone-id is non-zero
348-
if (_zone > 0 && includeZone) {
349-
n += p.print('%');
350-
char if_name[NETIF_NAMESIZE];
351-
netif_index_to_name(_zone, if_name);
352-
n += p.print(if_name);
353-
}
347+
// add a zone if zone-id is non-zero (causes exception on recent IDF builds)
348+
// if (_zone > 0 && includeZone) {
349+
// n += p.print('%');
350+
// char if_name[NETIF_NAMESIZE];
351+
// netif_index_to_name(_zone, if_name);
352+
// n += p.print(if_name);
353+
// }
354354
return n;
355355
}
356356

libraries/Network/src/NetworkInterface.cpp

+2-6
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,10 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
115115
setStatusBits(ESP_NETIF_HAS_LOCAL_IP6_BIT);
116116
}
117117
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
118-
char if_name[NETIF_NAMESIZE] = {
119-
0,
120-
};
121-
netif_index_to_name(event->ip6_info.ip.zone, if_name);
122118
static const char *addr_types[] = {"UNKNOWN", "GLOBAL", "LINK_LOCAL", "SITE_LOCAL", "UNIQUE_LOCAL", "IPV4_MAPPED_IPV6"};
123119
log_v(
124-
"IF %s Got IPv6: Interface: %d, IP Index: %d, Type: %s, Zone: %d (%s), Address: " IPV6STR, desc(), _interface_id, event->ip_index, addr_types[addr_type],
125-
event->ip6_info.ip.zone, if_name, IPV62STR(event->ip6_info.ip)
120+
"IF %s Got IPv6: Interface: %d, IP Index: %d, Type: %s, Zone: %d, Address: " IPV6STR, desc(), _interface_id, event->ip_index, addr_types[addr_type],
121+
event->ip6_info.ip.zone, IPV62STR(event->ip6_info.ip)
126122
);
127123
#endif
128124
memcpy(&arduino_event.event_info.got_ip6, event_data, sizeof(ip_event_got_ip6_t));

0 commit comments

Comments
 (0)