Skip to content

Commit b54bf01

Browse files
authored
Merge pull request #362 from eclipse-threadx/dev
Merged changes ahead of the v202504 release
2 parents e306027 + c40d15e commit b54bf01

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

common/inc/nx_api.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,9 @@ VOID _nx_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, ULONG
529529
#define AZURE_RTOS_NETXDUO
530530
#define NETXDUO_MAJOR_VERSION 6
531531
#define NETXDUO_MINOR_VERSION 4
532-
#define NETXDUO_PATCH_VERSION 4
533-
#define NETXDUO_BUILD_VERSION 202503
534-
#define NETXDUO_HOTFIX_VERSION 'a'
532+
#define NETXDUO_PATCH_VERSION 5
533+
#define NETXDUO_BUILD_VERSION 202504
534+
#define NETXDUO_HOTFIX_VERSION ' '
535535

536536
/* Define the following symbols for backward compatibility */
537537
#define EL_PRODUCT_NETXDUO

common/src/nx_icmpv6_process_packet_too_big.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,20 @@ NX_INTERFACE *if_ptr;
164164
status = _nx_icmpv6_dest_table_add(ip_ptr, original_destination_ip,
165165
&dest_entry_ptr, &default_next_hop_address[0], mtu, 0,
166166
packet_ptr -> nx_packet_address.nx_packet_ipv6_address_ptr);
167+
168+
/* If a new ND cache is created, force the entry to be "INCOMPLETE" so that the timer logic will
169+
re-try, and then timeout if no responses are received. */
170+
if(dest_entry_ptr -> nx_ipv6_destination_entry_nd_entry != NX_NULL)
171+
{
172+
ND_CACHE_ENTRY *nd_entry = dest_entry_ptr -> nx_ipv6_destination_entry_nd_entry;
173+
if(nd_entry -> nx_nd_cache_nd_status == ND_CACHE_STATE_CREATED)
174+
{
175+
_nx_icmpv6_send_ns(ip_ptr, &nd_entry -> nx_nd_cache_dest_ip[0], 1,
176+
nd_entry -> nx_nd_cache_outgoing_address, 0, nd_entry);
177+
nd_entry->nx_nd_cache_num_solicit = NX_MAX_MULTICAST_SOLICIT - 1;
178+
nd_entry->nx_nd_cache_timer_tick = ip_ptr -> nx_ipv6_retrans_timer_ticks;
179+
}
180+
}
167181
}
168182

169183
/* Release the packet. */

0 commit comments

Comments
 (0)