Mod aaa-12 修改configm.h、auth_parameters.h文件

RCA：
SOL：
修改人：chenling
检视人：

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

@@ -8,7 +8,7 @@
 #include "../user_manager_config/user_account_config.h"
 #include "netconfig.h"
 #include "log_config.h"
-#include "authfree.h"
+#include "../web_config/authfree.h"
 #include "localportal.h"
 #include "jumppage.h"
 #include "userlock.h"
@@ -42,11 +42,9 @@
 #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 PORTALSERVER_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|1)
+#define AUTHFREE_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|1)
-#define AUTHFREE_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|2)
+#define FREEPARAMETERS_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|2)
-#define USERLOCK_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|3)
+
-#define JUMPPAGE_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|4)
-#define AGINGTIME_CONFIG (uint64)((uint64)LOCALAUTH_CONFIG_MODULE<<32|5)
 
 #define LOG_CONFIG_CONSOLE      (uint64)((uint64)LOG_CONFIG_MODULE<<32|1)
 #define NAT4_CONFIG (uint64)((uint64)NAT_CONFIG_MODULE<<32|1)
@@ -121,15 +119,6 @@
         usergroup_config_get,     \
         usergroup_config_get_all  \
     },\
-    {\
-        PORTALSERVER_CONFIG,  \
-        CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,          \
-        FALSE,                    \
-        portalserver_config_chk,     \
-        portalserver_config_proc,    \
-        NULL, \
-        NULL \
-    }, \
     { \
         AUTHFREE_CONFIG,  \
         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
@@ -140,32 +129,14 @@
         NULL \
     },\
      {\
-        USERLOCK_CONFIG,  \
+        FREEPARAMETERS_CONFIG,  \
         CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
         FALSE,                    \
-        userlock_config_chk,     \
+        authpara_config_chk,     \
-        userlock_config_proc,    \
+        authpara_config_proc,    \
         NULL, \
         NULL \
     },\
-    {\
-        JUMPPAGE_CONFIG,  \
-        CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
-        FALSE,                    \
-        NULL, \
-        jumppage_config_proc,   \
-        NULL, \
-        NULL \
-    }, \
-     {\
-        AGINGTIME_CONFIG,  \
-        CONFIG_FROM_WEB|CONFIG_FROM_NETOPEER,           \
-        FALSE,                    \
-        agingtime_config_chk, \
-        agingtime_config_proc,   \
-        agingtime_config_get, \
-        agingtime_config_get_all \
-    }, \
     {\
         USER_MANAGER_CONFIG_USER,   \
         CONFIG_FROM_WEB,            \

Platform/user/configm/config-server/web_config/auth_parameters.h

@@ -40,11 +40,19 @@ int _valid_ipv4_port(const char *str, int port);
 /* iuput格式：{"type": 0, "data": {"ip": 1028737217,"port": 1010,"timehorizon": 10,"failcount": 20,"locktime":30, "aging_time":10}}*/
 ret_code authpara_config_json_parse(pointer input, uint *conf_type, auth_parameters_t *authpara_buff);
 
-/*修改认证参数 */
+/*检查增加的参数格式是否正确 */
+ret_code authpara_config_add_chk(uint source,uint config_type,
+                       pointer input, int input_len,
+                       pointer output, int *output_len)
+
 ret_code authpara_config_mod_chk(uint source,uint config_type,
                        pointer input, int input_len,
                        pointer output, int *output_len);
 
+ret_code authpara_config_chk(uint source,uint *config_type,
+                       pointer input, int *input_len,
+                       pointer output, int *output_len)
+
 ret_code authpara_config_add_proc(uint source, uint config_type,
                         pointer input, int input_len,
                         pointer output, int *output_len);
@@ -57,5 +65,7 @@ ret_code authpara_config_proc(uint source, uint config_type,
                        pointer input, int input_len,
                        pointer output, int *output_len);
 
+
+
 #endif