cmhi
/
vcpe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 1. 移除DHCP HTTP服务端白名单 

2. 增加获取DHCP 相关配置接口
3. 增加DHCP 主备服务器配置
This commit is contained in:
huangxin 2022-11-23 09:20:38 +08:00
parent 7c4d8aaf58
commit 814d744ceb
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/vcpe.cfg
View File

@ -78,7 +78,8 @@ application:
# DHCP Server Config
dhcp_server: {
listen_on = ["192.168.30.1", "192.168.100.1"];
http_client = ["192.168.30.1", "192.168.30.110", "192.168.100.1", "192.168.100.110"];
# 主备服务器设置
# replication = ["192.168.100.211", "192.168.100.215"];
range_set: (
{ dhcp_range = "192.168.30.110-192.168.30.120";

2
srcs/libs/configure/config.c
View File

@ -67,7 +67,7 @@ do {
ADD_CFG_ITEM(CFG_HTTP_SVR_PORT, "application.http_svr.listen_port", VALUE_TYPE_INTEGRAL, "6789", "Network port to listen on"); \
ADD_CFG_ITEM(CFG_HTTP_SVR_TCP_NODELAY, "application.http_svr.tcp_nodelay", VALUE_TYPE_BOOL, "1", "TCP delay switch"); \
ADD_CFG_ITEM(CFG_DHCP_LISTEN_ON, "application.dhcp_server.listen_on", VALUE_TYPE_ARRAY_STR, "", "DHCP listen interface"); \
ADD_CFG_ITEM(CFG_DHCP_HTTP_CLIENT, "application.dhcp_server.http_client", VALUE_TYPE_ARRAY_STR, "", "DHCP http server client write list"); \
ADD_CFG_ITEM(CFG_DHCP_REPLICATION_SVR, "application.dhcp_server.replication", VALUE_TYPE_ARRAY_STR, "", "DHCP replication server master and secondary"); \
ADD_CFG_ITEM(CFG_DHCP_RANGE_SET, "application.dhcp_server.range_set", VALUE_TYPE_ARRAY_OBJ, "", "DHCP IP pool"); \
} while (0)// clang-format on

8
srcs/libs/configure/config_help.c
View File

@ -7,6 +7,14 @@ const vector config_get_dhcp_server_range_set() {
return cfg_get_vector(CFG_DHCP_RANGE_SET);
}
const vector config_get_dhcp_listen_on() {
return cfg_get_vector(CFG_DHCP_LISTEN_ON);
}
const vector config_get_dhcp_replication_svr() {
return cfg_get_vector(CFG_DHCP_REPLICATION_SVR);
}
const char* config_get_http_server_addr() {
return cfg_get_string_value(CFG_HTTP_SVR_ADDR);
}

4
srcs/libs/include/config.h
View File

@ -62,7 +62,7 @@ typedef enum {
CFG_HTTP_SVR_PORT = 30,
CFG_HTTP_SVR_TCP_NODELAY = 31,
CFG_DHCP_LISTEN_ON = 32,
CFG_DHCP_HTTP_CLIENT = 33,
CFG_DHCP_REPLICATION_SVR = 33,
CFG_DHCP_RANGE_SET = 34,
CONFIG_ITEM_ID_MAX
} CONFIG_ITEM_ID;
@ -114,6 +114,8 @@ const char *config_get_http_server_addr();
unsigned int config_get_http_server_port();
int config_get_http_server_tcp_nodelay();
const vector config_get_dhcp_server_range_set();
const vector config_get_dhcp_listen_on();
const vector config_get_dhcp_replication_svr();
#ifdef __cplusplus
}
#endif