Move the frisbee mcast address and port (not really needed) into

configure so that we can localize it for inner emulab. Not good to
overlap the address space between inner and outer emulab if inner
boss is going to use frisbee client to suck images from outer frisbeed.

configure

@@ -894,6 +894,8 @@ fi
 
 
 
+
+
 
 
 
@@ -947,6 +949,8 @@ TBLOGFACIL="local5"
 LINKTEST_NSPATH="/share/linktest-ns"
 BOSSEVENTPORT=2927
 UNIFIED_BOSS_AND_OPS=0
+FRISEBEEMCASTADDR="234.5.6"
+FRISEBEEMCASTPORT=3564
 
 #
 # Okay, I know this is improper usage of --with. Too bad.
@@ -1396,7 +1400,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./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 "configure:1400: checking for a BSD compatible install" >&5
+echo "configure:1404: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1802,6 +1806,8 @@ s%@SSLCERT_COUNTRY@%$SSLCERT_COUNTRY%g
 s%@SSLCERT_STATE@%$SSLCERT_STATE%g
 s%@SSLCERT_LOCALITY@%$SSLCERT_LOCALITY%g
 s%@SSLCERT_ORGNAME@%$SSLCERT_ORGNAME%g
+s%@FRISEBEEMCASTADDR@%$FRISEBEEMCASTADDR%g
+s%@FRISEBEEMCASTPORT@%$FRISEBEEMCASTPORT%g
 s%@TBOPSEMAIL@%$TBOPSEMAIL%g
 s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g
 s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g

configure.in

@@ -88,6 +88,8 @@ AC_SUBST(SSLCERT_COUNTRY)
 AC_SUBST(SSLCERT_STATE)
 AC_SUBST(SSLCERT_LOCALITY)
 AC_SUBST(SSLCERT_ORGNAME)
+AC_SUBST(FRISEBEEMCASTADDR)
+AC_SUBST(FRISEBEEMCASTPORT)
 
 #
 # Offer both versions of the email addresses that have the @ escaped
@@ -139,6 +141,8 @@ TBLOGFACIL="local5"
 LINKTEST_NSPATH="/share/linktest-ns"
 BOSSEVENTPORT=2927
 UNIFIED_BOSS_AND_OPS=0
+FRISEBEEMCASTADDR="234.5.6"
+FRISEBEEMCASTPORT=3564
 
 #
 # Okay, I know this is improper usage of --with. Too bad.

defs-elabinelab

@@ -63,3 +63,7 @@ PUBLIC_NETWORK=changeme
 PUBLIC_ROUTER=changeme
 PUBLIC_NETMASK=changeme
 DHCPD_DYNRANGE=changeme
+#
+# Must localize to avoid conflict with outer emulab frisbeed.
+#
+FRISEBEEMCASTADDR=changeme

defs-example

@@ -146,6 +146,8 @@ IPBASE=10
 DELAYCAPACITY=2
 SFSSUPPORT=0
 DISABLE_NSE=1
+FRISEBEEMCASTADDR="234.5.6"
+FRISEBEEMCASTPORT=3564
 
 # Sometimes the main page is down in a directory on WWWHOST
 # No trailing '/'!

tbsetup/frisbeelauncher.in

@@ -27,6 +27,8 @@ my $killmode = 0;
 my $TB		= "@prefix@";
 my $TBOPS	= "@TBOPSEMAIL@";
 my $BOSSNODE_IP = "@BOSSNODE_IP@";
+my $BASEADDR    = "@FRISEBEEMCASTADDR@";
+my $BASEPORT    = "@FRISEBEEMCASTPORT@";
 
 #
 # Untaint the path
@@ -45,8 +47,6 @@ use libtestbed;
 
 # Defines
 my $FRISBEED	= "$TB/sbin/frisbeed";
-my $BASEADDR	= "234.5.6";
-my $BASEPORT	= "3564";
 my $LOGFILE	= "$TB/log/frisbeelauncher";
 
 my $STD_BW	= 72000000; 	# 71.6Mb/sec w/1000HZ kernel