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

OCT 1. 增加部分代码编译开关

This commit is contained in:
黄昕 2022-12-23 10:57:16 +08:00
parent 2529f04b66
commit 85deb1ae4a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ int config_get_http_server_tcp_nodelay() {
return cfg_get_bool_value(CFG_HTTP_SVR_TCP_NODELAY); return cfg_get_bool_value(CFG_HTTP_SVR_TCP_NODELAY);
} }
#ifdef LWIP_ON
const char *config_get_vxlan_nic_name() { const char *config_get_vxlan_nic_name() {
return cfg_get_string_value(CFG_VXLAN_NIC_NAME); return cfg_get_string_value(CFG_VXLAN_NIC_NAME);
} }
@ -68,6 +69,7 @@ const char *config_get_vxlan_pkg_filter() {
int cfg_get_support_vxlan() { int cfg_get_support_vxlan() {
return cfg_get_bool_value(CFG_VXLAN_SUPPORT); return cfg_get_bool_value(CFG_VXLAN_SUPPORT);
} }
#endif
const char *config_get_ssl_ca_path() { const char *config_get_ssl_ca_path() {
return cfg_get_string_value(CFG_CURL_CA_PATH); return cfg_get_string_value(CFG_CURL_CA_PATH);

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

@ -129,10 +129,12 @@ const char *config_item_dump_fmt(const char *titleMessage);
const char *get_config_key(const char *pKeygen); const char *get_config_key(const char *pKeygen);
const char *get_config_keygen(); const char *get_config_keygen();
int cfg_get_support_vxlan(); int cfg_get_support_vxlan();
#ifdef LWIP_ON
const char *config_get_vxlan_nic_name(); const char *config_get_vxlan_nic_name();
const char *config_get_vxlan_peer_mac(); const char *config_get_vxlan_peer_mac();
const char *config_get_vxlan_peer_ip(); const char *config_get_vxlan_peer_ip();
const char *config_get_vxlan_pkg_filter(); const char *config_get_vxlan_pkg_filter();
#endif
const char *config_get_agent_iptv_report_url(); const char *config_get_agent_iptv_report_url();
const char *config_get_http_server_addr(); const char *config_get_http_server_addr();
unsigned int config_get_http_server_port(); unsigned int config_get_http_server_port();

6
srcs/vcpe_main.c
View File

@ -12,7 +12,7 @@
#include "prj_config.h" #include "prj_config.h"
#include "user_errno.h" #include "user_errno.h"
#if LWIP_ON #ifdef LWIP_ON
#include "user_info.h" #include "user_info.h"
#include "lwip/tcpip.h" #include "lwip/tcpip.h"
#endif #endif
@ -26,7 +26,7 @@
#include "dual_server/dualsvr.h" #include "dual_server/dualsvr.h"
#endif #endif
#if LWIP_ON #ifdef LWIP_ON
static void test_init(void *arg) { /* remove compiler warning */ static void test_init(void *arg) { /* remove compiler warning */
sys_sem_t *init_sem; sys_sem_t *init_sem;
@ -71,7 +71,7 @@ int main(int argc, char **argv) {
exit(0); exit(0);
} }
#if LWIP_ON #ifdef LWIP_ON
lwip_init_env(); lwip_init_env();
user_info_init(); user_info_init();
pppoe_session_init(); pppoe_session_init();