diff options
author | Ido Barnea <ibarnea@cisco.com> | 2017-02-19 17:01:27 +0200 |
---|---|---|
committer | Ido Barnea <ibarnea@cisco.com> | 2017-02-21 12:03:42 +0200 |
commit | 977c61cb03e8bfc5f03d174b1761c2003f0e7ba6 (patch) | |
tree | 0af73f379be03a9abeb63324cda0d97cbc12afd8 /src/bp_sim.cpp | |
parent | e37db2930e8c495e0f08bf0cb9b8529c0d88a3b3 (diff) |
Removed mac keyword from all traffic profiles
Signed-off-by: Ido Barnea <ibarnea@cisco.com>
Diffstat (limited to 'src/bp_sim.cpp')
-rwxr-xr-x | src/bp_sim.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/bp_sim.cpp b/src/bp_sim.cpp index 8a8292a6..243c9316 100755 --- a/src/bp_sim.cpp +++ b/src/bp_sim.cpp @@ -2882,14 +2882,6 @@ void operator >> (const YAML::Node& node, CFlowsYamlInfo & flows_info) { flows_info.m_mac_replace_by_ip =false; } - const YAML::Node& mac_info = node["mac"]; - for(unsigned i=0;i<mac_info.size();i++) { - uint32_t fi; - const YAML::Node & node =mac_info; - node[i] >> fi; - flows_info.m_mac_base.push_back(fi); - } - const YAML::Node& cap_info = node["cap_info"]; for(unsigned i=0;i<cap_info.size();i++) { CFlowYamlInfo fi; @@ -2958,20 +2950,9 @@ void CFlowsYamlInfo::Dump(FILE *fd){ m_vlan_info.Dump(fd); - fprintf(fd," mac base : "); - int i; - for (i=0; i<(int)m_mac_base.size(); i++) { - if (i< (int)(m_mac_base.size()-1) ) { - fprintf(fd,"0x%02x,",m_mac_base[i]); - }else{ - fprintf(fd,"0x%02x",m_mac_base[i]); - } - } - fprintf(fd,"\n"); - fprintf(fd," cap file info \n"); fprintf(fd," ------------- \n"); - for (i=0; i<(int)m_vec.size(); i++) { + for (int i=0; i<(int)m_vec.size(); i++) { m_vec[i].Dump(fd); } m_tw.Dump(fd); @@ -5081,11 +5062,6 @@ int CFlowGenList::load_from_yaml(std::string file_name, } CGlobalInfo::m_options.preview.set_mac_ip_overide_enable(m_yaml_info.m_mac_replace_by_ip); - if ( m_yaml_info.m_mac_base.size() != 6 ){ - printf(" mac addr is not valid \n"); - exit(0); - } - if (m_yaml_info.m_ipv6_set == true) { // Copy the most significant 96-bits from yaml data for (idx=0; idx<6; idx++){ |