diff options
Diffstat (limited to 'VNFs/vFW')
17 files changed, 2 insertions, 44 deletions
diff --git a/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_1Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_1Thread.cfg index a274506b..067ffc35 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_1Thread.cfg @@ -45,7 +45,6 @@ pktq_out = TXQ0.1 TXQ1.1 TXQ2.1 TXQ3.1 SWQ0 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 diff --git a/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_4Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_4Thread.cfg index 7d543c83..0454a6e3 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV4_MultiPortPair_4Thread.cfg @@ -45,7 +45,6 @@ pktq_out = TXQ0.1 TXQ1.1 TXQ2.1 TXQ3.1 SWQ0 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -66,7 +65,6 @@ pktq_out = TXQ0.2 TXQ1.2 TXQ2.2 TXQ3.2 SWQ1 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -87,7 +85,6 @@ pktq_out = TXQ0.3 TXQ1.3 TXQ2.3 TXQ3.3 SWQ2 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -107,7 +104,6 @@ pktq_out = TXQ0.4 TXQ1.4 TXQ2.4 TXQ3.4 SWQ3 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_1Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_1Thread.cfg index b90fad14..315c0dad 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_1Thread.cfg @@ -47,7 +47,6 @@ pktq_out = TXQ0.1 TXQ1.1 SWQ0 ;n_flows gets round up to power of 2 n_flows = 4000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 diff --git a/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_4Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_4Thread.cfg index dee9d97d..49436ddf 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV4_SinglePortPair_4Thread.cfg @@ -47,7 +47,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -67,7 +66,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -87,7 +85,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -108,7 +105,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_1Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_1Thread.cfg index ddf746e2..bb350839 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_1Thread.cfg @@ -47,7 +47,6 @@ pktq_out = TXQ0.1 TXQ1.1 TXQ2.1 TXQ3.1 SWQ0 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 diff --git a/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_4Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_4Thread.cfg index 5b1a1cd7..7af5a450 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV6_MultiPortPair_4Thread.cfg @@ -47,7 +47,6 @@ pktq_out = TXQ0.1 TXQ1.1 TXQ2.1 TXQ3.1 SWQ0 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -67,7 +66,6 @@ pktq_out = TXQ0.2 TXQ1.2 TXQ2.2 TXQ3.2 SWQ1 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -87,7 +85,6 @@ pktq_out = TXQ0.3 TXQ1.3 TXQ2.3 TXQ3.3 SWQ2 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -107,7 +104,6 @@ pktq_out = TXQ0.4 TXQ1.4 TXQ2.4 TXQ3.4 SWQ3 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 diff --git a/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_1Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_1Thread.cfg index ed2e8422..0fc3ec2c 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_1Thread.cfg @@ -47,7 +47,6 @@ pktq_out = TXQ0.1 TXQ1.1 SWQ0;TXQ2.1 TXQ3.1 SWQ0 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 diff --git a/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_4Thread.cfg b/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_4Thread.cfg index fd9da8f2..960af412 100644 --- a/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_HWLB_IPV6_SinglePortPair_4Thread.cfg @@ -47,7 +47,6 @@ pktq_out = TXQ0.1 TXQ1.1 SWQ0;TXQ2.1 TXQ3.1 SWQ0 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 @@ -68,7 +67,6 @@ pktq_out = TXQ0.2 TXQ1.2 SWQ1;TXQ2.2 TXQ3.2 SWQ1 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -89,7 +87,6 @@ pktq_out = TXQ0.3 TXQ1.3 SWQ2;TXQ2.3 TXQ3.3 SWQ2 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -109,7 +106,6 @@ pktq_out = TXQ0.4 TXQ1.4 SWQ3;TXQ2.3 TXQ3.3 SWQ2 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg index 8e26c286..69527492 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_1Thread.cfg @@ -64,7 +64,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -105,7 +104,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_4Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_4Thread.cfg index adcce34e..b1a0d2f9 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV4_MultiPortPair_4Thread.cfg @@ -66,7 +66,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -84,7 +83,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -123,7 +121,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -141,7 +138,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_1Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_1Thread.cfg index 5499ea8c..51a01019 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_1Thread.cfg @@ -63,7 +63,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 4096000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_4Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_4Thread.cfg index abb4735b..4e375299 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV4_SinglePortPair_4Thread.cfg @@ -62,7 +62,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -80,7 +79,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -98,7 +96,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -116,7 +113,6 @@ n_rules = 4096 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv4 traffic_type = 4 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_1Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_1Thread.cfg index aefb37aa..f5bd020d 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_1Thread.cfg @@ -65,7 +65,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -106,7 +105,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_4Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_4Thread.cfg index bc30db8d..29bd4780 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV6_MultiPortPair_4Thread.cfg @@ -64,7 +64,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -82,7 +81,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -120,7 +118,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -138,7 +135,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_1Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_1Thread.cfg index 4fb0fad1..da263c45 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_1Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_1Thread.cfg @@ -63,7 +63,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_4Thread.cfg b/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_4Thread.cfg index 4c372f75..2ab3e506 100644 --- a/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_4Thread.cfg +++ b/VNFs/vFW/config/VFW_SWLB_IPV6_SinglePortPair_4Thread.cfg @@ -63,7 +63,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -81,7 +80,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -99,7 +97,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 @@ -117,7 +114,6 @@ n_rules = 10000 ;n_flows gets round up to power of 2 n_flows = 1000000 -pkt_type = ipv6 traffic_type = 6 ; tcp_time_wait controls timeout for closed connection, normally 120 tcp_time_wait = 10 diff --git a/VNFs/vFW/pipeline/pipeline_vfw_be.c b/VNFs/vFW/pipeline/pipeline_vfw_be.c index a654c3fc..f6ada29a 100644 --- a/VNFs/vFW/pipeline/pipeline_vfw_be.c +++ b/VNFs/vFW/pipeline/pipeline_vfw_be.c @@ -142,7 +142,7 @@ struct mbuf_tcp_meta_data { #define IP_VERSION_4 4 #define IP_VERSION_6 6 -#define MIX 10 + /* IPv6 */ #define IP_HDR_SIZE_IPV6 40 #define IP_HDR_DSCP_OFST_IPV6 0 @@ -2548,7 +2548,7 @@ static void strncpy(pipe->name, params->name, sizeof(pipe->name)); pipe->log_level = params->log_level; pipe_vfw->n_flows = 4096; /* small default value */ - pipe_vfw->traffic_type = MIX; + pipe_vfw->traffic_type = IP_VERSION_4; pipe_vfw->pipeline_num = 0xff; for (i = 0; i < PIPELINE_MAX_PORT_IN; i++) { pipe_vfw->links_map[i] = 0xff; |