Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 22:20:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net/ethernet: ARP can be configured on interface

Browse Source 
ARP can be configured on interface.

Signed-off-by: gaohedong <gaohedong@xiaomi.com>
This commit is contained in:
gaohedong
2025-05-20 00:42:15 +08:00
committed by Xiang Xiao
parent 6ad864ff0c
commit 23013b33ce
9 changed files with 78 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/net/if.h
+1 -1
View File
@@ -53,7 +53,7 @@
#define IFF_IPv6 (1 << 3) /* Configured for IPv6 packet (vs ARP or IPv4) */
#define IFF_LOOPBACK (1 << 5) /* Is a loopback net */
#define IFF_POINTOPOINT (1 << 6) /* Is point-to-point link */
#define IFF_NOARP (1 << 7) /* ARP is not required for this packet */
#define IFF_NOARP (1 << 7) /* ARP is not required for this interface */
#define IFF_NAT (1 << 8) /* NAT is enabled for this interface */
#define IFF_SLAVE (1 << 11) /* Slave of a load balancer. */
#define IFF_MULTICAST (1 << 12) /* Supports multicast. */
net/arp/arp_acd.c
+1 -1
View File
@@ -236,7 +236,7 @@ void arp_acd_update(FAR struct net_driver_s *dev)
void arp_acd_setup(FAR struct net_driver_s *dev)
{
if (dev->d_acd.need_announce == false)
if (!dev->d_acd.need_announce || IFF_IS_NOARP(dev->d_flags))
{
return;
}
net/arp/arp_input.c
+9
View File
@@ -196,6 +196,15 @@ void arp_input(FAR struct net_driver_s *dev)
{
FAR uint8_t *buf;
if (IFF_IS_NOARP(dev->d_flags))
{
/* No arp */
ninfo("ARP not supported on %s, no receive!\n", dev->d_ifname);
dev->d_len = 0;
return;
}
if (dev->d_iob != NULL)
{
buf = dev->d_buf;
net/arp/arp_out.c
+9 -14
View File
@@ -150,20 +150,6 @@ void arp_out(FAR struct net_driver_s *dev)
return;
}
#if defined(CONFIG_NET_PKT) || defined(CONFIG_NET_ARP_SEND)
/* Skip sending ARP requests when the frame to be transmitted was
* written into a packet socket.
*/
if (IFF_IS_NOARP(dev->d_flags))
{
/* Clear the indication and let the packet continue on its way. */
IFF_CLR_NOARP(dev->d_flags);
return;
}
#endif
/* Find the destination IP address in the ARP table and construct
* the Ethernet header. If the destination IP address isn't on the
* local network, we use the default router's IP address instead.
@@ -265,6 +251,15 @@ void arp_out(FAR struct net_driver_s *dev)
ret = arp_find(ipaddr, ethaddr.ether_addr_octet, dev, false);
if (ret < 0)
{
/* No send ARP if the interface forbidden */
if (IFF_IS_NOARP(dev->d_flags))
{
ninfo("ARP not supported on %s, no send!\n", dev->d_ifname);
dev->d_len = 0;
return;
}
ninfo("ARP request for IP %08lx\n", (unsigned long)ipaddr);
/* The destination address was not in our ARP table, so we overwrite
net/arp/arp_send.c
+8 -6
View File
@@ -134,12 +134,6 @@ static uint16_t arp_send_eventhandler(FAR struct net_driver_s *dev,
arp_format(dev, state->snd_ipaddr);
/* Make sure no ARP request overwrites this ARP request. This
* flag will be cleared in arp_out().
*/
IFF_SET_NOARP(dev->d_flags);
/* Don't allow any further call backs. */
arp_send_terminate(dev, state, OK);
@@ -277,6 +271,14 @@ int arp_send(in_addr_t ipaddr)
return OK;
}
/* No ARP packet if this device do not support ARP */
if (IFF_IS_NOARP(dev->d_flags))
{
ninfo("ARP not supported on %s, no send!\n", dev->d_ifname);
return OK;
}
/* Allocate resources to receive a callback. This and the following
* initialization is performed with the network lock because we don't
* want anything to happen until we are ready.
net/icmpv6/icmpv6_neighbor.c
+8
View File
@@ -259,6 +259,14 @@ int icmpv6_neighbor(FAR struct net_driver_s *dev,
#endif
}
/* No ARP packet if this device do not support ARP */
if (IFF_IS_NOARP(dev->d_flags))
{
ninfo("ARP not supported on %s, no send!\n", dev->d_ifname);
return -EHOSTUNREACH;
}
/* Allocate resources to receive a callback. This and the following
* initialization is performed with the network lock because we don't
* want anything to happen until we are ready.
net/neighbor/neighbor_ethernet_out.c
+7 -12
View File
@@ -100,18 +100,6 @@ void neighbor_ethernet_out(FAR struct net_driver_s *dev)
FAR struct ipv6_hdr_s *ip = IPv6BUF;
struct neighbor_addr_s laddr;
/* Skip sending Neighbor Solicitations when the frame to be transmitted was
* written into a packet socket.
*/
if (IFF_IS_NOARP(dev->d_flags))
{
/* Clear the indication and let the packet continue on its way. */
IFF_CLR_NOARP(dev->d_flags);
return;
}
/* Find the destination IPv6 address in the Neighbor Table and construct
* the Ethernet header. If the destination IPv6 address isn't on the local
* network, we use the default router's IPv6 address instead.
@@ -162,6 +150,13 @@ void neighbor_ethernet_out(FAR struct net_driver_s *dev)
if (neighbor_lookup(ipaddr, &laddr) < 0)
{
#ifdef CONFIG_NET_ICMPv6
/* No ARP packet if this device do not support ARP */
if (IFF_IS_NOARP(dev->d_flags))
{
return;
}
ninfo("IPv6 Neighbor solicitation for IPv6\n");
/* The destination address was not in our Neighbor Table, so we
net/netdev/netdev_ioctl.c
+35 -11
View File
@@ -1026,26 +1026,50 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
#endif
case SIOCSIFFLAGS: /* Sets the interface flags */
#ifdef CONFIG_NET_ARP
/* Is this a request to bring the interface up? */
/* Is this a request to set the IFF_NOARP flag? */
if ((req->ifr_flags & IFF_UP) != 0)
if (IFF_IS_NOARP(req->ifr_flags) != IFF_IS_NOARP(dev->d_flags))
{
/* Yes.. bring the interface up */
if (IFF_IS_NOARP(req->ifr_flags))
{
/* Yes. Set the IFF_NOARP flag */
ret = netdev_ifup(dev);
IFF_SET_NOARP(dev->d_flags);
}
else
{
/* No. Clear the IFF_NOARP flag */
IFF_CLR_NOARP(dev->d_flags);
}
}
#endif
/* Is this a request to bring the interface up/down? */
if (IFF_IS_UP(req->ifr_flags) != IFF_IS_UP(dev->d_flags))
{
if (IFF_IS_UP(req->ifr_flags))
{
/* Yes.. bring the interface up */
ret = netdev_ifup(dev);
#ifdef CONFIG_NET_ARP_ACD
/* having address then start acd */
/* having address then start acd */
arp_acd_setup(dev);
arp_acd_setup(dev);
#endif /* CONFIG_NET_ARP_ACD */
}
else
{
/* Yes.. take the interface down */
}
else
{
/* Yes.. take the interface down */
ret = netdev_ifdown(dev);
ret = netdev_ifdown(dev);
}
}
break;
case SIOCGIFFLAGS: /* Gets the interface flags */
net/pkt/pkt_sendmsg_unbuffered.c
-6
View File
@@ -138,12 +138,6 @@ static uint16_t psock_send_eventhandler(FAR struct net_driver_s *dev,
ethhdr->type = pstate->addr->sll_protocol;
dev->d_len += NET_LL_HDRLEN(dev);
}
/* Make sure no ARP request overwrites this ARP request. This
* flag will be cleared in arp_out().
*/
IFF_SET_NOARP(dev->d_flags);
}
end_wait: