Changeset b0c185f

Timestamp:

Feb 5, 2009 6:07:56 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c8c2c64

Parents:

8bc5754

Message:

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

File:

• 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" .