Commander1024/ESP32_Serial_Swiss_Army_Knife
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Dual-Stack Network Diagnostics

Browse Source
This commit is contained in:
Commander1024
2026-09-21 10:01:55 +02:00
parent 60c1e279d6
commit 06df47c934
18 changed files with 1488 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/console_completion.c
+14
View File
@@ -164,8 +164,22 @@ static const char *const s_completion_candidates[] = {
"wifi ap secret",
"wifi ap show-secret",
"wifi ping",
"wifi ping -4",
"wifi ping -6",
"wifi nslookup",
"wifi nslookup -4",
"wifi nslookup -6",
"wifi traceroute",
"wifi traceroute -4",
"wifi traceroute -6",
/* Shared diagnostics: fixed family flags only, never guessed hosts. */
"ping -4",
"ping -6",
"nslookup -4",
"nslookup -6",
"traceroute -4",
"traceroute -6",
/* Station mDNS hostname configuration. */
"mdns status",
src/network_console.c
+444 -260
View File
@@ -5,6 +5,7 @@
#include <errno.h>
#include <inttypes.h>
#include <net/if.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -13,6 +14,8 @@
#include "esp_console.h"
#include "esp_err.h"
#include "esp_heap_caps.h"
#include "esp_netif.h"
#include "esp_idf_version.h"
#include "esp_timer.h"
#include "freertos/FreeRTOS.h"
#include "freertos/queue.h"
@@ -21,6 +24,7 @@
#include "lwip/inet_chksum.h"
#include "lwip/ip_addr.h"
#include "lwip/netdb.h"
#include "lwip/netif.h"
#include "lwip/prot/icmp.h"
#include "lwip/prot/ip4.h"
#include "lwip/sockets.h"
@@ -35,21 +39,25 @@
#define TRACEROUTE_TIMEOUT_US INT64_C(1000000)
#define NUMERIC_ADDRESS_CAPACITY 48U
/* This covers two maximum-size IPv4 headers plus both required ICMP headers. */
#define TRACEROUTE_REPLY_CAPACITY \
(IP_HLEN_MAX + sizeof(struct icmp_hdr) + IP_HLEN_MAX + sizeof(struct icmp_echo_hdr))
/* Raw receive framing and IP_TTL-for-IPv6 are SDK-specific; re-audit on upgrade. */
#if ESP_IDF_VERSION != ESP_IDF_VERSION_VAL(5, 5, 0)
#error "Re-audit network diagnostics raw sockets for this ESP-IDF version"
#endif
#define TRACEROUTE_REPLY_CAPACITY 1280U
static void print_command_usage(const char *command)
{
if (command != NULL && strcmp(command, "ping") == 0) {
printf("Usage: ping <host> [count] (count: 1..20, default: 4)\n");
printf("Usage: ping [-4|-6] <host> [count] (count: 1..20, default: 4)\n");
} else if (command != NULL && strcmp(command, "nslookup") == 0) {
printf("Usage: nslookup <host>\n");
printf("Usage: nslookup [-4|-6] <host>\n");
} else if (command != NULL && strcmp(command, "traceroute") == 0) {
printf("Usage: traceroute <host> [max-hops] (IPv4 only; 1..30, default: 16)\n");
printf("Usage: traceroute [-4|-6] <host> [max-hops] (1..30, default: 16)\n");
} else {
printf("Network commands: ping, nslookup, traceroute\n");
}
printf("One -4 or -6 may appear before or after the host; defaults prefer IPv4 for probes.\n"
"Link-local IPv6 probes require %%sta, %%ap, or a device interface index/name.\n");
}
static bool parse_bounded_u32(const char *text, uint32_t minimum,
@@ -97,8 +105,19 @@ static bool sockaddr_to_numeric(const struct sockaddr *address,
return false;
}
return inet_ntop(address->sa_family, numeric_address, buffer,
(socklen_t)buffer_size) != NULL;
if (inet_ntop(address->sa_family, numeric_address, buffer,
(socklen_t)buffer_size) == NULL) {
return false;
}
if (address->sa_family == AF_INET6) {
uint32_t zone = ((const struct sockaddr_in6 *)address)->sin6_scope_id;
if (zone != 0U) {
size_t used = strlen(buffer);
int written = snprintf(buffer + used, buffer_size - used, "%%%" PRIu32, zone);
return written >= 0 && (size_t)written < buffer_size - used;
}
}
return true;
}
static bool addrinfo_to_ip_addr(const struct addrinfo *entry, ip_addr_t *target)
@@ -124,6 +143,7 @@ static bool addrinfo_to_ip_addr(const struct addrinfo *entry, ip_addr_t *target)
(const struct sockaddr_in6 *)entry->ai_addr;
ip6_addr_t ipv6;
inet6_addr_to_ip6addr(&ipv6, &socket_address->sin6_addr);
ip6_addr_set_zone(&ipv6, socket_address->sin6_scope_id);
ip_addr_copy_from_ip6(*target, ipv6);
return true;
}
@@ -132,34 +152,178 @@ static bool addrinfo_to_ip_addr(const struct addrinfo *entry, ip_addr_t *target)
return false;
}
static int resolve_ping_target(const char *host, ip_addr_t *target,
char *numeric, size_t numeric_size)
{
struct addrinfo hints = {
.ai_family = AF_UNSPEC,
.ai_socktype = SOCK_RAW,
};
struct addrinfo *results = NULL;
int resolver_result = getaddrinfo(host, NULL, &hints, &results);
if (resolver_result != 0) {
printf("ping: could not resolve '%s' (getaddrinfo error %d)\n",
host, resolver_result);
return 1;
}
typedef struct {
const char *host;
int family;
uint32_t limit;
} diagnostic_arguments_t;
bool found = false;
for (const struct addrinfo *entry = results; entry != NULL; entry = entry->ai_next) {
if (addrinfo_to_ip_addr(entry, target) &&
sockaddr_to_numeric(entry->ai_addr, entry->ai_addrlen,
numeric, numeric_size)) {
found = true;
break;
typedef struct {
struct sockaddr_storage address;
socklen_t length;
} diagnostic_target_t;
static bool parse_arguments(int argc, char **argv, uint32_t default_limit,
uint32_t maximum, diagnostic_arguments_t *args)
{
*args = (diagnostic_arguments_t){.family = AF_UNSPEC, .limit = default_limit};
bool have_limit = false;
for (int i = 1; i < argc; ++i) {
const char *word = argv[i];
if (word == NULL || *word == '\0') {
return false;
}
if (*word == '-') {
if (args->family != AF_UNSPEC ||
(strcmp(word, "-4") != 0 && strcmp(word, "-6") != 0)) {
return false;
}
args->family = word[1] == '4' ? AF_INET : AF_INET6;
} else if (args->host == NULL) {
args->host = word;
} else if (have_limit || maximum == 0U ||
!parse_bounded_u32(word, 1U, maximum, &args->limit)) {
return false;
} else {
have_limit = true;
}
}
freeaddrinfo(results);
return args->host != NULL;
}
if (!found) {
printf("ping: '%s' did not resolve to a supported IPv4 or IPv6 address\n", host);
static unsigned int device_zone(const char *name)
{
if (strcmp(name, "sta") == 0 || strcmp(name, "ap") == 0) {
esp_netif_t *netif = esp_netif_get_handle_from_ifkey(
strcmp(name, "sta") == 0 ? "WIFI_STA_DEF" : "WIFI_AP_DEF");
int index = netif != NULL ? esp_netif_get_netif_impl_index(netif) : 0;
return index > 0 && index <= UINT8_MAX ? (unsigned int)index : 0U;
}
uint32_t index;
char interface_name[IF_NAMESIZE];
if (parse_bounded_u32(name, 1U, UINT8_MAX, &index)) {
return if_indextoname(index, interface_name) != NULL ? index : 0U;
}
return if_nametoindex(name);
}
/* Return 1 for a literal, 0 for a hostname, -1 for invalid literals.
* Missing link-local zones are valid for display, but not for probing.
* Never pass '%' through DNS: zones belong to this device, not the client. */
static int parse_literal(const char *host, int family, diagnostic_target_t *target)
{
char address[INET6_ADDRSTRLEN];
const char *percent = strchr(host, '%');
size_t length = percent != NULL ? (size_t)(percent - host) : strlen(host);
if (length >= sizeof(address)) {
return percent != NULL || strchr(host, ':') != NULL ? -1 : 0;
}
memcpy(address, host, length);
address[length] = '\0';
memset(target, 0, sizeof(*target));
struct sockaddr_in *v4 = (struct sockaddr_in *)&target->address;
if (inet_pton(AF_INET, address, &v4->sin_addr) == 1) {
if (percent != NULL || family == AF_INET6) {
return -1;
}
v4->sin_family = AF_INET;
target->length = sizeof(*v4);
return 1;
}
struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)&target->address;
if (inet_pton(AF_INET6, address, &v6->sin6_addr) != 1) {
return percent != NULL || strchr(host, ':') != NULL ? -1 : 0;
}
if (family == AF_INET || IN6_IS_ADDR_V4MAPPED(&v6->sin6_addr)) {
return -1;
}
v6->sin6_family = AF_INET6;
target->length = sizeof(*v6);
if (percent != NULL) {
v6->sin6_scope_id = device_zone(percent + 1);
if (v6->sin6_scope_id == 0U) {
return -1;
}
}
return 1;
}
static bool target_needs_scope(const diagnostic_target_t *target)
{
if (target->address.ss_family != AF_INET6) {
return false;
}
const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)&target->address;
return IN6_IS_ADDR_LINKLOCAL(&v6->sin6_addr) && v6->sin6_scope_id == 0U;
}
static void print_scope_requirement(const char *numeric)
{
printf("Link-local %s needs an explicit device scope for probes: %s%%sta or %s%%ap\n"
"(choose the device interface, not the SSH/browser client's; a valid device index/name also works).\n",
numeric, numeric, numeric);
}
static int resolve_family(const char *host, int family, diagnostic_target_t *target)
{
struct addrinfo hints = {.ai_family = family, .ai_socktype = SOCK_RAW};
struct addrinfo *results = NULL;
int error = getaddrinfo(host, NULL, &hints, &results);
if (error != 0) {
return error;
}
error = EAI_NONAME;
for (const struct addrinfo *entry = results; entry != NULL; entry = entry->ai_next) {
size_t required = family == AF_INET ? sizeof(struct sockaddr_in) :
sizeof(struct sockaddr_in6);
if (entry->ai_family != family || entry->ai_addr == NULL ||
entry->ai_addr->sa_family != family || entry->ai_addrlen < required) {
continue;
}
memset(target, 0, sizeof(*target));
memcpy(&target->address, entry->ai_addr, required);
target->length = required;
if (family == AF_INET6) {
const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)&target->address;
if (IN6_IS_ADDR_V4MAPPED(&v6->sin6_addr)) {
continue;
}
}
error = 0;
break;
}
freeaddrinfo(results);
return error;
}
static int resolve_target(const diagnostic_arguments_t *args, diagnostic_target_t *target,
char *numeric, size_t numeric_size)
{
int literal = parse_literal(args->host, args->family, target);
if (literal < 0) {
printf("Invalid address/family/zone. Link-local IPv6 requires %%sta, %%ap, or a valid\n"
"device interface index/name (not the SSH/browser client's interface).\n");
return 1;
}
if (literal == 0) {
int first = args->family == AF_UNSPEC ? AF_INET : args->family;
int error = resolve_family(args->host, first, target);
/* IDF collapses DNS absence, timeout and server failure into EAI_FAIL.
* Fall back only after resolution returned no address, never after IO. */
if (args->family == AF_UNSPEC && (error == EAI_NONAME || error == EAI_FAIL)) {
error = resolve_family(args->host, AF_INET6, target);
}
if (error != 0) {
printf("Could not resolve '%s' (getaddrinfo error %d).\n", args->host, error);
return 1;
}
}
if (!sockaddr_to_numeric((const struct sockaddr *)&target->address, target->length,
numeric, numeric_size)) {
return 1;
}
if (target_needs_scope(target)) {
print_scope_requirement(numeric);
return 1;
}
return 0;
@@ -191,6 +355,11 @@ static StaticQueue_t s_ping_queue_storage;
* storage cannot dangle. Queue control stays internal. No internal-RAM fallback. */
static uint8_t *s_ping_queue_bytes;
static QueueHandle_t s_ping_queue;
/* SDK ping deletion is asynchronous. Keep callback context alive even if the
* console deadline expires; END permits callback queue reuse, not proof that
* the retiring SDK task/socket has been destroyed. */
static ping_wait_context_t s_ping_context;
static bool s_ping_pending;
static void ping_on_success(esp_ping_handle_t handle, void *arguments)
{
@@ -274,21 +443,35 @@ static void ping_on_end(esp_ping_handle_t handle, void *arguments)
static int execute_ping(int argc, char **argv)
{
if ((argc != 2 && argc != 3) || argv[1] == NULL || *argv[1] == '\0') {
if (s_ping_pending) {
ping_event_t pending;
while (xQueueReceive(s_ping_queue, &pending, 0U) == pdTRUE) {
if (pending.kind == PING_EVENT_END) {
s_ping_pending = false;
break;
}
}
if (s_ping_pending) {
printf("ping: previous SDK session has not completed; no new session started\n");
return 1;
}
}
diagnostic_arguments_t args;
if (!parse_arguments(argc, argv, PING_DEFAULT_COUNT, PING_MAX_COUNT, &args)) {
print_command_usage("ping");
return 1;
}
uint32_t count = PING_DEFAULT_COUNT;
if (argc == 3 &&
!parse_bounded_u32(argv[2], PING_MIN_COUNT, PING_MAX_COUNT, &count)) {
print_command_usage("ping");
return 1;
}
ip_addr_t target;
uint32_t count = args.limit;
diagnostic_target_t resolved;
char numeric[NUMERIC_ADDRESS_CAPACITY];
if (resolve_ping_target(argv[1], &target, numeric, sizeof(numeric)) != 0) {
if (resolve_target(&args, &resolved, numeric, sizeof(numeric)) != 0) {
return 1;
}
ip_addr_t target;
struct addrinfo entry = {.ai_family = resolved.address.ss_family,
.ai_addr = (struct sockaddr *)&resolved.address,
.ai_addrlen = resolved.length};
if (!addrinfo_to_ip_addr(&entry, &target)) {
return 1;
}
@@ -311,14 +494,20 @@ static int execute_ping(int argc, char **argv)
printf("ping: could not allocate event queue\n");
return 1;
}
ping_wait_context_t context = {.queue = s_ping_queue};
s_ping_context.queue = s_ping_queue;
esp_ping_config_t config = ESP_PING_DEFAULT_CONFIG();
config.count = count;
config.interval_ms = 1000U;
config.timeout_ms = 1000U;
config.target_addr = target;
if (resolved.address.ss_family == AF_INET6) {
/* IDF 5.5 ping omits sin6_scope_id when constructing sendto's address. */
config.interface = ((const struct sockaddr_in6 *)&resolved.address)->sin6_scope_id;
}
const esp_ping_callbacks_t callbacks = {
.cb_args = &context,
.cb_args = &s_ping_context,
.on_ping_success = ping_on_success,
.on_ping_timeout = ping_on_timeout,
.on_ping_end = ping_on_end,
@@ -331,24 +520,32 @@ static int execute_ping(int argc, char **argv)
return 1;
}
printf("PING %s (%s): %" PRIu32 " probes\n", argv[1], numeric, count);
printf("PING %s (%s): %" PRIu32 " probes\n", args.host, numeric, count);
s_ping_pending = true;
error = esp_ping_start(session);
if (error != ESP_OK) {
printf("ping: could not start session: %s\n", esp_err_to_name(error));
(void)esp_ping_delete_session(session);
s_ping_pending = false;
return 1;
}
int64_t deadline = esp_timer_get_time() + ((int64_t)count * 2000 + 2000) * 1000;
for (;;) {
ping_event_t event;
if (xQueueReceive(s_ping_queue, &event, portMAX_DELAY) != pdTRUE) {
printf("ping: wait for session completion failed\n");
int64_t remaining = deadline - esp_timer_get_time();
TickType_t wait = remaining > 0 ? pdMS_TO_TICKS((uint32_t)((remaining + 999) / 1000)) : 0;
if (remaining <= 0 || xQueueReceive(s_ping_queue, &event, wait ? wait : 1U) != pdTRUE) {
/* Do not touch the handle here: END may concurrently delete it.
* SDK receive may outlive its configured timeout under ICMP noise. */
printf("ping: console deadline exceeded; SDK session retained until completion\n");
return 1;
}
if (event.kind == PING_EVENT_LINE) {
printf("%s\n", event.line);
continue;
}
s_ping_pending = false;
if (event.profile_error != ESP_OK) {
printf("ping: session ended, but summary profile retrieval failed: %s\n",
esp_err_to_name(event.profile_error));
@@ -371,134 +568,53 @@ static int execute_ping(int argc, char **argv)
}
}
static bool socket_addresses_equal(const struct addrinfo *left,
const struct addrinfo *right)
{
if (left == NULL || right == NULL || left->ai_addr == NULL ||
right->ai_addr == NULL || left->ai_family != right->ai_family) {
return false;
}
if (left->ai_family == AF_INET &&
left->ai_addrlen >= (socklen_t)sizeof(struct sockaddr_in) &&
right->ai_addrlen >= (socklen_t)sizeof(struct sockaddr_in)) {
const struct sockaddr_in *left_address =
(const struct sockaddr_in *)left->ai_addr;
const struct sockaddr_in *right_address =
(const struct sockaddr_in *)right->ai_addr;
return left_address->sin_addr.s_addr == right_address->sin_addr.s_addr;
}
#if defined(CONFIG_LWIP_IPV6) && CONFIG_LWIP_IPV6
if (left->ai_family == AF_INET6 &&
left->ai_addrlen >= (socklen_t)sizeof(struct sockaddr_in6) &&
right->ai_addrlen >= (socklen_t)sizeof(struct sockaddr_in6)) {
const struct sockaddr_in6 *left_address =
(const struct sockaddr_in6 *)left->ai_addr;
const struct sockaddr_in6 *right_address =
(const struct sockaddr_in6 *)right->ai_addr;
return memcmp(&left_address->sin6_addr, &right_address->sin6_addr,
sizeof(left_address->sin6_addr)) == 0;
}
#endif
return false;
}
static bool address_appeared_earlier(const struct addrinfo *first,
const struct addrinfo *current)
{
for (const struct addrinfo *entry = first;
entry != NULL && entry != current; entry = entry->ai_next) {
if (socket_addresses_equal(entry, current)) {
return true;
}
}
return false;
}
static int execute_nslookup(int argc, char **argv)
{
if (argc != 2 || argv[1] == NULL || *argv[1] == '\0') {
diagnostic_arguments_t args;
if (!parse_arguments(argc, argv, 0U, 0U, &args)) {
print_command_usage("nslookup");
return 1;
}
struct addrinfo hints = {
.ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM,
};
struct addrinfo *results = NULL;
int resolver_result = getaddrinfo(argv[1], NULL, &hints, &results);
if (resolver_result != 0) {
printf("nslookup: could not resolve '%s' (getaddrinfo error %d)\n",
argv[1], resolver_result);
return 1;
}
printf("Name: %s\n", argv[1]);
size_t printed = 0U;
for (const struct addrinfo *entry = results; entry != NULL; entry = entry->ai_next) {
if (address_appeared_earlier(results, entry)) {
continue;
}
char numeric[NUMERIC_ADDRESS_CAPACITY];
if (!sockaddr_to_numeric(entry->ai_addr, entry->ai_addrlen,
diagnostic_target_t target;
char numeric[NUMERIC_ADDRESS_CAPACITY];
int literal = parse_literal(args.host, args.family, &target);
if (literal != 0) {
if (literal < 0 ||
!sockaddr_to_numeric((const struct sockaddr *)&target.address, target.length,
numeric, sizeof(numeric))) {
printf("nslookup: invalid address/family/device zone\n");
return 1;
}
printf("Address: %s (numeric literal; no DNS query)\n", numeric);
if (target_needs_scope(&target)) {
print_scope_requirement(numeric);
}
return 0;
}
printf("Name: %s\nResolver: lwIP getaddrinfo; one selected address per family (configured max %d), not a full DNS RRset.\n"
"DNS absence, timeout and server failure may share EAI_FAIL.\n", args.host,
CONFIG_LWIP_DNS_MAX_HOST_IP);
unsigned int printed = 0U;
const int families[] = {AF_INET, AF_INET6};
for (size_t i = 0; i < 2U; ++i) {
int family = families[i];
if (args.family != AF_UNSPEC && args.family != family) {
continue;
}
printf("Address: %s (%s)\n", numeric,
entry->ai_family == AF_INET ? "IPv4" : "IPv6");
++printed;
}
freeaddrinfo(results);
if (printed == 0U) {
printf("nslookup: no supported IPv4 or IPv6 addresses returned\n");
return 1;
}
return 0;
}
static int resolve_traceroute_target(const char *host,
struct sockaddr_in *target,
char *numeric, size_t numeric_size)
{
struct addrinfo hints = {
.ai_family = AF_INET,
.ai_socktype = SOCK_RAW,
.ai_protocol = IPPROTO_ICMP,
};
struct addrinfo *results = NULL;
int resolver_result = getaddrinfo(host, NULL, &hints, &results);
if (resolver_result != 0) {
printf("traceroute: could not resolve IPv4 host '%s' (getaddrinfo error %d)\n",
host, resolver_result);
return 1;
}
const struct addrinfo *selected = NULL;
for (const struct addrinfo *entry = results; entry != NULL; entry = entry->ai_next) {
if (entry->ai_family == AF_INET && entry->ai_addr != NULL &&
entry->ai_addrlen >= (socklen_t)sizeof(struct sockaddr_in)) {
selected = entry;
break;
int error = resolve_family(args.host, family, &target);
if (error == 0 && sockaddr_to_numeric((const struct sockaddr *)&target.address,
target.length, numeric, sizeof(numeric))) {
printf("%s: %s\n", family == AF_INET ? "A" : "AAAA", numeric);
if (target_needs_scope(&target)) {
print_scope_requirement(numeric);
}
++printed;
} else {
printf("%s: no usable address (resolver error %d; not proof of no record)\n",
family == AF_INET ? "A" : "AAAA", error);
}
}
if (selected == NULL ||
!sockaddr_to_numeric(selected->ai_addr, selected->ai_addrlen,
numeric, numeric_size)) {
freeaddrinfo(results);
printf("traceroute: '%s' did not resolve to an IPv4 address\n", host);
return 1;
}
memcpy(target, selected->ai_addr, sizeof(*target));
freeaddrinfo(results);
return 0;
return printed != 0U ? 0 : 1;
}
typedef enum {
@@ -508,85 +624,119 @@ typedef enum {
TRACE_REPLY_UNREACHABLE,
} trace_reply_kind_t;
static uint16_t read_be16(const uint8_t *bytes)
{
return (uint16_t)((uint16_t)bytes[0] << 8 | bytes[1]);
}
static uint32_t checksum_sum(const uint8_t *bytes, size_t length, uint32_t sum)
{
while (length >= 2U) {
sum += read_be16(bytes);
bytes += 2;
length -= 2;
}
if (length != 0U) {
sum += (uint16_t)bytes[0] << 8;
}
return sum;
}
static bool checksum_valid(uint32_t sum)
{
while (sum >> 16) {
sum = (sum & 0xffffU) + (sum >> 16);
}
return sum == 0xffffU;
}
/* IDF raw sockets include the outer IP header and deliver before ICMP checksum
* validation. Reject all IPv6 extension headers (including fragments), both
* outer and quoted: the installed raw demux only matches the base next-header.
* No unaligned structure loads and no inspection beyond the received bytes. */
static trace_reply_kind_t parse_trace_reply(const uint8_t *packet, size_t length,
const diagnostic_target_t *target,
uint16_t expected_id,
uint16_t expected_sequence,
uint32_t expected_destination,
uint8_t *unreachable_code)
{
if (packet == NULL || length < IP_HLEN + sizeof(struct icmp_hdr)) {
bool v6 = target->address.ss_family == AF_INET6;
size_t header = v6 ? 40U : 20U;
if (packet == NULL || length < header + 8U || packet[0] >> 4 != (v6 ? 6 : 4)) {
return TRACE_REPLY_UNRELATED;
}
const struct ip_hdr *outer_ip = (const struct ip_hdr *)(const void *)packet;
size_t outer_header_length = IPH_HL_BYTES(outer_ip);
if (IPH_V(outer_ip) != 4U || outer_header_length < IP_HLEN ||
outer_header_length > length ||
length - outer_header_length < sizeof(struct icmp_hdr) ||
IPH_PROTO(outer_ip) != IPPROTO_ICMP) {
return TRACE_REPLY_UNRELATED;
const uint8_t *destination;
size_t address_size;
size_t source_offset;
size_t destination_offset;
size_t total;
if (v6) {
destination = (const uint8_t *)&((const struct sockaddr_in6 *)&target->address)->sin6_addr;
address_size = 16U;
source_offset = 8U;
destination_offset = 24U;
total = 40U + read_be16(packet + 4);
if (packet[6] != IPPROTO_ICMPV6 || total > length || total < 48U ||
!checksum_valid(checksum_sum(packet + 8, 32,
checksum_sum(packet + 40, total - 40, (uint32_t)(total - 40) + IPPROTO_ICMPV6)))) {
return TRACE_REPLY_UNRELATED;
}
} else {
destination = (const uint8_t *)&((const struct sockaddr_in *)&target->address)->sin_addr;
address_size = 4U;
source_offset = 12U;
destination_offset = 16U;
header = (packet[0] & 15U) * 4U;
total = read_be16(packet + 2);
if (header < 20U || total > length || total < header + 8U ||
packet[9] != IPPROTO_ICMP || (read_be16(packet + 6) & 0x3fffU) != 0U ||
!checksum_valid(checksum_sum(packet, header, 0)) ||
!checksum_valid(checksum_sum(packet + header, total - header, 0))) {
return TRACE_REPLY_UNRELATED;
}
}
uint16_t outer_total_length = lwip_ntohs(IPH_LEN(outer_ip));
if (outer_total_length < outer_header_length + sizeof(struct icmp_hdr)) {
return TRACE_REPLY_UNRELATED;
}
size_t available = length;
if ((size_t)outer_total_length < available) {
available = outer_total_length;
}
const uint8_t *outer_icmp_bytes = packet + outer_header_length;
const struct icmp_hdr *outer_icmp =
(const struct icmp_hdr *)(const void *)outer_icmp_bytes;
if (ICMPH_TYPE(outer_icmp) == ICMP_ER) {
const struct icmp_echo_hdr *echo_reply =
(const struct icmp_echo_hdr *)(const void *)outer_icmp_bytes;
if (echo_reply->id == expected_id &&
echo_reply->seqno == expected_sequence) {
const uint8_t *icmp = packet + header;
if (icmp[0] == (v6 ? 129U : ICMP_ER)) {
if (icmp[1] == 0U && memcmp(icmp + 4, &expected_id, 2) == 0 &&
memcmp(icmp + 6, &expected_sequence, 2) == 0 &&
memcmp(packet + source_offset, destination, address_size) == 0) {
return TRACE_REPLY_DESTINATION;
}
return TRACE_REPLY_UNRELATED;
}
if (ICMPH_TYPE(outer_icmp) != ICMP_TE &&
ICMPH_TYPE(outer_icmp) != ICMP_DUR) {
bool exceeded = icmp[0] == (v6 ? 3U : ICMP_TE) && icmp[1] == 0U;
bool unreachable = icmp[0] == (v6 ? 1U : ICMP_DUR) && icmp[1] <= (v6 ? 7U : 15U);
if (!exceeded && !unreachable) {
return TRACE_REPLY_UNRELATED;
}
/* ICMP errors quote the original IPv4 header and at least 8 payload bytes. */
size_t inner_offset = outer_header_length + sizeof(struct icmp_hdr);
if (inner_offset > available || available - inner_offset < IP_HLEN) {
const uint8_t *inner = icmp + 8;
size_t available = total - header - 8U;
size_t inner_header = v6 ? 40U : 20U;
if (available < inner_header + 8U || inner[0] >> 4 != (v6 ? 6 : 4) ||
memcmp(inner + destination_offset, destination, address_size) != 0) {
return TRACE_REPLY_UNRELATED;
}
const struct ip_hdr *inner_ip =
(const struct ip_hdr *)(const void *)(packet + inner_offset);
size_t inner_header_length = IPH_HL_BYTES(inner_ip);
if (IPH_V(inner_ip) != 4U || inner_header_length < IP_HLEN ||
inner_header_length > available - inner_offset ||
available - inner_offset - inner_header_length < sizeof(struct icmp_echo_hdr) ||
IPH_PROTO(inner_ip) != IPPROTO_ICMP ||
inner_ip->dest.addr != expected_destination ||
lwip_ntohs(IPH_LEN(inner_ip)) <
inner_header_length + sizeof(struct icmp_echo_hdr)) {
return TRACE_REPLY_UNRELATED;
}
const struct icmp_echo_hdr *quoted_echo =
(const struct icmp_echo_hdr *)(const void *)(
packet + inner_offset + inner_header_length);
if (ICMPH_TYPE((const struct icmp_hdr *)quoted_echo) != ICMP_ECHO ||
quoted_echo->id != expected_id ||
quoted_echo->seqno != expected_sequence) {
return TRACE_REPLY_UNRELATED;
}
if (ICMPH_TYPE(outer_icmp) == ICMP_DUR) {
if (unreachable_code != NULL) {
*unreachable_code = ICMPH_CODE(outer_icmp);
if (v6) {
if (inner[6] != IPPROTO_ICMPV6 || read_be16(inner + 4) < 8U) {
return TRACE_REPLY_UNRELATED;
}
} else {
inner_header = (inner[0] & 15U) * 4U;
if (inner_header < 20U || inner_header + 8U > available ||
read_be16(inner + 2) < inner_header + 8U || inner[9] != IPPROTO_ICMP ||
(read_be16(inner + 6) & 0x3fffU) != 0U ||
!checksum_valid(checksum_sum(inner, inner_header, 0))) {
return TRACE_REPLY_UNRELATED;
}
}
const uint8_t *echo = inner + inner_header;
if (echo[0] != (v6 ? 128U : ICMP_ECHO) || echo[1] != 0U ||
memcmp(echo + 4, &expected_id, 2) != 0 ||
memcmp(echo + 6, &expected_sequence, 2) != 0) {
return TRACE_REPLY_UNRELATED;
}
if (unreachable) {
*unreachable_code = icmp[1];
return TRACE_REPLY_UNREACHABLE;
}
return TRACE_REPLY_HOP;
@@ -601,7 +751,7 @@ typedef enum {
} trace_wait_result_t;
static trace_wait_result_t wait_for_trace_reply(int socket_fd,
const struct sockaddr_in *target,
const diagnostic_target_t *target,
uint16_t expected_id,
uint16_t expected_sequence,
int64_t sent_at_us,
@@ -615,7 +765,9 @@ static trace_wait_result_t wait_for_trace_reply(int socket_fd,
for (;;) {
int64_t remaining_us = deadline_us - esp_timer_get_time();
if (remaining_us <= 0) {
/* IDF floors timeval to milliseconds; zero means an infinite mailbox
* wait. Stop up to 999 us early rather than installing that timeout. */
if (remaining_us < 1000) {
return TRACE_WAIT_TIMEOUT;
}
@@ -629,7 +781,7 @@ static trace_wait_result_t wait_for_trace_reply(int socket_fd,
return TRACE_WAIT_ERROR;
}
struct sockaddr_in source = {0};
struct sockaddr_storage source = {0};
socklen_t source_length = sizeof(source);
ssize_t received = recvfrom(socket_fd, reply, sizeof(reply), 0,
(struct sockaddr *)&source, &source_length);
@@ -644,15 +796,28 @@ static trace_wait_result_t wait_for_trace_reply(int socket_fd,
}
trace_reply_kind_t kind = parse_trace_reply(
reply, (size_t)received, expected_id, expected_sequence,
target->sin_addr.s_addr, unreachable_code);
reply, (size_t)received, target, expected_id, expected_sequence, unreachable_code);
if (kind == TRACE_REPLY_UNRELATED) {
continue;
}
/* An echo reply is the destination only when it came from our target. */
if (kind == TRACE_REPLY_DESTINATION &&
source.sin_addr.s_addr != target->sin_addr.s_addr) {
if (source.ss_family != target->address.ss_family || source_length < target->length) {
continue;
}
if (source.ss_family == AF_INET6) {
const struct sockaddr_in6 *from = (const struct sockaddr_in6 *)&source;
const struct sockaddr_in6 *to = (const struct sockaddr_in6 *)&target->address;
/* Bound raw sockets already enforce ingress interface. Global
* source addresses legitimately carry no zone in recvfrom. */
if ((to->sin6_scope_id != 0U && from->sin6_scope_id != 0U &&
from->sin6_scope_id != to->sin6_scope_id) ||
(kind == TRACE_REPLY_DESTINATION &&
memcmp(&from->sin6_addr, &to->sin6_addr, sizeof(to->sin6_addr)) != 0)) {
continue;
}
} else if (kind == TRACE_REPLY_DESTINATION &&
((const struct sockaddr_in *)&source)->sin_addr.s_addr !=
((const struct sockaddr_in *)&target->address)->sin_addr.s_addr) {
continue;
}
@@ -686,34 +851,49 @@ static void print_trace_rtt(int64_t round_trip_us)
static int execute_traceroute(int argc, char **argv)
{
if ((argc != 2 && argc != 3) || argv[1] == NULL || *argv[1] == '\0') {
diagnostic_arguments_t args;
if (!parse_arguments(argc, argv, TRACEROUTE_DEFAULT_HOPS, TRACEROUTE_MAX_HOPS, &args)) {
print_command_usage("traceroute");
return 1;
}
uint32_t max_hops = TRACEROUTE_DEFAULT_HOPS;
if (argc == 3 &&
!parse_bounded_u32(argv[2], TRACEROUTE_MIN_HOPS,
TRACEROUTE_MAX_HOPS, &max_hops)) {
print_command_usage("traceroute");
return 1;
}
printf("traceroute: IPv4 only (one ICMP echo probe per hop)\n");
struct sockaddr_in target = {0};
uint32_t max_hops = args.limit;
diagnostic_target_t target;
char target_numeric[NUMERIC_ADDRESS_CAPACITY];
if (resolve_traceroute_target(argv[1], &target,
target_numeric, sizeof(target_numeric)) != 0) {
if (resolve_target(&args, &target, target_numeric, sizeof(target_numeric)) != 0) {
return 1;
}
int socket_fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
bool v6 = target.address.ss_family == AF_INET6;
printf("traceroute: one ICMP echo probe per hop, 1 s receive deadline.\n");
if (v6) {
printf("IPv6 extension headers/fragments in replies or quotes are unsupported and ignored.\n");
}
int socket_fd = socket(target.address.ss_family, SOCK_RAW,
v6 ? IPPROTO_ICMPV6 : IPPROTO_ICMP);
if (socket_fd < 0) {
printf("traceroute: could not create raw ICMP socket: %s\n", strerror(errno));
return 1;
}
if (v6) {
int only_v6 = 1;
if (setsockopt(socket_fd, IPPROTO_IPV6, IPV6_V6ONLY,
&only_v6, sizeof(only_v6)) != 0) {
printf("traceroute: could not restrict socket to IPv6: %s\n", strerror(errno));
close(socket_fd);
return 1;
}
uint32_t zone = ((const struct sockaddr_in6 *)&target.address)->sin6_scope_id;
if (zone != 0U) {
struct ifreq interface = {0};
if (if_indextoname(zone, interface.ifr_name) == NULL ||
setsockopt(socket_fd, SOL_SOCKET, SO_BINDTODEVICE,
&interface, sizeof(interface)) != 0) {
printf("traceroute: could not bind device interface: %s\n", strerror(errno));
close(socket_fd);
return 1;
}
}
}
const struct timeval one_second = {
.tv_sec = 1,
.tv_usec = 0,
@@ -726,7 +906,7 @@ static int execute_traceroute(int argc, char **argv)
}
printf("traceroute to %s (%s), %" PRIu32 " hops max\n",
argv[1], target_numeric, max_hops);
args.host, target_numeric, max_hops);
/* A per-run ID plus one sequence per hop rejects other raw-socket traffic. */
uint16_t identifier = lwip_htons((uint16_t)esp_timer_get_time());
@@ -735,6 +915,8 @@ static int execute_traceroute(int argc, char **argv)
uint32_t final_hop = 0U;
for (uint32_t hop = 1U; hop <= max_hops; ++hop) {
/* IDF 5.5 lwIP uses the common PCB ttl for IPv6 hop limit too;
* IPV6_UNICAST_HOPS is not implemented. ICMPv6 TX checksum is automatic. */
int ttl = (int)hop;
if (setsockopt(socket_fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)) != 0) {
printf("traceroute: could not set TTL for hop %" PRIu32 ": %s\n",
@@ -744,17 +926,19 @@ static int execute_traceroute(int argc, char **argv)
}
struct icmp_echo_hdr probe = {
.type = ICMP_ECHO,
.type = v6 ? 128U : ICMP_ECHO,
.code = 0U,
.chksum = 0U,
.id = identifier,
.seqno = lwip_htons((uint16_t)hop),
};
probe.chksum = inet_chksum(&probe, (u16_t)sizeof(probe));
if (!v6) {
probe.chksum = inet_chksum(&probe, (u16_t)sizeof(probe));
}
int64_t sent_at_us = esp_timer_get_time();
ssize_t sent = sendto(socket_fd, &probe, sizeof(probe), 0,
(const struct sockaddr *)&target, sizeof(target));
(const struct sockaddr *)&target.address, target.length);
if (sent != (ssize_t)sizeof(probe)) {
printf("traceroute: probe send failed at hop %" PRIu32 ": %s\n",
hop, strerror(errno));
@@ -844,21 +1028,21 @@ esp_err_t network_console_register_root_commands(void)
static const esp_console_cmd_t commands[] = {
{
.command = "ping",
.help = "ping <host> [count] (count 1..20, default 4)",
.help = "ping [-4|-6] <host> [count] (count 1..20, default 4)",
.hint = NULL,
.func = &network_console_execute,
.argtable = NULL,
},
{
.command = "nslookup",
.help = "nslookup <host> (print unique numeric IPv4/IPv6 addresses)",
.help = "nslookup [-4|-6] <host> (default: query A and AAAA separately)",
.hint = NULL,
.func = &network_console_execute,
.argtable = NULL,
},
{
.command = "traceroute",
.help = "traceroute <host> [max-hops] (IPv4 only; 1..30, default 16)",
.help = "traceroute [-4|-6] <host> [max-hops] (1..30, default 16)",
.hint = NULL,
.func = &network_console_execute,
.argtable = NULL,
src/network_console.h
+10 -1
View File
@@ -16,7 +16,16 @@ esp_err_t network_console_register_root_commands(void);
/* Return true only for a root command handled by network_console_execute(). */
bool network_console_is_command(const char *name);
/* Execute ping, nslookup, or traceroute; argv[0] selects the operation. */
/* Canonical handler for every frontend and wifi alias; argv[0] selects:
* ping [-4|-6] <host> [count] count 1..20, default 4
* traceroute [-4|-6] <host> [max-hops] hops 1..30, default 16
* nslookup [-4|-6] <host>
* One family flag may also follow the host/count. Probe hostnames default to
* IPv4, then IPv6 only if resolution returns no address; nslookup queries both.
* IPv6 link-local probes require a device-local %sta/%ap/index/lwIP-name zone;
* nslookup displays unscoped link-local records/literals without probing them.
* Call only through the serialized administration dispatcher.
*/
int network_console_execute(int argc, char **argv);
#ifdef __cplusplus
src/wifi_console.c
+4 -3
View File
@@ -34,9 +34,10 @@ static void print_usage(void)
printf(" wifi ap channel <1..11>\n");
printf(" wifi ap secret|show-secret\n");
printf(" wifi save|load|defaults|reset\n");
printf(" wifi ping <host> [count]\n");
printf(" wifi nslookup <host>\n");
printf(" wifi traceroute <host> [max-hops]\n");
printf(" wifi ping [-4|-6] <host> [count] (1..20, default 4)\n");
printf(" wifi nslookup [-4|-6] <host> (default: A and AAAA)\n");
printf(" wifi traceroute [-4|-6] <host> [max-hops] (1..30, default 16)\n");
printf(" Diagnostic family flags may also follow the host or count/max-hops.\n");
}
static bool parse_u32(const char *text, uint32_t maximum, uint32_t *value)