Changeset fd7a59b for fedkit

Timestamp:

Oct 16, 2007 6:47:07 PM (17 years ago)

Author:

Kevin Lahey <lahey@…>

Branches:

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

Children:

e5fee75

Parents:

e863014

Message:

Support for tunneling between multiple interfaces -- it looks like the
script actually got shorter in the course of adding functionality!
Note that this change contains a BSD-specific call to 'route get'; if we
eventually start using Linux as a tunnel node type, we'll need to tweak
this.

File:

• fedkit/fed-tun.pl (modified) (4 diffs)

fedkit/fed-tun.pl

@@ -14 +14 @@
 # 
 # * Create a layer 2 ssh tunnel, set up bridging, and hang loose.
+#
 
 use strict;
@@ -26 +27 @@
 my $NC = "/usr/bin/nc";
 my $SSH_PORT = 22;
+my $ROUTE_GET = "/sbin/route get";  # XXX:  works on FreeBSD, but should
+                                    #       should be 'ip route get' for Linux
 
 sub setup_bridging;
@@ -40 +43 @@
 my $usage = "Usage: fed-tun.pl [-r] [-d] [-f config-filename] [count addr]\n";
 
-my %opts;
+my %opts;       # Note that this is used for both getops and the options file
 my @expected_opts = qw(active tunnelcfg bossname fsname type 
                        peer pubkeys privkeys);
@@ -176 +179 @@
     close(IFFILE);
 } elsif ($remote) {
-    # We're on the remote system;  for now, we just grab and use
-    # the one experimental interface.  Later, we'll actually look
-    # at the address passed to match up the appropriate interfaces.
+    # We're on the remote system;  figure out which interface to 
+    # tweak, based on the IP address passed in.
 
     my $iter = 0;
-
-    open(IFFILE, "/var/emulab/boot/ifmap") || die "couldn't open ifmap\n";
-    while (<IFFILE>) {
-        die "Argh, too many experimental interfaces!" if ($iter > 0);
-        my @a = split(' ');
-        my $iface = $a[0];
-        my $addr = $a[1];
-        my $bridge = "bridge" . $count;
-        my $tun = "tap" . $count;
-
-        &setup_bridging($tun, $bridge, $iface, $addr);
-        $iter++;
-    }
-    close(IFFILE);
-
+    my $iface;
+
+    open(RTFILE, "$ROUTE_GET $addr |") || die "couldn't do $ROUTE_GET\n";
+    while (<RTFILE>) {
+        if (/interface: (\w+)/) {
+            $iface = $1;
+        }
+    }
+    close(RTFILE);
+
+    die "Couldn't find interface to use." if (!defined($iface));
+    my $bridge = "bridge" . $count;
+    my $tun = "tap" . $count;
+
+    &setup_bridging($tun, $bridge, $iface, $addr);
     print "Remote connection all set up!\n";  # Trigger other end with output
 } else {