No longer flush PipeStream after every write., allowing us to eliminate polling with a sleep between each poll. Fixes #21.

Always use ServiceFactory to create PipeStream instances.

Author: drieseng

src/Renci.SshNet/ScpClient.NET.cs

@@ -31,12 +31,7 @@ public void Upload(FileInfo fileInfo, string path)
             using (var input = ServiceFactory.CreatePipeStream())
             using (var channel = Session.CreateChannelSession())
             {
-                channel.DataReceived += delegate(object sender, ChannelDataEventArgs e)
-                {
-                    input.Write(e.Data, 0, e.Data.Length);
-                    input.Flush();
-                };
-
+                channel.DataReceived += (sender, e) => input.Write(e.Data, 0, e.Data.Length);
                 channel.Open();
 
                 if (!channel.SendExecRequest(string.Format("scp -t \"{0}\"", path)))
@@ -64,15 +59,10 @@ public void Upload(DirectoryInfo directoryInfo, string path)
             if (string.IsNullOrEmpty(path))
                 throw new ArgumentException("path");
 
-            using (var input = new PipeStream())
+            using (var input = ServiceFactory.CreatePipeStream())
             using (var channel = Session.CreateChannelSession())
             {
-                channel.DataReceived += delegate(object sender, ChannelDataEventArgs e)
-                {
-                    input.Write(e.Data, 0, e.Data.Length);
-                    input.Flush();
-                };
-
+                channel.DataReceived += (sender, e) => input.Write(e.Data, 0, e.Data.Length);
                 channel.Open();
 
                 //  Send channel command request
@@ -106,15 +96,10 @@ public void Download(string filename, FileInfo fileInfo)
             if (fileInfo == null)
                 throw new ArgumentNullException("fileInfo");
 
-            using (var input = new PipeStream())
+            using (var input = ServiceFactory.CreatePipeStream())
             using (var channel = Session.CreateChannelSession())
             {
-                channel.DataReceived += delegate(object sender, ChannelDataEventArgs e)
-                {
-                    input.Write(e.Data, 0, e.Data.Length);
-                    input.Flush();
-                };
-
+                channel.DataReceived += (sender, e) => input.Write(e.Data, 0, e.Data.Length);
                 channel.Open();
 
                 //  Send channel command request
@@ -141,15 +126,10 @@ public void Download(string directoryName, DirectoryInfo directoryInfo)
             if (directoryInfo == null)
                 throw new ArgumentNullException("directoryInfo");
 
-            using (var input = new PipeStream())
+            using (var input = ServiceFactory.CreatePipeStream())
             using (var channel = Session.CreateChannelSession())
             {
-                channel.DataReceived += delegate(object sender, ChannelDataEventArgs e)
-                {
-                    input.Write(e.Data, 0, e.Data.Length);
-                    input.Flush();
-                };
-
+                channel.DataReceived += (sender, e) => input.Write(e.Data, 0, e.Data.Length);
                 channel.Open();
 
                 //  Send channel command request

src/Renci.SshNet/ScpClient.cs

@@ -5,7 +5,6 @@
 using Renci.SshNet.Common;
 using System.Text.RegularExpressions;
 using System.Diagnostics.CodeAnalysis;
-using Renci.SshNet.Abstractions;
 
 namespace Renci.SshNet
 {
@@ -170,12 +169,7 @@ public void Upload(Stream source, string path)
             using (var input = ServiceFactory.CreatePipeStream())
             using (var channel = Session.CreateChannelSession())
             {
-                channel.DataReceived += delegate(object sender, ChannelDataEventArgs e)
-                {
-                    input.Write(e.Data, 0, e.Data.Length);
-                    input.Flush();
-                };
-
+                channel.DataReceived += (sender, e) => input.Write(e.Data, 0, e.Data.Length);
                 channel.Open();
 
                 var pathEnd = path.LastIndexOfAny(new[] { '\\', '/' });
@@ -213,15 +207,10 @@ public void Download(string filename, Stream destination)
             if (destination == null)
                 throw new ArgumentNullException("destination");
 
-            using (var input = new PipeStream())
+            using (var input = ServiceFactory.CreatePipeStream())
             using (var channel = Session.CreateChannelSession())
             {
-                channel.DataReceived += delegate(object sender, ChannelDataEventArgs e)
-                {
-                    input.Write(e.Data, 0, e.Data.Length);
-                    input.Flush();
-                };
-
+                channel.DataReceived += (sender, e) => input.Write(e.Data, 0, e.Data.Length);
                 channel.Open();
 
                 //  Send channel command request
@@ -377,13 +366,8 @@ private void SendData(IChannel channel, byte[] buffer)
         private static int ReadByte(Stream stream)
         {
             var b = stream.ReadByte();
-
-            while (b < 0)
-            {
-                ThreadAbstraction.Sleep(100);
-                b = stream.ReadByte();
-            }
-
+            if (b == -1)
+                throw new SshException("Stream has been closed.");
             return b;
         }