Changeset fe53e75 for fedkit

Timestamp:

May 18, 2008 9:54:18 PM (17 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:

48f7524

Parents:

6115f88

Message:

split out the ssh tunnels to simplify debugging

File:

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

fedkit/fed-tun.pl

@@ -64 +64 @@
 my $type;
 my $tunnelcfg;
-my $ssh_port_fwds = "";
+my @ssh_port_fwds;              # Queue of ssh portforwarders to start.  The
+                                # -L or -R is in here.
 my $remote_script_dir;          # location of the other sides fed-tun.pl
 my $event_repeater;             # The pathname of the event repeater
@@ -109 +110 @@
 
     if (defined($opts{'fsname'})) {
-        $ssh_port_fwds = "-R :$SMBFS_PORT:$opts{'fsname'}:$SMBFS_PORT ";
+        push(@ssh_port_fwds,"-R :$SMBFS_PORT:$opts{'fsname'}:$SMBFS_PORT");
     }
 
     if (defined($opts{'bossname'})) {
-        $ssh_port_fwds .= "-R :$TMCD_PORT:$opts{'bossname'}:$TMCD_PORT ";
+        push(@ssh_port_fwds, "-R :$TMCD_PORT:$opts{'bossname'}:$TMCD_PORT");
     }
 
     if (defined($opts{'eventservername'})) {
-        $ssh_port_fwds .= "-R :$remote_pubsub_port:$opts{'eventservername'}:" . 
-            "$PUBSUB_PORT ";
+        push(@ssh_port_fwds,"-R ". 
+            ":$remote_pubsub_port:$opts{'eventservername'}:$PUBSUB_PORT");
     }
     if (defined($opts{'remoteeventservername'})) {
-        $ssh_port_fwds .= "-L :$remote_pubsub_port:" . 
-            "$opts{'remoteeventservername'}:$PUBSUB_PORT ";
-    }
-
-    $ssh_port_fwds = "" if ($opts{'type'} eq 'experiment');
-
-    print "ssh_port_fwds = $ssh_port_fwds\n" if ($debug);
+        push(@ssh_port_fwds,"-L :$remote_pubsub_port:" . 
+            "$opts{'remoteeventservername'}:$PUBSUB_PORT");
+    }
+
+    @ssh_port_fwds = () if ($opts{'type'} eq 'experiment');
+
+    print "ssh_port_fwds = ", join("\n",@ssh_port_fwds), "\n" if ($debug);
 }
 
@@ -172 +173 @@
 
     if ($type eq "control") {
-        system("$SSH $ssh_port_fwds -Nno \"StrictHostKeyChecking no\" $opts{'peer'} &"); #or die "Failed to run ssh";
+        foreach my $fwd (@ssh_port_fwds) {
+            system("$SSH -N $fwd -Nno \"StrictHostKeyChecking no\" ". 
+                "$opts{'peer'} &"); #or die "Failed to run ssh";
+        }
 
         exit;
@@ -184 +188 @@
         my $bridge = "bridge" . $count;
         my $tun = "tap" . $count;
+        my $cmd;
 
         print "Found $iface, $addr, to bridge on $bridge\n" if ($debug);
@@ -191 +196 @@
         # In order to check for problems, we open it this way and read
         # the expected single line of output when the tunnel is connected.
-
-        print "$SSH -w $count:$count $ssh_port_fwds -o \"StrictHostKeyChecking no\" $opts{'peer'}  \"$remote_script_dir/fed-tun.pl $remote_config_file -r $addr $count\"\n" if $debug;
-        open($SSHCMD[$count], "$SSH -w $count:$count $ssh_port_fwds -o \"StrictHostKeyChecking no\" $opts{'peer'}  \"$remote_script_dir/fed-tun.pl $remote_config_file -r $addr $count\" |") or die "Failed to run ssh";
+        # To make debugging easier and to degrade more gracefully, I've split
+        # these out into multiple processes.
+        
+        foreach my $fwd (@ssh_port_fwds) {
+            $cmd = "$SSH -N $fwd -o \"StrictHostKeyChecking no\" ". 
+                "$opts{'peer'} &";
+
+            print "$cmd\n" if $debug;
+            system("$cmd"); # or die "Failed to run ssh";
+        }
+        $cmd =  "$SSH -w $count:$count -o \"StrictHostKeyChecking no\" " . 
+            "$opts{'peer'}  \"$remote_script_dir/fed-tun.pl " . 
+            "$remote_config_file -r $addr $count\" & |";
+
+        print "$cmd\n" if $debug;
+
+        open($SSHCMD[$count], $cmd) 
+           or die "Failed to run ssh";
 
         my $check = <$SSHCMD[$count]>;  # Make sure something ran...
@@ -200 +220 @@
         &setup_bridging($tun, $bridge, $iface, $addr);
         $count++;
-        $ssh_port_fwds = "";  # only do this on the first connection
+        @ssh_port_fwds = ();  # only do this on the first connection
     }
     close(IFFILE);
@@ -245 +265 @@
     # event repeater.
 
-    my $file = new IO::File(">/tmp/remote");
-    print($file "hello!!!\n") if $file;
     if ( $count == 0 && $type ne "experiment" ) {
         my $remote_pubsub_port = $PUBSUB_PORT - 1;  # There will be a local
@@ -252 +270 @@
                                                     # dodge the port on the
                                                     # remote tunnel node.
-        print($file "In here!\n");
         # Make sure we have the relevant parameters
         die "Missing event repeater params (No config file ?)\n"
@@ -270 +287 @@
         warn "Event repeater returned $?\n" if $?;
     }
-    $file->close() if $file;
 } else {
     print "inactive end of a connection, finishing" if ($debug);