mirror/rtbrick-bngblaster
1
0
Fork 0
mirror of https://github.com/rtbrick/bngblaster.git synced 2024-05-06 15:54:57 +00:00
Code Issues Projects Releases Wiki Activity

Add outer-vlan/inner-vlan config

Browse Source
This commit is contained in:
Christian Giese
2021-04-30 11:21:57 +02:00
parent 3c5eea352f
commit 5d4137bd63
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bbl_config.c
+27 -13
View File
@@ -119,25 +119,39 @@ json_parse_access_interface (bbl_ctx_s *ctx, json_t *access_interface, bbl_acces
return false;
}
value = json_object_get(access_interface, "outer-vlan-min");
value = json_object_get(access_interface, "outer-vlan");
if (json_is_number(value)) {
access_config->access_outer_vlan_min = json_number_value(value);
access_config->access_outer_vlan_min &= 4095;
access_config->access_outer_vlan_max = access_config->access_outer_vlan_min;
} else {
value = json_object_get(access_interface, "outer-vlan-min");
if (json_is_number(value)) {
access_config->access_outer_vlan_min = json_number_value(value);
access_config->access_outer_vlan_min &= 4095;
}
value = json_object_get(access_interface, "outer-vlan-max");
if (value) {
access_config->access_outer_vlan_max = json_number_value(value);
access_config->access_outer_vlan_max &= 4095;
}
}
value = json_object_get(access_interface, "outer-vlan-max");
if (value) {
access_config->access_outer_vlan_max = json_number_value(value);
access_config->access_outer_vlan_max &= 4095;
}
value = json_object_get(access_interface, "inner-vlan-min");
if (value) {
value = json_object_get(access_interface, "inner-vlan");
if (json_is_number(value)) {
access_config->access_inner_vlan_min = json_number_value(value);
access_config->access_inner_vlan_min &= 4095;
}
value = json_object_get(access_interface, "inner-vlan-max");
if (value) {
access_config->access_inner_vlan_max = json_number_value(value);
access_config->access_inner_vlan_max &= 4095;
access_config->access_inner_vlan_max = access_config->access_inner_vlan_min;
} else {
value = json_object_get(access_interface, "inner-vlan-min");
if (value) {
access_config->access_inner_vlan_min = json_number_value(value);
access_config->access_inner_vlan_min &= 4095;
}
value = json_object_get(access_interface, "inner-vlan-max");
if (value) {
access_config->access_inner_vlan_max = json_number_value(value);
access_config->access_inner_vlan_max &= 4095;
}
}
if(access_config->access_outer_vlan_min > access_config->access_outer_vlan_max ||
access_config->access_inner_vlan_min > access_config->access_inner_vlan_max) {