From 84d3f43c7b9f079ff692fc84e670b053fea65d1b Mon Sep 17 00:00:00 2001 From: Brandon Heller Date: Mon, 1 Dec 2008 01:34:30 -0800 Subject: [PATCH] Change test_ip_offset to new spec behavior, where the L4 ports are set to zero for purposes of matching fragment packets. --- .../black_box/regress/test_ip_offset/run.pl | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/regress/projects/black_box/regress/test_ip_offset/run.pl b/regress/projects/black_box/regress/test_ip_offset/run.pl index 322f948..3010d20 100755 --- a/regress/projects/black_box/regress/test_ip_offset/run.pl +++ b/regress/projects/black_box/regress/test_ip_offset/run.pl @@ -13,7 +13,7 @@ sub send_expect_exact { # in_port refers to the flow mod entry's input - my $test_pkt_args = { + my $test_pkt_frag_args = { DA => "00:00:00:00:00:0" . ( $out_port + 1 ), SA => "00:00:00:00:00:0" . ( $in_port + 1 ), src_ip => "192.168.200." . ( $in_port + 1 ), @@ -24,6 +24,19 @@ sub send_expect_exact { src_port => 1, dst_port => 0 }; + my $test_pkt_frag = new NF2::UDP_pkt(%$test_pkt_frag_args); + + my $test_pkt_args = { + DA => "00:00:00:00:00:0" . ( $out_port + 1 ), + SA => "00:00:00:00:00:0" . ( $in_port + 1 ), + src_ip => "192.168.200." . ( $in_port + 1 ), + dst_ip => "192.168.201." . ( $out_port + 1 ), + ttl => 64, + len => $pkt_len, + frag => 0, + src_port => 0, + dst_port => 0 + }; my $test_pkt = new NF2::UDP_pkt(%$test_pkt_args); #print HexDump ( $test_pkt->packed ); @@ -41,8 +54,8 @@ sub send_expect_exact { usleep($$options_ref{'send_delay'}); # Send a packet - ensure packet comes out desired port - nftest_send( "eth" . ( $in_port_offset + 1 ), $test_pkt->packed ); - nftest_expect( "eth" . ( $out_port_offset + 1 ), $test_pkt->packed ); + nftest_send( "eth" . ( $in_port_offset + 1 ), $test_pkt_frag->packed ); + nftest_expect( "eth" . ( $out_port_offset + 1 ), $test_pkt_frag->packed ); } sub my_test {