draft #3 of client config

1 files changed, 64 insertions, 75 deletions

diff --git a/src/bp_sim.cpp b/src/bp_sim.cpp
index db90107d..abedf95c 100755
--- a/src/bp_sim.cpp
+++ b/src/bp_sim.cpp
@@ -2449,26 +2449,6 @@ void CCapFileFlowInfo::Delete(){
     RemoveAll();
 }
 
-void operator >> (const YAML::Node& node, mac_mapping_t &fi) {
-    utl_yaml_read_ip_addr(node,"ip", fi.ip);
-    const YAML::Node& mac_info = node["mac"];
-    for(unsigned i=0;i<mac_info.size();i++) {
-        const YAML::Node & node_2 =mac_info;
-        uint32_t value;
-        node_2[i]  >> value;
-        fi.mac.mac[i] = value;
-    }
-}
-
-void operator >> (const YAML::Node& node, std::map<uint32_t, mac_addr_align_t> &mac_info) {
-    const YAML::Node& mac_node = node["items"];
-    mac_mapping_t mac_mapping;
-    for (unsigned i=0;i<mac_node.size();i++) {
-        mac_node[i] >> mac_mapping;
-        mac_info[mac_mapping.ip] = mac_mapping.mac;
-    }
-}
-
 void operator >> (const YAML::Node& node, CFlowYamlDpPkt & fi) {
     uint32_t val;
     node["pkt_id"]      >> val;
@@ -3348,7 +3328,7 @@ bool CFlowGenListPerThread::Create(uint32_t           thread_id,
     /* split the clients to threads */
     CTupleGenYamlInfo * tuple_gen = &m_flow_list->m_yaml_info.m_tuple_gen;
 
-    m_smart_gen.Create(0,m_thread_id,m_flow_list->get_is_mac_conf());
+    m_smart_gen.Create(0,m_thread_id);
 
     /* split the clients to threads using the mask */
     CIpPortion  portion;
@@ -3358,14 +3338,14 @@ bool CFlowGenListPerThread::Create(uint32_t           thread_id,
                   portion);
 
         m_smart_gen.add_client_pool(tuple_gen->m_client_pool[i].m_dist,
-                        portion.m_ip_start,
-                        portion.m_ip_end,
-                        get_longest_flow(i,true),
-                        get_total_kcps(i,true)*1000,
-                        &m_flow_list->m_mac_info,
-                        tuple_gen->m_client_pool[i].m_tcp_aging_sec,
-                        tuple_gen->m_client_pool[i].m_udp_aging_sec
-                        );
+                                    portion.m_ip_start,
+                                    portion.m_ip_end,
+                                    get_longest_flow(i,true),
+                                    get_total_kcps(i,true)*1000,
+                                    m_flow_list->m_client_config_info,
+                                    tuple_gen->m_client_pool[i].m_tcp_aging_sec,
+                                    tuple_gen->m_client_pool[i].m_udp_aging_sec
+                                    );
     }
     for (int i=0;i<tuple_gen->m_server_pool.size();i++) {
         split_ips(m_thread_id, m_max_threads, getDualPortId(),
@@ -4419,32 +4399,16 @@ void CFlowGenList::clean_p_thread_info(void){
     m_threads_info.clear();
 }
 
-
-
-int CFlowGenList::load_from_mac_file(std::string file_name) {
-    if ( !utl_is_file_exists (file_name)  ){
-         printf(" ERROR no mac_file is set,  file %s does not exist \n",file_name.c_str());
-         exit(-1);
-     }
-    m_mac_info.set_configured(true);
-
-     try {
-        std::ifstream fin((char *)file_name.c_str());
-        YAML::Parser parser(fin);
-        YAML::Node doc;
-
-        parser.GetNextDocument(doc);
-        doc[0] >> m_mac_info.get_mac_info();
-     } catch ( const std::exception& e ) {
-         std::cout << e.what() << "\n";
-         m_mac_info.clear();
-         exit(-1);
-     }
-
-     return (0);
+int CFlowGenList::load_client_config_file(std::string file_name) {
+    try {
+        m_client_config_info.load_yaml_file(file_name);
+    } catch (const std::exception& e) {
+        std::cout << e.what() << "\n";
+        exit(-1);
+    }
+    return (0);
 }
 
-
 int CFlowGenList::load_from_yaml(std::string file_name,
                                  uint32_t num_threads){
     uint8_t idx;
@@ -4756,7 +4720,7 @@ bool CParserOption::is_valid_opt_val(int val, int min, int max, const std::strin
 void CParserOption::dump(FILE *fd){
     preview.Dump(fd);
     fprintf(fd," cfg file    : %s \n",cfg_file.c_str());
-    fprintf(fd," mac file    : %s \n",mac_file.c_str());
+    fprintf(fd," mac file    : %s \n",client_cfg_file.c_str());
     fprintf(fd," out file    : %s \n",out_file.c_str());
     fprintf(fd," duration    : %.0f \n",m_duration);
     fprintf(fd," factor      : %.0f \n",m_factor);
@@ -5068,37 +5032,62 @@ int CErfIFStl::send_node(CGenNode * _no_to_use){
     return (0);
 }
 
+void CErfIF::add_vlan(uint16_t vlan_id) {
+    uint8_t *buffer =(uint8_t *)m_raw->raw;
 
+    uint16_t vlan_protocol = EthernetHeader::Protocol::VLAN;
+    uint32_t vlan_tag = (vlan_protocol << 16) | vlan_id;
+    vlan_tag = PKT_HTONL(vlan_tag);
 
-int CErfIF::send_node(CGenNode * node){
+    /* insert vlan tag and adjust packet size */
+    memcpy(cbuff+4, buffer + 12, m_raw->pkt_len - 12);
+    memcpy(cbuff, &vlan_tag, 4);
+    memcpy(buffer + 12, cbuff, m_raw->pkt_len-8);
 
-    if ( m_preview_mode->getFileWrite() ){
+    m_raw->pkt_len += 4;
+}
 
-    CFlowPktInfo * lp=node->m_pkt_info;
-    rte_mbuf_t * m=lp->generate_new_mbuf(node);
-    pkt_dir_t dir=node->cur_interface_dir();
+void CErfIF::apply_client_config(CGenNode *node, pkt_dir_t dir) {
+    uint8_t *p =(uint8_t *)m_raw->raw;
+    uint16_t vlan_id;
+
+    if (dir == CLIENT_SIDE) {
+        memcpy(p, node->m_client_cfg->m_init_mac, 6);
+        vlan_id = node->m_client_cfg->m_init_vlan;
+    } else {
+        memcpy(p, node->m_client_cfg->m_res_mac, 6);
+        vlan_id = node->m_client_cfg->m_res_vlan;
+    }
+
+    add_vlan(vlan_id);
+  
+}
+
+int CErfIF::send_node(CGenNode *node){
+
+    if (!m_preview_mode->getFileWrite()) {
+        return (0);
+    }
 
-    fill_raw_packet(m,node,dir);
+    CFlowPktInfo *lp = node->m_pkt_info;
+    rte_mbuf_t   *m  = lp->generate_new_mbuf(node);
+    pkt_dir_t    dir = node->cur_interface_dir();
+
+    fill_raw_packet(m, node, dir);
 
     /* update mac addr dest/src 12 bytes */
     uint8_t *p=(uint8_t *)m_raw->raw;
     int p_id=(int)dir;
     memcpy(p,CGlobalInfo::m_options.get_dst_src_mac_addr(p_id),12);
 
-    /* If vlan is enabled, add vlan header */
-    if ( unlikely( CGlobalInfo::m_options.preview.get_vlan_mode_enable() ) ){
-            /* retrieve vlan ID and  form vlan tag */
-            uint8_t vlan_port = (node->m_src_ip &1);
-            uint16_t vlan_protocol = EthernetHeader::Protocol::VLAN;
-            uint16_t vlan_id = CGlobalInfo::m_options.m_vlan_port[vlan_port];
-            uint32_t vlan_tag = (vlan_protocol << 16) | vlan_id;
-            vlan_tag = PKT_HTONL(vlan_tag);
+    /* if a client configuration was provided - apply the config */
+    if (node->m_client_cfg) {
+        apply_client_config(node, dir);
 
-            /* insert vlan tag and adjust packet size */
-            memcpy(cbuff+4, p+12, m_raw->pkt_len-12);
-            memcpy(cbuff, &vlan_tag, 4);
-            memcpy(p+12, cbuff, m_raw->pkt_len-8);
-            m_raw->pkt_len += 4;
+    } else if (CGlobalInfo::m_options.preview.get_vlan_mode_enable()) {
+        uint8_t vlan_port = (node->m_src_ip & 1);
+        uint16_t vlan_id = CGlobalInfo::m_options.m_vlan_port[vlan_port];
+        add_vlan(vlan_id);
     }
 
     //utl_DumpBuffer(stdout,p,  12,0);
@@ -5107,8 +5096,8 @@ int CErfIF::send_node(CGenNode * node){
     BP_ASSERT(rc == 0);
 
     rte_pktmbuf_free(m);
-   }
-   return (0);
+
+    return (0);
 }
 
 int CErfIF::flush_tx_queue(void){