RX features - added port attributes for IPv4 and DG

Signed-off-by: imarom <imarom@cisco.com>

6 files changed, 134 insertions, 50 deletions

diff --git a/src/common/basic_utils.cpp b/src/common/basic_utils.cpp
index f169c29f..52988131 100755
--- a/src/common/basic_utils.cpp
+++ b/src/common/basic_utils.cpp
@@ -20,6 +20,10 @@ limitations under the License.
 #include <sstream>
 #include <sys/resource.h>
 
+#include "pal_utl.h"
+
+int my_inet_pton4(const char *src, unsigned char *dst);
+
 bool utl_is_file_exists (const std::string& name) {
     if (FILE *file = fopen(name.c_str(), "r")) {
         fclose(file);
@@ -190,6 +194,13 @@ void utl_macaddr_to_str(const uint8_t *macaddr, std::string &output) {
 
 }
 
+std::string utl_macaddr_to_str(const uint8_t *macaddr) {
+    std::string tmp;
+    utl_macaddr_to_str(macaddr, tmp);
+    
+    return tmp;
+}
+
 /**
  * generate a random connection handler
  * 
@@ -248,3 +259,23 @@ void utl_set_coredump_size(long size, bool map_huge_pages) {
     fprintf(fp, "%08x\n", mask);
     fclose(fp);
 }
+
+uint32_t utl_ipv4_to_uint32(const char *ipv4_str, uint32_t &ipv4_num) {
+    
+    uint32_t tmp;
+    
+    int rc = my_inet_pton4(ipv4_str, (unsigned char *)&tmp);
+    if (!rc) {
+        return (0);
+    }
+    
+    ipv4_num = PAL_NTOHL(tmp);
+    
+    return (1);
+}
+   
+std::string utl_uint32_to_ipv4(uint32_t ipv4_addr) {
+    std::stringstream ss;
+    ss << ((ipv4_addr >> 24) & 0xff) << "." << ((ipv4_addr >> 16) & 0xff) << "." << ((ipv4_addr >> 8) & 0xff) << "." << (ipv4_addr & 0xff);
+    return ss.str();
+}
diff --git a/src/common/basic_utils.h b/src/common/basic_utils.h
index f6250a2b..fdbd2f08 100755
--- a/src/common/basic_utils.h
+++ b/src/common/basic_utils.h
@@ -86,6 +86,8 @@ bool utl_is_file_exists (const std::string& name) ;
 
 void utl_macaddr_to_str(const uint8_t *macaddr, std::string &output);
 
+std::string utl_macaddr_to_str(const uint8_t *macaddr);
+
 std::string utl_generate_random_str(unsigned int &seed, int len);
 
 /**
@@ -98,6 +100,9 @@ std::string utl_generate_random_str(unsigned int &seed, int len);
  */
 void utl_set_coredump_size(long size, bool map_huge_pages = false);
 
+uint32_t       utl_ipv4_to_uint32(const char *ipv4_str, uint32_t &ipv4_num);
+std::string    utl_uint32_to_ipv4(uint32_t ipv4_addr);
+   
 #endif
 
 
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index fcee6a58..406b9c20 100644
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -308,7 +308,7 @@ public:
             | TrexPlatformApi::IF_STAT_PAYLOAD;
     }
     virtual CFlowStatParser *get_flow_stat_parser();
-    virtual int set_rcv_all(CPhyEthIF * _if, bool set_on) {return 0;}
+    virtual int set_rcv_all(CPhyEthIF * _if, bool set_on) {return -ENOTSUP;}
 };
 
 class CTRexExtendedDriverBase40G : public CTRexExtendedDriverBase10G {
@@ -1507,6 +1507,7 @@ int DpdkTRexPortAttr::set_led(bool on){
 int DpdkTRexPortAttr::get_flow_ctrl(int &mode) {
     int ret = rte_eth_dev_flow_ctrl_get(m_port_id, &fc_conf_tmp);
     if (ret) {
+        mode = -1;
         return ret;
     }
     mode = (int) fc_conf_tmp.mode;
@@ -3100,6 +3101,8 @@ void CGlobalTRex::pre_test() {
                 exit(1);
             }
             memcpy(CGlobalInfo::m_options.m_mac_addr[port_id].u.m_mac.dest, mac, ETHER_ADDR_LEN);
+            m_ports[port_id].get_port_attr()->set_next_hop_mac(mac);
+            
             // if port is connected in loopback, no need to send gratuitous ARP. It will only confuse our ingress counters.
             if (pretest.is_loopback(port_id))
                 CGlobalInfo::m_options.m_ip_cfg[port_id].set_grat_arp_needed(false);
@@ -4170,20 +4173,9 @@ CGlobalTRex:: publish_async_port_attr_changed(uint8_t port_id) {
     Json::Value data;
     data["port_id"] = port_id;
     TRexPortAttr * _attr = m_ports[port_id].get_port_attr();
-
-    /* attributes */
-    data["attr"]["speed"] = _attr->get_link_speed();
-    data["attr"]["promiscuous"]["enabled"] = _attr->get_promiscuous();
-    data["attr"]["link"]["up"] = _attr->is_link_up();
-    data["attr"]["rx_filter_mode"] = _attr->get_rx_filter_mode();
-
-    int mode;
-    int ret = _attr->get_flow_ctrl(mode);
-    if (ret != 0) {
-        mode = -1;
-    }
-    data["attr"]["fc"]["mode"] = mode;
-
+    
+    _attr->to_json(data["attr"]);
+    
     m_zmq_publisher.publish_event(TrexPublisher::EVENT_PORT_ATTR_CHANGED, data);
 }
 
@@ -4687,6 +4679,10 @@ bool CPhyEthIF::Create(uint8_t portid) {
     m_last_tx_pps  = 0.0;
     m_port_attr    = g_trex.m_drv->create_port_attr(portid);
 
+    
+    m_port_attr->set_ipv4(CGlobalInfo::m_options.m_ip_cfg[m_port_id].get_ip());
+    m_port_attr->set_default_gateway(CGlobalInfo::m_options.m_ip_cfg[m_port_id].get_def_gw());
+    
     return true;
 }
 
diff --git a/src/rpc-server/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
index b63c2faa..5ee853b8 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_general.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
@@ -292,9 +292,6 @@ TrexRpcCmdGetSysInfo::_run(const Json::Value &params, Json::Value &result) {
 
     for (int i = 0; i < main->get_port_count(); i++) {
         string driver;
-        string hw_macaddr;
-        string src_macaddr;
-        string dst_macaddr;
         string pci_addr;
         string description;
         supp_speeds_t supp_speeds;
@@ -303,7 +300,6 @@ TrexRpcCmdGetSysInfo::_run(const Json::Value &params, Json::Value &result) {
         TrexStatelessPort *port = main->get_port_by_id(i);
 
         port->get_properties(driver);
-        port->get_macaddr(hw_macaddr, src_macaddr, dst_macaddr);
 
         port->get_pci_info(pci_addr, numa);
         main->get_platform_api()->getPortAttrObj(i)->get_description(description);
@@ -313,9 +309,6 @@ TrexRpcCmdGetSysInfo::_run(const Json::Value &params, Json::Value &result) {
 
         section["ports"][i]["driver"]       = driver;
         section["ports"][i]["description"]  = description;
-        section["ports"][i]["hw_macaddr"]   = hw_macaddr;
-        section["ports"][i]["src_macaddr"]  = src_macaddr;
-        section["ports"][i]["dst_macaddr"]  = dst_macaddr;
 
         section["ports"][i]["pci_addr"]         = pci_addr;
         section["ports"][i]["numa"]             = numa;
@@ -363,6 +356,23 @@ TrexRpcCmdSetPortAttr::parse_rx_filter_mode(const Json::Value &msg, uint8_t port
     return get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->set_rx_filter_mode(filter_mode);
 }
 
+int
+TrexRpcCmdSetPortAttr::parse_ipv4(const Json::Value &msg, uint8_t port_id, Json::Value &result) {
+    
+    const std::string ipv4_str = parse_string(msg, "addr", result);
+    
+    uint32_t ipv4_addr;
+    if (!utl_ipv4_to_uint32(ipv4_str.c_str(), ipv4_addr)) {
+        std::stringstream ss;
+        ss << "invalid IPv4 address: '" << ipv4_str << "'";
+        generate_parse_err(result, ss.str());
+    }
+            
+    get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->set_ipv4(ipv4_addr);
+    return (0);
+}
+
+
 /**
  * set port commands
  *
@@ -408,15 +418,20 @@ TrexRpcCmdSetPortAttr::_run(const Json::Value &params, Json::Value &result) {
             ret = parse_rx_filter_mode(attr[name], port_id, result);
         }
 
+        else if (name == "ipv4") {
+            ret = parse_ipv4(attr[name], port_id, result);
+        }
+        
+        /* unknown attribute */
         else {
             generate_execute_err(result, "Not recognized attribute: " + name);
             break;
         }
 
+        /* check error code */
         if ( ret == -ENOTSUP ) {
             generate_execute_err(result, "Error applying " + name + ": operation is not supported for this NIC.");
-        }
-        else if (ret) {
+        } else if (ret) {
             generate_execute_err(result, "Error applying " + name + " attribute, return value: " + to_string(ret));
         }
     }
@@ -592,20 +607,8 @@ TrexRpcCmdGetPortStatus::_run(const Json::Value &params, Json::Value &result) {
     result["result"]["max_stream_id"] = port->get_max_stream_id();
 
     /* attributes */
-    result["result"]["attr"]["promiscuous"]["enabled"] = get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->get_promiscuous();
-    result["result"]["attr"]["link"]["up"] = get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->is_link_up();
-    result["result"]["attr"]["speed"]      = get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->get_link_speed();
-
-    int mode;
-    int ret = get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->get_flow_ctrl(mode);
-    if (ret != 0) {
-        mode = -1;
-    }
-    result["result"]["attr"]["fc"]["mode"] = mode;
-
-    /* RX filter */
-    result["result"]["attr"]["rx_filter_mode"] = get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->get_rx_filter_mode();
-
+    get_stateless_obj()->get_platform_api()->getPortAttrObj(port_id)->to_json(result["result"]["attr"]);
+    
     /* RX info */
     port->get_rx_features().to_json(result["result"]["rx_info"]);
 
diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h
index b8a5d323..49610eb8 100644
--- a/src/rpc-server/commands/trex_rpc_cmds.h
+++ b/src/rpc-server/commands/trex_rpc_cmds.h
@@ -96,7 +96,7 @@ TREX_RPC_CMD_DEFINE(TrexRpcCmdGetPortXStatsNames,  "get_port_xstats_names",  1,
 TREX_RPC_CMD_DEFINE_EXTENDED(TrexRpcCmdSetPortAttr, "set_port_attr", 2, true,  APIClass::API_CLASS_TYPE_CORE,
 
     int parse_rx_filter_mode(const Json::Value &msg, uint8_t port_id, Json::Value &result);
-
+    int parse_ipv4(const Json::Value &msg, uint8_t port_id, Json::Value &result);
 );
 
 
diff --git a/src/trex_port_attr.h b/src/trex_port_attr.h
index 5ba4f7e2..ccf12ae2 100755
--- a/src/trex_port_attr.h
+++ b/src/trex_port_attr.h
@@ -21,10 +21,17 @@ limitations under the License.
 #include <vector>
 #include "rte_ethdev_includes.h"
 #include "trex_defs.h"
-
+#include "common/basic_utils.h"
 
 class TRexPortAttr {
 public:
+
+    TRexPortAttr() {
+        m_ipv4 = 0;
+        m_default_gateway = 0;
+        memset(m_next_hop_mac, 0, sizeof(m_next_hop_mac));
+    }
+    
     virtual ~TRexPortAttr(){}
 
 /*    UPDATES    */
@@ -50,7 +57,10 @@ public:
     virtual bool is_link_change_supported() { return flag_is_link_change_supported; }
     virtual void get_description(std::string &description) { description = intf_info_st.description; }
     virtual void get_supported_speeds(supp_speeds_t &supp_speeds) = 0;
-
+    uint32_t get_ipv4() {return m_ipv4;}
+    uint32_t get_default_gateway() {return m_default_gateway;}
+    const uint8_t * get_next_hop_mac() {return m_next_hop_mac;}
+    
     virtual std::string get_rx_filter_mode() {
         switch (m_rx_filter_mode) {
         case RX_FILTER_MODE_ALL:
@@ -70,21 +80,60 @@ public:
     virtual int set_flow_ctrl(int mode) = 0;
     virtual int set_led(bool on) = 0;
     virtual int set_rx_filter_mode(rx_filter_mode_e mode) = 0;
-
+    
+    void set_ipv4(uint32_t addr) {
+        m_ipv4 = addr;
+    }
+    
+    void set_default_gateway(uint32_t addr) {
+        m_default_gateway = addr;
+    }
+    
+    void set_next_hop_mac(const uint8_t *next_hop_mac) {
+        memcpy(m_next_hop_mac, next_hop_mac, sizeof(m_next_hop_mac));
+    }
+    
 /*    DUMPS    */
     virtual void dump_link(FILE *fd) = 0;
 
+    /* dump object status to JSON */
+    void to_json(Json::Value &output) {
+        struct ether_addr dpdk_mac_addr;
+        macaddr_get(&dpdk_mac_addr);
+        
+        uint8_t mac_addr[6];
+        memcpy(mac_addr, dpdk_mac_addr.addr_bytes, 6);
+        
+        output["mac_addr"]               = utl_macaddr_to_str(mac_addr);
+        output["next_hop_mac"]           = utl_macaddr_to_str(m_next_hop_mac);
+        output["promiscuous"]["enabled"] = get_promiscuous();
+        output["link"]["up"]             = is_link_up();
+        output["speed"]                  = get_link_speed();
+        output["rx_filter_mode"]         = get_rx_filter_mode();
+        output["ipv4"]                   = utl_uint32_to_ipv4(get_ipv4());
+        output["default_gateway"]        = utl_uint32_to_ipv4(get_default_gateway());
+        
+        int mode;
+        get_flow_ctrl(mode);
+        output["fc"]["mode"] = mode;
+        
+    }
+    
 protected:
-    uint8_t m_port_id;
-    rte_eth_link m_link;
-    struct rte_eth_dev_info dev_info;
-
+    
+    uint8_t                   m_port_id;
+    rte_eth_link              m_link;
+    uint32_t                  m_ipv4;
+    uint32_t                  m_default_gateway;
+    uint8_t                   m_next_hop_mac[6];
+    struct rte_eth_dev_info   dev_info;
+    
     rx_filter_mode_e m_rx_filter_mode;
 
-    bool flag_is_virtual;
-    bool flag_is_fc_change_supported;
-    bool flag_is_led_change_supported;
-    bool flag_is_link_change_supported;
+    bool       flag_is_virtual;
+    bool       flag_is_fc_change_supported;
+    bool       flag_is_led_change_supported;
+    bool       flag_is_link_change_supported;
     
 
     struct intf_info_st {