From 80d3ea3d1a5deb600cc2f28c18f9768874acac3c Mon Sep 17 00:00:00 2001 From: "Leigh B. Stoller" Date: Fri, 15 Apr 2005 16:19:35 +0000 Subject: [PATCH] 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. --- tbsetup/ns2ir/elabinelab.ns | 4 ++-- tmcd/common/config/rc.mkelab | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tbsetup/ns2ir/elabinelab.ns b/tbsetup/ns2ir/elabinelab.ns index f5c8302ad..053be9900 100644 --- a/tbsetup/ns2ir/elabinelab.ns +++ b/tbsetup/ns2ir/elabinelab.ns @@ -69,8 +69,8 @@ for {set i 1} {$i <= $maxpcs} {incr i} { } set publiclan [$ns make-lan $lanstr 100Mb 0ms] -tb-set-ip-lan $myboss $publiclan 10.200.1.70 -tb-set-ip-lan $myops $publiclan 10.200.1.74 +tb-set-ip-lan $myboss $publiclan 10.200.1.252 +tb-set-ip-lan $myops $publiclan 10.200.1.253 for {set i 1} {$i <= $maxpcs} {incr i} { set name "mypc${i}" tb-set-ip-lan [set $name] $publiclan 10.200.1.$i diff --git a/tmcd/common/config/rc.mkelab b/tmcd/common/config/rc.mkelab index a7eb88426..967346bd5 100755 --- a/tmcd/common/config/rc.mkelab +++ b/tmcd/common/config/rc.mkelab @@ -802,10 +802,12 @@ sub CreateDefsFile($) my $opsnode_ip = $emulabconfig{"OPSIP"}; my $control_network = inet_ntoa(inet_aton($opsnode_ip) & inet_aton("255.255.255.0")); + # Put dynrange at the top. 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) | - inet_aton("0.0.0.249")); + inet_aton("0.0.0.250")); my ($a,$b,$c,$d) = ($bossnode_ip =~ /(\d+).(\d+).(\d+).(\d+)/); my $frismcastaddr = "235.${d}.${c}"; -- GitLab