From 85deb1ae4a96ca979b48d22f3f43e3159b018fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=98=95?= <huangxin@cmhi.chinamobile.com>
Date: Fri, 23 Dec 2022 10:57:16 +0800
Subject: [PATCH] =?UTF-8?q?OCT=201.=20=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=96=E8=AF=91=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 srcs/libs/configure/config_help.c | 2 ++
 srcs/libs/include/config.h        | 2 ++
 srcs/vcpe_main.c                  | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcs/libs/configure/config_help.c b/srcs/libs/configure/config_help.c
index dfbab5f..9e9aab9 100644
--- a/srcs/libs/configure/config_help.c
+++ b/srcs/libs/configure/config_help.c
@@ -49,6 +49,7 @@ int config_get_http_server_tcp_nodelay() {
     return cfg_get_bool_value(CFG_HTTP_SVR_TCP_NODELAY);
 }
 
+#ifdef LWIP_ON
 const char *config_get_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() {
     return cfg_get_bool_value(CFG_VXLAN_SUPPORT);
 }
+#endif
 
 const char *config_get_ssl_ca_path() {
     return cfg_get_string_value(CFG_CURL_CA_PATH);
diff --git a/srcs/libs/include/config.h b/srcs/libs/include/config.h
index e486088..66dd590 100644
--- a/srcs/libs/include/config.h
+++ b/srcs/libs/include/config.h
@@ -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_keygen();
 int          cfg_get_support_vxlan();
+#ifdef LWIP_ON
 const char  *config_get_vxlan_nic_name();
 const char  *config_get_vxlan_peer_mac();
 const char  *config_get_vxlan_peer_ip();
 const char  *config_get_vxlan_pkg_filter();
+#endif
 const char  *config_get_agent_iptv_report_url();
 const char  *config_get_http_server_addr();
 unsigned int config_get_http_server_port();
diff --git a/srcs/vcpe_main.c b/srcs/vcpe_main.c
index 8fefbf7..8cc5bb0 100644
--- a/srcs/vcpe_main.c
+++ b/srcs/vcpe_main.c
@@ -12,7 +12,7 @@
 #include "prj_config.h"
 #include "user_errno.h"
 
-#if LWIP_ON
+#ifdef LWIP_ON
 #include "user_info.h"
 #include "lwip/tcpip.h"
 #endif
@@ -26,7 +26,7 @@
 #include "dual_server/dualsvr.h"
 #endif
 
-#if LWIP_ON
+#ifdef LWIP_ON
 static void test_init(void *arg) { /* remove compiler warning */
     sys_sem_t *init_sem;
 
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
         exit(0);
     }
 
-#if LWIP_ON
+#ifdef LWIP_ON
     lwip_init_env();
     user_info_init();
     pppoe_session_init();