Changeset dc803a7

Timestamp:

Mar 12, 2010 2:37:32 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

7e50f69

Parents:

310d419

Message:

Set up all routing daemons from the fedkit and note interfaces we've added in a way that SEER's federated testbed will grok them.

Location:

fedkit

Files:

• Makefile (modified) (1 diff)
• config_from_tunnelip.pl (modified) (4 diffs)
• federate.pl (modified) (1 diff)
• gated_routing.pl (moved) (moved from fedkit/protogeni_routing.pl) (2 diffs)
• libevent-1.3b.tbz (added)
• openospfd-4.0.tbz (added)
• ospf_routing.pl (added)

fedkit/Makefile

@@ -3 +3 @@
          config_from_tunnelip.pl active_config.pl combo.pl \
          prep_gateway.pl port_forward.pl setup_bridge.pl import_key.pl \
-         protogeni_routing.pl start_seer.pl
+         gated_routing.pl start_seer.pl ospf_routing.pl
 
 LIBRARIES=gateway_lib.pm 
 
-fedkit.tgz:     ${LIBRARIES} ${BINARIES} ${PATCHES}
+PACKAGES=libevent-1.3b.tbz openospfd-4.0.tbz
+
+fedkit.tgz:     ${LIBRARIES} ${BINARIES} ${PATCHES} ${PACKAGES}
         mkdir -p /tmp/fedkit/local/federation/bin
         mkdir -p /tmp/fedkit/local/federation/lib
         mkdir -p /tmp/fedkit/local/federation/etc
+        mkdir -p /tmp/fedkit/local/federation/pkg
         cp ${BINARIES} /tmp/fedkit/local/federation/bin
         cp ${LIBRARIES} /tmp/fedkit/local/federation/lib
+        cp ${PACKAGES} /tmp/fedkit/local/federation/pkg
         tar czf fedkit.tgz -C /tmp/fedkit local
         rm -rf /tmp/fedkit

fedkit/config_from_tunnelip.pl

@@ -2 +2 @@
 
 use strict;
+use IO::File;
 use IO::Pipe;
 use Getopt::Long;
@@ -19 +20 @@
 my $router;                     # Router for the internet
 my $routedest;                  # Add host route to this address (if given)
+my $recordfile;                 # Record interfaces
 
 # Linux and FreeBSD use slightly different route syntax, so get the OS
@@ -25 +27 @@
 
 # Option parsing, --destination sets $routedest
-GetOptions('destination=s' => \$routedest);
+GetOptions('destination=s' => \$routedest, "record=s" => \$recordfile);
 
 # Parse out the info about tunnelips
@@ -71 +73 @@
 }
 else { warn "Destination but no router\n" if $routedest; }
+if ($recordfile) {
+    $netmask = "255.255.255.0" unless $netmask;
+    my $rf = new IO::File(">>$recordfile") || 
+        die "Can't open $recordfile:$!\n";
+    print $rf "$ip:$interface:$mac:$netmask\n";
+    $rf->close();
+}
 exit(0);

fedkit/federate.pl

@@ -123 +123 @@
 copy("/tmp/hosts", "/etc/hosts");
 
-# Ick.  at least one of our images has gated in the wrong place (sigh).  If
-# so, fix it and restart routing.  
-if (!-x "/usr/sbin/gated" && -x "/sbin/gated" ) {
-    print "Linking to /sbin/gated and starting routing\n";
-    symlink("/sbin/gated", "/usr/sbin/gated");
-    system("$RC_ROUTE boot") if -x $RC_ROUTE;
-}
-
-# If there are tunnelip interfaces to bring up, bring 'em
+
+# If there are tunnelip interfaces to bring up, bring 'em up.  Record any such
+# interfaces in /usr/local/federation/interfaces, so SEER can find them later.
 system("$perl -I/usr/local/federation/lib " . 
-    "/usr/local/federation/bin/config_from_tunnelip.pl");
+    "/usr/local/federation/bin/config_from_tunnelip.pl " . 
+    "--record=/usr/local/federation/etc/interfaces");
+
+if ($uname =~ /Linux/ ) {
+    system("$perl /usr/local/federation/bin/gated_routing.pl")
+        if -r "/usr/local/federation/bin/gated_routing.pl";
+}
+elsif ($uname =~/FreeBSD/ ) {
+    # FreeBSD needs to have ospfs installed and a router config created and
+    # run.
+    system("$perl /usr/local/federation/bin/ospf_routing.pl")
+        if -r "/usr/local/federation/bin/ospf_routing.pl";
+}
 
 

fedkit/gated_routing.pl

@@ -6 +6 @@
 
 my $IFCONFIG = "/sbin/ifconfig";
-my $GATED= "/usr/sbin/gated";
+my @GATEDS= ("/usr/sbin/gated", "/sbin/gated" );
+my $GATED;
 
 my $fn = "/usr/local/federation/etc/gated.conf";
@@ -21 +22 @@
 }
 $ifp->close();
+
+foreach my $g (@GATEDS) {
+    if (-x $g ) {
+        $GATED = $g;
+        last;
+    }
+}
+
+die "Can't find gated in " . join(",", @GATEDS) . "\n" unless $GATED;
 
 my $f = new IO::File(">$fn") || die "Can't open $fn: $!\n";