diff --git a/config/vcpe.cfg b/config/vcpe.cfg index 51574cd..834c0cf 100644 --- a/config/vcpe.cfg +++ b/config/vcpe.cfg @@ -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"; diff --git a/srcs/libs/configure/config.c b/srcs/libs/configure/config.c index 2fd6de3..7e6b006 100644 --- a/srcs/libs/configure/config.c +++ b/srcs/libs/configure/config.c @@ -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 diff --git a/srcs/libs/configure/config_help.c b/srcs/libs/configure/config_help.c index e894893..9a100db 100644 --- a/srcs/libs/configure/config_help.c +++ b/srcs/libs/configure/config_help.c @@ -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); } diff --git a/srcs/libs/include/config.h b/srcs/libs/include/config.h index 1dc2714..f547a6e 100644 --- a/srcs/libs/include/config.h +++ b/srcs/libs/include/config.h @@ -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