Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
AdRainty
rt-thread
提交
cd34fa8e
R
rt-thread
项目概览
AdRainty
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd34fa8e
编写于
4月 24, 2017
作者:
B
Bernard Xiong
提交者:
GitHub
4月 24, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #726 from xools/lwip-2.0.2.fix
[lwIP] Lwip 2.0.2.fix
上级
d320c43d
8be35520
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
100 addition
and
14 deletion
+100
-14
components/net/KConfig
components/net/KConfig
+3
-0
components/net/SConscript
components/net/SConscript
+1
-1
components/net/lwip-2.0.2/SConscript
components/net/lwip-2.0.2/SConscript
+81
-0
components/net/lwip-2.0.2/src/arch/sys_arch.c
components/net/lwip-2.0.2/src/arch/sys_arch.c
+1
-2
components/net/lwip-2.0.2/src/lwipopts.h
components/net/lwip-2.0.2/src/lwipopts.h
+10
-7
components/net/lwip-2.0.2/src/lwippools.h
components/net/lwip-2.0.2/src/lwippools.h
+1
-1
components/net/lwip-2.0.2/src/netif/ethernetif.c
components/net/lwip-2.0.2/src/netif/ethernetif.c
+3
-3
未找到文件。
components/net/KConfig
浏览文件 @
cd34fa8e
...
@@ -17,6 +17,9 @@ config RT_USING_LWIP
...
@@ -17,6 +17,9 @@ config RT_USING_LWIP
config RT_USING_LWIP200
config RT_USING_LWIP200
bool "lwIP v2.0.0"
bool "lwIP v2.0.0"
config RT_USING_LWIP202
bool "lwIP v2.0.2"
endchoice
endchoice
config RT_LWIP_IGMP
config RT_LWIP_IGMP
...
...
components/net/SConscript
浏览文件 @
cd34fa8e
...
@@ -8,7 +8,7 @@ cwd = GetCurrentDir()
...
@@ -8,7 +8,7 @@ cwd = GetCurrentDir()
list
=
os
.
listdir
(
cwd
)
list
=
os
.
listdir
(
cwd
)
# the default version of LWIP is 1.4.1
# the default version of LWIP is 1.4.1
if
not
GetDepend
(
'RT_USING_LWIP132'
)
and
not
GetDepend
(
'RT_USING_LWIP140'
)
and
not
GetDepend
(
'RT_USING_LWIP200'
):
if
not
GetDepend
(
'RT_USING_LWIP132'
)
and
not
GetDepend
(
'RT_USING_LWIP140'
)
and
not
GetDepend
(
'RT_USING_LWIP200'
)
and
not
GetDepend
(
'RT_USING_LWIP202'
)
:
AddDepend
(
'RT_USING_LWIP141'
)
AddDepend
(
'RT_USING_LWIP141'
)
for
d
in
list
:
for
d
in
list
:
...
...
components/net/lwip-2.0.2/SConscript
0 → 100644
浏览文件 @
cd34fa8e
from
building
import
*
src
=
Split
(
"""
src/arch/sys_arch.c
src/api/api_lib.c
src/api/api_msg.c
src/api/err.c
src/api/netbuf.c
src/api/netdb.c
src/api/netifapi.c
src/api/sockets.c
src/api/tcpip.c
src/core/def.c
src/core/dns.c
src/core/inet_chksum.c
src/core/init.c
src/core/ip.c
src/core/memp.c
src/core/netif.c
src/core/pbuf.c
src/core/raw.c
src/core/stats.c
src/core/sys.c
src/core/tcp.c
src/core/tcp_in.c
src/core/tcp_out.c
src/core/timeouts.c
src/core/udp.c
src/netif/ethernet.c
src/netif/ethernetif.c
src/netif/lowpan6.c
src/netif/slipif.c
"""
)
ipv4_src
=
Split
(
"""
src/core/ipv4/autoip.c
src/core/ipv4/dhcp.c
src/core/ipv4/etharp.c
src/core/ipv4/icmp.c
src/core/ipv4/igmp.c
src/core/ipv4/ip4.c
src/core/ipv4/ip4_addr.c
src/core/ipv4/ip4_frag.c
"""
)
ipv6_src
=
Split
(
"""
src/core/ipv6/dhcp6.c
src/core/ipv6/ethip6.c
src/core/ipv6/icmp6.c
src/core/ipv6/inet6.c
src/core/ipv6/ip6.c
src/core/ipv6/ip6_addr.c
src/core/ipv6/ip6_frag.c
src/core/ipv6/mld6.c
src/core/ipv6/nd6.c
"""
)
snmp_src
=
Glob
(
"src/apps/snmp/*.c"
)
ppp_src
=
Glob
(
"src/netif/ppp/*.c"
)
+
Glob
(
"src/netif/ppp/polarssl/*c"
)
src
=
src
+
ipv4_src
# The set of source files associated with this SConscript file.
path
=
[
GetCurrentDir
()
+
'/src'
,
GetCurrentDir
()
+
'/src/include'
,
GetCurrentDir
()
+
'/src/include/ipv4'
,
GetCurrentDir
()
+
'/src/arch/include'
,
GetCurrentDir
()
+
'/src/include/netif'
]
if
GetDepend
([
'RT_LWIP_SNMP'
]):
src
+=
snmp_src
path
+=
[
GetCurrentDir
()
+
'/src/apps/snmp'
]
if
GetDepend
([
'RT_LWIP_PPP'
]):
src
+=
ppp_src
path
+=
[
GetCurrentDir
()
+
'/src/netif/ppp'
]
group
=
DefineGroup
(
'lwIP'
,
src
,
depend
=
[
'RT_USING_LWIP'
,
'RT_USING_LWIP202'
],
CPPPATH
=
path
)
Return
(
'group'
)
components/net/lwip-2.0.2/src/arch/sys_arch.c
浏览文件 @
cd34fa8e
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include "arch/sys_arch.h"
#include "arch/sys_arch.h"
#include "lwip/debug.h"
#include "lwip/debug.h"
#include "lwip/netif.h"
#include "lwip/netif.h"
#include "lwip/netifapi.h"
#include "lwip/tcpip.h"
#include "lwip/tcpip.h"
#include "netif/ethernetif.h"
#include "netif/ethernetif.h"
#include "lwip/sio.h"
#include "lwip/sio.h"
...
@@ -601,7 +602,6 @@ u32_t sys_now(void)
...
@@ -601,7 +602,6 @@ u32_t sys_now(void)
}
}
#if 0
WEAK
WEAK
void
mem_init
(
void
)
void
mem_init
(
void
)
{
{
...
@@ -628,7 +628,6 @@ void mem_free(void *mem)
...
@@ -628,7 +628,6 @@ void mem_free(void *mem)
{
{
rt_free
(
mem
);
rt_free
(
mem
);
}
}
#endif
#ifdef RT_LWIP_PPP
#ifdef RT_LWIP_PPP
u32_t
sio_read
(
sio_fd_t
fd
,
u8_t
*
buf
,
u32_t
size
)
u32_t
sio_read
(
sio_fd_t
fd
,
u8_t
*
buf
,
u32_t
size
)
...
...
components/net/lwip-2.0.2/src/lwipopts.h
浏览文件 @
cd34fa8e
...
@@ -39,7 +39,10 @@
...
@@ -39,7 +39,10 @@
#define LWIP_HAVE_LOOPIF 0
#define LWIP_HAVE_LOOPIF 0
#define LWIP_PLATFORM_BYTESWAP 0
#define LWIP_PLATFORM_BYTESWAP 0
#ifndef BYTE_ORDER
#define BYTE_ORDER LITTLE_ENDIAN
#define BYTE_ORDER LITTLE_ENDIAN
#endif
/* #define RT_LWIP_DEBUG */
/* #define RT_LWIP_DEBUG */
...
@@ -52,9 +55,9 @@
...
@@ -52,9 +55,9 @@
#define SYS_DEBUG LWIP_DBG_OFF
#define SYS_DEBUG LWIP_DBG_OFF
#define ETHARP_DEBUG LWIP_DBG_OFF
#define ETHARP_DEBUG LWIP_DBG_OFF
#define PPP_DEBUG LWIP_DBG_OFF
#define PPP_DEBUG LWIP_DBG_OFF
#define MEM_DEBUG LWIP_DBG_O
N
#define MEM_DEBUG LWIP_DBG_O
FF
#define MEMP_DEBUG LWIP_DBG_O
N
#define MEMP_DEBUG LWIP_DBG_O
FF
#define PBUF_DEBUG LWIP_DBG_O
N
#define PBUF_DEBUG LWIP_DBG_O
FF
#define API_LIB_DEBUG LWIP_DBG_OFF
#define API_LIB_DEBUG LWIP_DBG_OFF
#define API_MSG_DEBUG LWIP_DBG_OFF
#define API_MSG_DEBUG LWIP_DBG_OFF
#define TCPIP_DEBUG LWIP_DBG_OFF
#define TCPIP_DEBUG LWIP_DBG_OFF
...
@@ -86,9 +89,9 @@
...
@@ -86,9 +89,9 @@
#define MEMP_OVERFLOW_CHECK 1 ////
#define MEMP_OVERFLOW_CHECK 1 ////
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1 ////
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1 ////
//#define MEM_LIBC_MALLOC 1
//#define MEM_LIBC_MALLOC 1
#define MEM_USE_POOLS 1
//
#define MEM_USE_POOLS 1
#define MEMP_USE_CUSTOM_POOLS 1
//
#define MEMP_USE_CUSTOM_POOLS 1
#define MEM_SIZE (1024*64)
//
#define MEM_SIZE (1024*64)
#ifdef RT_LWIP_USING_RT_MEM
#ifdef RT_LWIP_USING_RT_MEM
#define MEMP_MEM_MALLOC 1
#define MEMP_MEM_MALLOC 1
...
@@ -99,7 +102,7 @@
...
@@ -99,7 +102,7 @@
/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
sends a lot of data out of ROM (or other static memory), this
sends a lot of data out of ROM (or other static memory), this
should be set high. */
should be set high. */
#define MEMP_NUM_PBUF
64
//16
#define MEMP_NUM_PBUF
32
//16
/* the number of UDP protocol control blocks. One per active RAW "connection". */
/* the number of UDP protocol control blocks. One per active RAW "connection". */
#ifdef RT_LWIP_RAW_PCB_NUM
#ifdef RT_LWIP_RAW_PCB_NUM
...
...
components/net/lwip-2.0.2/src/lwippools.h
浏览文件 @
cd34fa8e
...
@@ -5,6 +5,6 @@
...
@@ -5,6 +5,6 @@
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
1024
)
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
1024
)
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
1514
)
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
1514
)
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
1536
)
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
1536
)
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
4096
)
LWIP_MALLOC_MEMPOOL
((
unsigned
char
)
128
,
4096
)
LWIP_MALLOC_MEMPOOL_END
LWIP_MALLOC_MEMPOOL_END
#endif
#endif
components/net/lwip-2.0.2/src/netif/ethernetif.c
浏览文件 @
cd34fa8e
...
@@ -506,11 +506,11 @@ FINSH_FUNCTION_EXPORT(set_if, set network interface address);
...
@@ -506,11 +506,11 @@ FINSH_FUNCTION_EXPORT(set_if, set network interface address);
#include <lwip/dns.h>
#include <lwip/dns.h>
void
set_dns
(
char
*
dns_server
)
void
set_dns
(
char
*
dns_server
)
{
{
ip_addr_t
*
addr
;
ip_addr_t
addr
;
if
((
dns_server
!=
RT_NULL
)
&&
ipaddr_aton
(
dns_server
,
addr
))
if
((
dns_server
!=
RT_NULL
)
&&
ipaddr_aton
(
dns_server
,
&
addr
))
{
{
dns_setserver
(
0
,
addr
);
dns_setserver
(
0
,
&
addr
);
}
}
}
}
FINSH_FUNCTION_EXPORT
(
set_dns
,
set
DNS
server
address
);
FINSH_FUNCTION_EXPORT
(
set_dns
,
set
DNS
server
address
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录