Commit 07dd8996 authored by Kevin Atkinson's avatar Kevin Atkinson

Set the OS for nodes in the sync and traffic-gen tests!

Other minor changes.
parent b4e046f4
......@@ -13,6 +13,12 @@ set node2 [$ns node]
set node3 [$ns node]
set node4 [$ns node]
tb-set-node-os $node0 @OS@
tb-set-node-os $node1 @OS@
tb-set-node-os $node2 @OS@
tb-set-node-os $node3 @OS@
tb-set-node-os $node4 @OS@
tb-set-sync-server $node0
tb-set-node-startcmd $node0 "@DATADIR@/startcmd0.sh /proj/@PID@/exp/@EID@/tmp/"
......
......@@ -10,6 +10,9 @@ source tb_compat.tcl
set node0 [$ns node]
set node1 [$ns node]
tb-set-node-os $node0 @OS@
tb-set-node-os $node1 @OS@
set link1 [$ns duplex-link $node0 $node1 100Mb 0ms DropTail]
set udp0 [new Agent/UDP]
......
......@@ -7,13 +7,14 @@
use IO::Socket;
use POSIX ":sys_wait_h";
use Carp;
use Data::Dumper;
local $^W = 1;
sub parse ($) {
local ($_) = @_;
@d = /(\d+)\.\d+ \(icmp:\d+,\d+ tcp:(\d+),\d+ udp:(\d+),\d+ other:\d+,\d+\)/ or die;
@d = /(\d+)\.\d+ \(icmp:\d+,\d+ tcp:(\d+),\d+ udp:(\d+),\d+ other:\d+,\d+\)/ or confess "?$_";
return @d;
}
......@@ -76,6 +77,7 @@ sub find_interval (\$\%$$$$$)
test 'event', [], sub {
# connect to emulab pcapper daemon on port 4443
my $n0s = IO::Socket::INET->new(Proto => 'tcp',
PeerAddr => "node0.$eid.$pid",
PeerPort => 4443)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment