Changeset b0c185f for fedkit


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • fedkit/fed-tun.pl

    r8bc5754 rb0c185f  
    2525my $IFCONFIG = "/sbin/ifconfig";
    2626my $TMCC = "/usr/local/etc/emulab/tmcc";
     27my $FINDIF = "/usr/local/etc/emulab/findif";
    2728# If a special version of ssh is required, it will be installed in
    2829# /usr/local/bin/ssh.  Otherwise use the usual one.
     
    398399    print "tunnel options:  ip=$tunnel_ip mask=$tunnel_mask mac=$tunnel_mac router=$tunnel_router\n" if ($debug);
    399400
    400     # Sadly, we ignore the tunnel mac for now -- we should eventually
    401     # use it to determine which interface to use, just like the
    402     # Emulab startup scripts.
     401    if (defined($tunnel_mac) && ($tunnel_mac ne "")) {
     402       print "Opening $FINDIF $tunnel_mac\n" if ($debug);
     403       open(FIF, "$FINDIF $tunnel_mac |") || die "findif failed\n";
     404       my $line = <FIF>;
     405       chomp($line);
     406       print "$FINDIF returned $line\n" if ($debug);
     407       $tunnel_iface = $line;
     408    }
    403409
    404410    system("ifconfig $tunnel_iface $tunnel_ip" .
Note: See TracChangeset for help on using the changeset viewer.