From 2c1f2cd45fa28ceba5b9a5a1732755786005de61 Mon Sep 17 00:00:00 2001
From: zhanglianghy <zhanglianghy@cmhi.chinamobile.com>
Date: Wed, 14 Aug 2019 15:37:30 +0800
Subject: [PATCH] =?UTF-8?q?MOD=20aaa-12=20=E6=A8=A1=E5=9D=97=E5=92=8Cconfi?=
 =?UTF-8?q?gid=E7=9A=84=E5=AE=9A=E4=B9=89=E6=94=BE=E5=88=B0Common/config?=
 =?UTF-8?q?=5Fmanager.h=E4=B8=AD=20SOL=20=20=20=E6=A8=A1=E5=9D=97=E5=92=8C?=
 =?UTF-8?q?configid=E7=9A=84=E5=AE=9A=E4=B9=89=E6=94=BE=E5=88=B0Common/con?=
 =?UTF-8?q?fig=5Fmanager.h=E4=B8=AD=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9A?=
 =?UTF-8?q?zhangliang=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Azhangliang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Common/config_manager.h                       | 47 +++++++++++++++++++
 .../configm/config-server/include/configm.h   | 43 +----------------
 2 files changed, 48 insertions(+), 42 deletions(-)
 create mode 100644 Common/config_manager.h

diff --git a/Common/config_manager.h b/Common/config_manager.h
new file mode 100644
index 000000000..5be7b2c88
--- /dev/null
+++ b/Common/config_manager.h
@@ -0,0 +1,47 @@
+#ifndef _CONFIG_MANAGER_H
+#define _CONFIG_MANAGER_H
+
+/* 类型定义 */
+
+/* IP CONFIG */
+#define NETCONFIG_MODULE 0x00000001
+
+/* USER MANAGER CONFIG */
+#define USER_MANAGER_CONFIG_MODULE 0x00000002
+
+/*PORTAL SERVER CONFIG */
+#define LOCALAUTH_CONFIG_MODULE 0x00000003
+
+#define LOG_CONFIG_MODULE       0x00000004
+
+/*nat config */
+#define NAT_CONFIG_MODULE 0x00000008
+
+
+
+/* config id define*/
+#define IPCONFIG_V4   (uint64)((uint64)NETCONFIG_MODULE<<32|1)
+#define BR_CONFIG     (uint64)((uint64)NETCONFIG_MODULE<<32|2)
+#define BRIF_CONFIG   (uint64)((uint64)NETCONFIG_MODULE<<32|3)
+#define BRFDB_CONFIG  (uint64)((uint64)NETCONFIG_MODULE<<32|4)
+
+
+#define USER_MANAGER_CONFIG_GROUP (uint64)((uint64)USER_MANAGER_CONFIG_MODULE<<32|1)
+#define USER_MANAGER_CONFIG_USER (uint64)((uint64)USER_MANAGER_CONFIG_MODULE<<32|2)
+
+#define AUTHFREE_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|1)
+#define FREEPARAMETERS_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|2)
+
+
+#define LOG_CONFIG_CONSOLE              (uint64)((uint64)LOG_CONFIG_MODULE<<32|1)
+#define LOG_CONFIG_MONITOR              (uint64)((uint64)LOG_CONFIG_MODULE<<32|2)
+#define LOG_CONFIG_REMOTE_ADD_HOST      (uint64)((uint64)LOG_CONFIG_MODULE<<32|3)
+#define LOG_CONFIG_REMOTE_DEL_HOST      (uint64)((uint64)LOG_CONFIG_MODULE<<32|4)
+#define LOG_CONFIG_REMOTE_LEVEL         (uint64)((uint64)LOG_CONFIG_MODULE<<32|5)
+
+
+
+#define NAT4_CONFIG (uint64)((uint64)NAT_CONFIG_MODULE<<32|1)
+
+
+#endif
\ No newline at end of file
diff --git a/Platform/user/configm/config-server/include/configm.h b/Platform/user/configm/config-server/include/configm.h
index e3547cff2..a7aa72c65 100755
--- a/Platform/user/configm/config-server/include/configm.h
+++ b/Platform/user/configm/config-server/include/configm.h
@@ -1,6 +1,6 @@
 #ifndef CONFIGM_H_
 #define CONFIGM_H_
-
+#include "config_manager.h"
 #include "s2j/s2j.h"
 #include "../../../../common/rpc/rpc_common.h"
 #include "../../../../../Common/commuapinl.h"
@@ -11,47 +11,6 @@
 #include "../web_config/authfree.h"
 #include "../web_config/auth_parameters.h"
 
-/* 类型定义 */
-
-/* IP CONFIG */
-#define NETCONFIG_MODULE 0x00000001
-
-/* USER MANAGER CONFIG */
-#define USER_MANAGER_CONFIG_MODULE 0x00000002
-
-/*PORTAL SERVER CONFIG */
-#define LOCALAUTH_CONFIG_MODULE 0x00000003
-
-#define LOG_CONFIG_MODULE       0x00000004
-
-/*nat config */
-#define NAT_CONFIG_MODULE 0x00000008
-
-
-
-/* config id define*/
-#define IPCONFIG_V4   (uint64)((uint64)NETCONFIG_MODULE<<32|1)
-#define BR_CONFIG     (uint64)((uint64)NETCONFIG_MODULE<<32|2)
-#define BRIF_CONFIG   (uint64)((uint64)NETCONFIG_MODULE<<32|3)
-#define BRFDB_CONFIG  (uint64)((uint64)NETCONFIG_MODULE<<32|4)
-
-
-#define USER_MANAGER_CONFIG_GROUP (uint64)((uint64)USER_MANAGER_CONFIG_MODULE<<32|1)
-#define USER_MANAGER_CONFIG_USER (uint64)((uint64)USER_MANAGER_CONFIG_MODULE<<32|2)
-
-#define AUTHFREE_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|1)
-#define FREEPARAMETERS_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|2)
-
-
-#define LOG_CONFIG_CONSOLE              (uint64)((uint64)LOG_CONFIG_MODULE<<32|1)
-#define LOG_CONFIG_MONITOR              (uint64)((uint64)LOG_CONFIG_MODULE<<32|2)
-#define LOG_CONFIG_REMOTE_ADD_HOST      (uint64)((uint64)LOG_CONFIG_MODULE<<32|3)
-#define LOG_CONFIG_REMOTE_DEL_HOST      (uint64)((uint64)LOG_CONFIG_MODULE<<32|4)
-#define LOG_CONFIG_REMOTE_LEVEL         (uint64)((uint64)LOG_CONFIG_MODULE<<32|5)
-
-
-
-#define NAT4_CONFIG (uint64)((uint64)NAT_CONFIG_MODULE<<32|1)
 
 #define CONFIG_INIT_ARRAY \
 {\