MOD aaa-12 桥模型代码上传

SOL  桥模型代码上传
修改人：zhangliang
检视人：zhangliang

Platform/build/user.configm.Makefile

@@ -28,6 +28,8 @@ VPATH = ../user/configm/config-server
 
 COMMON_SRCS = configserver.c \
     netconfig/ipconfig/ipconfig.c netconfig/parsefile.c \
+	netconfig/bridge/brconfig.c netconfig/bridge/brnetlink.c \
+	netconfig/bridge/libbridge/libbridge_if.c netconfig/bridge/libbridge/libbridge_init.c  netconfig/bridge/libbridge/libbridge_devif.c\
         authfree_config/authfree.c \
 	localportal_config/localportal.c \
 	userlock_config/userlock.c \
@@ -41,7 +43,7 @@ COMMON_SRCS = configserver.c \
 PLAT_LINUX_SRCS = $(COMMON_SRCS)
 PLAT_ARM64_SRCS = $(COMMON_SRCS)
 
-COMMOM_CFLAGS = -I../user/configm/config-server/include -I../../Common -I../common/redismq -I../common/configm -I../common/rpc -I../common/rpc/hashtable -I../common/ulog
+COMMOM_CFLAGS = -I../user/configm/config-server/include -I../../Common -I../common/redismq -I../common/configm -I../common/rpc -I../common/rpc/hashtable -I../common/ulog  -I../user/configm/config-server/netconfig/bridge/include 
 # gcc CFLAGS
 PLAT_ARM64_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/arm64/usr/local/include
 PLAT_LINUX_CFLAGS := $(COMMOM_CFLAGS) -I../thirdparty/x86_64/usr/local/include

Platform/user/configm/config-server/include/configm.h

@@ -13,6 +13,7 @@
 #include "jumppage.h"
 #include "userlock.h"
 #include "agingtime.h"
+#include "brconfig.h"
 
 /* 类型定义 */
 
@@ -31,6 +32,10 @@
 
 /* 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)
@@ -45,10 +50,6 @@
 
 #define CONFIG_INIT_ARRAY \
 {\
-    {\
-        NETCONFIG_MODULE,\
-        NULL\
-    },\
     {                       \
         LOG_CONFIG_MODULE,  \
         log_config_init     \
@@ -72,17 +73,42 @@
          IPCONFIG_V4,  \
          CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,  \
          FALSE,             \
-         FALSE,             \
          ip_config_chk,     \
          ip_config_proc,    \
          ip_config_get,     \
          ip_config_get_all  \
     },\
+    {\
+         BR_CONFIG,  \
+         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,  \
+         FALSE,             \
+         br_config_chk,     \
+         br_config_proc,    \
+         NULL,     \
+         NULL  \
+    },\
+    {\
+     BRIF_CONFIG,  \
+     CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,  \
+     FALSE,             \
+     br_if_config_chk,     \
+     br_if_config_proc,    \
+     br_if_config_get,     \
+     br_if_config_get_all  \
+    },\
+    {\
+     BRFDB_CONFIG,  \
+     CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,  \
+     FALSE,             \
+     br_fdb_config_chk,     \
+     NULL,    \
+     br_fdb_config_get,     \
+     NULL  \
+    },\
     {\
         USER_MANAGER_CONFIG_GROUP,  \
         CONFIG_FROM_WEB,          \
         FALSE,                    \
-        FALSE,                    \
         usergroup_config_chk,     \
         usergroup_config_proc,    \
         usergroup_config_get,     \
@@ -92,7 +118,6 @@
         PORTALSERVER_CONFIG,  \
         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,          \
         FALSE,                    \
-        FALSE,                    \
         portalserver_config_chk,     \
         portalserver_config_proc,    \
         NULL, \
@@ -102,7 +127,6 @@
         AUTHFREE_CONFIG,  \
         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
         FALSE,                    \
-        FALSE,                    \
         freeauth_config_chk,     \
         freeauth_config_proc,    \
         NULL, \
@@ -112,7 +136,6 @@
         USERLOCK_CONFIG,  \
         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
         FALSE,                    \
-        FALSE,                    \
         userlock_config_chk,     \
         userlock_config_proc,    \
         NULL, \
@@ -122,7 +145,6 @@
         JUMPPAGE_CONFIG,  \
         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
         FALSE,                    \
-        FALSE,                    \
         NULL, \
         jumppage_config_proc,   \
         NULL, \
@@ -132,7 +154,6 @@
         AGINGTIME_CONFIG,  \
         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
         FALSE,                    \
-        FALSE,                    \
         agingtime_config_chk, \
         agingtime_config_proc,   \
         agingtime_config_get, \
@@ -142,7 +163,6 @@
         USER_MANAGER_CONFIG_USER,   \
         CONFIG_FROM_WEB,            \
         FALSE,                      \
-        FALSE,                      \
         user_config_chk,            \
         user_config_proc,           \
         user_config_get,            \
@@ -152,7 +172,6 @@
         LOG_CONFIG_CONSOLE,         \
         CONFIG_FROM_WEB,            \
         FALSE,                      \
-        FALSE,                      \
         log_console_config_chk,     \
         log_console_config_proc,    \
         NULL,                       \
@@ -190,7 +209,6 @@ struct _config_service {
     uint64            config_id;       /* 配置ID，全局唯一，用于寻找对应的配置业务*/
     uint              config_src;      /* 配置源检查，全局唯一，用于寻找对应的配置业务,从低位到高位，第一位表示web，后续配置扩展 */
     boolean           recovery;        /* 配置恢复处理函数，如果为FALSE则不进行配置恢复  */
-    boolean           multi_inst;      /* 是否是多实例  */
     cm_config_chk     chk_callback;    /* 配置校验回调函数 */
     cm_config_proc    proc_callback;   /* 配置接口 */
     cm_config_get     get_callback;    /* 获取配置接口 */