From 977c61cb03e8bfc5f03d174b1761c2003f0e7ba6 Mon Sep 17 00:00:00 2001
From: Ido Barnea <ibarnea@cisco.com>
Date: Sun, 19 Feb 2017 17:01:27 +0200
Subject: Removed mac keyword from all traffic profiles

Signed-off-by: Ido Barnea <ibarnea@cisco.com>
---
 src/bp_sim.cpp | 26 +-------------------------
 src/bp_sim.h   |  8 --------
 2 files changed, 1 insertion(+), 33 deletions(-)

(limited to 'src')

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++){
diff --git a/src/bp_sim.h b/src/bp_sim.h
index 53ff33ed..8c882c51 100755
--- a/src/bp_sim.h
+++ b/src/bp_sim.h
@@ -3643,9 +3643,6 @@ inline CFlowPktInfo * CCapFileFlowInfo::GetPacket(uint32_t index){
 struct CFlowsYamlInfo {
 public:
     double          m_duration_sec;    //duration in sec for the cap file
-
-// IPv4 addressing
-
 // IPv6 addressing
     std::vector     <uint16_t> m_src_ipv6;
     std::vector     <uint16_t> m_dst_ipv6;
@@ -3671,12 +3668,7 @@ public:
     CVlanYamlInfo   m_vlan_info;
     CTupleGenYamlInfo m_tuple_gen;
     bool              m_tuple_gen_was_set;
-
-
-    std::vector     <uint8_t> m_mac_base;
-
     std::vector     <CFlowYamlInfo> m_vec;
-
     bool            m_is_plugin_configured; /* any plugin  is configured */
 
     CTimerWheelYamlInfo         m_tw;
-- 
cgit 1.2.3-korg