Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
过眠
arduino-esp32
提交
4cf0e98f
A
arduino-esp32
项目概览
过眠
/
arduino-esp32
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
arduino-esp32
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4cf0e98f
编写于
9月 20, 2017
作者:
M
me-no-dev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix desync with IDF in dhcpserver
上级
f648ad7c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
135 addition
and
117 deletion
+135
-117
libraries/WiFi/src/WiFiAP.cpp
libraries/WiFi/src/WiFiAP.cpp
+1
-0
tools/sdk/include/lwip/apps/dhcpserver.h
tools/sdk/include/lwip/apps/dhcpserver.h
+0
-117
tools/sdk/include/lwip/apps/dhcpserver_options.h
tools/sdk/include/lwip/apps/dhcpserver_options.h
+134
-0
未找到文件。
libraries/WiFi/src/WiFiAP.cpp
浏览文件 @
4cf0e98f
...
...
@@ -37,6 +37,7 @@ extern "C" {
#include <esp_wifi.h>
#include <esp_event_loop.h>
#include <lwip/ip_addr.h>
#include "apps/dhcpserver_options.h"
}
...
...
tools/sdk/include/lwip/apps/dhcpserver.h
浏览文件 @
4cf0e98f
...
...
@@ -36,123 +36,6 @@ typedef struct dhcps_msg {
u8_t
options
[
312
];
}
dhcps_msg
;
/** DHCP OPTIONS CODE **/
typedef
enum
{
/* RFC 1497 Vendor Extensions */
PAD
=
0
,
END
=
255
,
SUBNET_MASK
=
1
,
TIME_OFFSET
=
2
,
ROUTER
=
3
,
TIME_SERVER
=
4
,
NAME_SERVER
=
5
,
DOMAIN_NAME_SERVER
=
6
,
LOG_SERVER
=
7
,
COOKIE_SERVER
=
8
,
LPR_SERVER
=
9
,
IMPRESS_SERVER
=
10
,
RESOURCE_LOCATION_SERVER
=
11
,
HOST_NAME
=
12
,
BOOT_FILE_SIZE
=
13
,
MERIT_DUMP_FILE
=
14
,
DOMAIN_NAME
=
15
,
SWAP_SERVER
=
16
,
ROOT_PATH
=
17
,
EXTENSIONS_PATH
=
18
,
/* IP Layer Parameters per Host */
IP_FORWARDING
=
19
,
NON_LOCAL_SOURCE_ROUTING
=
20
,
POLICY_FILTER
=
21
,
MAXIMUM_DATAGRAM_REASSEMBLY_SIZE
=
22
,
DEFAULT_IP_TIME_TO_LIVE
=
23
,
PATH_MTU_AGING_TIMEOUT
=
24
,
PATH_MTU_PLATEAU_TABLE
=
25
,
/* IP Layer Parameters per Interface */
INTERFACE_MTU
=
26
,
ALL_SUBNETS_ARE_LOCAL
=
27
,
BROADCAST_ADDRESS
=
28
,
PERFORM_MASK_DISCOVERY
=
29
,
MASK_SUPPLIER
=
30
,
PERFORM_ROUTER_DISCOVERY
=
31
,
ROUTER_SOLICITATION_ADDRESS
=
32
,
STATIC_ROUTE
=
33
,
/* Link Layer Parameters per Interface */
TRAILER_ENCAPSULATION
=
34
,
ARP_CACHE_TIMEOUT
=
35
,
ETHERNET_ENCAPSULATION
=
36
,
/* TCP Parameters */
TCP_DEFAULT_TTL
=
37
,
TCP_KEEPALIVE_INTERVAL
=
38
,
TCP_KEEPALIVE_GARBAGE
=
39
,
/* Application and Service Parameters */
NETWORK_INFORMATION_SERVICE_DOMAIN
=
40
,
NETWORK_INFORMATION_SERVERS
=
41
,
NETWORK_TIME_PROTOCOL_SERVERS
=
42
,
VENDOR_SPECIFIC_INFORMATION
=
43
,
NETBIOS_OVER_TCP_IP_NAME_SERVER
=
44
,
NETBIOS_OVER_TCP_IP_DATAGRAM_DISTRIBUTION_SERVER
=
45
,
NETBIOS_OVER_TCP_IP_NODE_TYPE
=
46
,
NETBIOS_OVER_TCP_IP_SCOPE
=
47
,
X_WINDOW_SYSTEM_FONT_SERVER
=
48
,
X_WINDOW_SYSTEM_DISPLAY_MANAGER
=
49
,
NETWORK_INFORMATION_SERVICE_PLUS_DOMAIN
=
64
,
NETWORK_INFORMATION_SERVICE_PLUS_SERVERS
=
65
,
MOBILE_IP_HOME_AGENT
=
68
,
SMTP_SERVER
=
69
,
POP3_SERVER
=
70
,
NNTP_SERVER
=
71
,
DEFAULT_WWW_SERVER
=
72
,
DEFAULT_FINGER_SERVER
=
73
,
DEFAULT_IRC_SERVER
=
74
,
STREETTALK_SERVER
=
75
,
STREETTALK_DIRECTORY_ASSISTANCE_SERVER
=
76
,
/* DHCP Extensions */
REQUESTED_IP_ADDRESS
=
50
,
IP_ADDRESS_LEASE_TIME
=
51
,
OPTION_OVERLOAD
=
52
,
TFTP_SERVER_NAME
=
66
,
BOOTFILE_NAME
=
67
,
DHCP_MESSAGE_TYPE
=
53
,
SERVER_IDENTIFIER
=
54
,
PARAMETER_REQUEST_LIST
=
55
,
MESSAGE
=
56
,
MAXIMUM_DHCP_MESSAGE_SIZE
=
57
,
RENEWAL_T1_TIME_VALUE
=
58
,
REBINDING_T2_TIME_VALUE
=
59
,
VENDOR_CLASS_IDENTIFIER
=
60
,
CLIENT_IDENTIFIER
=
61
,
USER_CLASS
=
77
,
FQDN
=
81
,
DHCP_AGENT_OPTIONS
=
82
,
NDS_SERVERS
=
85
,
NDS_TREE_NAME
=
86
,
NDS_CONTEXT
=
87
,
CLIENT_LAST_TRANSACTION_TIME
=
91
,
ASSOCIATED_IP
=
92
,
USER_AUTHENTICATION_PROTOCOL
=
98
,
AUTO_CONFIGURE
=
116
,
NAME_SERVICE_SEARCH
=
117
,
SUBNET_SELECTION
=
118
,
DOMAIN_SEARCH
=
119
,
CLASSLESS_ROUTE
=
121
,
}
dhcp_msg_option
;
/* Defined in esp_misc.h */
typedef
struct
{
bool
enable
;
...
...
tools/sdk/include/lwip/apps/dhcpserver_options.h
0 → 100644
浏览文件 @
4cf0e98f
// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
/** DHCP Options
This macros are not part of the public dhcpserver.h interface.
**/
typedef
enum
{
/* RFC 1497 Vendor Extensions */
PAD
=
0
,
END
=
255
,
SUBNET_MASK
=
1
,
TIME_OFFSET
=
2
,
ROUTER
=
3
,
TIME_SERVER
=
4
,
NAME_SERVER
=
5
,
DOMAIN_NAME_SERVER
=
6
,
LOG_SERVER
=
7
,
COOKIE_SERVER
=
8
,
LPR_SERVER
=
9
,
IMPRESS_SERVER
=
10
,
RESOURCE_LOCATION_SERVER
=
11
,
HOST_NAME
=
12
,
BOOT_FILE_SIZE
=
13
,
MERIT_DUMP_FILE
=
14
,
DOMAIN_NAME
=
15
,
SWAP_SERVER
=
16
,
ROOT_PATH
=
17
,
EXTENSIONS_PATH
=
18
,
/* IP Layer Parameters per Host */
IP_FORWARDING
=
19
,
NON_LOCAL_SOURCE_ROUTING
=
20
,
POLICY_FILTER
=
21
,
MAXIMUM_DATAGRAM_REASSEMBLY_SIZE
=
22
,
DEFAULT_IP_TIME_TO_LIVE
=
23
,
PATH_MTU_AGING_TIMEOUT
=
24
,
PATH_MTU_PLATEAU_TABLE
=
25
,
/* IP Layer Parameters per Interface */
INTERFACE_MTU
=
26
,
ALL_SUBNETS_ARE_LOCAL
=
27
,
BROADCAST_ADDRESS
=
28
,
PERFORM_MASK_DISCOVERY
=
29
,
MASK_SUPPLIER
=
30
,
PERFORM_ROUTER_DISCOVERY
=
31
,
ROUTER_SOLICITATION_ADDRESS
=
32
,
STATIC_ROUTE
=
33
,
/* Link Layer Parameters per Interface */
TRAILER_ENCAPSULATION
=
34
,
ARP_CACHE_TIMEOUT
=
35
,
ETHERNET_ENCAPSULATION
=
36
,
/* TCP Parameters */
TCP_DEFAULT_TTL
=
37
,
TCP_KEEPALIVE_INTERVAL
=
38
,
TCP_KEEPALIVE_GARBAGE
=
39
,
/* Application and Service Parameters */
NETWORK_INFORMATION_SERVICE_DOMAIN
=
40
,
NETWORK_INFORMATION_SERVERS
=
41
,
NETWORK_TIME_PROTOCOL_SERVERS
=
42
,
VENDOR_SPECIFIC_INFORMATION
=
43
,
NETBIOS_OVER_TCP_IP_NAME_SERVER
=
44
,
NETBIOS_OVER_TCP_IP_DATAGRAM_DISTRIBUTION_SERVER
=
45
,
NETBIOS_OVER_TCP_IP_NODE_TYPE
=
46
,
NETBIOS_OVER_TCP_IP_SCOPE
=
47
,
X_WINDOW_SYSTEM_FONT_SERVER
=
48
,
X_WINDOW_SYSTEM_DISPLAY_MANAGER
=
49
,
NETWORK_INFORMATION_SERVICE_PLUS_DOMAIN
=
64
,
NETWORK_INFORMATION_SERVICE_PLUS_SERVERS
=
65
,
MOBILE_IP_HOME_AGENT
=
68
,
SMTP_SERVER
=
69
,
POP3_SERVER
=
70
,
NNTP_SERVER
=
71
,
DEFAULT_WWW_SERVER
=
72
,
DEFAULT_FINGER_SERVER
=
73
,
DEFAULT_IRC_SERVER
=
74
,
STREETTALK_SERVER
=
75
,
STREETTALK_DIRECTORY_ASSISTANCE_SERVER
=
76
,
/* DHCP Extensions */
REQUESTED_IP_ADDRESS
=
50
,
IP_ADDRESS_LEASE_TIME
=
51
,
OPTION_OVERLOAD
=
52
,
TFTP_SERVER_NAME
=
66
,
BOOTFILE_NAME
=
67
,
DHCP_MESSAGE_TYPE
=
53
,
SERVER_IDENTIFIER
=
54
,
PARAMETER_REQUEST_LIST
=
55
,
MESSAGE
=
56
,
MAXIMUM_DHCP_MESSAGE_SIZE
=
57
,
RENEWAL_T1_TIME_VALUE
=
58
,
REBINDING_T2_TIME_VALUE
=
59
,
VENDOR_CLASS_IDENTIFIER
=
60
,
CLIENT_IDENTIFIER
=
61
,
USER_CLASS
=
77
,
FQDN
=
81
,
DHCP_AGENT_OPTIONS
=
82
,
NDS_SERVERS
=
85
,
NDS_TREE_NAME
=
86
,
NDS_CONTEXT
=
87
,
CLIENT_LAST_TRANSACTION_TIME
=
91
,
ASSOCIATED_IP
=
92
,
USER_AUTHENTICATION_PROTOCOL
=
98
,
AUTO_CONFIGURE
=
116
,
NAME_SERVICE_SEARCH
=
117
,
SUBNET_SELECTION
=
118
,
DOMAIN_SEARCH
=
119
,
CLASSLESS_ROUTE
=
121
,
}
dhcp_msg_option
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录