Commit 80d3ea3d authored by Leigh B. Stoller's avatar Leigh B. Stoller

Move the dynrange up to the top of the network, but leave room for

boss and ops, which I now set to .252 and .253 instead of .70 and .74.
This avoids conflict and confusion.
parent 1770abd9
...@@ -69,8 +69,8 @@ for {set i 1} {$i <= $maxpcs} {incr i} { ...@@ -69,8 +69,8 @@ for {set i 1} {$i <= $maxpcs} {incr i} {
} }
set publiclan [$ns make-lan $lanstr 100Mb 0ms] set publiclan [$ns make-lan $lanstr 100Mb 0ms]
tb-set-ip-lan $myboss $publiclan 10.200.1.70 tb-set-ip-lan $myboss $publiclan 10.200.1.252
tb-set-ip-lan $myops $publiclan 10.200.1.74 tb-set-ip-lan $myops $publiclan 10.200.1.253
for {set i 1} {$i <= $maxpcs} {incr i} { for {set i 1} {$i <= $maxpcs} {incr i} {
set name "mypc${i}" set name "mypc${i}"
tb-set-ip-lan [set $name] $publiclan 10.200.1.$i tb-set-ip-lan [set $name] $publiclan 10.200.1.$i
......
...@@ -802,10 +802,12 @@ sub CreateDefsFile($) ...@@ -802,10 +802,12 @@ sub CreateDefsFile($)
my $opsnode_ip = $emulabconfig{"OPSIP"}; my $opsnode_ip = $emulabconfig{"OPSIP"};
my $control_network = inet_ntoa(inet_aton($opsnode_ip) & my $control_network = inet_ntoa(inet_aton($opsnode_ip) &
inet_aton("255.255.255.0")); inet_aton("255.255.255.0"));
# Put dynrange at the top.
my $dynrange_low = inet_ntoa(inet_aton($control_network) | my $dynrange_low = inet_ntoa(inet_aton($control_network) |
inet_aton("0.0.0.200")); inet_aton("0.0.0.230"));
# Note that boss/ops are hardwired to .252 and .253
my $dynrange_high = inet_ntoa(inet_aton($control_network) | my $dynrange_high = inet_ntoa(inet_aton($control_network) |
inet_aton("0.0.0.249")); inet_aton("0.0.0.250"));
my ($a,$b,$c,$d) = ($bossnode_ip =~ /(\d+).(\d+).(\d+).(\d+)/); my ($a,$b,$c,$d) = ($bossnode_ip =~ /(\d+).(\d+).(\d+).(\d+)/);
my $frismcastaddr = "235.${d}.${c}"; my $frismcastaddr = "235.${d}.${c}";
......
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