Changeset 55779d47c032102fabb8e53ca101529f2025b228 for fedkit

Timestamp:

02/22/10 04:40:21 (2 years ago)

Author:

Ted Faber <faber@…>

Children:

2b11a1d726b3605cdc7df9978925a09a8ab8a23c

Parents:

238db1e65f3d8b44b2b0cb6afd4527ef192804fb

git-committer:

Ted Faber <faber@isi.edu> / 2010-02-22T12:40:21Z+0000

Message:

Supporting nodes connected by transit networks

Location:

fedkit

Files:

• active_config.pl (modified) (2 diffs)
• federate.pl (modified) (1 diff)
• prep_gateway.pl (modified) (1 diff)

fedkit/active_config.pl

@@ -42 +42 @@
 exit(20) if $?;
 
-my $f = new IO::File($iface_file) || die "Can't open $iface_file: $!\n";
-my $ifnum = 0;
 
 print "Waiting for ssh on $peer\n";
@@ -52 +50 @@
     "-i $ssh_privkey $peer ls", 5*60);
 
-while (<$f>) {
-    /([[:alnum:]]+)\s+([\d\.]+)/ && do {
-        my ($iface, $addr) = ($1, $2);
+if (my $f = new IO::File($iface_file)) {
+    my $ifnum = 0;
+    while (<$f>) {
+        /([[:alnum:]]+)\s+([\d\.]+)/ && do {
+            my ($iface, $addr) = ($1, $2);
 
-        my $cmd = "$ssh -w $ifnum:$ifnum -o \"Tunnel ethernet\" " . 
-            "-o \"StrictHostKeyChecking no\" -i $ssh_privkey " .
-            "$peer perl -I$fedkit_dir/lib $fedkit_dir/bin/setup_bridge.pl " .
-            "--tapno=$ifnum --dest=$addr &";
-        system($cmd);
-        die if $?;
-        gateway_lib::bind_tap_to_iface($ifnum, $iface, $addr);
-        $ifnum++;
-    };
+            my $cmd = "$ssh -w $ifnum:$ifnum -o \"Tunnel ethernet\" " . 
+                "-o \"StrictHostKeyChecking no\" -i $ssh_privkey " .
+                "$peer perl -I$fedkit_dir/lib $fedkit_dir/bin/setup_bridge.pl " .
+                "--tapno=$ifnum --dest=$addr &";
+            system($cmd);
+            die if $?;
+            gateway_lib::bind_tap_to_iface($ifnum, $iface, $addr);
+            $ifnum++;
+        };
+    }
+    $f->close();
 }
-$f->close();
+else {
+    warn "Can't open $iface_file: $!\n";
+}
 exit(0);
 

fedkit/federate.pl

@@ -79 +79 @@
 copy("/tmp/hosts", "/etc/hosts");
 
+# If there are tunnelip interfaces to bring up, bring 'em
+system("$perl -I/usr/local/federation/lib " . 
+    "/usr/local/federation/bin/config_from_tunnelip.pl");
+
 
 if ($services{'userconfig'}) {

fedkit/prep_gateway.pl

@@ -43 +43 @@
     # Add the route to a peer.  Wait up to an hour for the peer's IP address to
     # appear in the DNS.
-    gateway_lib::add_route($peer, $router, 1, 60 *60);
+    gateway_lib::add_route($peer, $router, 1, 60 *60) 
+        if $peer && $router;
 }