From 865078ff29ebfc34e51948a3c48c7c33b7de4e08 Mon Sep 17 00:00:00 2001 From: ChenLing Date: Thu, 12 Sep 2019 18:10:37 +0800 Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=20=E4=BF=AE=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=A4=E8=AF=81-=E5=85=8D=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6=20RCA?= =?UTF-8?q?=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?chenling=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configm/config-server/web_config/authfree.c | 9 ++++----- .../configm/config-server/web_config/authfree.h | 7 ++++--- .../web_config/config-adm/user_authfree.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Platform/user/configm/config-server/web_config/authfree.c b/Platform/user/configm/config-server/web_config/authfree.c index cf0ad24a7..4f7378566 100644 --- a/Platform/user/configm/config-server/web_config/authfree.c +++ b/Platform/user/configm/config-server/web_config/authfree.c @@ -19,7 +19,6 @@ freeauth_configure_t freeauth_array[RULE_MAX_NUM] = {0}; /*存储序列号的数组*/ int rule_order[RULE_MAX_NUM] = {0}; -#define UNAMESIZE (63 + 1) #define SPECHAR(element) (strpbrk((element), "~!@#$%^&*()_+{}|:\"<>?\\,./;\'[]-=`")) //校验特殊字符 #ifdef FREEAUTH_ACK_COOKIES @@ -273,7 +272,7 @@ ret_code freeauth_mov_json_parse(pointer input, uint *conf_type, rule_mod_t *rul if(rule_mod) { memset(rule_mod, 0, sizeof(rule_mod_t)); rule_mod->after = struct_rulemod->after; - strncpy(rule_mod->name, struct_rulemod->name, 31); + strncpy(rule_mod->name, struct_rulemod->name, UNAMESIZE); } printf("移动数据解析完成\n"); @@ -340,7 +339,7 @@ ret_code freeauth_config_json_parse(pointer input, uint *conf_type, freeauth_con if(freeauth_buff) { memset(freeauth_buff, 0, sizeof(freeauth_configure_t)); freeauth_buff->rule_priority = struct_freeauth->rule_priority; - strncpy(freeauth_buff->name, struct_freeauth->name, 31); + strncpy(freeauth_buff->name, struct_freeauth->name, UNAMESIZE); inet_pton(AF_INET, struct_freeauth->sip, &freeauth_buff->sip); /*点分十进制-十进制*/ inet_pton(AF_INET, struct_freeauth->dip, &freeauth_buff->dip); freeauth_buff->dport = struct_freeauth->dport; @@ -420,7 +419,7 @@ ret_code authfree_config_json_parse_array(pointer input, uint *conf_type, freeau name = cJSON_GetObjectItem(pArrayItem, "name"); if(name) { - strncpy(freeauth_buff->name, name->valuestring, 31); + strncpy(freeauth_buff->name, name->valuestring, UNAMESIZE); printf("freeauth_buff->name = %s\n", freeauth_buff->name); } @@ -859,7 +858,7 @@ ret_code freeauth_config_del_proc(uint source, uint config_type, for(int j = 0; j < cnt; j++) { memset(name, 0, 256); - strncpy(name, freeauth_configure[j].name, 31); + strncpy(name, freeauth_configure[j].name, UNAMESIZE); del_authfree(freeauth_configure[j].name, &authfree_result); diff --git a/Platform/user/configm/config-server/web_config/authfree.h b/Platform/user/configm/config-server/web_config/authfree.h index f5f555233..09a198e82 100644 --- a/Platform/user/configm/config-server/web_config/authfree.h +++ b/Platform/user/configm/config-server/web_config/authfree.h @@ -24,11 +24,12 @@ #define FREEAUTH_CONFIG_GET 4 #define FREEAUTH_CONFIG_DEL_ALL 5 +#define UNAMESIZE (63) /*配置消息 */ typedef struct { int rule_priority; /*未认证权限优先级*/ - char name[32]; /*未认证权限名称*/ + char name[UNAMESIZE + 1]; /*未认证权限名称*/ uint32_t sip; /*未认证权限源IP地址*/ uint32_t dip; /*未认证权限目的IP地址*/ int dport; /*未认证权限目的端口号*/ @@ -39,7 +40,7 @@ typedef struct { /*配置消息 */ typedef struct { int rule_priority; /*未认证权限优先级*/ - char name[32]; /*未认证权限名称*/ + char name[UNAMESIZE + 1]; /*未认证权限名称*/ char sip[20]; /*未认证权限源IP地址*/ char dip[20]; /*未认证权限目的IP地址*/ int dport; /*未认证权限目的端口号*/ @@ -50,7 +51,7 @@ typedef struct { /*修改权限消息*/ typedef struct { - char name[32]; + char name[UNAMESIZE + 1]; int after; }rule_mod_t; diff --git a/Platform/user/configm/config-server/web_config/config-adm/user_authfree.c b/Platform/user/configm/config-server/web_config/config-adm/user_authfree.c index d9dc70959..b2b65aea7 100644 --- a/Platform/user/configm/config-server/web_config/config-adm/user_authfree.c +++ b/Platform/user/configm/config-server/web_config/config-adm/user_authfree.c @@ -61,7 +61,7 @@ void add_authfree(int rule_priority, char *name, uint32_t sip, uint32_t dip, int printf("%s(%d) freeauth_array[%d] = %p\n", __FUNCTION__, __LINE__, i, &freeauth_array[i]); memset(&freeauth_array[i], 0, sizeof(freeauth_configure_t)); freeauth_array[i].rule_priority = rule_priority; - strncpy(freeauth_array[i].name, name, 31); + strncpy(freeauth_array[i].name, name, UNAMESIZE); freeauth_array[i].sip = sip; freeauth_array[i].dip = dip; freeauth_array[i].dport = dport; @@ -192,7 +192,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result for(i = 0; i < RULE_MAX_NUM; i++) { before_array[i].rule_priority = freeauth_array[i].rule_priority; - strncpy(before_array[i].name, freeauth_array[i].name, 31); + strncpy(before_array[i].name, freeauth_array[i].name, UNAMESIZE); before_array[i].rule_priority = freeauth_array[i].rule_priority; before_array[i].sip = freeauth_array[i].sip; before_array[i].dip = freeauth_array[i].dip; @@ -214,7 +214,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result { /*after-1 change before*/ //freeauth_array[after - 1].rule_priority = after; - strncpy(freeauth_array[after - 1].name, before_array[before].name, 31); + strncpy(freeauth_array[after - 1].name, before_array[before].name, UNAMESIZE); freeauth_array[after - 1].sip = before_array[before].sip; freeauth_array[after - 1].dip = before_array[before].dip; freeauth_array[after - 1].dport = before_array[before].dport; @@ -223,7 +223,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result for(i = (before + 1); i < after; i++) { //freeauth_array[i - 1].rule_priority = i; - strncpy(freeauth_array[i - 1].name, before_array[i].name, 31); + strncpy(freeauth_array[i - 1].name, before_array[i].name, UNAMESIZE); freeauth_array[i - 1].sip = before_array[i].sip; freeauth_array[i - 1].dip = before_array[i].dip; freeauth_array[i - 1].dport = before_array[i].dport; @@ -246,7 +246,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result { /*after change before*/ //freeauth_array[after].rule_priority = before - 1; - strncpy(freeauth_array[after].name, before_array[before].name, 31); + strncpy(freeauth_array[after].name, before_array[before].name,UNAMESIZE); freeauth_array[after].sip = before_array[before].sip; freeauth_array[after].dip = before_array[before].dip; freeauth_array[after].dport = before_array[before].dport; @@ -256,7 +256,7 @@ void mov_authfree(char *name, int after_arry, authfree_result_t *authfree_result for(i = after; i < before; i++) { //freeauth_array[i + 1].rule_priority = i + 2; - strncpy(freeauth_array[i + 1].name, before_array[i].name, 31); + strncpy(freeauth_array[i + 1].name, before_array[i].name,UNAMESIZE); freeauth_array[i + 1].sip = before_array[i].sip; freeauth_array[i + 1].dip = before_array[i].dip; freeauth_array[i + 1].dport = before_array[i].dport; @@ -293,7 +293,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result) for(i = 0; i < RULE_MAX_NUM; i++) { del_array[i].rule_priority = freeauth_array[i].rule_priority; - strncpy(del_array[i].name, freeauth_array[i].name, 31); + strncpy(del_array[i].name, freeauth_array[i].name,UNAMESIZE); del_array[i].rule_priority = freeauth_array[i].rule_priority; del_array[i].sip = freeauth_array[i].sip; del_array[i].dip = freeauth_array[i].dip; @@ -369,7 +369,7 @@ void del_authfree(char *name, authfree_result_t *authfree_result) printf("%s(%d) freeauth_array[%d] = %p\n", __FUNCTION__, __LINE__, j, &freeauth_array[j]); memset(&freeauth_array[j], 0, sizeof(freeauth_configure_t)); freeauth_array[j].rule_priority = del_array[i].rule_priority; - strncpy(freeauth_array[j].name, del_array[i].name, 31); + strncpy(freeauth_array[j].name, del_array[i].name, UNAMESIZE); freeauth_array[j].sip = del_array[i].sip; freeauth_array[j].dip = del_array[i].dip; freeauth_array[j].dport = del_array[i].dport;