fix(aft_netif): Minor compat fix for v6.0+

Author: david-cermak

components/freertos_tcp/esp_netif/esp_netif_impl.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -71,7 +71,7 @@ struct esp_netif_stack *esp_netif_new_netstack_if(esp_netif_t *esp_netif, const
         ip4_to_afpt_ip(&base_cfg->ip_info->netmask, mask);
         ip4_to_afpt_ip(&base_cfg->ip_info->gw, gw);
     }
-    FreeRTOS_FillEndPoint( &( netif->aft_netif ), &( netif->endpoints[0]), ip, mask, gw, dns, base_cfg->mac );
+    FreeRTOS_FillEndPoint(&(netif->aft_netif), &(netif->endpoints[0]), ip, mask, gw, dns, base_cfg->mac);
     if (base_cfg->flags & ESP_NETIF_DHCP_CLIENT) {
         netif->endpoints[0].bits.bWantDHCP = pdTRUE;
     }
@@ -367,7 +367,7 @@ esp_err_t esp_netif_get_ip_info(esp_netif_t *esp_netif, esp_netif_ip_info_t *ip_
     ESP_LOGD(TAG, "%s esp_netif:%p", __func__, esp_netif);
     uint32_t ulIPAddress = 0, ulNetMask, ulGatewayAddress, ulDNSServerAddress;
     struct esp_netif_stack *netif = esp_netif->net_stack;
-    FreeRTOS_GetEndPointConfiguration( &ulIPAddress, &ulNetMask, &ulGatewayAddress, &ulDNSServerAddress, netif->aft_netif.pxEndPoint );
+    FreeRTOS_GetEndPointConfiguration(&ulIPAddress, &ulNetMask, &ulGatewayAddress, &ulDNSServerAddress, netif->aft_netif.pxEndPoint);
     ip_info->ip.addr = ulIPAddress;
     ip_info->netmask.addr = ulNetMask;
     ip_info->gw.addr = ulGatewayAddress;
@@ -472,7 +472,8 @@ int esp_netif_get_all_ip6(esp_netif_t *esp_netif, esp_ip6_addr_t if_ip6[])
     return 0;
 }
 
-esp_ip6_addr_type_t esp_netif_ip6_get_addr_type(esp_ip6_addr_t *ip6_addr)
+// esp_ip6_addr_type_t esp_netif_ip6_get_addr_type(esp_ip6_addr_t *ip6_addr)
+esp_ip6_addr_type_t esp_netif_ip6_get_addr_type(const esp_ip6_addr_t* ip6_addr)
 {
     return ESP_IP6_ADDR_IS_UNKNOWN;
 }
@@ -484,7 +485,7 @@ esp_err_t esp_netif_tcpip_exec(esp_netif_callback_fn fn, void *ctx)
 
 esp_netif_t *esp_netif_find_if(esp_netif_find_predicate_t fn, void *ctx)
 {
-    for (NetworkInterface_t *netif = FreeRTOS_FirstNetworkInterface(); netif != NULL; netif = FreeRTOS_NextNetworkInterface(netif) ) {
+    for (NetworkInterface_t *netif = FreeRTOS_FirstNetworkInterface(); netif != NULL; netif = FreeRTOS_NextNetworkInterface(netif)) {
         esp_netif_t *esp_netif = netif->pvArgument;
         if (fn(esp_netif, ctx)) {
             return esp_netif;
@@ -500,25 +501,25 @@ esp_err_t esp_netif_set_link_speed(esp_netif_t *esp_netif, uint32_t speed)
 
 /* Called by FreeRTOS+TCP when the network connects or disconnects.  Disconnect
  * events are only received if implemented in the MAC driver. */
-void vApplicationIPNetworkEventHook_Multi( eIPCallbackEvent_t eNetworkEvent,
-        struct xNetworkEndPoint *pxEndPoint )
+void vApplicationIPNetworkEventHook_Multi(eIPCallbackEvent_t eNetworkEvent,
+                                          struct xNetworkEndPoint *pxEndPoint)
 {
     uint32_t ulIPAddress = 0, ulNetMask, ulGatewayAddress, ulDNSServerAddress;
     char cBuffer[ 16 ];
     static BaseType_t xTasksAlreadyCreated = pdFALSE;
 
     /* If the network has just come up...*/
-    if ( eNetworkEvent == eNetworkUp ) {
+    if (eNetworkEvent == eNetworkUp) {
         /* Create the tasks that use the IP stack if they have not already been
          * created. */
-        if ( xTasksAlreadyCreated == pdFALSE ) {
+        if (xTasksAlreadyCreated == pdFALSE) {
             /* See the comments above the definitions of these pre-processor
              * macros at the top of this file for a description of the individual
              * demo tasks. */
 
 #if ( mainCREATE_TCP_ECHO_TASKS_SINGLE == 1 )
             {
-                vStartTCPEchoClientTasks_SingleTasks( mainECHO_CLIENT_TASK_STACK_SIZE, mainECHO_CLIENT_TASK_PRIORITY );
+                vStartTCPEchoClientTasks_SingleTasks(mainECHO_CLIENT_TASK_STACK_SIZE, mainECHO_CLIENT_TASK_PRIORITY);
             }
 #endif /* mainCREATE_TCP_ECHO_TASKS_SINGLE */
 
@@ -527,18 +528,18 @@ void vApplicationIPNetworkEventHook_Multi( eIPCallbackEvent_t eNetworkEvent,
 
         /* Print out the network configuration, which may have come from a DHCP
          * server. */
-        FreeRTOS_GetEndPointConfiguration( &ulIPAddress, &ulNetMask, &ulGatewayAddress, &ulDNSServerAddress, pxEndPoint );
-        FreeRTOS_inet_ntoa( ulIPAddress, cBuffer );
-        printf( "\r\n\r\nIP Address: %s\r\n", cBuffer );
+        FreeRTOS_GetEndPointConfiguration(&ulIPAddress, &ulNetMask, &ulGatewayAddress, &ulDNSServerAddress, pxEndPoint);
+        FreeRTOS_inet_ntoa(ulIPAddress, cBuffer);
+        printf("\r\n\r\nIP Address: %s\r\n", cBuffer);
 
-        FreeRTOS_inet_ntoa( ulNetMask, cBuffer );
-        printf( "Subnet Mask: %s\r\n", cBuffer );
+        FreeRTOS_inet_ntoa(ulNetMask, cBuffer);
+        printf("Subnet Mask: %s\r\n", cBuffer);
 
-        FreeRTOS_inet_ntoa( ulGatewayAddress, cBuffer );
-        printf( "Gateway Address: %s\r\n", cBuffer );
+        FreeRTOS_inet_ntoa(ulGatewayAddress, cBuffer);
+        printf("Gateway Address: %s\r\n", cBuffer);
 
-        FreeRTOS_inet_ntoa( ulDNSServerAddress, cBuffer );
-        printf( "DNS Server Address: %s\r\n\r\n\r\n", cBuffer );
+        FreeRTOS_inet_ntoa(ulDNSServerAddress, cBuffer);
+        printf("DNS Server Address: %s\r\n\r\n\r\n", cBuffer);
         esp_netif_t *esp_netif = pxEndPoint->pxNetworkInterface->pvArgument;
         ip_event_got_ip_t evt = {
             .esp_netif = esp_netif,
@@ -553,21 +554,21 @@ void vApplicationIPNetworkEventHook_Multi( eIPCallbackEvent_t eNetworkEvent,
             ESP_LOGE(TAG, "dhcpc cb: failed to post got ip event (%x)", ret);
         }
     } else {
-        printf( "Application idle hook network down\n" );
+        printf("Application idle hook network down\n");
     }
 }
 
-BaseType_t xApplicationDNSQueryHook_Multi( struct xNetworkEndPoint *pxEndPoint, const char *pcName )
+BaseType_t xApplicationDNSQueryHook_Multi(struct xNetworkEndPoint *pxEndPoint, const char *pcName)
 {
     BaseType_t xReturn;
 
     esp_netif_t *esp_netif = pxEndPoint->pxNetworkInterface->pvArgument;
     /* Determine if a name lookup is for this node.  Two names are given
      * to this node: that returned by pcApplicationHostnameHook() and that set
      * by mainDEVICE_NICK_NAME. */
-    if ( strcasecmp( pcName, pcApplicationHostnameHook() ) == 0 ) {
+    if (strcasecmp(pcName, pcApplicationHostnameHook()) == 0) {
         xReturn = pdPASS;
-    } else if ( strcasecmp( pcName, esp_netif->hostname ) == 0 ) {
+    } else if (strcasecmp(pcName, esp_netif->hostname) == 0) {
         xReturn = pdPASS;
     } else {
         xReturn = pdFAIL;