* Introduced ChannelExtendedDataEventArgs which is used to signal receive of extended data.

* Removed DataTypeCode from ChannelDataEventArgs, as this is specific to extended data.
* Large set of optimizations in receive and send of SSH messages:
  - removed several buffer copies
  - modified most of the SSH messages to allow the size of the message to be calculated in advance to eliminate need to resize buffer.
  - added Compress(byte[] data, int offset, int length) overload to Compressor to compress part of a given buffer thereby avoiding need for buffer copy.
  - added Encrypt(byte[] data, int offset, int length) overload to Cipher to encrypt part of a given buffer thereby avoiding need for buffer copy.

* SshData:
  - SshData.GetBytes uses a SshDataStream which has a capacity that (in almost all cases) matches the size of the SSH message.
  - Added a Load(byte[] value, int offset) overload.
  - Added a LoadBytes(byte[] bytes, int offset) overload.
  - Added a Write(byte[] data) overload.
  - Added a Write(byte[] buffer, int offset, int count) overload.

* Added SendData(byte[] data, int offset, int size) overload to Channel to allow sending part of a given buffer.
  This avoids a buffer copy in ScpClient, SftpClient, Shell, ChannelDirectTcpip, ChannelForwardedTcpip.
  Fixes issue #1516.

All optimization changes above are only active when the TUNING conditional compilation symbol is defined.
By default, this symbol is defined.

Author: drieseng

Renci.SshClient/Renci.SshNet.Tests/Classes/CipherInfoTest.cs

@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Common;
 using Renci.SshNet.Security.Cryptography;
 using Renci.SshNet.Tests.Common;
 using System;

Renci.SshClient/Renci.SshNet.Tests/Classes/Common/SshDataTest.cs

@@ -9,30 +9,35 @@ public class SshDataTest
         [TestMethod]
         public void Write_Boolean_False()
         {
-            var sshData = new MySshData();
-            sshData.Load(new byte[0]);
+            var sshData = new BoolSshData(false);
+            
+            var bytes = sshData.GetBytes();
 
-            sshData.Write(false);
-            Assert.AreEqual((byte) 0, sshData.ReadByte());
-            Assert.IsTrue(sshData.IsEndOfData);
+            Assert.AreEqual((byte) 0, bytes[0]);
         }
 
         [TestMethod]
         public void Write_Boolean_True()
         {
-            var sshData = new MySshData();
-            sshData.Load(new byte[0]);
+            var sshData = new BoolSshData(true);
 
-            sshData.Write(true);
-            Assert.AreEqual((byte) 1, sshData.ReadByte());
-            Assert.IsTrue(sshData.IsEndOfData);
+            var bytes = sshData.GetBytes();
+
+            Assert.AreEqual((byte) 1, bytes[0]);
         }
 
-        private class MySshData : SshData
+        private class BoolSshData : SshData
         {
-            public new void Write(bool data)
+            private readonly bool _value;
+
+            public BoolSshData(bool value)
+            {
+                _value = value;
+            }
+
+            public new bool IsEndOfData
             {
-                base.Write(data);
+                get { return base.IsEndOfData; }
             }
 
             public new byte ReadByte()
@@ -46,6 +51,7 @@ protected override void LoadData()
 
             protected override void SaveData()
             {
+                Write(_value);
             }
         }
     }

Renci.SshClient/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Dispose_PortStarted_ChannelBound.cs

@@ -100,7 +100,7 @@ protected void Arrange()
                         _sessionMock.Raise(s => s.RequestSuccessReceived += null,
                             new MessageEventArgs<RequestSuccessMessage>(new RequestSuccessMessage())));
             _sessionMock.Setup(p => p.WaitOnHandle(It.IsAny<WaitHandle>()));
-            _sessionMock.Setup(p => p.SendMessage(It.Is<ChannelOpenFailureMessage>(c => c.LocalChannelNumber == _remoteChannelNumberWhileClosing && c.ReasonCode == ChannelOpenFailureMessage.AdministrativelyProhibited && c.Description == string.Empty && c.Language == null)));
+            _sessionMock.Setup(p => p.SendMessage(It.Is<ChannelOpenFailureMessage>(c => c.LocalChannelNumber == _remoteChannelNumberWhileClosing && c.ReasonCode == ChannelOpenFailureMessage.AdministrativelyProhibited && c.Description == string.Empty && c.Language == "en")));
             _sessionMock.Setup(p => p.CreateChannelForwardedTcpip(_remoteChannelNumberStarted, _remoteWindowSizeStarted, _remotePacketSizeStarted)).Returns(_channelMock.Object);
             _channelMock.Setup(
                 p =>

Renci.SshClient/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Started.cs

@@ -179,28 +179,6 @@ public void ForwardedPortShouldIgnoreChannelOpenMessageForOtherHostAndBoundPort(
             Assert.AreEqual(0, _exceptionRegister.Count);
         }
 
-        [TestMethod]
-        public void ForwardedPortShouldIgnoreChannelOpenMessageWhenChannelOpenInfoIsNull()
-        {
-            var channelNumber = (uint)new Random().Next(1001, int.MaxValue);
-            var initialWindowSize = (uint)new Random().Next(0, int.MaxValue);
-            var maximumPacketSize = (uint)new Random().Next(0, int.MaxValue);
-            var channelMock = new Mock<IChannelForwardedTcpip>(MockBehavior.Strict);
-
-            _sessionMock.Setup(
-                p =>
-                    p.CreateChannelForwardedTcpip(channelNumber, initialWindowSize, maximumPacketSize)).Returns(channelMock.Object);
-
-            _sessionMock.Raise(p => p.ChannelOpenReceived += null,
-                new MessageEventArgs<ChannelOpenMessage>(new ChannelOpenMessage(channelNumber, initialWindowSize,
-                    maximumPacketSize, null)));
-
-            _sessionMock.Verify(p => p.CreateChannelForwardedTcpip(channelNumber, initialWindowSize, maximumPacketSize), Times.Never);
-
-            Assert.AreEqual(0, _closingRegister.Count);
-            Assert.AreEqual(0, _exceptionRegister.Count);
-        }
-
         [TestMethod]
         public void ForwardedPortShouldIgnoreChannelOpenMessageWhenChannelOpenInfoIsNotForwardedTcpipChannelInfo()
         {
@@ -215,7 +193,7 @@ public void ForwardedPortShouldIgnoreChannelOpenMessageWhenChannelOpenInfoIsNotF
 
             _sessionMock.Raise(p => p.ChannelOpenReceived += null,
                 new MessageEventArgs<ChannelOpenMessage>(new ChannelOpenMessage(channelNumber, initialWindowSize,
-                    maximumPacketSize, new DirectTcpipChannelInfo())));
+                    maximumPacketSize, new DirectTcpipChannelInfo("HOST", 5, "ORIGIN", 4))));
 
             _sessionMock.Verify(p => p.CreateChannelForwardedTcpip(channelNumber, initialWindowSize, maximumPacketSize), Times.Never);
 

Renci.SshClient/Renci.SshNet.Tests/Classes/Messages/Authentication/RequestMessageTest.cs

@@ -1,4 +1,6 @@
-using Renci.SshNet.Messages.Connection;
+using System.Linq;
+using Renci.SshNet.Common;
+using Renci.SshNet.Messages.Connection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using Renci.SshNet.Tests.Common;
@@ -9,29 +11,162 @@ namespace Renci.SshNet.Tests.Classes.Messages.Connection
     ///This is a test class for ChannelDataMessageTest and is intended
     ///to contain all ChannelDataMessageTest Unit Tests
     ///</summary>
-    [TestClass()]
+    [TestClass]
     public class ChannelDataMessageTest : TestBase
     {
-        /// <summary>
-        ///A test for ChannelDataMessage Constructor
-        ///</summary>
-        [TestMethod()]
-        public void ChannelDataMessageConstructorTest()
+        [TestMethod]
+        public void DefaultConstructor()
         {
-            ChannelDataMessage target = new ChannelDataMessage();
-            Assert.Inconclusive("TODO: Implement code to verify target");
+            var target = new ChannelDataMessage();
+
+            Assert.IsNull(target.Data);
+#if TUNING
+            Assert.AreEqual(0, target.Offset);
+            Assert.AreEqual(0, target.Size);
+#endif
+        }
+
+        [TestMethod]
+        public void Constructor_LocalChannelNumberAndData()
+        {
+            var random = new Random();
+
+            var localChannelNumber = (uint)random.Next(0, int.MaxValue);
+            var data = new byte[3];
+
+            var target = new ChannelDataMessage(localChannelNumber, data);
+
+            Assert.AreSame(data, target.Data);
+#if TUNING
+            Assert.AreEqual(0, target.Offset);
+            Assert.AreEqual(data.Length, target.Size);
+#endif
+        }
+
+        [TestMethod]
+        public void Constructor_LocalChannelNumberAndData_ShouldThrowArgumentNullExceptionWhenDataIsNull()
+        {
+            var localChannelNumber = (uint) new Random().Next(0, int.MaxValue);
+            byte[] data = null;
+
+            try
+            {
+                new ChannelDataMessage(localChannelNumber, data);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("data", ex.ParamName);
+            }
+        }
+
+#if TUNING
+        [TestMethod]
+        public void Constructor_LocalChannelNumberAndDataAndOffsetAndSize()
+        {
+            var localChannelNumber = (uint) new Random().Next(0, int.MaxValue);
+            var data = new byte[4];
+            const int offset = 2;
+            const int size = 1;
+
+            var target = new ChannelDataMessage(localChannelNumber, data, offset, size);
+
+            Assert.AreSame(data, target.Data);
+            Assert.AreEqual(offset, target.Offset);
+            Assert.AreEqual(size, target.Size);
+        }
+
+        [TestMethod]
+        public void Constructor_LocalChannelNumberAndDataAndOffsetAndSize_ShouldThrowArgumentNullExceptionWhenDataIsNull()
+        {
+            var localChannelNumber = (uint) new Random().Next(0, int.MaxValue);
+            byte[] data = null;
+            const int offset = 0;
+            const int size = 0;
+
+            try
+            {
+                new ChannelDataMessage(localChannelNumber, data, offset, size);
+                Assert.Fail();
+            }
+            catch (ArgumentNullException ex)
+            {
+                Assert.IsNull(ex.InnerException);
+                Assert.AreEqual("data", ex.ParamName);
+            }
+        }
+#endif
+
+        [TestMethod]
+        public void GetBytes()
+        {
+            var random = new Random();
+
+            var localChannelNumber = (uint) random.Next(0, int.MaxValue);
+            var data = new byte[random.Next(10, 20)];
+            random.NextBytes(data);
+#if TUNING
+            var offset = random.Next(2, 4);
+            var size = random.Next(5, 9);
+
+            var target = new ChannelDataMessage(localChannelNumber, data, offset, size);
+#else
+            var offset = 0;
+            var size = data.Length;
+
+            var target = new ChannelDataMessage(localChannelNumber, data);
+#endif
+
+            var bytes = target.GetBytes();
+
+            var expectedBytesLength = 1; // Type
+            expectedBytesLength += 4; // LocalChannelNumber
+            expectedBytesLength += 4; // Data length
+            expectedBytesLength += size; // Data
+
+            Assert.AreEqual(expectedBytesLength, bytes.Length);
+
+            var sshDataStream = new SshDataStream(bytes);
+
+            Assert.AreEqual(ChannelDataMessage.MessageNumber, sshDataStream.ReadByte());
+            Assert.AreEqual(localChannelNumber, sshDataStream.ReadUInt32());
+            Assert.AreEqual((uint) size, sshDataStream.ReadUInt32());
+
+            var actualData = new byte[size];
+            sshDataStream.Read(actualData, 0, size);
+            Assert.IsTrue(actualData.SequenceEqual(data.Take(offset, size)));
+
+            Assert.IsTrue(sshDataStream.IsEndOfData);
         }
 
-        /// <summary>
-        ///A test for ChannelDataMessage Constructor
-        ///</summary>
-        [TestMethod()]
-        public void ChannelDataMessageConstructorTest1()
+        [TestMethod]
+        public void Load()
         {
-            uint localChannelNumber = 0; // TODO: Initialize to an appropriate value
-            byte[] data = null; // TODO: Initialize to an appropriate value
-            ChannelDataMessage target = new ChannelDataMessage(localChannelNumber, data);
-            Assert.Inconclusive("TODO: Implement code to verify target");
+            var random = new Random();
+
+            var localChannelNumber = (uint)random.Next(0, int.MaxValue);
+            var data = new byte[random.Next(10, 20)];
+            random.NextBytes(data);
+#if TUNING
+            var offset = random.Next(2, 4);
+            var size = random.Next(5, 9);
+            var channelDataMessage = new ChannelDataMessage(localChannelNumber, data, offset, size);
+#else
+            var offset = 0;
+            var size = data.Length;
+            var channelDataMessage = new ChannelDataMessage(localChannelNumber, data);
+#endif
+            var bytes = channelDataMessage.GetBytes();
+            var target = new ChannelDataMessage();
+
+            target.Load(bytes);
+
+            Assert.IsTrue(target.Data.SequenceEqual(data.Take(offset, size)));
+#if TUNING
+            Assert.AreEqual(0, target.Offset);
+            Assert.AreEqual(size, target.Size);
+#endif
         }
     }
 }