Commit 03bb8748 authored by Mike Hibler's avatar Mike Hibler

Configure virtnode net/mask in a couple of places where it was hardwired.

parent 8a2e4d6a
...@@ -1446,6 +1446,8 @@ done ...@@ -1446,6 +1446,8 @@ done
...@@ -1489,8 +1491,10 @@ CLIENT_MANDIR="/usr/local/man" ...@@ -1489,8 +1491,10 @@ CLIENT_MANDIR="/usr/local/man"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
FANCYBANNER=0 FANCYBANNER=0
JAILIPBASE=172.16.0.0 VIRTNODE_NETWORK=172.16.0.0
JAILIPMASK=255.240.0.0 VIRTNODE_NETMASK=255.240.0.0
JAILIPBASE=$VIRTNODE_NETWORK
JAILIPMASK=$VIRTNODE_NETMASK
IPBASE=10 IPBASE=10
SFSSUPPORT=0 SFSSUPPORT=0
ELABINELAB=0 ELABINELAB=0
...@@ -2106,17 +2110,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h ...@@ -2106,17 +2110,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2110: checking for $ac_hdr" >&5 echo "configure:2114: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2115 "configure" #line 2119 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2155,17 +2159,17 @@ for ac_hdr in linux/videodev.h ...@@ -2155,17 +2159,17 @@ for ac_hdr in linux/videodev.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2159: checking for $ac_hdr" >&5 echo "configure:2163: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2164 "configure" #line 2168 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2198,7 +2202,7 @@ done ...@@ -2198,7 +2202,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args. # Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2 set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2202: checking for $ac_word" >&5 echo "configure:2206: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2277,7 +2281,7 @@ fi ...@@ -2277,7 +2281,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:2281: checking for a BSD compatible install" >&5 echo "configure:2285: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2338,7 +2342,7 @@ esac ...@@ -2338,7 +2342,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args. # Extract the first word of "rsync", so it can be a program name with args.
set dummy rsync; ac_word=$2 set dummy rsync; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2342: checking for $ac_word" >&5 echo "configure:2346: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2816,6 +2820,8 @@ s%@PRIVATE_NETMASK@%$PRIVATE_NETMASK%g ...@@ -2816,6 +2820,8 @@ s%@PRIVATE_NETMASK@%$PRIVATE_NETMASK%g
s%@PUBLIC_NETWORK@%$PUBLIC_NETWORK%g s%@PUBLIC_NETWORK@%$PUBLIC_NETWORK%g
s%@PUBLIC_ROUTER@%$PUBLIC_ROUTER%g s%@PUBLIC_ROUTER@%$PUBLIC_ROUTER%g
s%@PUBLIC_NETMASK@%$PUBLIC_NETMASK%g s%@PUBLIC_NETMASK@%$PUBLIC_NETMASK%g
s%@VIRTNODE_NETWORK@%$VIRTNODE_NETWORK%g
s%@VIRTNODE_NETMASK@%$VIRTNODE_NETMASK%g
s%@DHCPD_DYNRANGE@%$DHCPD_DYNRANGE%g s%@DHCPD_DYNRANGE@%$DHCPD_DYNRANGE%g
s%@DHCPD_CONTROLNET_DECL@%$DHCPD_CONTROLNET_DECL%g s%@DHCPD_CONTROLNET_DECL@%$DHCPD_CONTROLNET_DECL%g
s%@NAMED_FORWARDERS@%$NAMED_FORWARDERS%g s%@NAMED_FORWARDERS@%$NAMED_FORWARDERS%g
......
...@@ -182,6 +182,8 @@ AC_SUBST(PRIVATE_NETMASK) ...@@ -182,6 +182,8 @@ AC_SUBST(PRIVATE_NETMASK)
AC_SUBST(PUBLIC_NETWORK) AC_SUBST(PUBLIC_NETWORK)
AC_SUBST(PUBLIC_ROUTER) AC_SUBST(PUBLIC_ROUTER)
AC_SUBST(PUBLIC_NETMASK) AC_SUBST(PUBLIC_NETMASK)
AC_SUBST(VIRTNODE_NETWORK)
AC_SUBST(VIRTNODE_NETMASK)
AC_SUBST(DHCPD_DYNRANGE) AC_SUBST(DHCPD_DYNRANGE)
AC_SUBST(DHCPD_CONTROLNET_DECL) AC_SUBST(DHCPD_CONTROLNET_DECL)
AC_SUBST(NAMED_FORWARDERS) AC_SUBST(NAMED_FORWARDERS)
...@@ -242,8 +244,10 @@ CLIENT_MANDIR="/usr/local/man" ...@@ -242,8 +244,10 @@ CLIENT_MANDIR="/usr/local/man"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
FANCYBANNER=0 FANCYBANNER=0
JAILIPBASE=172.16.0.0 VIRTNODE_NETWORK=172.16.0.0
JAILIPMASK=255.240.0.0 VIRTNODE_NETMASK=255.240.0.0
JAILIPBASE=$VIRTNODE_NETWORK
JAILIPMASK=$VIRTNODE_NETMASK
IPBASE=10 IPBASE=10
SFSSUPPORT=0 SFSSUPPORT=0
ELABINELAB=0 ELABINELAB=0
......
...@@ -91,6 +91,6 @@ shared-network emulab { ...@@ -91,6 +91,6 @@ shared-network emulab {
# #
# Private network; for virtual (jailed) nodes. # Private network; for virtual (jailed) nodes.
# #
subnet 172.16.0.0 netmask 255.240.0.0 { subnet @VIRTNODE_NETWORK@ netmask @VIRTNODE_NETMASK@ {
} }
} }
...@@ -22,7 +22,7 @@ view "internal" { ...@@ -22,7 +22,7 @@ view "internal" {
match-clients { match-clients {
127.0.0.0/8; 127.0.0.0/8;
%internal_network_withmask%; %internal_network_withmask%;
172.16.0.0/12; %virtnode_network_withmask%;
}; };
zone "@OURDOMAIN@" in { zone "@OURDOMAIN@" in {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2004, 2006 University of Utah and the Flux Group. # Copyright (c) 2000-2004, 2006, 2007 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
use Getopt::Std; use Getopt::Std;
...@@ -41,6 +41,8 @@ my $PUBLIC_NETWORK = "@PUBLIC_NETWORK@"; ...@@ -41,6 +41,8 @@ my $PUBLIC_NETWORK = "@PUBLIC_NETWORK@";
my $PUBLIC_ROUTER = "@PUBLIC_ROUTER@"; my $PUBLIC_ROUTER = "@PUBLIC_ROUTER@";
my $PUBLIC_NETMASK = "@PUBLIC_NETMASK@"; my $PUBLIC_NETMASK = "@PUBLIC_NETMASK@";
my $NAMED_FORWARDERS = "@NAMED_FORWARDERS@"; my $NAMED_FORWARDERS = "@NAMED_FORWARDERS@";
my $VIRTNODE_NETWORK = "@VIRTNODE_NETWORK@";
my $VIRTNODE_NETMASK = "@VIRTNODE_NETMASK@";
# Testbed libraries. # Testbed libraries.
use lib "@prefix@/lib"; use lib "@prefix@/lib";
...@@ -77,6 +79,15 @@ for (my $i = 0; $i < scalar(@NETMASKS); $i++) { ...@@ -77,6 +79,15 @@ for (my $i = 0; $i < scalar(@NETMASKS); $i++) {
last; last;
} }
} }
my $VIRTNODE_SLASH_NETMASK = "24";
for (my $i = 0; $i < scalar(@NETMASKS); $i++) {
my $foo = pack("N", $NETMASKS[$i]);
if ($VIRTNODE_NETMASK eq inet_ntoa($foo)) {
$VIRTNODE_SLASH_NETMASK = "$i";
last;
}
}
# This is for the dotted and reverse dotted notation needed for the # This is for the dotted and reverse dotted notation needed for the
# reverse maps. This is probably all wrong ... # reverse maps. This is probably all wrong ...
...@@ -100,6 +111,9 @@ while (<IF>) { ...@@ -100,6 +111,9 @@ while (<IF>) {
if ($2 eq "internal_network_withmask") { if ($2 eq "internal_network_withmask") {
print $1 . "${TESTBED_NETWORK}/${TESTBED_SLASH_NETMASK}" ."$3\n"; print $1 . "${TESTBED_NETWORK}/${TESTBED_SLASH_NETMASK}" ."$3\n";
} }
elsif ($2 eq "virtnode_network_withmask") {
print $1 . "${VIRTNODE_NETWORK}/${VIRTNODE_SLASH_NETMASK}" ."$3\n";
}
elsif ($2 eq "internal_network_dotted") { elsif ($2 eq "internal_network_dotted") {
print $1 . "${ia}.${ib}.${ic}" . "$3\n"; print $1 . "${ia}.${ib}.${ic}" . "$3\n";
} }
......
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