Changes in / [26821ac:4a02274]


Ignore:
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/desktop_access.py

    rea0e8cb r51d3aa0  
    418418            print >>f, 'sleep 60; done'
    419419            print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \
    420                     '-o "StrictHostKeyChecking no" -i %s %s perl -I/usr/local/federation/lib /usr/local/federation/bin/setup_bridge.pl --tapno=0 --addr=%s &') % \
     420                    '-o "StrictHostKeyChecking no" -i %s %s perl -I/usr/local/federation/lib /usr/local/federation/bin/setup_bridge.pl --tapno=0 --addr=%s --use_file &') % \
    421421                    (port, self.ssh_identity, peer, my_addr)
    422422            # This should give the tap a a chance to come up
  • fedkit/gateway_lib.pm

    r8f654de r2c16731  
    434434}
    435435
     436# Fling a few ping packets at the peer in the hopes that it opens doors through
     437# NATs and other filters.  Practically speaking this can make a big difference.
     438sub ping_peer {
     439    my($peer) = @_;
     440    system("ping -c 5 $peer");
     441}
     442
    436443sub testcmd_repeat {
    437444    my($cmd, $timeout, $sleep) = @_;
  • fedkit/prep_gateway.pl

    r8f654de r2c16731  
    8989    # appear in the DNS.
    9090    foreach my $p (split(/\s*,\s*/, $peer)) {
    91         gateway_lib::add_route($p, $router, 1, 60 *60)
    92             if $p && $router;
     91        if ($p && $router ) {
     92            gateway_lib::add_route($p, $router, 1, 60 *60);
     93            # grease the skids
     94            gateway_lib::ping_peer($p);
     95        }
    9396    }
    9497}
  • fedkit/setup_bridge.pl

    rc6d6c43 rdffa585  
    1313my $fedkit_dir= "/usr/local/federation";
    1414my $perl = "/usr/bin/perl";
     15my $peer;
    1516my $use_file;
    1617my %opts = (
     
    1819    'addr=s' => \$addr,
    1920    'dest=s' => \$dest,
     21    'peer=s' => \$peer,
    2022    'use_file', \$use_file,
    2123);
    2224
    2325exit(20) unless GetOptions(%opts);
    24 gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
     26gateway_lib::read_config(gateway_lib::config_filename(), \%opts)
    2527    if $use_file;
    2628
     
    3436
    3537gateway_lib::bind_tap_to_iface($tapno, $iface);
     38gateway_lib::ping_peer($peer)
     39    if $peer;
    3640
    3741exit(0);
Note: See TracChangeset for help on using the changeset viewer.