Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yunke120
rt-thread
提交
c9aba13f
R
rt-thread
项目概览
yunke120
/
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,发现更多精彩内容 >>
提交
c9aba13f
编写于
8月 30, 2014
作者:
H
hduffddybz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update lwip git head
上级
69d089ca
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
15 addition
and
9 deletion
+15
-9
components/net/lwip-head/CHANGELOG
components/net/lwip-head/CHANGELOG
+4
-0
components/net/lwip-head/src/core/init.c
components/net/lwip-head/src/core/init.c
+1
-1
components/net/lwip-head/src/include/lwip/netif.h
components/net/lwip-head/src/include/lwip/netif.h
+5
-2
components/net/lwip-head/src/include/lwip/opt.h
components/net/lwip-head/src/include/lwip/opt.h
+1
-1
components/net/lwip-head/test/unit/dhcp/test_dhcp.c
components/net/lwip-head/test/unit/dhcp/test_dhcp.c
+4
-5
未找到文件。
components/net/lwip-head/CHANGELOG
浏览文件 @
c9aba13f
...
...
@@ -6,6 +6,10 @@ HISTORY
++ New features:
2013-08-19: Simon Goldschmidt
* netif.h: bug #42998: made NETIF_MAX_HWADDR_LEN overridable for some special
networks
2013-03-17: Simon Goldschmidt (patch by Ghobad Emadi)
* opt.h, etharp.c: Added LWIP_HOOK_ETHARP_GET_GW to implement IPv4 routing with
multiple gateways
...
...
components/net/lwip-head/src/core/init.c
浏览文件 @
c9aba13f
...
...
@@ -106,7 +106,7 @@
#error "If you want to use Sequential API, you have to define MEMP_NUM_TCPIP_MSG_API>=1 in your lwipopts.h"
#endif
/* There must be sufficient timeouts, taking into account requirements of the subsystems. */
#if
(LWIP_TIMERS && (MEMP_NUM_SYS_TIMEOUT < (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD) : 0)
)))
#if
LWIP_TIMERS && (MEMP_NUM_SYS_TIMEOUT < (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD) : 0
)))
#error "MEMP_NUM_SYS_TIMEOUT is too low to accomodate all required timeouts"
#endif
#if (IP_REASSEMBLY && (MEMP_NUM_REASSDATA > IP_REASS_MAX_PBUFS))
...
...
components/net/lwip-head/src/include/lwip/netif.h
浏览文件 @
c9aba13f
...
...
@@ -60,9 +60,12 @@ extern "C" {
/* Throughout this file, IP addresses are expected to be in
* the same byte order as in IP_PCB. */
/** must be the maximum of all used hardware address lengths
across all types of interfaces in use */
/** Must be the maximum of all used hardware address lengths
across all types of interfaces in use.
This does not have to be changed, normally. */
#ifndef NETIF_MAX_HWADDR_LEN
#define NETIF_MAX_HWADDR_LEN 6U
#endif
/** Whether the network interface is 'up'. This is
* a software flag used to control whether this network
...
...
components/net/lwip-head/src/include/lwip/opt.h
浏览文件 @
c9aba13f
components/net/lwip-head/test/unit/dhcp/test_dhcp.c
浏览文件 @
c9aba13f
...
...
@@ -369,7 +369,6 @@ static err_t lwip_tx_func(struct netif *netif, struct pbuf *p)
case
3
:
case
4
:
case
5
:
case
6
:
{
const
u8_t
arpproto
[]
=
{
0x08
,
0x06
};
...
...
@@ -379,7 +378,7 @@ static err_t lwip_tx_func(struct netif *netif, struct pbuf *p)
check_pkt
(
p
,
12
,
arpproto
,
sizeof
(
arpproto
));
/* eth level proto: ip */
break
;
}
case
7
:
case
6
:
{
const
u8_t
fake_arp
[
6
]
=
{
0x12
,
0x34
,
0x56
,
0x78
,
0x9a
,
0xab
};
const
u8_t
ipproto
[]
=
{
0x08
,
0x00
};
...
...
@@ -773,13 +772,13 @@ START_TEST(test_dhcp_relayed)
}
fail_unless
(
netif_is_up
(
&
net_test
));
fail_unless
(
txpacket
==
6
,
"txpacket = %d"
,
txpacket
);
fail_unless
(
txpacket
==
5
,
"txpacket = %d"
,
txpacket
);
/* We need to send arp response here.. */
send_pkt
(
&
net_test
,
arp_resp
,
sizeof
(
arp_resp
));
fail_unless
(
txpacket
==
7
,
"txpacket = %d"
,
txpacket
);
fail_unless
(
txpacket
==
6
,
"txpacket = %d"
,
txpacket
);
fail_unless
(
netif_is_up
(
&
net_test
));
xid
=
htonl
(
net_test
.
dhcp
->
xid
);
/* xid updated */
...
...
@@ -790,7 +789,7 @@ START_TEST(test_dhcp_relayed)
tick_lwip
();
}
fail_unless
(
txpacket
==
7
,
"txpacket = %d"
,
txpacket
);
fail_unless
(
txpacket
==
6
,
"txpacket = %d"
,
txpacket
);
netif_remove
(
&
net_test
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录