Changeset 479a7d9 for fedkit

Timestamp:

May 25, 2010 5:41:26 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

d38ff56

Parents:

85462fb

Message:

Confirm that remote redirection reaches nodes (an lets this script find them
rather than making fedd do it). Also make sure there are no dupes in the ports
to forward.

File:

• fedkit/port_forward.pl (modified) (1 diff)

fedkit/port_forward.pl

@@ -44 +44 @@
 exit(20) if $?;
 
+# Remove dupes from ports
+my %mark;
+@ports = grep($mark{$_}++, @ports);
+
 foreach my $p (@ports) {
     my ($type, $port, $host, $eport) = split(":", $p);
     $eport = $port unless $eport;
+    if ($type ne "local") {
+        # We will need to resolve this host name.  Make sure we can.
+        if (!gateway_lib::get_ip($host)) {
+            # the short form isn't resovable. Try the full domain that the
+            # portal is in.  If that doesn't work assume the user knows better
+            # and leave $host untouched.
+            chomp (my $hn = `hostname`);
+            (my $try = $hn) =~ s/^[^\.]+/$host/;
+
+            $host = $try if gateway_lib::get_ip($try);
+        }
+    }
     my $fopt =  ($type eq 'local'  ? "-L" : "-R") . " :$port:$host:$eport";
     my $cmd = "$ssh -N $fopt -p $ssh_port -o \"StrictHostKeyChecking no\" " .