Merge branch 'feat/disable_ipv4_cli_ext' into 'main'

zwx1995esp · zwx1995esp · commit b76af81ffad1 · 2025-07-09T09:52:55.000Z
feat(ext_cli): support iperf when ipv4 is disabled

See merge request espressif/esp-thread-br!177
diff --git a/components/esp_ot_cli_extension/src/esp_ot_iperf.c b/components/esp_ot_cli_extension/src/esp_ot_iperf.c
@@ -118,12 +118,15 @@ otError esp_ot_process_iperf(void *aContext, uint8_t aArgsLength, char *aArgs[])
             }
         }
         if (client_flag) {
+#if CONFIG_LWIP_IPV4
             if (cfg.type == IPERF_IP_TYPE_IPV4) {
                 cfg.destination_ip4 = inet_addr(s_dest_ip_addr);
                 char ip_addr[50];
                 strncpy(ip_addr, inet_ntoa(cfg.destination_ip4), sizeof(ip_addr));
                 otCliOutputFormat("ip:%s\n", ip_addr);
-            } else {
+            } else
+#endif // CONFIG_LWIP_IPV4
+            {
                 cfg.destination_ip6 = s_dest_ip_addr;
                 otCliOutputFormat("ip:%s\n", cfg.destination_ip6);
             }

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,15 @@ otError esp_ot_process_iperf(void aContext, uint8_t aArgsLength, char aArgs[])`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`if (client_flag) {`
	`121`	`+#if CONFIG_LWIP_IPV4`
`121`	`122`	`if (cfg.type == IPERF_IP_TYPE_IPV4) {`
`122`	`123`	`cfg.destination_ip4 = inet_addr(s_dest_ip_addr);`
`123`	`124`	`char ip_addr[50];`
`124`	`125`	`strncpy(ip_addr, inet_ntoa(cfg.destination_ip4), sizeof(ip_addr));`
`125`	`126`	`otCliOutputFormat("ip:%s\n", ip_addr);`
`126`		`- } else {`
	`127`	`+ } else`
	`128`	`+#endif // CONFIG_LWIP_IPV4`
	`129`	`+ {`
`127`	`130`	`cfg.destination_ip6 = s_dest_ip_addr;`
`128`	`131`	`otCliOutputFormat("ip:%s\n", cfg.destination_ip6);`
`129`	`132`	`}`