Changeset e1ed2a7b

Timestamp:

Mar 10, 2014 4:21:30 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

a2ca699

Parents:

7862660 (diff), dffa585 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

Files:

• fedd/federation/desktop_access.py (modified) (1 diff)
• fedkit/gateway_lib.pm (modified) (1 diff)
• fedkit/prep_gateway.pl (modified) (1 diff)
• fedkit/setup_bridge.pl (modified) (3 diffs)

fedd/federation/desktop_access.py

@@ -418 +418 @@
             print >>f, 'sleep 60; done'
             print >>f, ('ssh -w 0:0 -p %s -o "Tunnel ethernet" ' + \
-                    '-o "StrictHostKeyChecking no" -i %s %s perl -I/usr/local/federation/lib /usr/local/federation/bin/setup_bridge.pl --tapno=0 --addr=%s &') % \
+                    '-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 &') % \
                     (port, self.ssh_identity, peer, my_addr)
             # This should give the tap a a chance to come up

fedkit/gateway_lib.pm

@@ -434 +434 @@
 }
 
+# Fling a few ping packets at the peer in the hopes that it opens doors through
+# NATs and other filters.  Practically speaking this can make a big difference.
+sub ping_peer {
+    my($peer) = @_;
+    system("ping -c 5 $peer");
+}
+
 sub testcmd_repeat {
     my($cmd, $timeout, $sleep) = @_;

fedkit/prep_gateway.pl

@@ -89 +89 @@
     # appear in the DNS.
     foreach my $p (split(/\s*,\s*/, $peer)) {
-        gateway_lib::add_route($p, $router, 1, 60 *60) 
-            if $p && $router;
+        if ($p && $router ) {
+            gateway_lib::add_route($p, $router, 1, 60 *60);
+            # grease the skids
+            gateway_lib::ping_peer($p);
+        }
     }
 }

fedkit/setup_bridge.pl

@@ -13 +13 @@
 my $fedkit_dir= "/usr/local/federation";
 my $perl = "/usr/bin/perl";
+my $peer;
 my $use_file;
 my %opts = (
@@ -18 +19 @@
     'addr=s' => \$addr,
     'dest=s' => \$dest,
+    'peer=s' => \$peer,
     'use_file', \$use_file,
 );
 
 exit(20) unless GetOptions(%opts);
-gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
+gateway_lib::read_config(gateway_lib::config_filename(), \%opts)
     if $use_file;
 
@@ -34 +36 @@
 
 gateway_lib::bind_tap_to_iface($tapno, $iface);
+gateway_lib::ping_peer($peer)
+    if $peer;
 
 exit(0);