Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-09-27 18:58:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

arp: add device check for arp interface

Browse Source 
Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu
2022-12-14 21:17:08 +08:00
committed by Xiang Xiao
parent 1760057e29
commit 1a81a936df
5 changed files with 87 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netdev/netdev_ioctl.c
+17 -64
View File
@@ -1220,40 +1220,6 @@ static int netdev_imsf_ioctl(FAR struct socket *psock, int cmd,
}
#endif
/****************************************************************************
* Name: netdev_arp_callback
*
* Description:
* This is a callback that checks if the Ethernet network device has the
* indicated name
*
* Input Parameters:
* dev Ethernet driver device structure
* req The argument of the ioctl cmd
*
* Returned Value:
* 1 on success
* 0 on error
****************************************************************************/
#ifdef CONFIG_NET_ARP
static int netdev_arp_callback(FAR struct net_driver_s *dev, FAR void *arg)
{
FAR struct arpreq *req = arg;
FAR struct sockaddr_in *addr = (FAR struct sockaddr_in *)&req->arp_pa;
if (strncmp(dev->d_ifname, (FAR const char *)req->arp_dev,
sizeof(dev->d_ifname)))
{
return 0;
}
arp_update(dev, addr->sin_addr.s_addr,
(FAR uint8_t *)req->arp_ha.sa_data);
return 1;
}
#endif
/****************************************************************************
* Name: netdev_arp_ioctl
*
@@ -1276,15 +1242,25 @@ static int netdev_arp_callback(FAR struct net_driver_s *dev, FAR void *arg)
static int netdev_arp_ioctl(FAR struct socket *psock, int cmd,
FAR struct arpreq *req)
{
FAR struct net_driver_s *dev = NULL;
FAR struct sockaddr_in *addr = NULL;
int ret;
if (req != NULL)
{
addr = (FAR struct sockaddr_in *)&req->arp_pa;
dev = req->arp_dev[0] ?
netdev_findbyname((FAR const char *)req->arp_dev) :
netdev_findby_ripv4addr(INADDR_ANY, addr->sin_addr.s_addr);
}
/* Execute the command */
switch (cmd)
{
case SIOCSARP: /* Set an ARP mapping */
{
if (req != NULL &&
if (dev != NULL && req != NULL &&
req->arp_pa.sa_family == AF_INET &&
req->arp_ha.sa_family == ARPHRD_ETHER)
{
@@ -1292,7 +1268,8 @@ static int netdev_arp_ioctl(FAR struct socket *psock, int cmd,
* address -OR- add a new ARP table entry if there is not.
*/
ret = netdev_foreach(netdev_arp_callback, req) ? OK : -EINVAL;
ret = arp_update(dev, addr->sin_addr.s_addr,
(FAR const uint8_t *)req->arp_ha.sa_data);
}
else
{
@@ -1303,28 +1280,11 @@ static int netdev_arp_ioctl(FAR struct socket *psock, int cmd,
case SIOCDARP: /* Delete an ARP mapping */
{
if (req != NULL && req->arp_pa.sa_family == AF_INET)
if (dev != NULL && req != NULL && req->arp_pa.sa_family == AF_INET)
{
FAR struct sockaddr_in *addr =
(FAR struct sockaddr_in *)&req->arp_pa;
/* Delete the ARP entry for this protocol address. */
/* Find the existing ARP entry for this protocol address. */
FAR struct arp_entry_s *entry =
arp_lookup(addr->sin_addr.s_addr);
if (entry != NULL)
{
/* The ARP table is fixed size; an entry is deleted
* by nullifying its protocol address.
*/
entry->at_ipaddr = 0;
ret = OK;
}
else
{
ret = -ENOENT;
}
ret = arp_delete(addr->sin_addr.s_addr, dev);
}
else
{
@@ -1337,15 +1297,8 @@ static int netdev_arp_ioctl(FAR struct socket *psock, int cmd,
{
if (req != NULL && req->arp_pa.sa_family == AF_INET)
{
FAR struct sockaddr_in *addr =
(FAR struct sockaddr_in *)&req->arp_pa;
/* Get the hardware address from an existing ARP table entry
* matching this protocol address.
*/
ret = arp_find(addr->sin_addr.s_addr,
(FAR struct ether_addr *)req->arp_ha.sa_data);
(FAR uint8_t *)req->arp_ha.sa_data, dev);
if (ret >= 0)
{
/* Return the mapped hardware address. */