diff options
41 files changed, 0 insertions, 83 deletions
diff --git a/src/scripts/vnet/arp4 b/src/scripts/vnet/arp4 index acb20da33c8..372d82a9ccd 100644 --- a/src/scripts/vnet/arp4 +++ b/src/scripts/vnet/arp4 @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.0.0.2 ICMP echo_request diff --git a/src/scripts/vnet/arp4-mpls b/src/scripts/vnet/arp4-mpls index d3d39f3b921..3e1561157ea 100644 --- a/src/scripts/vnet/arp4-mpls +++ b/src/scripts/vnet/arp4-mpls @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.2.2.2 ICMP echo_request diff --git a/src/scripts/vnet/arp6 b/src/scripts/vnet/arp6 index e6a98935309..df58fb6478f 100644 --- a/src/scripts/vnet/arp6 +++ b/src/scripts/vnet/arp6 @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip6-input size 64-64 - no-recycle data { ICMP6: 2000::2 -> 2001::2 ICMP echo_request diff --git a/src/scripts/vnet/bvi b/src/scripts/vnet/bvi index 2174da0db63..124fa044bfd 100644 --- a/src/scripts/vnet/bvi +++ b/src/scripts/vnet/bvi @@ -41,7 +41,6 @@ cle run packet-generator new { name bvi_to_l2 limit 100 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { @@ -53,7 +52,6 @@ packet-generator new { packet-generator new { name l2_to_bvi limit 50 - no-recycle node ethernet-input interface GigabitEthernet2/2/0 data { @@ -65,7 +63,6 @@ packet-generator new { packet-generator new { name l2_to_bvi_via_flood limit 25 - no-recycle node ethernet-input interface GigabitEthernet2/2/0 data { diff --git a/src/scripts/vnet/icmp b/src/scripts/vnet/icmp index 1e054e2df4a..889eca82c8f 100644 --- a/src/scripts/vnet/icmp +++ b/src/scripts/vnet/icmp @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.2.3.4 -> 5.6.7.8 ICMP echo_request diff --git a/src/scripts/vnet/icmp6 b/src/scripts/vnet/icmp6 index 2a65acba256..4fcb600594c 100644 --- a/src/scripts/vnet/icmp6 +++ b/src/scripts/vnet/icmp6 @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip6-input size 64-64 - no-recycle data { ICMP6: ::1 -> ::2 ICMP echo_request diff --git a/src/scripts/vnet/ip6 b/src/scripts/vnet/ip6 index adb27225fed..de6a8e85cd0 100644 --- a/src/scripts/vnet/ip6 +++ b/src/scripts/vnet/ip6 @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ethernet-input size 64-64 - no-recycle data { IP6: 1.2.3 -> 4.5.6 ICMP: 3002::2 -> 3001::2 diff --git a/src/scripts/vnet/ip6-hbh b/src/scripts/vnet/ip6-hbh index 0c6de47f100..87be118eadd 100644 --- a/src/scripts/vnet/ip6-hbh +++ b/src/scripts/vnet/ip6-hbh @@ -6,7 +6,6 @@ packet-generator new { limit 1 node ip6-input size 48-48 - no-recycle data { IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2 hex 0x3B00010403040506 @@ -18,7 +17,6 @@ packet-generator new { limit 1 node ip6-input size 48-48 - no-recycle data { IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2 hex 0x3B00C10403040506 @@ -31,7 +29,6 @@ packet-generator new { limit 1 node ip6-input size 48-48 - no-recycle data { IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2 hex 0x3BffC10403040506 @@ -44,7 +41,6 @@ packet-generator new { limit 1 node ip6-input size 64-64 - no-recycle data { IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2 hex 0x3BffC10403040506 @@ -57,7 +53,6 @@ packet-generator new { limit 1 node ip6-input size 56-56 - no-recycle data { IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2 length 16 @@ -71,7 +66,6 @@ packet-generator new { limit 1 node ip6-input size 56-56 - no-recycle data { IP6_HOP_BY_HOP_OPTIONS: 1::2 -> 1::2 length 16 diff --git a/src/scripts/vnet/l2efpfilter b/src/scripts/vnet/l2efpfilter index 307b4436e81..d1074ce5b0c 100644 --- a/src/scripts/vnet/l2efpfilter +++ b/src/scripts/vnet/l2efpfilter @@ -48,7 +48,6 @@ clear int packet-generator new { name pre_vtr_fail limit 10 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { @@ -60,7 +59,6 @@ packet-generator new { packet-generator new { name post_vtr_pass limit 20 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { @@ -72,7 +70,6 @@ packet-generator new { packet-generator new { name post_vtr_fail limit 50 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { diff --git a/src/scripts/vnet/l2efpfilter_perf b/src/scripts/vnet/l2efpfilter_perf index b2f4b490cb8..08c1b46a01c 100644 --- a/src/scripts/vnet/l2efpfilter_perf +++ b/src/scripts/vnet/l2efpfilter_perf @@ -48,7 +48,6 @@ clear int packet-generator new { name post_vtr_pass limit 9111003 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { diff --git a/src/scripts/vnet/l2fib b/src/scripts/vnet/l2fib index 81ede171ef2..dd5c5a803f8 100644 --- a/src/scripts/vnet/l2fib +++ b/src/scripts/vnet/l2fib @@ -28,7 +28,6 @@ clear int packet-generator new { name new_input_if_index_mac_move limit 4 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 size 98-98 @@ -38,7 +37,6 @@ packet-generator new { packet-generator new { name dmac_hit limit 7 - no-recycle node ethernet-input interface GigabitEthernet2/2/0 size 98-98 diff --git a/src/scripts/vnet/l2fib_perf b/src/scripts/vnet/l2fib_perf index 638317ff705..55565061dae 100644 --- a/src/scripts/vnet/l2fib_perf +++ b/src/scripts/vnet/l2fib_perf @@ -20,7 +20,6 @@ cle run packet-generator new { name perf limit 9111003 - no-recycle node ethernet-input interface GigabitEthernet2/2/0.1 size 98-98 diff --git a/src/scripts/vnet/l2fib_xc b/src/scripts/vnet/l2fib_xc index 35d7342b3f7..bb25bd35247 100644 --- a/src/scripts/vnet/l2fib_xc +++ b/src/scripts/vnet/l2fib_xc @@ -22,7 +22,6 @@ clear int packet-generator new { name xc limit 11 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 size 98-98 diff --git a/src/scripts/vnet/l2flood b/src/scripts/vnet/l2flood index 013462cef64..ec82306d487 100644 --- a/src/scripts/vnet/l2flood +++ b/src/scripts/vnet/l2flood @@ -30,7 +30,6 @@ clear int packet-generator new { name flood limit 1 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { diff --git a/src/scripts/vnet/l2tp b/src/scripts/vnet/l2tp index 337805aa44c..fcfe4b5f9ac 100644 --- a/src/scripts/vnet/l2tp +++ b/src/scripts/vnet/l2tp @@ -42,7 +42,6 @@ packet-generator new { name decap limit 10 size 200-200 - no-recycle node ethernet-input interface GigabitEthernet2/2/0 data { @@ -59,7 +58,6 @@ packet-generator new { name decap_bad_sid limit 30 size 200-200 - no-recycle node ethernet-input interface GigabitEthernet2/2/0 data { @@ -76,7 +74,6 @@ packet-generator new { name decap_bad_cookie limit 50 size 200-200 - no-recycle node ethernet-input interface GigabitEthernet2/2/0 data { @@ -92,7 +89,6 @@ packet-generator new { packet-generator new { name encap limit 100 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { @@ -106,7 +102,6 @@ packet-generator new { name decap_sublayer limit 300 size 200-200 - no-recycle node ethernet-input interface GigabitEthernet2/2/0 data { @@ -122,7 +117,6 @@ packet-generator new { packet-generator new { name encap_sublayer limit 700 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { diff --git a/src/scripts/vnet/lfib/ip4-to-mpls b/src/scripts/vnet/lfib/ip4-to-mpls index 85753797751..c7923297a9f 100644 --- a/src/scripts/vnet/lfib/ip4-to-mpls +++ b/src/scripts/vnet/lfib/ip4-to-mpls @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.2.2.2 ICMP echo_request diff --git a/src/scripts/vnet/lfib/mpls-pop-to-mpls b/src/scripts/vnet/lfib/mpls-pop-to-mpls index 2818ac133e1..1b7ef8d2e7b 100644 --- a/src/scripts/vnet/lfib/mpls-pop-to-mpls +++ b/src/scripts/vnet/lfib/mpls-pop-to-mpls @@ -3,7 +3,6 @@ packet-generator new { limit 1 node mpls-input size 72-72 - no-recycle data { hex 0x0001e0ff0001f1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 } diff --git a/src/scripts/vnet/lfib/mpls-to-ip4 b/src/scripts/vnet/lfib/mpls-to-ip4 index 24e235e01db..4bd707fa2e8 100644 --- a/src/scripts/vnet/lfib/mpls-to-ip4 +++ b/src/scripts/vnet/lfib/mpls-to-ip4 @@ -3,7 +3,6 @@ packet-generator new { limit 1 node mpls-input size 68-68 - no-recycle data { hex 0x0001e1ff4500004000000000400177ba010000020202020208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 } diff --git a/src/scripts/vnet/lfib/mpls-to-mpls b/src/scripts/vnet/lfib/mpls-to-mpls index 497dbab324f..07015d2b310 100644 --- a/src/scripts/vnet/lfib/mpls-to-mpls +++ b/src/scripts/vnet/lfib/mpls-to-mpls @@ -3,7 +3,6 @@ packet-generator new { limit 1 node mpls-input size 68-68 - no-recycle data { hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 } diff --git a/src/scripts/vnet/mcast/ip4 b/src/scripts/vnet/mcast/ip4 index eb6bab27bc6..101f09b087a 100644 --- a/src/scripts/vnet/mcast/ip4 +++ b/src/scripts/vnet/mcast/ip4 @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip4-input size 512-512 - no-recycle data { ICMP: 1.0.0.2 -> 232.1.1.1 ICMP echo_request diff --git a/src/scripts/vnet/mpls-o-ethernet/pg b/src/scripts/vnet/mpls-o-ethernet/pg index ba5397f7648..4070cde861f 100644 --- a/src/scripts/vnet/mpls-o-ethernet/pg +++ b/src/scripts/vnet/mpls-o-ethernet/pg @@ -3,7 +3,6 @@ packet-generator new { limit 1 node mpls-ethernet-input size 68-68 - no-recycle data { hex 0x0001e1ff4500004000000000400177ba010000020200000208007a6e000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021222324252627 } diff --git a/src/scripts/vnet/mpls-tunnel b/src/scripts/vnet/mpls-tunnel index d04b29702e7..e69ad6b678b 100644 --- a/src/scripts/vnet/mpls-tunnel +++ b/src/scripts/vnet/mpls-tunnel @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.0.0.2 ICMP echo_request @@ -15,7 +14,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.0.1.2 ICMP echo_request @@ -27,7 +25,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.0.2.2 ICMP echo_request @@ -39,7 +36,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.0.3.2 ICMP echo_request diff --git a/src/scripts/vnet/nat44 b/src/scripts/vnet/nat44 index 3292b565e18..bce96487dd2 100644 --- a/src/scripts/vnet/nat44 +++ b/src/scripts/vnet/nat44 @@ -6,7 +6,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle interface pg0 data { UDP: 10.0.0.3 -> 172.16.1.2 @@ -21,7 +20,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle interface pg0 data { UDP: 10.0.0.3 -> 172.16.1.2 diff --git a/src/scripts/vnet/nat44_det b/src/scripts/vnet/nat44_det index 629772e69f4..ad1e7bb09d5 100644 --- a/src/scripts/vnet/nat44_det +++ b/src/scripts/vnet/nat44_det @@ -6,7 +6,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 0 interface pg0 data { @@ -22,7 +21,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 1 interface pg0 data { @@ -38,7 +36,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 0 interface pg1 data { @@ -54,7 +51,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 1 interface pg1 data { @@ -70,7 +66,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 2 interface pg0 data { @@ -86,7 +81,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 1 interface pg1 data { diff --git a/src/scripts/vnet/nat44_lb b/src/scripts/vnet/nat44_lb index f66c13ce99f..0e476357c54 100644 --- a/src/scripts/vnet/nat44_lb +++ b/src/scripts/vnet/nat44_lb @@ -6,7 +6,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 0 interface pg1 data { @@ -22,7 +21,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 1 interface pg1 data { diff --git a/src/scripts/vnet/nat44_static b/src/scripts/vnet/nat44_static index 2b8f25ec20c..26e340819f1 100644 --- a/src/scripts/vnet/nat44_static +++ b/src/scripts/vnet/nat44_static @@ -6,7 +6,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 0 interface pg0 data { @@ -22,7 +21,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 1 interface pg1 data { diff --git a/src/scripts/vnet/nat44_static_with_port b/src/scripts/vnet/nat44_static_with_port index 25e16e94d66..7297fb4c7a2 100644 --- a/src/scripts/vnet/nat44_static_with_port +++ b/src/scripts/vnet/nat44_static_with_port @@ -6,7 +6,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 0 interface pg0 data { @@ -22,7 +21,6 @@ packet-generator new { limit 1000000 node ip4-input size 64-64 - no-recycle worker 1 interface pg1 data { diff --git a/src/scripts/vnet/nat64 b/src/scripts/vnet/nat64 index f0d98ea8c69..85cd1798ed1 100644 --- a/src/scripts/vnet/nat64 +++ b/src/scripts/vnet/nat64 @@ -6,7 +6,6 @@ packet-generator new { limit 10 node ip6-input size 64-64 - no-recycle worker 0 interface pg0 data { @@ -22,7 +21,6 @@ packet-generator new { limit 10 node ip6-input size 64-64 - no-recycle interface pg0 worker 1 data { diff --git a/src/scripts/vnet/nat64_static b/src/scripts/vnet/nat64_static index ff5e8dbb2c7..3cf682d5854 100644 --- a/src/scripts/vnet/nat64_static +++ b/src/scripts/vnet/nat64_static @@ -6,7 +6,6 @@ packet-generator new { limit 10 node ip4-input size 64-64 - no-recycle worker 0 interface pg1 data { @@ -22,7 +21,6 @@ packet-generator new { limit 10 node ip4-input size 64-64 - no-recycle interface pg1 worker 1 data { diff --git a/src/scripts/vnet/pcap b/src/scripts/vnet/pcap index 692e5f27012..d8f47c69074 100644 --- a/src/scripts/vnet/pcap +++ b/src/scripts/vnet/pcap @@ -2,7 +2,6 @@ packet-generator new { name x limit 1 node ethernet-input - no-recycle pcap /home/eliot/pcap-data/ISIS_level1_adjacency.cap } @@ -10,7 +9,6 @@ packet-generator new { name y limit 1 node hdlc-input - no-recycle pcap /home/eliot/pcap-data/ISIS_p2p_adjacency.cap } diff --git a/src/scripts/vnet/rewrite b/src/scripts/vnet/rewrite index d41b9dbf7fc..d05ce89e6b8 100644 --- a/src/scripts/vnet/rewrite +++ b/src/scripts/vnet/rewrite @@ -26,7 +26,6 @@ cle run packet-generator new { name toport limit 2 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { @@ -38,7 +37,6 @@ packet-generator new { packet-generator new { name tovlan limit 2 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { @@ -50,7 +48,6 @@ packet-generator new { packet-generator new { name toqinq limit 2 - no-recycle node ethernet-input interface GigabitEthernet2/1/0 data { diff --git a/src/scripts/vnet/rpf b/src/scripts/vnet/rpf index 571c6b79a8c..7a6608e2667 100644 --- a/src/scripts/vnet/rpf +++ b/src/scripts/vnet/rpf @@ -3,7 +3,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.2.3.4 -> 5.6.7.8 ICMP echo_request diff --git a/src/scripts/vnet/source_and_port_range_check b/src/scripts/vnet/source_and_port_range_check index dce227b4315..7eabde3127f 100644 --- a/src/scripts/vnet/source_and_port_range_check +++ b/src/scripts/vnet/source_and_port_range_check @@ -9,7 +9,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 1.2.3.4 -> 5.6.7.8 UDP: 3000 -> 3001 @@ -22,7 +21,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 1.1.1.1 -> 5.6.7.8 UDP: 3000 -> 3001 @@ -35,7 +33,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 1.1.1.1 -> 5.6.7.8 UDP: 6000 -> 6001 diff --git a/src/scripts/vnet/srp b/src/scripts/vnet/srp index 7cc37011386..c20b38a6d20 100644 --- a/src/scripts/vnet/srp +++ b/src/scripts/vnet/srp @@ -8,7 +8,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { ICMP: 1.0.0.2 -> 2.0.0.2 ICMP echo_request diff --git a/src/scripts/vnet/tcp b/src/scripts/vnet/tcp index b9c23c3a019..8c6c1077aa4 100644 --- a/src/scripts/vnet/tcp +++ b/src/scripts/vnet/tcp @@ -8,7 +8,6 @@ packet-generator new { node ip4-input size 100-100 interface loop0 - no-recycle data { TCP: 192.168.1.2 -> 192.168.1.1 TCP: 32415 -> 80 diff --git a/src/scripts/vnet/udp b/src/scripts/vnet/udp index 7dda1eec511..8e3b75b1be1 100644 --- a/src/scripts/vnet/udp +++ b/src/scripts/vnet/udp @@ -9,7 +9,6 @@ packet-generator new { node ip4-input size 100-100 interface loop0 - no-recycle data { UDP: 192.168.1.2 - 192.168.2.255 -> 192.168.1.1 UDP: 4321 -> 1234 diff --git a/src/scripts/vnet/uri/udp b/src/scripts/vnet/uri/udp index 3ab4292fce6..bbbe2c1431d 100644 --- a/src/scripts/vnet/uri/udp +++ b/src/scripts/vnet/uri/udp @@ -15,7 +15,6 @@ packet-generator new { node ip4-input size 100-100 interface loop0 - no-recycle data { UDP: 192.168.1.2 - 192.168.2.255 -> 192.168.1.1 UDP: 4321 -> 1234 diff --git a/src/scripts/vnet/urpf b/src/scripts/vnet/urpf index a4d875276ee..1268ff50b72 100644 --- a/src/scripts/vnet/urpf +++ b/src/scripts/vnet/urpf @@ -9,7 +9,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 1.2.3.4 -> 2.2.2.2 UDP: 3000 -> 3001 @@ -22,7 +21,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 1.1.1.1 -> 2.2.2.2 UDP: 3000 -> 3001 @@ -35,7 +33,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 11.11.12.13 -> 2.2.2.2 UDP: 6000 -> 6001 @@ -48,7 +45,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 11.11.12.13 -> 10.10.10.10 UDP: 6000 -> 6001 @@ -61,7 +57,6 @@ packet-generator new { limit 1 node ip4-input size 64-64 - no-recycle data { UDP: 1.1.1.1 -> 10.10.10.10 UDP: 3000 -> 3001 diff --git a/src/scripts/vnet/vlan b/src/scripts/vnet/vlan index 076080a6978..eb3359ea499 100644 --- a/src/scripts/vnet/vlan +++ b/src/scripts/vnet/vlan @@ -9,7 +9,6 @@ packet-generator new { node ethernet-input interface fake-eth0 size 64-64 - no-recycle data { IP4: 1.2.3 -> 4.5.6 vlan 1 ICMP: 1.2.3.4 -> 5.6.7.8 diff --git a/src/vnet/pg/cli.c b/src/vnet/pg/cli.c index 803db129e00..834ec48192e 100644 --- a/src/vnet/pg/cli.c +++ b/src/vnet/pg/cli.c @@ -267,8 +267,6 @@ pg_pcap_read (pg_stream_t * s, char *file_name) s->min_packet_bytes = pm.min_packet_bytes; s->max_packet_bytes = pm.max_packet_bytes; s->buffer_bytes = pm.max_packet_bytes; - /* For PCAP buffers we never re-use buffers. */ - s->flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE; if (s->n_packets_limit == 0) s->n_packets_limit = vec_len (pm.packets_read); @@ -387,9 +385,6 @@ new_stream (vlib_main_t * vm, else if (unformat_user (input, unformat_pg_stream_parameter, &s)) ; - else if (unformat (input, "no-recycle")) - s.flags |= PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE; - else { error = clib_error_create ("unknown input `%U'", diff --git a/src/vnet/pg/pg.h b/src/vnet/pg/pg.h index bc3b03b7670..c0e000fe7b2 100644 --- a/src/vnet/pg/pg.h +++ b/src/vnet/pg/pg.h @@ -100,7 +100,6 @@ typedef struct pg_stream_t /* Stream is currently enabled. */ #define PG_STREAM_FLAGS_IS_ENABLED (1 << 0) -#define PG_STREAM_FLAGS_DISABLE_BUFFER_RECYCLE (1 << 1) /* Edit groups are created by each protocol level (e.g. ethernet, ip4, tcp, ...). */ |