Commit dea88238 authored by Leigh Stoller's avatar Leigh Stoller

Add JAILIPBASE and JAILIPMASK defines.

parent b68c79c7
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#undef TBDBNAME #undef TBDBNAME
#undef TBADMINGROUP #undef TBADMINGROUP
#undef IPBASE #undef IPBASE
#undef JAILIPBASE
#undef JAILIPMASK
#undef BOSSNODE #undef BOSSNODE
#undef USERNODE #undef USERNODE
#undef FSNODE #undef FSNODE
......
...@@ -861,6 +861,8 @@ fi ...@@ -861,6 +861,8 @@ fi
...@@ -898,6 +900,8 @@ CLIENT_BINDIR="/usr/local/etc/emulab" ...@@ -898,6 +900,8 @@ CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab" CLIENT_VARDIR="/var/emulab"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
...@@ -945,6 +949,14 @@ cat >> confdefs.h <<EOF ...@@ -945,6 +949,14 @@ cat >> confdefs.h <<EOF
#define IPBASE "$IPBASE" #define IPBASE "$IPBASE"
EOF EOF
cat >> confdefs.h <<EOF
#define JAILIPBASE "$JAILIPBASE"
EOF
cat >> confdefs.h <<EOF
#define JAILIPMASK "$JAILIPMASK"
EOF
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define BOSSNODE "$BOSSNODE" #define BOSSNODE "$BOSSNODE"
EOF EOF
...@@ -1190,6 +1202,7 @@ else ...@@ -1190,6 +1202,7 @@ else
event/example/GNUmakefile event/example/tbsend.pl \ event/example/GNUmakefile event/example/tbsend.pl \
event/example/tbrecv.pl event/example/tbsend-short.pl \ event/example/tbrecv.pl event/example/tbsend-short.pl \
event/trafgen/GNUmakefile \ event/trafgen/GNUmakefile \
event/proxy/GNUmakefile \
event/nsetrafgen/GNUmakefile \ event/nsetrafgen/GNUmakefile \
event/delay-agent/GNUmakefile \ event/delay-agent/GNUmakefile \
event/program-agent/GNUmakefile \ event/program-agent/GNUmakefile \
...@@ -1280,7 +1293,7 @@ fi ...@@ -1280,7 +1293,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:1284: checking for a BSD compatible install" >&5 echo "configure:1297: 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
...@@ -1578,6 +1591,8 @@ s%@TBDBNAME@%$TBDBNAME%g ...@@ -1578,6 +1591,8 @@ s%@TBDBNAME@%$TBDBNAME%g
s%@TBADMINGROUP@%$TBADMINGROUP%g s%@TBADMINGROUP@%$TBADMINGROUP%g
s%@DELAYCAPACITY@%$DELAYCAPACITY%g s%@DELAYCAPACITY@%$DELAYCAPACITY%g
s%@IPBASE@%$IPBASE%g s%@IPBASE@%$IPBASE%g
s%@JAILIPBASE@%$JAILIPBASE%g
s%@JAILIPMASK@%$JAILIPMASK%g
s%@BOSSNODE@%$BOSSNODE%g s%@BOSSNODE@%$BOSSNODE%g
s%@USERNODE@%$USERNODE%g s%@USERNODE@%$USERNODE%g
s%@FSNODE@%$FSNODE%g s%@FSNODE@%$FSNODE%g
......
...@@ -24,6 +24,8 @@ AC_SUBST(TBDBNAME) ...@@ -24,6 +24,8 @@ AC_SUBST(TBDBNAME)
AC_SUBST(TBADMINGROUP) AC_SUBST(TBADMINGROUP)
AC_SUBST(DELAYCAPACITY) AC_SUBST(DELAYCAPACITY)
AC_SUBST(IPBASE) AC_SUBST(IPBASE)
AC_SUBST(JAILIPBASE)
AC_SUBST(JAILIPMASK)
AC_SUBST(BOSSNODE) AC_SUBST(BOSSNODE)
AC_SUBST(USERNODE) AC_SUBST(USERNODE)
AC_SUBST(FSNODE) AC_SUBST(FSNODE)
...@@ -88,6 +90,8 @@ CLIENT_BINDIR="/usr/local/etc/emulab" ...@@ -88,6 +90,8 @@ CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab" CLIENT_VARDIR="/var/emulab"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
...@@ -121,6 +125,8 @@ fi ...@@ -121,6 +125,8 @@ fi
AC_DEFINE_UNQUOTED(TBDBNAME, "$TBDBNAME") AC_DEFINE_UNQUOTED(TBDBNAME, "$TBDBNAME")
AC_DEFINE_UNQUOTED(TBADMINGROUP, "$TBADMINGROUP") AC_DEFINE_UNQUOTED(TBADMINGROUP, "$TBADMINGROUP")
AC_DEFINE_UNQUOTED(IPBASE, "$IPBASE") AC_DEFINE_UNQUOTED(IPBASE, "$IPBASE")
AC_DEFINE_UNQUOTED(JAILIPBASE, "$JAILIPBASE")
AC_DEFINE_UNQUOTED(JAILIPMASK, "$JAILIPMASK")
AC_DEFINE_UNQUOTED(BOSSNODE, "$BOSSNODE") AC_DEFINE_UNQUOTED(BOSSNODE, "$BOSSNODE")
AC_DEFINE_UNQUOTED(USERNODE, "$USERNODE") AC_DEFINE_UNQUOTED(USERNODE, "$USERNODE")
AC_DEFINE_UNQUOTED(FSNODE, "$FSNODE") AC_DEFINE_UNQUOTED(FSNODE, "$FSNODE")
...@@ -310,6 +316,7 @@ else ...@@ -310,6 +316,7 @@ else
event/example/GNUmakefile event/example/tbsend.pl \ event/example/GNUmakefile event/example/tbsend.pl \
event/example/tbrecv.pl event/example/tbsend-short.pl \ event/example/tbrecv.pl event/example/tbsend-short.pl \
event/trafgen/GNUmakefile \ event/trafgen/GNUmakefile \
event/proxy/GNUmakefile \
event/nsetrafgen/GNUmakefile \ event/nsetrafgen/GNUmakefile \
event/delay-agent/GNUmakefile \ event/delay-agent/GNUmakefile \
event/program-agent/GNUmakefile \ event/program-agent/GNUmakefile \
......
...@@ -18,6 +18,8 @@ TBAUTOMAILEMAIL=testbed-automail@flux.utah.edu ...@@ -18,6 +18,8 @@ TBAUTOMAILEMAIL=testbed-automail@flux.utah.edu
TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu TBACTIVEARCHIVE=testbed-active-users-archive@flux.cs.utah.edu
TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu TBUSERSARCHIVE=testbed-users-archive@flux.cs.utah.edu
IPBASE=192.168 IPBASE=192.168
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=2 DELAYCAPACITY=2
BOSSNODE=boss.emulab.net BOSSNODE=boss.emulab.net
USERNODE=users.emulab.net USERNODE=users.emulab.net
......
...@@ -16,6 +16,7 @@ OURDOMAIN=emulab.net ...@@ -16,6 +16,7 @@ OURDOMAIN=emulab.net
FSDIR_GROUPS=/q/groups FSDIR_GROUPS=/q/groups
FSDIR_PROJ=/q/proj FSDIR_PROJ=/q/proj
FSDIR_USERS=/users FSDIR_USERS=/users
FSDIR_SHARE=/share
TBSTATEDEMAIL=stoller@fast.cs.utah.edu TBSTATEDEMAIL=stoller@fast.cs.utah.edu
TBTESTSUITEEMAIL=stoller@fast.cs.utah.edu TBTESTSUITEEMAIL=stoller@fast.cs.utah.edu
WWWHOST=www.emulab.net WWWHOST=www.emulab.net
......
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