Merge branch 'sshnet:develop' into feature_AES_CSP

Author: zybexXL

src/Renci.SshNet/Connection/ConnectorBase.cs

@@ -49,7 +49,7 @@ protected Socket SocketConnect(string host, int port, TimeSpan timeout)
             {
                 SocketAbstraction.Connect(socket, ep, timeout);
 
-                const int socketBufferSize = 2 * Session.MaximumSshPacketSize;
+                const int socketBufferSize = 10 * Session.MaximumSshPacketSize;
                 socket.SendBufferSize = socketBufferSize;
                 socket.ReceiveBufferSize = socketBufferSize;
                 return socket;

src/Renci.SshNet/ServiceFactory.cs

@@ -143,7 +143,7 @@ public INetConfSession CreateNetConfSession(ISession session, int operationTimeo
         /// </returns>
         public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSession, uint bufferSize)
         {
-            const int defaultMaxPendingReads = 3;
+            const int defaultMaxPendingReads = 10;
 
             // Issue #292: Avoid overlapping SSH_FXP_OPEN and SSH_FXP_LSTAT requests for the same file as this
             // causes a performance degradation on Sun SSH
@@ -163,7 +163,7 @@ public ISftpFileReader CreateSftpFileReader(string fileName, ISftpSession sftpSe
             {
                 var fileAttributes = sftpSession.EndLStat(statAsyncResult);
                 fileSize = fileAttributes.Size;
-                maxPendingReads = Math.Min(10, (int) Math.Ceiling((double) fileAttributes.Size / chunkSize) + 1);
+                maxPendingReads = Math.Min(100, (int)Math.Ceiling((double)fileAttributes.Size / chunkSize) + 1);
             }
             catch (SshException ex)
             {

test/Renci.SshNet.IntegrationTests/SftpClientTests.cs

@@ -34,21 +34,21 @@ public void Create_directory_with_contents_and_list_it()
             Assert.IsTrue(_sftpClient.Exists(testFilePath));
 
             // Check if ListDirectory works
-            var files = _sftpClient.ListDirectory(testDirectory);
+            var expectedFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>()
+                {
+                    ("/home/sshnet/sshnet-test/.", IsRegularFile: false, IsDirectory: true),
+                    ("/home/sshnet/sshnet-test/..", IsRegularFile: false, IsDirectory: true),
+                    ("/home/sshnet/sshnet-test/test-file.txt", IsRegularFile: true, IsDirectory: false),
+                };
+
+            var actualFiles = _sftpClient.ListDirectory(testDirectory)
+                .Select(f => (f.FullName, f.IsRegularFile, f.IsDirectory))
+                .ToList();
 
             _sftpClient.DeleteFile(testFilePath);
             _sftpClient.DeleteDirectory(testDirectory);
 
-            var builder = new StringBuilder();
-            foreach (var file in files)
-            {
-                builder.AppendLine($"{file.FullName} {file.IsRegularFile} {file.IsDirectory}");
-            }
-
-            Assert.AreEqual(@"/home/sshnet/sshnet-test/. False True
-/home/sshnet/sshnet-test/.. False True
-/home/sshnet/sshnet-test/test-file.txt True False
-", builder.ToString());
+            CollectionAssert.AreEquivalent(expectedFiles, actualFiles);
         }
 
         [TestMethod]
@@ -69,21 +69,24 @@ public async Task Create_directory_with_contents_and_list_it_async()
             Assert.IsTrue(_sftpClient.Exists(testFilePath));
 
             // Check if ListDirectory works
-            var files = _sftpClient.ListDirectoryAsync(testDirectory, CancellationToken.None);
+            var expectedFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>()
+                {
+                    ("/home/sshnet/sshnet-test/.", IsRegularFile: false, IsDirectory: true),
+                    ("/home/sshnet/sshnet-test/..", IsRegularFile: false, IsDirectory: true),
+                    ("/home/sshnet/sshnet-test/test-file.txt", IsRegularFile: true, IsDirectory: false),
+                };
+
+            var actualFiles = new List<(string FullName, bool IsRegularFile, bool IsDirectory)>();
 
-            var builder = new StringBuilder();
-            await foreach (var file in files)
+            await foreach (var file in _sftpClient.ListDirectoryAsync(testDirectory, CancellationToken.None))
             {
-                builder.AppendLine($"{file.FullName} {file.IsRegularFile} {file.IsDirectory}");
+                actualFiles.Add((file.FullName, file.IsRegularFile, file.IsDirectory));
             }
 
             _sftpClient.DeleteFile(testFilePath);
             _sftpClient.DeleteDirectory(testDirectory);
 
-            Assert.AreEqual(@"/home/sshnet/sshnet-test/. False True
-/home/sshnet/sshnet-test/.. False True
-/home/sshnet/sshnet-test/test-file.txt True False
-", builder.ToString());
+            CollectionAssert.AreEquivalent(expectedFiles, actualFiles);
         }
 
         [TestMethod]

test/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateSftpFileReader_EndLStatThrowsSshException.cs

@@ -59,7 +59,7 @@ private void SetupMocks()
                             .Setup(p => p.EndLStat(_statAsyncResult))
                             .Throws(new SshException());
             _sftpSessionMock.InSequence(seq)
-                            .Setup(p => p.CreateFileReader(_handle, _sftpSessionMock.Object, _chunkSize, 3, null))
+                            .Setup(p => p.CreateFileReader(_handle, _sftpSessionMock.Object, _chunkSize, 10, null))
                             .Returns(_sftpFileReaderMock.Object);
         }
 

test/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateSftpFileReader_FileSizeIsMoreThanTenTimesGreaterThanChunkSize.cs renamed to test/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateSftpFileReader_FileSizeIsMoreThanMaxPendingReadsTimesChunkSize.cs

@@ -8,7 +8,7 @@
 namespace Renci.SshNet.Tests.Classes
 {
     [TestClass]
-    public class ServiceFactoryTest_CreateSftpFileReader_FileSizeIsMoreThanTenTimesGreaterThanChunkSize
+    public class ServiceFactoryTest_CreateSftpFileReader_FileSizeIsMoreThanMaxPendingReadsTimesChunkSize
     {
         private ServiceFactory _serviceFactory;
         private Mock<ISftpSession> _sftpSessionMock;
@@ -22,18 +22,20 @@ public class ServiceFactoryTest_CreateSftpFileReader_FileSizeIsMoreThanTenTimesG
         private SftpFileAttributes _fileAttributes;
         private long _fileSize;
         private ISftpFileReader _actual;
+        private int _maxPendingReads;
 
         private void SetupData()
         {
             var random = new Random();
 
+            _maxPendingReads = 100;
             _bufferSize = (uint)random.Next(1, int.MaxValue);
             _openAsyncResult = new SftpOpenAsyncResult(null, null);
             _handle = CryptoAbstraction.GenerateRandom(random.Next(1, 10));
             _statAsyncResult = new SFtpStatAsyncResult(null, null);
             _fileName = random.Next().ToString();
             _chunkSize = (uint) random.Next(1000, 5000);
-            _fileSize = _chunkSize * random.Next(11, 50);
+            _fileSize = _chunkSize * random.Next(_maxPendingReads + 1, _maxPendingReads * 2);
             _fileAttributes = new SftpFileAttributesBuilder().WithSize(_fileSize).Build();
         }
 
@@ -63,7 +65,7 @@ private void SetupMocks()
                             .Setup(p => p.EndLStat(_statAsyncResult))
                             .Returns(_fileAttributes);
             _sftpSessionMock.InSequence(seq)
-                            .Setup(p => p.CreateFileReader(_handle, _sftpSessionMock.Object, _chunkSize, 10, _fileSize))
+                            .Setup(p => p.CreateFileReader(_handle, _sftpSessionMock.Object, _chunkSize, _maxPendingReads, _fileSize))
                             .Returns(_sftpFileReaderMock.Object);
         }