regress: formatting clean-ups

Change submitted by: Jean Tourrilhes <jt@hpl.hp.com>
This commit is contained in:
Glen Gibb committed 2010-03-10 16:43:17 -08:00
1 parent 99743eb3d2
commit 12f93c9261
4 files changed
+9 -7

No files matched your search

+1 -1
View File
@@ -228,9 +228,9 @@ sub nftest_init {
"port_base=i",
"send_delay=i",
"base_idle=i",
"ignore_byte_count",
"num_ports=i",
"common-st-args=s",
"ignore_byte_count",
"no_vlan",
"no_slicing",
"no_barrier",
@@ -12,12 +12,12 @@ sub forward_broadcast {
my $len = $$options_ref{'pkt_len'};
my $pkt_args = {
DA => "FF:FF:FF:FF:FF:FF",
DA => "FF:FF:FF:FF:FF:FF",
SA => "00:00:00:00:00:" . sprintf( "%02d", $in_port ),
src_ip => "192.168." . ($in_port) . "." . ($out_port),
src_ip => "192.168." . ( $in_port ) . "." . ( $out_port ),
dst_ip => "255.255.255.255",
ttl => 64,
len => $len,
ttl => 64,
len => $len,
src_port => 1,
dst_port => 0
};
@@ -29,7 +29,7 @@ sub forward_broadcast {
$flow_mod_pkt = create_flow_mod_from_udp($ofp, $test_pkt, $in_port, $out_port, $$options_ref{'max_idle'}, $flags, $wildcards);
# Send 'flow_mod' message
syswrite($sock, $flow_mod_pkt);
syswrite( $sock, $flow_mod_pkt );
print "sent flow_mod message\n";
# Give OF switch time to process the flow mod
@@ -42,7 +42,7 @@ sub forward_broadcast {
nftest_expect("eth" . ($out_port), $test_pkt->packed);
print "wait \n";
wait_for_flow_expired_all($ofp, $sock, $options_ref);
wait_for_flow_expired_all( $ofp, $sock, $options_ref );
}
run_black_box_test(\&forward_broadcast, \@ARGV);
@@ -16,6 +16,7 @@ sub verify_packet_in {
my $pkt = get_default_black_box_pkt_len($in_port, $out_port, $pktsiz);
nftest_send('eth1', $pkt->packed);
print "Sent test packet for len ".$miss_send_len."...\n";
my $rcvd_msg;
sysread($sock, $rcvd_msg, 1512) || die "Failed to receive message: $!";
@@ -13,6 +13,7 @@ sub my_test {
my $pkt = get_default_black_box_pkt( $in_port, $out_port);
nftest_send('eth1', $pkt->packed );
print "Sent test packet...\n";
my $recvd_mesg;
sysread( $sock, $recvd_mesg, 1512 ) || die "Failed to receive message: $!";