Skip to content

Commit

Permalink
add netdev ifindex feature
Browse files Browse the repository at this point in the history
  • Loading branch information
zmshahaha committed Sep 10, 2024
1 parent d2160d3 commit 9df785a
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 0 deletions.
3 changes: 3 additions & 0 deletions components/net/netdev/include/netdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ struct netdev
netdev_callback_fn status_callback; /* network interface device flags change callback */
netdev_callback_fn addr_callback; /* network interface device address information change callback */

int ifindex; /* network interface device ifindex */

#ifdef RT_USING_SAL
void *sal_user_data; /* user-specific data for SAL */
#endif /* RT_USING_SAL */
Expand Down Expand Up @@ -153,6 +155,7 @@ int netdev_unregister(struct netdev *netdev);
struct netdev *netdev_get_first_by_flags(uint16_t flags);
struct netdev *netdev_get_by_ipaddr(ip_addr_t *ip_addr);
struct netdev *netdev_get_by_name(const char *name);
struct netdev *netdev_get_by_ifindex(int ifindex);
#ifdef RT_USING_SAL
struct netdev *netdev_get_by_family(int family);
int netdev_family_get(struct netdev *netdev);
Expand Down
40 changes: 40 additions & 0 deletions components/net/netdev/src/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ struct netdev *netdev_lo = RT_NULL;
static netdev_callback_fn g_netdev_register_callback = RT_NULL;
static netdev_callback_fn g_netdev_default_change_callback = RT_NULL;
static RT_DEFINE_SPINLOCK(_spinlock);
static int netdev_num;

/**
* This function will register network interface device and
Expand Down Expand Up @@ -115,6 +116,9 @@ int netdev_register(struct netdev *netdev, const char *name, void *user_data)
rt_slist_append(&(netdev_list->list), &(netdev->list));
}

netdev_num++;
netdev->ifindex = netdev_num;

rt_spin_unlock_irqrestore(&_spinlock, level);

if (netdev_default == RT_NULL)
Expand Down Expand Up @@ -333,6 +337,42 @@ struct netdev *netdev_get_by_name(const char *name)
return RT_NULL;
}

/**
* This function will get network interface device
* in network interface device list by netdev ifindex.
*
* @param ifindex the ifindex of network interface device
*
* @return != NULL: network interface device object
* NULL: get failed
*/
struct netdev *netdev_get_by_ifindex(int ifindex)
{
rt_slist_t *node = RT_NULL;
struct netdev *netdev = RT_NULL;

if (netdev_list == RT_NULL)
{
return RT_NULL;
}

rt_spin_lock(&_spinlock);

for (node = &(netdev_list->list); node; node = rt_slist_next(node))
{
netdev = rt_slist_entry(node, struct netdev, list);
if (netdev && (netdev->ifindex == ifindex))
{
rt_spin_unlock(&_spinlock);
return netdev;
}
}

rt_spin_unlock(&_spinlock);

return RT_NULL;
}

#ifdef RT_USING_SAL
/**
* This function will get the first network interface device
Expand Down
13 changes: 13 additions & 0 deletions components/net/sal/src/sal_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -1474,6 +1474,19 @@ int sal_ioctlsocket(int socket, long cmd, void *arg)
ifconf_tmp->ifc_ifcu.ifcu_buf = ifconf_tmp->ifc_ifcu.ifcu_buf - sizeof(struct sal_ifreq) * count_size;
return 0;
}
case SIOCGIFINDEX:
{
for (node = &(cur_netdev_list->list); node; node = rt_slist_next(node))
{
netdev = rt_list_entry(node, struct netdev, list);
if (rt_strcmp(ifr->ifr_ifrn.ifrn_name, netdev->name) == 0)
{
ifr->ifr_ifru.ifru_ivalue = netdev->ifindex;
return 0;
}
}
return -ENODEV;
}
default:
break;
}
Expand Down

0 comments on commit 9df785a

Please sign in to comment.