cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add aaa-12 修改VLAN模块-变成_ 

SOL 修改VLAN模块-变成_
修改人：wangjingjing
检视人：yinbin

Signed-off-by: “wangjingjing” <wangjingjing@cmhi.chinamobile.com>
This commit is contained in:
“wangjingjing” 2019-09-23 20:05:21 -07:00
parent 449968168e
commit d156ab9f9d
1 changed files with 24 additions and 24 deletions
Platform/user/configm/config-server/vlan_config
vlan_config.c

48
Platform/user/configm/config-server/vlan_config/vlan_config.c
View File

@ -1217,22 +1217,22 @@ ret_code interface_vlan_set(interface_vlan_info *if_vlan_info)
* 每一个proc是一个operate操作
* {
* "operate" : "add",
* "conf-ifvlan": [
* "conf_ifvlan": [
* {
* "if-name" : "eth0",
* "if_name" : "eth0",
* "vid" : [
* 100,
* 200,
* ],
* "if-attr" : "trunk"
* "if_attr" : "trunk"
* },
* {
* "if-name" : "eth1",
* "if_name" : "eth1",
* "vid" : [
* 300,
* 400,
* ],
* "if-attr" : "trunk"
* "if_attr" : "trunk"
* },
* ]
* }
@ -1259,7 +1259,7 @@ ret_code vlan_config_json_parse(pointer input, interface_vlan_info *if_vlan_info
ret = RET_INPUTERR;
goto out;
}
if(!(conf_ifvlan = cJSON_GetObjectItem(root, "conf-ifvlan"))){
if(!(conf_ifvlan = cJSON_GetObjectItem(root, "conf_ifvlan"))){
printf("[vlan]vlan_config_json_parse: Json No conf_ifvlan node.\n");
ret = RET_INPUTERR;
goto out;
@ -1295,7 +1295,7 @@ ret_code vlan_config_json_parse(pointer input, interface_vlan_info *if_vlan_info
if(!node){
continue;
}
cJSON *ifName = cJSON_GetObjectItem(node, "if-name");
cJSON *ifName = cJSON_GetObjectItem(node, "if_name");
if(!ifName){
//continue;
printf("[vlan]vlan_config_json_parse: json has no ifName node.\n");
@ -1309,7 +1309,7 @@ ret_code vlan_config_json_parse(pointer input, interface_vlan_info *if_vlan_info
}
memcpy(if_vlan_info[i].if_name, ifName->valuestring, strlen(ifName->valuestring));
printf("[vlan]if_vlan_info[%d].if_name=%s\n", i, if_vlan_info[i].if_name);
cJSON *ifAttr = cJSON_GetObjectItem(node, "if-attr");
cJSON *ifAttr = cJSON_GetObjectItem(node, "if_attr");
if(!ifAttr){
//continue;
printf("[vlan]vlan_config_json_parse: Json has no ifAttr node.\n");
@ -1418,33 +1418,33 @@ ret_code vlan_config_proc(uint source, uint config_type,
* 放入interface结构,以便后续使用
* get格式
* {
* "get-ifvlan": [
* "get_ifvlan": [
* {
* "if-name" : "eth0",
* "if_name" : "eth0",
* },
* {
* "if-name" : "eth1",
* "if_name" : "eth1",
* },
* }
*
* 返回数据格式
* {
* "if-vlan": [
* "if_vlan": [
* {
* "if-name" : "eth0",
* "if_name" : "eth0",
* "vid" : [
* 100,
* 200,
* ],
* "if-attr" : "trunk"
* "if_attr" : "trunk"
* },
* {
* "if-name" : "eth1",
* "if_name" : "eth1",
* "vid" : [
* 300,
* 400,
* ],
* "if-attr" : "trunk"
* "if_attr" : "trunk"
* },
* }
* 输入:
@ -1477,8 +1477,8 @@ ret_code vlan_get_json_parse(int *interface, pointer input)
//goto out;
//}
if(!(get_ifvlan = cJSON_GetObjectItem(root, "get-ifvlan"))){
printf("[vlan]vlan_get_json_parse: No get-ifvlan node.\n");
if(!(get_ifvlan = cJSON_GetObjectItem(root, "get_ifvlan"))){
printf("[vlan]vlan_get_json_parse: No get_ifvlan node.\n");
ret = RET_INPUTERR;
goto out;
}
@ -1496,7 +1496,7 @@ ret_code vlan_get_json_parse(int *interface, pointer input)
if(!node){//???
continue;
}
cJSON *ifName = cJSON_GetObjectItem(node, "if-name");
cJSON *ifName = cJSON_GetObjectItem(node, "if_name");
if(!ifName){
//continue;
printf("[vlan]vlan_get_json_parse: json has no ifName node.\n");
@ -1547,7 +1547,7 @@ ret_code vlan_config_format_json(int *interface, pointer output, int *output_len
printf("[vlan]vlan_config_format_json: cJSON create root failed.\n");
return RET_ERR;
}
cJSON_AddItemToObject(root, "if-vlan", arr = cJSON_CreateArray());
cJSON_AddItemToObject(root, "if_vlan", arr = cJSON_CreateArray());
for(i = 0; i < MAX_INTERFACES; i++){
//ifnode = get_ifnode_from_global(if_vlan_info[i].if_name)
if(!(interface[i])){
@ -1560,15 +1560,15 @@ ret_code vlan_config_format_json(int *interface, pointer output, int *output_len
return RET_ERR;
}
cJSON_AddStringToObject(js_list , "if-name", g_if_vlan_info[i].if_name);
cJSON_AddStringToObject(js_list , "if_name", g_if_vlan_info[i].if_name);
if(g_if_vlan_info[i].attr == LINK_TYPE_TRUNK){
cJSON_AddStringToObject(js_list , "if-attr", "trunk");
cJSON_AddStringToObject(js_list , "if_attr", "trunk");
}
//else if(g_if_vlan_info[i].attr == LINK_TYPE_ACCESS){
//cJSON_AddStringToObject(js_list , "if-attr", "access");
//cJSON_AddStringToObject(js_list , "if_attr", "access");
//}
else {
printf("[vlan]vlan_config_format_json: if-atrtr error.\n");
printf("[vlan]vlan_config_format_json: if_atrtr error.\n");
cJSON_Delete(root);
return RET_ERR;