Create combined image and add helm chart

[samplevnf.git] / VNFs / DPPD-PROX / prox_lua_types.c

diff --git a/VNFs/DPPD-PROX/prox_lua_types.c b/VNFs/DPPD-PROX/prox_lua_types.c
index 7a0b6e0..1b23735 100644 (file)
--- a/VNFs/DPPD-PROX/prox_lua_types.c
+++ b/VNFs/DPPD-PROX/prox_lua_types.c
@@ -39,6 +39,7 @@
 #include "handle_qinq_encap4.h"
 #include "toeplitz.h"
 #include "handle_lb_5tuple.h"
+#include "prox_compat.h"
 
 #if RTE_VERSION < RTE_VERSION_NUM(1,8,0,0)
 #define RTE_CACHE_LINE_SIZE CACHE_LINE_SIZE
@@ -182,7 +183,7 @@ int lua_to_ip6(struct lua_State *L, enum lua_place from, const char *name, uint8
        return 0;
 }
 
-int lua_to_mac(struct lua_State *L, enum lua_place from, const char *name, struct ether_addr *mac)
+int lua_to_mac(struct lua_State *L, enum lua_place from, const char *name, prox_rte_ether_addr *mac)
 {
        uint32_t n_entries;
        uint32_t mac_array[4];
@@ -345,7 +346,7 @@ int lua_to_string(struct lua_State *L, enum lua_place from, const char *name, ch
        }
        str = lua_tostring(L, -1);
 
-       strncpy(dst, str, size);
+       prox_strncpy(dst, str, size);
 
        lua_pop(L, pop);
        return 0;
@@ -417,8 +418,8 @@ int lua_to_next_hop(struct lua_State *L, enum lua_place from, const char *name,
        uint32_t next_hop_index;
        uint32_t port_id;
        uint32_t ip;
-       uint32_t mpls;
-       struct ether_addr mac;
+       uint32_t mpls = 0;
+       prox_rte_ether_addr mac;
        int pop;
 
        if ((pop = lua_getfrom(L, from, name)) < 0)
@@ -436,11 +437,11 @@ int lua_to_next_hop(struct lua_State *L, enum lua_place from, const char *name,
        while (lua_next(L, -2)) {
                if (lua_to_int(L, TABLE, "id", &next_hop_index) ||
                    lua_to_int(L, TABLE, "port_id", &port_id) ||
-                   lua_to_ip(L, TABLE, "ip", &ip) ||
-                   lua_to_mac(L, TABLE, "mac", &mac) ||
-                   lua_to_int(L, TABLE, "mpls", &mpls))
+                   lua_to_ip(L, TABLE, "ip", &ip))
                        return -1;
 
+               lua_to_mac(L, TABLE, "mac", &mac);
+               lua_to_int(L, TABLE, "mpls", &mpls);
                PROX_PANIC(port_id >= PROX_MAX_PORTS, "Port id too high (only supporting %d ports)\n", PROX_MAX_PORTS);
                PROX_PANIC(next_hop_index >= MAX_HOP_INDEX, "Next-hop to high (only supporting %d next hops)\n", MAX_HOP_INDEX);
 
@@ -462,7 +463,7 @@ int lua_to_next_hop6(struct lua_State *L, enum lua_place from, const char *name,
 {
        struct next_hop6 *ret;
        uint32_t next_hop_index, port_id, mpls;
-       struct ether_addr mac;
+       prox_rte_ether_addr mac;
        uint8_t ip[16];
        int pop;
 
@@ -503,6 +504,7 @@ int lua_to_next_hop6(struct lua_State *L, enum lua_place from, const char *name,
        return 0;
 }
 
+#define MAX_NEW_RULES  128
 int lua_to_routes4(struct lua_State *L, enum lua_place from, const char *name, uint8_t socket, struct lpm4 *lpm)
 {
        struct ip4_subnet dst;
@@ -513,11 +515,12 @@ int lua_to_routes4(struct lua_State *L, enum lua_place from, const char *name, u
        char lpm_name[64];
        int ret;
        int pop;
+       static int count = 1;
 
        if ((pop = lua_getfrom(L, from, name)) < 0)
                return -1;
 
-       snprintf(lpm_name, sizeof(lpm_name), "IPv4_lpm_s%u", socket);
+       snprintf(lpm_name, sizeof(lpm_name), "IPv4_lpm_s%u_%d", socket, count++);
 
        if (!lua_istable(L, -1)) {
                set_err("Data is not a table\n");
@@ -530,12 +533,12 @@ int lua_to_routes4(struct lua_State *L, enum lua_place from, const char *name, u
        lua_pop(L, 1);
 #if RTE_VERSION >= RTE_VERSION_NUM(16,4,0,1)
        struct rte_lpm_config conf;
-       conf.max_rules = 2 * n_tot_rules;
+       conf.max_rules = 2 * n_tot_rules + MAX_NEW_RULES;
        conf.number_tbl8s = 256;
        conf.flags = 0;
        new_lpm = rte_lpm_create(lpm_name, socket, &conf);
 #else
-       new_lpm = rte_lpm_create(lpm_name, socket, 2 * n_tot_rules, 0);
+       new_lpm = rte_lpm_create(lpm_name, socket, 2 * n_tot_rules + MAX_NEW_RULES, 0);
 #endif
        PROX_PANIC(NULL == new_lpm, "Failed to allocate lpm\n");
 
@@ -918,7 +921,7 @@ int lua_to_cpe_table_data(struct lua_State *L, enum lua_place from, const char *
        struct ip4_subnet cidr;
        uint32_t n_entries = 0;
        uint32_t port_idx, gre_id, svlan, cvlan, user;
-       struct ether_addr mac;
+       prox_rte_ether_addr mac;
        uint32_t idx = 0;
 
        lua_pushnil(L);