another small fix for trex-130

1 files changed, 32 insertions, 55 deletions

diff --git a/src/platform_cfg.cpp b/src/platform_cfg.cpp
index db563cc9..f0911611 100755
--- a/src/platform_cfg.cpp
+++ b/src/platform_cfg.cpp
@@ -189,95 +189,72 @@ void operator >> (const YAML::Node& node, CMacYamlInfo & mac_info) {
 }
 
 void operator >> (const YAML::Node& node, CPlatformMemoryYamlInfo & plat_info) {
-    try {
-     node["mbuf_64"] >> plat_info.m_mbuf[MBUF_64];    
-    } catch ( const std::exception& e ) {
+
+    if ( node.FindValue("mbuf_64") ){
+        node["mbuf_64"] >> plat_info.m_mbuf[MBUF_64];    
     }
 
-    try {
-     node["mbuf_128"] >> plat_info.m_mbuf[MBUF_128];    
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("mbuf_128") ){
+        node["mbuf_128"] >> plat_info.m_mbuf[MBUF_128];    
     }
 
-    try {
-     node["mbuf_256"] >> plat_info.m_mbuf[MBUF_256];    
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("mbuf_256") ){
+        node["mbuf_256"] >> plat_info.m_mbuf[MBUF_256];    
     }
 
-    try {
-     node["mbuf_512"] >> plat_info.m_mbuf[MBUF_512];        
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("mbuf_512") ){
+        node["mbuf_512"] >> plat_info.m_mbuf[MBUF_512];        
     }
 
-    try {
-     node["mbuf_1024"] >> plat_info.m_mbuf[MBUF_1024];         
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("mbuf_1024") ){
+        node["mbuf_1024"] >> plat_info.m_mbuf[MBUF_1024];         
     }
 
-    try {
-     node["mbuf_2048"] >> plat_info.m_mbuf[MBUF_2048];      
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("mbuf_2048") ){
+        node["mbuf_2048"] >> plat_info.m_mbuf[MBUF_2048];      
     }
 
-    try {
-     node["traffic_mbuf_64"] >> plat_info.m_mbuf[TRAFFIC_MBUF_64];    
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("traffic_mbuf_64") ){
+        node["traffic_mbuf_64"] >> plat_info.m_mbuf[TRAFFIC_MBUF_64];    
     }
 
-    try {
-     node["traffic_mbuf_128"] >> plat_info.m_mbuf[TRAFFIC_MBUF_128];    
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("traffic_mbuf_128") ){
+        node["traffic_mbuf_128"] >> plat_info.m_mbuf[TRAFFIC_MBUF_128];    
     }
 
-    try {
-     node["traffic_mbuf_256"] >> plat_info.m_mbuf[TRAFFIC_MBUF_256];    
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("traffic_mbuf_256") ){
+        node["traffic_mbuf_256"] >> plat_info.m_mbuf[TRAFFIC_MBUF_256];    
     }
 
-    try {
-     node["traffic_mbuf_512"] >> plat_info.m_mbuf[TRAFFIC_MBUF_512];        
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("traffic_mbuf_512") ){
+        node["traffic_mbuf_512"] >> plat_info.m_mbuf[TRAFFIC_MBUF_512];        
     }
 
-    try {
-     node["traffic_mbuf_1024"] >> plat_info.m_mbuf[TRAFFIC_MBUF_1024];         
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("traffic_mbuf_1024") ){
+        node["traffic_mbuf_1024"] >> plat_info.m_mbuf[TRAFFIC_MBUF_1024];         
     }
 
-    try {
-     node["traffic_mbuf_2048"] >> plat_info.m_mbuf[TRAFFIC_MBUF_2048];      
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("traffic_mbuf_2048") ){
+        node["traffic_mbuf_2048"] >> plat_info.m_mbuf[TRAFFIC_MBUF_2048];      
     }
 
-    try {
-     node["dp_flows"] >> plat_info.m_mbuf[MBUF_DP_FLOWS];      
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("dp_flows") ){
+        node["dp_flows"] >> plat_info.m_mbuf[MBUF_DP_FLOWS];      
     }
 
-    try {
-       node["global_flows"] >> plat_info.m_mbuf[MBUF_GLOBAL_FLOWS];      
-    } catch ( const std::exception& e ) {
+    if ( node.FindValue("global_flows") ){
+        node["global_flows"] >> plat_info.m_mbuf[MBUF_GLOBAL_FLOWS];      
     }
+
 }
 
 
 void operator >> (const YAML::Node& node, CPlatformYamlInfo & plat_info) {
 
-
-    try {
-        const YAML::Node& interface_mask = node["interface_mask"];
-        for(unsigned i=0;i<interface_mask.size();i++) {
-            std::string  fi;
-            const YAML::Node & node = interface_mask;
-            node[i]  >> fi;
-            plat_info.m_if_mask.push_back(fi);
-        }
-        plat_info.m_if_mask_exist=true;
-    } catch ( const std::exception& e ) {
-
+    if (node.FindValue("interface_mask")) {
+        printf("WARNING interface_mask in not used any more !\n");
     }
 
-
     /* must have interfaces */
     const YAML::Node& interfaces = node["interfaces"];
     for(unsigned i=0;i<interfaces.size();i++) {