summaryrefslogtreecommitdiffstats
path: root/src/platform_cfg.cpp
diff options
context:
space:
mode:
authorIdo Barnea <ibarnea@cisco.com>2017-03-22 11:33:38 +0200
committerIdo Barnea <ibarnea@cisco.com>2017-03-22 11:33:38 +0200
commit9218827e7337abe0296b9bb27ea3ca0865f8ef0e (patch)
treeb1a2f8a29a5f27c6b95c1f4383f6b48f883f4929 /src/platform_cfg.cpp
parentce79813cbdf7ccb9db7f3db9aab7a9c71005ecf0 (diff)
Error in case of vlan out of range in config file
Signed-off-by: Ido Barnea <ibarnea@cisco.com>
Diffstat (limited to 'src/platform_cfg.cpp')
-rwxr-xr-xsrc/platform_cfg.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/platform_cfg.cpp b/src/platform_cfg.cpp
index 8a2a9486..3acc993c 100755
--- a/src/platform_cfg.cpp
+++ b/src/platform_cfg.cpp
@@ -255,10 +255,8 @@ void operator >> (const YAML::Node& node, CMacYamlInfo & mac_info) {
if (! utl_yaml_read_ip_addr(node, "mask", mac_info.m_mask)) {
mac_info.m_mask = 0;
}
- if (! utl_yaml_read_uint16(node, "vlan", mac_info.m_vlan)) {
+ if (! utl_yaml_read_uint16(node, "vlan", mac_info.m_vlan, 0, 0xfff)) {
mac_info.m_vlan = 0;
- } else {
- mac_info.m_vlan &= 0x0fff; // we only care about the vlan ID
}
}