X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=VNFs%2FDPPD-PROX%2Ftask_init.h;h=5186826a918147619a648e899f7f242299b1a1e6;hb=974e4b3123b7d926d548d8924b41e8b732e2732f;hp=86a9521c599581584ff3f623f15908e0aa7f1070;hpb=f6abc2e6a02557e82ad0d1e5440653bb8884ecc8;p=samplevnf.git diff --git a/VNFs/DPPD-PROX/task_init.h b/VNFs/DPPD-PROX/task_init.h index 86a9521c..5186826a 100644 --- a/VNFs/DPPD-PROX/task_init.h +++ b/VNFs/DPPD-PROX/task_init.h @@ -46,6 +46,9 @@ struct lcore_cfg; #define TASK_ARG_DO_NOT_SET_SRC_MAC 0x200 #define TASK_ARG_DO_NOT_SET_DST_MAC 0x400 #define TASK_ARG_HW_SRC_MAC 0x800 +#define TASK_ARG_L3 0x1000 + +#define PROX_MODE_LEN 32 enum protocols {IPV4, ARP, IPV6}; @@ -63,8 +66,8 @@ struct task_args; struct task_init { enum task_mode mode; - char mode_str[32]; - char sub_mode_str[32]; + char mode_str[PROX_MODE_LEN]; + char sub_mode_str[PROX_MODE_LEN]; void (*early_init)(struct task_args *targ); void (*init)(struct task_base *tbase, struct task_args *targ); int (*handle)(struct task_base *tbase, struct rte_mbuf **mbufs, const uint16_t n_pkts); @@ -77,7 +80,6 @@ struct task_init { size_t size; uint16_t flag_req_data; /* flags from prox_shared.h */ uint64_t flag_features; - uint32_t mbuf_size; LIST_ENTRY(task_init) entries; }; @@ -103,7 +105,6 @@ struct task_args { struct lcore_cfg *lconf; uint32_t nb_mbuf; uint32_t mbuf_size; - uint8_t mbuf_size_set_explicitely; uint32_t nb_cache_mbuf; uint8_t nb_slave_threads; uint8_t nb_worker_threads; @@ -191,7 +192,7 @@ struct task_args { uint32_t bucket_size; uint32_t lat_enabled; uint32_t pkt_size; - uint8_t pkt_inline[ETHER_MAX_LEN]; + uint8_t pkt_inline[MAX_PKT_SIZE]; uint32_t probability; char nat_table[256]; uint32_t use_src; @@ -226,7 +227,9 @@ struct task_args { struct rte_ring **ctrl_rx_rings; struct rte_ring **ctrl_tx_rings; int n_ctrl_rings; + uint irq_debug; struct task_base *tmaster; + char sub_mode_str[PROX_MODE_LEN]; }; /* Return the first port that is reachable through the task. If the