Changeset cd3eceb

Timestamp:

Sep 17, 2007 3:35:32 PM (17 years ago)

Author:

Kevin Lahey <lahey@…>

Branches:

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

Children:

0e23fdb

Parents:

3529a90

Message:

Ouch, tighten up handling of the options I read in from the configuration
file; Perl isn't as flexible about true and false as I thought.

File:

• fedkit/fed-tun.pl (modified) (5 diffs)

fedkit/fed-tun.pl

@@ -40 +40 @@
 
 my %opts;
+my @expected_opts = qw(active tunnelcfg bossname fsname type 
+                       peer pubkeys privkeys);
 my $filename;
 my $remote;
@@ -45 +47 @@
 my $count;
 my $addr;
+my $active;
+my $type;
+my $tunnelcfg;
+my $ssh_port_fwds = "";
 
 if ($#ARGV != 0 && !getopts('df:r', \%opts)) {
@@ -71 +77 @@
     &parse_config("$filename", \%opts) || 
         die "Cannot read config file $filename: $!\n";
-}
-
-my $ssh_port_fwds = "";
-
-if (defined($opts{'fsname'})) {
+
+    foreach my $opt (@expected_opts) {
+        warn "Missing $opt option\n" if (!defined($opts{$opt}));
+    }
+
+    $active = 1 if ($opts{'active'} =~ /true/i);
+    $tunnelcfg = 1 if ($opts{'tunnelcfg'} =~ /true/i);
+    $type = $opts{'type'};
+    $type =~ tr/A-Z/a-z/;
+
+    if (defined($opts{'fsname'})) {
         $ssh_port_fwds = "-R :139:$opts{'fsname'}:139 ";
-}
-
-if (defined($opts{'bossname'})) {
+    }
+
+    if (defined($opts{'bossname'})) {
         $ssh_port_fwds .= "-R :7777:$opts{'bossname'}:7777 ";
-}
-
-$ssh_port_fwds = "" if ($opts{'type'} eq 'experiment');
-
-print "ssh_port_fwds = $ssh_port_fwds\n" if ($debug);
-
-print "opts %opts\n";
+    }
+
+    $ssh_port_fwds = "" if ($opts{'type'} eq 'experiment');
+
+    print "ssh_port_fwds = $ssh_port_fwds\n" if ($debug);
+}
 
 # Need these to make the Ethernet tap and bridge to work...
@@ -94 +105 @@
 system("kldload /boot/kernel/if_tap.ko");
 
-if ($opts{'tunnelcfg'} && !$remote) {
+if ($tunnelcfg && !$remote) {
     # Most Emulab-like testbeds use globally-routable addresses on the
     # control net;  at DETER, we isolate the control net from the Internet.
@@ -108 +119 @@
 }
 
-if ($opts{'active'}) {
+if ($active) {
     # If we're the initiator, open up a separate tunnel to the remote 
     # host for each of the different experiment net interfaces on this