Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
红岛
rt-thread
提交
9ab59cf1
R
rt-thread
项目概览
红岛
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ab59cf1
编写于
6月 14, 2014
作者:
wuyangyong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
used parameter: size.
上级
f296c582
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
12 addition
and
6 deletion
+12
-6
components/net/lwip-1.3.2/apps/ping.c
components/net/lwip-1.3.2/apps/ping.c
+6
-3
components/net/lwip/apps/ping.c
components/net/lwip/apps/ping.c
+6
-3
未找到文件。
components/net/lwip-1.3.2/apps/ping.c
浏览文件 @
9ab59cf1
...
@@ -64,12 +64,12 @@ static void ping_prepare_echo( struct icmp_echo_hdr *iecho, u16_t len)
...
@@ -64,12 +64,12 @@ static void ping_prepare_echo( struct icmp_echo_hdr *iecho, u16_t len)
}
}
/* Ping using the socket ip */
/* Ping using the socket ip */
static
err_t
ping_send
(
int
s
,
struct
ip_addr
*
addr
)
static
err_t
ping_send
(
int
s
,
struct
ip_addr
*
addr
,
int
size
)
{
{
int
err
;
int
err
;
struct
icmp_echo_hdr
*
iecho
;
struct
icmp_echo_hdr
*
iecho
;
struct
sockaddr_in
to
;
struct
sockaddr_in
to
;
size_t
ping_size
=
sizeof
(
struct
icmp_echo_hdr
)
+
PING_DATA_SIZE
;
size_t
ping_size
=
sizeof
(
struct
icmp_echo_hdr
)
+
size
;
LWIP_ASSERT
(
"ping_size is too big"
,
ping_size
<=
0xffff
);
LWIP_ASSERT
(
"ping_size is too big"
,
ping_size
<=
0xffff
);
iecho
=
rt_malloc
(
ping_size
);
iecho
=
rt_malloc
(
ping_size
);
...
@@ -138,6 +138,9 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
...
@@ -138,6 +138,9 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
send_time
=
0
;
send_time
=
0
;
if
(
size
==
0
)
size
=
PING_DATA_SIZE
;
if
(
inet_aton
(
target
,
(
struct
in_addr
*
)
&
ping_target
)
==
0
)
return
-
RT_ERROR
;
if
(
inet_aton
(
target
,
(
struct
in_addr
*
)
&
ping_target
)
==
0
)
return
-
RT_ERROR
;
addr
=
(
struct
_ip_addr
*
)
&
ping_target
;
addr
=
(
struct
_ip_addr
*
)
&
ping_target
;
...
@@ -151,7 +154,7 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
...
@@ -151,7 +154,7 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
while
(
1
)
while
(
1
)
{
{
if
(
ping_send
(
s
,
&
ping_target
)
==
ERR_OK
)
if
(
ping_send
(
s
,
&
ping_target
,
size
)
==
ERR_OK
)
{
{
rt_kprintf
(
"ping: send %d.%d.%d.%d
\n
"
,
addr
->
addr0
,
addr
->
addr1
,
addr
->
addr2
,
addr
->
addr3
);
rt_kprintf
(
"ping: send %d.%d.%d.%d
\n
"
,
addr
->
addr0
,
addr
->
addr1
,
addr
->
addr2
,
addr
->
addr3
);
ping_recv
(
s
);
ping_recv
(
s
);
...
...
components/net/lwip/apps/ping.c
浏览文件 @
9ab59cf1
...
@@ -64,12 +64,12 @@ static void ping_prepare_echo( struct icmp_echo_hdr *iecho, u16_t len)
...
@@ -64,12 +64,12 @@ static void ping_prepare_echo( struct icmp_echo_hdr *iecho, u16_t len)
}
}
/* Ping using the socket ip */
/* Ping using the socket ip */
static
err_t
ping_send
(
int
s
,
struct
ip_addr
*
addr
)
static
err_t
ping_send
(
int
s
,
struct
ip_addr
*
addr
,
int
size
)
{
{
int
err
;
int
err
;
struct
icmp_echo_hdr
*
iecho
;
struct
icmp_echo_hdr
*
iecho
;
struct
sockaddr_in
to
;
struct
sockaddr_in
to
;
size_t
ping_size
=
sizeof
(
struct
icmp_echo_hdr
)
+
PING_DATA_SIZE
;
size_t
ping_size
=
sizeof
(
struct
icmp_echo_hdr
)
+
size
;
LWIP_ASSERT
(
"ping_size is too big"
,
ping_size
<=
0xffff
);
LWIP_ASSERT
(
"ping_size is too big"
,
ping_size
<=
0xffff
);
iecho
=
rt_malloc
(
ping_size
);
iecho
=
rt_malloc
(
ping_size
);
...
@@ -138,6 +138,9 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
...
@@ -138,6 +138,9 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
send_time
=
0
;
send_time
=
0
;
if
(
size
==
0
)
size
=
PING_DATA_SIZE
;
if
(
inet_aton
(
target
,
(
struct
in_addr
*
)
&
ping_target
)
==
0
)
return
-
RT_ERROR
;
if
(
inet_aton
(
target
,
(
struct
in_addr
*
)
&
ping_target
)
==
0
)
return
-
RT_ERROR
;
addr
=
(
struct
_ip_addr
*
)
&
ping_target
;
addr
=
(
struct
_ip_addr
*
)
&
ping_target
;
...
@@ -151,7 +154,7 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
...
@@ -151,7 +154,7 @@ rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
while
(
1
)
while
(
1
)
{
{
if
(
ping_send
(
s
,
&
ping_target
)
==
ERR_OK
)
if
(
ping_send
(
s
,
&
ping_target
,
size
)
==
ERR_OK
)
{
{
rt_kprintf
(
"ping: send %d.%d.%d.%d
\n
"
,
addr
->
addr0
,
addr
->
addr1
,
addr
->
addr2
,
addr
->
addr3
);
rt_kprintf
(
"ping: send %d.%d.%d.%d
\n
"
,
addr
->
addr0
,
addr
->
addr1
,
addr
->
addr2
,
addr
->
addr3
);
ping_recv
(
s
);
ping_recv
(
s
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录