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 \ {\