Merge branch 'feature/copy-remote' into devel

Benchmark/MockSocket.cs

@@ -154,6 +154,12 @@ public void Close() {
                 Monitor.Exit(_pumpThreadSync);
             }
         }
+
+        public string Remote {
+            get {
+                return "(mock)";
+            }
+        }
     }
 
     /// <summary>

Pipe/PipeCreator.cs

@@ -351,7 +351,7 @@ ref processInfo
                 Process process = Process.GetProcessById(processInfo.dwProcessId);
 
                 PipedProcess pipedProcess = new PipedProcess(process, childStdInHandle, childStdOutHandle, childStdErrHandle);
-                PipeSocket socket = new PipeSocket(parentReadStream, parentWriteStream);
+                PipeSocket socket = new PipeSocket(parentReadStream, parentWriteStream, commandLine);
                 PipeTerminalConnection connection = new PipeTerminalConnection(param, socket, pipedProcess);
 
                 return connection;
@@ -437,7 +437,10 @@ private static PipeTerminalConnection OpenNamedPipe(PipeTerminalParameter param)
                     writeStream = readStream;
                 }
 
-                PipeSocket sock = new PipeSocket(readStream, writeStream);
+                string remote = (hasOutputPipePath)
+                    ? param.InputPipePath + " > " + param.OutputPipePath
+                    : param.InputPipePath;
+                PipeSocket sock = new PipeSocket(readStream, writeStream, remote);
                 PipeTerminalConnection conn = new PipeTerminalConnection(param, sock, null);
 
                 return conn;

Pipe/PipeSocket.cs

@@ -27,6 +27,8 @@ namespace Poderosa.Pipe {
     /// </summary>
     internal class PipeSocket : IPoderosaSocket {
 
+        private readonly string _remote;
+
         private readonly FileStream _inputStream;
         private readonly FileStream _outputStream;
 
@@ -51,10 +53,12 @@ public bool IsClosed {
         /// </summary>
         /// <param name="inputStream">Stream to input from.</param>
         /// <param name="outputStream">Stream to output to. Can be same instance as inputStream.</param>
-        public PipeSocket(FileStream inputStream, FileStream outputStream) {
+        /// <param name="remote">text representing the remote side</param>
+        public PipeSocket(FileStream inputStream, FileStream outputStream, string remote) {
             Debug.Assert(inputStream != null);
             Debug.Assert(outputStream != null);
 
+            _remote = remote;
             _inputStream = inputStream;
             _outputStream = outputStream;
         }
@@ -132,6 +136,12 @@ public void RepeatAsyncRead(IByteAsyncInputStream receiver) {
             _inputThread.Start();
         }
 
+        public string Remote {
+            get {
+                return _remote;
+            }
+        }
+
         public bool Available {
             get {
                 return false;

Protocols/Connector.cs

@@ -30,8 +30,8 @@ namespace Poderosa.Protocols {
 
     internal class SSHConnector : InterruptableConnector {
 
-        private ISSHLoginParameter _destination;
-        private HostKeyVerifierBridge _keycheck;
+        private readonly ISSHLoginParameter _destination;
+        private readonly HostKeyVerifierBridge _keycheck;
         private TerminalConnection _result;
 
         public SSHConnector(ISSHLoginParameter destination, HostKeyVerifierBridge keycheck) {
@@ -43,7 +43,8 @@ protected override void Negotiate() {
             ITerminalParameter term = (ITerminalParameter)_destination.GetAdapter(typeof(ITerminalParameter));
             ITCPParameter tcp = (ITCPParameter)_destination.GetAdapter(typeof(ITCPParameter));
 
-            SSHTerminalConnection terminalConnection = new SSHTerminalConnection(_destination);
+            SSHTerminalConnection terminalConnection =
+                new SSHTerminalConnection(_destination, tcp.Destination, _socket.RemoteEndPoint as IPEndPoint);
 
             SSHConnectionParameter con =
                 new SSHConnectionParameter(
@@ -138,7 +139,7 @@ internal override TerminalConnection Result {
     }
 
     internal class TelnetConnector : InterruptableConnector {
-        private ITCPParameter _destination;
+        private readonly ITCPParameter _destination;
         private TelnetTerminalConnection _result;
 
         public TelnetConnector(ITCPParameter destination) {
@@ -148,7 +149,7 @@ public TelnetConnector(ITCPParameter destination) {
         protected override void Negotiate() {
             ITerminalParameter term = (ITerminalParameter)_destination.GetAdapter(typeof(ITerminalParameter));
             TelnetNegotiator neg = new TelnetNegotiator(term.TerminalType, term.InitialWidth, term.InitialHeight);
-            TelnetTerminalConnection r = new TelnetTerminalConnection(_destination, neg, new PlainPoderosaSocket(_socket));
+            TelnetTerminalConnection r = new TelnetTerminalConnection(_destination, neg, _socket, _destination.Destination);
             //BACK-BURNER r.UsingSocks = _socks!=null;
             _result = r;
         }

Protocols/LocalShell.cs

@@ -151,7 +151,10 @@ public ITerminalConnection Connect() {
                         args += " -- " + _param.ShellName;
                     }
                     ProcessStartInfo psi = new ProcessStartInfo(cygwinBridgePath, args);
-                    PrepareEnv(psi, _param);
+                    string cygwinDir = _param.CygwinDir;
+                    if (cygwinDir == null || cygwinDir.Length == 0)
+                        cygwinDir = CygwinUtil.GuessRootDirectory();
+                    PrepareEnv(psi, cygwinDir);
                     psi.CreateNoWindow = true;
                     psi.ErrorDialog = false;
                     psi.UseShellExecute = false;
@@ -180,7 +183,7 @@ public ITerminalConnection Connect() {
                         return null;
                     }
 
-                    return new CygwinTerminalConnection(term, sock);
+                    return new CygwinTerminalConnection(term, sock, cygwinDir);
                 }
             }
 
@@ -225,11 +228,8 @@ private IEnumerable<string> EnumerateCygwinBridgeParentPath() {
 
         }
 
-        protected static void PrepareEnv(ProcessStartInfo psi, ICygwinParameter p) {
+        protected static void PrepareEnv(ProcessStartInfo psi, string cygwinDir) {
             string path = psi.EnvironmentVariables["PATH"];
-            string cygwinDir = p.CygwinDir;
-            if (cygwinDir == null || cygwinDir.Length == 0)
-                cygwinDir = CygwinUtil.GuessRootDirectory();
             if (path == null)
                 path = String.Empty;
             else if (!path.EndsWith(";"))
@@ -411,17 +411,30 @@ private static string GetCygwinRootDirectory(RegistryKey baseKey, bool check64Bi
     /// </summary>
     internal class CygwinTerminalConnection : TerminalConnection, ITerminalConnection {
 
+        private readonly CygwinSocket _cygwinSocket;
+
         /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="terminalParameter">Terminal parameter</param>
         /// <param name="socket">Socket object</param>
-        public CygwinTerminalConnection(ITerminalParameter terminalParameter, Socket socket)
+        /// <param name="remote">text representing the remote side</param>
+        public CygwinTerminalConnection(ITerminalParameter terminalParameter, Socket socket, string remote)
             : base(terminalParameter) {
-            _destination = terminalParameter;
-            CygwinSocket s = new CygwinSocket(socket, this);
-            _socket = s;
-            _terminalOutput = s;
+
+            _cygwinSocket = new CygwinSocket(socket, this, remote);
+        }
+
+        public override ITerminalOutput TerminalOutput {
+            get {
+                return _cygwinSocket;
+            }
+        }
+
+        public override IPoderosaSocket Socket {
+            get {
+                return _cygwinSocket;
+            }
         }
     }
 
@@ -432,9 +445,8 @@ internal class CygwinSocket : IPoderosaSocket, ITerminalOutput {
         private byte[] _buff = new byte[0];
         private readonly object _buffSync = new object();
 
-        public CygwinSocket(Socket socket, TerminalConnection conn) {
-            _inner = new PlainPoderosaSocket(socket);
-            _inner.SetOwnerConnection(conn);
+        public CygwinSocket(Socket socket, TerminalConnection conn, string remote) {
+            _inner = new PlainPoderosaSocket(conn, socket, remote);
         }
 
         public void Transmit(ByteDataFragment data) {
@@ -512,5 +524,11 @@ public void Resize(int width, int height) {
                 }
             }
         }
+
+        public string Remote {
+            get {
+                return _inner.Remote;
+            }
+        }
     }
 }

Protocols/SSHSocket.cs

@@ -13,40 +13,44 @@
 // limitations under the License.
 
 using System;
-using System.Text;
-using System.Net.Sockets;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 using Granados;
 using Granados.SSH2;
 using Granados.IO;
 using Granados.KeyboardInteractive;
 using Granados.SSH;
-using System.Threading.Tasks;
 
 namespace Poderosa.Protocols {
     //SSHの入出力系
     internal abstract class SSHConnectionEventReceiverBase : ISSHConnectionEventHandler {
-        protected SSHTerminalConnection _parent;
+        protected readonly SSHTerminalConnection _parent;
         protected ISSHConnection _connection;
         protected IByteAsyncInputStream _callback;
         private bool _normalTerminationCalled;
 
         public SSHConnectionEventReceiverBase(SSHTerminalConnection parent) {
             _parent = parent;
         }
+
         //SSHConnection確立時に呼ぶ
         public void SetSSHConnection(ISSHConnection connection) {
             _connection = connection;
         }
+
         public ISSHConnection Connection {
             get {
                 return _connection;
             }
         }
+
         public virtual void CleanupErrorStatus() {
             if (_connection != null && _connection.IsOpen) {
                 _connection.Close();
@@ -123,16 +127,21 @@ private void CloseError(Exception ex) {
 
     internal class SSHSocket
         : SSHConnectionEventReceiverBase,
-          IPoderosaSocket, ITerminalOutput, IKeyboardInteractiveAuthenticationHandler {
+          IPoderosaSocketInet, ITerminalOutput, IKeyboardInteractiveAuthenticationHandler {
+
+        private readonly string _remote;
+        private readonly IPEndPoint _endPoint;
 
         private SSHChannelHandler _channelHandler;
-        private ByteDataFragment _data;
+        private readonly ByteDataFragment _data;
         private MemoryStream _buffer = new MemoryStream();
 
         private KeyboardInteractiveAuthHanlder _keyboardInteractiveAuthHanlder;
 
-        public SSHSocket(SSHTerminalConnection parent)
+        public SSHSocket(SSHTerminalConnection parent, string remote, IPEndPoint endPoint)
             : base(parent) {
+            _remote = remote;
+            _endPoint = endPoint;
             _data = new ByteDataFragment();
         }
 
@@ -187,7 +196,7 @@ public void ForceDisposed() {
                     _connection.Disconnect(DisconnectionReasonCode.ByApplication, "bye");
                 }
             }
-            catch(Exception e) {
+            catch (Exception e) {
                 Debug.WriteLine(e.Message);
                 Debug.WriteLine(e.StackTrace);
             }
@@ -245,12 +254,30 @@ public bool Available {
             }
         }
 
+        public string Remote {
+            get {
+                return _remote;
+            }
+        }
+        public IPAddress RemoteAddress {
+            get {
+                return (_endPoint != null) ? _endPoint.Address : null;
+            }
+        }
+
+        public int? RemotePortNumber {
+            get {
+                return (_endPoint != null) ? _endPoint.Port : (int?)null;
+            }
+        }
+
         #region IKeyboardInteractiveAuthenticationHandler
 
         public string[] KeyboardInteractiveAuthenticationPrompt(string[] prompts, bool[] echoes) {
             if (_keyboardInteractiveAuthHanlder != null) {
                 return _keyboardInteractiveAuthHanlder.KeyboardInteractiveAuthenticationPrompt(prompts, echoes);
-            } else {
+            }
+            else {
                 return prompts.Select(s => "").ToArray();
             }
         }