Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-06-02 04:37:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix net (#7034)

Browse Source 
* fix LWIP_HOOK_IP4_ROUTE_SRC.

* fix netdev ping select network card.
This commit is contained in:
geniusgogo
2023-03-10 16:16:41 +08:00
committed by GitHub
parent c8b30bf31a
commit e29dfb75ca
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/net/lwip/port/lwipopts.h
+1 -1
View File
@@ -637,7 +637,7 @@
#endif #endif
#if RT_USING_LWIP_VER_NUM >= 0x20000 /* >= v2.0.0 */ #if RT_USING_LWIP_VER_NUM >= 0x20000 /* >= v2.0.0 */
#define LWIP_HOOK_IP4_ROUTE_SRC(dest, src) lwip_ip4_route_src(dest, src) #define LWIP_HOOK_IP4_ROUTE_SRC(src, dest) lwip_ip4_route_src(dest, src)
#include "lwip/ip_addr.h" #include "lwip/ip_addr.h"
struct netif *lwip_ip4_route_src(const ip4_addr_t *dest, const ip4_addr_t *src); struct netif *lwip_ip4_route_src(const ip4_addr_t *dest, const ip4_addr_t *src);
#endif /* RT_USING_LWIP_VER_NUM >= 0x20000 */ #endif /* RT_USING_LWIP_VER_NUM >= 0x20000 */
components/net/netdev/src/netdev.c
+3 -7
View File
@@ -1130,19 +1130,15 @@ int netdev_cmd_ping(char* target_name, char *netdev_name, rt_uint32_t times, rt_
if (netdev_name != RT_NULL) if (netdev_name != RT_NULL)
{ {
netdev = netdev_get_by_name(netdev_name); netdev = netdev_get_by_name(netdev_name);
}
if (netdev == RT_NULL) if (netdev == RT_NULL)
{ {
netdev = netdev_default; netdev = netdev_default;
rt_kprintf("ping: not found specified netif, using default netdev %s.\n", netdev->name); rt_kprintf("ping: not found specified netif, using default netdev %s.\n", netdev->name);
} }
}
if (NETDEV_PING_IS_COMMONICABLE(netdev_default)) if (!NETDEV_PING_IS_COMMONICABLE(netdev))
{
/* using default network interface device for ping */
netdev = netdev_default;
}
else
{ {
/* using first internet up status network interface device */ /* using first internet up status network interface device */
netdev = netdev_get_first_by_flags(NETDEV_FLAG_LINK_UP); netdev = netdev_get_first_by_flags(NETDEV_FLAG_LINK_UP);