Changeset 4a02274 for fedkit/setup_bridge.pl

Timestamp:

Mar 10, 2014 11:12:49 AM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

a2ca699

Parents:

26821ac (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' into shared_nat

File:

• fedkit/setup_bridge.pl (modified) (3 diffs)

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);