This is an automated email from the ASF dual-hosted git repository. GUIDINGLI pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ba86ce83d87109a33608354389d3bd9c5a9586a8 Author: wenquan1 <[email protected]> AuthorDate: Thu May 21 15:38:12 2026 +0800 net/arp: Output ACD state to procfs for userspace query. Add the ACD announcing state to /proc/net/<ifname> as "(acd:ann)". Only the in-progress state is shown. The finished state is not displayed, because it does not guarantee that no future conflict will happen. Also fix a reentrancy problem in arp_acd_try_announce(): increment sendnum and change the state before calling arp_send_async(), because the async callback may run synchronously and re-enter arp_acd_arrange_announce(). Signed-off-by: wenquan1 <[email protected]> --- net/arp/arp_acd.c | 9 +++++---- net/procfs/netdev_statistics.c | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/net/arp/arp_acd.c b/net/arp/arp_acd.c index f350e93f3d7..6657d3f0f21 100644 --- a/net/arp/arp_acd.c +++ b/net/arp/arp_acd.c @@ -138,12 +138,9 @@ static void arp_acd_try_announce(FAR void *net_dev) return; } - /* arp_acd_announce */ - - arp_send_async(dev->d_ipaddr, arp_acd_send_finish); dev->d_acd.sendnum++; - if (dev->d_acd.sendnum >= ANNOUNCE_NUM) + if (dev->d_acd.sendnum > ANNOUNCE_NUM) { dev->d_acd.sendnum = 0; dev->d_acd.ttw = 0; @@ -152,6 +149,10 @@ static void arp_acd_try_announce(FAR void *net_dev) else { dev->d_acd.ttw = ANNOUNCE_INTERVAL * ARP_ACD_TICKS_PER_SECOND; + + /* arp_acd_announce */ + + arp_send_async(dev->d_ipaddr, arp_acd_send_finish); } } diff --git a/net/procfs/netdev_statistics.c b/net/procfs/netdev_statistics.c index bc03b990216..9430747a7a8 100644 --- a/net/procfs/netdev_statistics.c +++ b/net/procfs/netdev_statistics.c @@ -215,6 +215,7 @@ static int netprocfs_linklayer(FAR struct netprocfs_file_s *netfile) case NET_LL_IEEE80211: { char hwaddr[20]; + len += snprintf(&netfile->line[len], NET_LINELEN - len, "%s\tLink encap:Ethernet HWaddr %s", dev->d_ifname, @@ -301,6 +302,13 @@ static int netprocfs_inet4addresses(FAR struct netprocfs_file_s *netfile) len += snprintf(&netfile->line[len], NET_LINELEN - len, "(conflict!) "); } + else if (dev->d_acd.state == ARP_ACD_STATE_ANNOUNCING || + (dev->d_acd.state == ARP_ACD_STATE_INIT && + dev->d_acd.need_announce)) + { + len += snprintf(&netfile->line[len], NET_LINELEN - len, + "(acd:ann) "); + } #endif /* Show the IPv4 default router address */
