Changeset b0c185f4ab5a06c1e5b24fd43bf32108505281db for fedkit

Timestamp:

02/05/09 18:07:56 (3 years ago)

Author:

Ted Faber <faber@…>

Children:

c8c2c6405c2e024f565f0431fa2b411e0ba8a901

Parents:

8bc5754be1b96774a8dcfb3bdd6f6ecbff8244da

git-committer:

Ted Faber <faber@isi.edu> / 2009-02-06T02:07:56Z+0000

Message:

Keith Sklower's patch to use tunnel MAC addresses if they are supplied.

Files:

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

fedkit/fed-tun.pl

@@ -25 +25 @@
 my $IFCONFIG = "/sbin/ifconfig";
 my $TMCC = "/usr/local/etc/emulab/tmcc";
+my $FINDIF = "/usr/local/etc/emulab/findif";
 # If a special version of ssh is required, it will be installed in
 # /usr/local/bin/ssh.  Otherwise use the usual one.
@@ -398 +399 @@
     print "tunnel options:  ip=$tunnel_ip mask=$tunnel_mask mac=$tunnel_mac router=$tunnel_router\n" if ($debug);
 
-    # Sadly, we ignore the tunnel mac for now -- we should eventually
-    # use it to determine which interface to use, just like the
-    # Emulab startup scripts.
+    if (defined($tunnel_mac) && ($tunnel_mac ne "")) {
+       print "Opening $FINDIF $tunnel_mac\n" if ($debug);
+       open(FIF, "$FINDIF $tunnel_mac |") || die "findif failed\n";
+       my $line = <FIF>;
+       chomp($line);
+       print "$FINDIF returned $line\n" if ($debug);
+       $tunnel_iface = $line;
+    }
 
     system("ifconfig $tunnel_iface $tunnel_ip" .