libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-01-19 03:13:30 +08:00
Code Issues Releases Wiki Activity

[net][lwip] Fix open the netdev and the lwip component, ping command export error issue

Browse Source 
Signed-off-by: chenyong <1521761801@qq.com>
This commit is contained in:
chenyong 2019-04-27 17:27:27 +08:00
parent 2721e7189a
commit c9bea68240
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/net/lwip-1.4.1/src/apps/ping/ping.c
View File

@ -130,7 +130,7 @@ int lwip_ping_recv(int s, int *ttl)
return len; return len;
} }
#ifndef RT_USING_SAL #ifndef RT_USING_NETDEV
/* using the lwIP custom ping */ /* using the lwIP custom ping */
rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size) rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
@ -239,7 +239,7 @@ int cmd_ping(int argc, char **argv)
FINSH_FUNCTION_EXPORT_ALIAS(cmd_ping, __cmd_ping, ping network host); FINSH_FUNCTION_EXPORT_ALIAS(cmd_ping, __cmd_ping, ping network host);
#endif /* RT_USING_FINSH */ #endif /* RT_USING_FINSH */
#endif /* RT_USING_SAL */ #endif /* RT_USING_NETDEV */
#endif /* RT_LWIP_ICMP */ #endif /* RT_LWIP_ICMP */

4
components/net/lwip-2.0.2/src/apps/ping/ping.c
View File

@ -130,7 +130,7 @@ int lwip_ping_recv(int s, int *ttl)
return len; return len;
} }
#ifndef RT_USING_SAL #ifndef RT_USING_NETDEV
/* using the lwIP custom ping */ /* using the lwIP custom ping */
rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size) rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
@ -239,7 +239,7 @@ int cmd_ping(int argc, char **argv)
FINSH_FUNCTION_EXPORT_ALIAS(cmd_ping, __cmd_ping, ping network host); FINSH_FUNCTION_EXPORT_ALIAS(cmd_ping, __cmd_ping, ping network host);
#endif /* RT_USING_FINSH */ #endif /* RT_USING_FINSH */
#endif /* RT_USING_SAL */ #endif /* RT_USING_NETDEV */
#endif /* RT_LWIP_ICMP */ #endif /* RT_LWIP_ICMP */

4
components/net/lwip-2.1.0/src/apps/ping/ping.c
View File

@ -130,7 +130,7 @@ int lwip_ping_recv(int s, int *ttl)
return len; return len;
} }
#ifndef RT_USING_SAL #ifndef RT_USING_NETDEV
/* using the lwIP custom ping */ /* using the lwIP custom ping */
rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size) rt_err_t ping(char* target_name, rt_uint32_t times, rt_size_t size)
@ -239,7 +239,7 @@ int cmd_ping(int argc, char **argv)
FINSH_FUNCTION_EXPORT_ALIAS(cmd_ping, __cmd_ping, ping network host); FINSH_FUNCTION_EXPORT_ALIAS(cmd_ping, __cmd_ping, ping network host);
#endif /* RT_USING_FINSH */ #endif /* RT_USING_FINSH */
#endif /* RT_USING_SAL */ #endif /* RT_USING_NETDEV */
#endif /* RT_LWIP_ICMP */ #endif /* RT_LWIP_ICMP */

19
components/net/sal_socket/src/sal_socket.c
View File

@ -370,7 +370,7 @@ static int socket_init(int family, int type, int protocol, struct sal_socket **r
struct sal_proto_family *pf; struct sal_proto_family *pf;
struct netdev *netdv_def = netdev_default; struct netdev *netdv_def = netdev_default;
struct netdev *netdev = RT_NULL; struct netdev *netdev = RT_NULL;
rt_bool_t falgs = RT_FALSE; rt_bool_t flag = RT_FALSE;
if (family < 0 || family > AF_MAX) if (family < 0 || family > AF_MAX)
{ {
@ -388,23 +388,24 @@ static int socket_init(int family, int type, int protocol, struct sal_socket **r
sock->protocol = protocol; sock->protocol = protocol;
/* get socket operations from network interface device */ /* get socket operations from network interface device */
if (netdv_def && netdev_is_up(netdv_def)) if (netdv_def == RT_NULL)
{
LOG_E("not find default network interface device for socket create.");
return -3;
}
if (netdev_is_up(netdv_def))
{ {
/* check default network interface device protocol family */ /* check default network interface device protocol family */
pf = (struct sal_proto_family *) netdv_def->sal_user_data; pf = (struct sal_proto_family *) netdv_def->sal_user_data;
if (pf != RT_NULL && pf->skt_ops && (pf->family == family || pf->sec_family == family)) if (pf != RT_NULL && pf->skt_ops && (pf->family == family || pf->sec_family == family))
{ {
sock->netdev = netdv_def; sock->netdev = netdv_def;
falgs = RT_TRUE; flag = RT_TRUE;
} }
} }
else
{
LOG_E("not find default network interface device for socket create.");
return -3;
}
if (falgs == RT_FALSE) if (flag == RT_FALSE)
{ {
/* get network interface device by protocol family */ /* get network interface device by protocol family */
netdev = netdev_get_by_family(family); netdev = netdev_get_by_family(family);