Commit c5cc8dd2 authored by whitlocb's avatar whitlocb

Fix SSH tunneling to simulations.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21655 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0a300bd6
......@@ -113,6 +113,7 @@ enhancements and bug-fixes that were added to this release.</p>
<a name="Bugs_fixed"></a>
<p><b><font size="4">Other bugs fixed in version 2.7</font></b></p>
<ul>
<li>Connections to libsim-enabled simulations on remote systems cannot be made via ssh tunneling.</li>
<li>Lineout does not work on operator-created variables such as those created via the DataBinning operator.</li>
<li>Windows installer doesn't always show the host-profiles selections.</li>
<li>A bug in the exporting of STL files in parallel was fixed.</li>
......
......@@ -855,6 +855,11 @@ ViewerEngineManager::CreateEngineEx(const EngineKey &ek,
// Brad Whitlock, Tue Jun 5 17:11:02 PDT 2012
// Use profile to launch.
//
// Brad Whitlock, Tue Aug 20 11:12:34 PDT 2013
// Use original value for ssh tunneling to set into simData to ensure that
// host/port arguments are translated in SimConnectThroughLauncher when we
// do ssh tunneling.
//
// ****************************************************************************
bool
......@@ -913,15 +918,6 @@ ViewerEngineManager::ConnectSim(const EngineKey &ek,
{
MachineProfile profile = GetMachineProfile(ek.HostName());
// We don't set up tunnels when connecting to a simulation,
// just when launching the VCL
profile.SetTunnelSSH(false);
// We don't use a gateway when connecting to a simulation,
// just when launching the VCL
profile.SetUseGateway(false);
profile.SetGatewayHost("");
//
// Launch the engine.
//
......@@ -939,6 +935,15 @@ ViewerEngineManager::ConnectSim(const EngineKey &ek,
simData.tunnel = profile.GetTunnelSSH();
SetupConnectionProgressDialog(newEngine.proxy, simData.d);
// We don't set up tunnels when connecting to a simulation,
// just when launching the VCL
profile.SetTunnelSSH(false);
// We don't use a gateway when connecting to a simulation,
// just when launching the VCL
profile.SetUseGateway(false);
profile.SetGatewayHost("");
newEngine.proxy->Create(profile,
SimConnectThroughLauncher, (void *)&simData,
true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment