Refactor usage of extened requests

Renci.SshClient/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj

@@ -639,12 +639,18 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\PosixRenameRequest.cs">
-      <Link>Sftp\Requests\PosixRenameRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\StatVfsRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\StatVfsRequest.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpCloseRequest.cs">
       <Link>Sftp\Requests\SftpCloseRequest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpExtendedRequest.cs">
+      <Link>Sftp\Requests\SftpExtendedRequest.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpFSetStatRequest.cs">
       <Link>Sftp\Requests\SftpFSetStatRequest.cs</Link>
     </Compile>
@@ -702,8 +708,11 @@
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpWriteRequest.cs">
       <Link>Sftp\Requests\SftpWriteRequest.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\StatVfsRequest.cs">
-      <Link>Sftp\Requests\StatVfsRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpAttrsResponse.cs">
       <Link>Sftp\Responses\SftpAttrsResponse.cs</Link>
@@ -729,9 +738,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Responses\StatVfsResponse.cs">
-      <Link>Sftp\Responses\StatVfsResponse.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDataMessage.cs">
       <Link>Sftp\SftpDataMessage.cs</Link>
     </Compile>

Renci.SshClient/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj

@@ -606,12 +606,18 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\PosixRenameRequest.cs">
-      <Link>Sftp\Requests\PosixRenameRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\StatVfsRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\StatVfsRequest.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpCloseRequest.cs">
       <Link>Sftp\Requests\SftpCloseRequest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpExtendedRequest.cs">
+      <Link>Sftp\Requests\SftpExtendedRequest.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpFSetStatRequest.cs">
       <Link>Sftp\Requests\SftpFSetStatRequest.cs</Link>
     </Compile>
@@ -669,8 +675,11 @@
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpWriteRequest.cs">
       <Link>Sftp\Requests\SftpWriteRequest.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\StatVfsRequest.cs">
-      <Link>Sftp\Requests\StatVfsRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpAttrsResponse.cs">
       <Link>Sftp\Responses\SftpAttrsResponse.cs</Link>
@@ -696,9 +705,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Responses\StatVfsResponse.cs">
-      <Link>Sftp\Responses\StatVfsResponse.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDataMessage.cs">
       <Link>Sftp\SftpDataMessage.cs</Link>
     </Compile>

Renci.SshClient/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj

@@ -612,12 +612,18 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\PosixRenameRequest.cs">
-      <Link>Sftp\Requests\PosixRenameRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\StatVfsRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\StatVfsRequest.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpCloseRequest.cs">
       <Link>Sftp\Requests\SftpCloseRequest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpExtendedRequest.cs">
+      <Link>Sftp\Requests\SftpExtendedRequest.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpFSetStatRequest.cs">
       <Link>Sftp\Requests\SftpFSetStatRequest.cs</Link>
     </Compile>
@@ -675,8 +681,11 @@
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpWriteRequest.cs">
       <Link>Sftp\Requests\SftpWriteRequest.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\StatVfsRequest.cs">
-      <Link>Sftp\Requests\StatVfsRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpAttrsResponse.cs">
       <Link>Sftp\Responses\SftpAttrsResponse.cs</Link>
@@ -702,9 +711,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Responses\StatVfsResponse.cs">
-      <Link>Sftp\Responses\StatVfsResponse.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDataMessage.cs">
       <Link>Sftp\SftpDataMessage.cs</Link>
     </Compile>

Renci.SshClient/Renci.SshNet.WindowsPhone/Renci.SshNet.WindowsPhone.csproj

@@ -610,12 +610,18 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\PosixRenameRequest.cs">
-      <Link>Sftp\Requests\PosixRenameRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\StatVfsRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\StatVfsRequest.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpCloseRequest.cs">
       <Link>Sftp\Requests\SftpCloseRequest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpExtendedRequest.cs">
+      <Link>Sftp\Requests\SftpExtendedRequest.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpFSetStatRequest.cs">
       <Link>Sftp\Requests\SftpFSetStatRequest.cs</Link>
     </Compile>
@@ -673,8 +679,11 @@
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpWriteRequest.cs">
       <Link>Sftp\Requests\SftpWriteRequest.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\StatVfsRequest.cs">
-      <Link>Sftp\Requests\StatVfsRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpAttrsResponse.cs">
       <Link>Sftp\Responses\SftpAttrsResponse.cs</Link>
@@ -700,9 +709,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Responses\StatVfsResponse.cs">
-      <Link>Sftp\Responses\StatVfsResponse.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDataMessage.cs">
       <Link>Sftp\SftpDataMessage.cs</Link>
     </Compile>

Renci.SshClient/Renci.SshNet.WindowsPhone8/Renci.SshNet.WindowsPhone8.csproj

@@ -653,12 +653,18 @@
     <Compile Include="..\Renci.SshNet\Sftp\Flags.cs">
       <Link>Sftp\Flags.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\PosixRenameRequest.cs">
-      <Link>Sftp\Requests\PosixRenameRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\ExtendedRequests\StatVfsRequest.cs">
+      <Link>Sftp\Requests\ExtendedRequests\StatVfsRequest.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpCloseRequest.cs">
       <Link>Sftp\Requests\SftpCloseRequest.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpExtendedRequest.cs">
+      <Link>Sftp\Requests\SftpExtendedRequest.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpFSetStatRequest.cs">
       <Link>Sftp\Requests\SftpFSetStatRequest.cs</Link>
     </Compile>
@@ -716,8 +722,11 @@
     <Compile Include="..\Renci.SshNet\Sftp\Requests\SftpWriteRequest.cs">
       <Link>Sftp\Requests\SftpWriteRequest.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Requests\StatVfsRequest.cs">
-      <Link>Sftp\Requests\StatVfsRequest.cs</Link>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Renci.SshNet\Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs">
+      <Link>Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs</Link>
     </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpAttrsResponse.cs">
       <Link>Sftp\Responses\SftpAttrsResponse.cs</Link>
@@ -743,9 +752,6 @@
     <Compile Include="..\Renci.SshNet\Sftp\Responses\SftpVersionResponse.cs">
       <Link>Sftp\Responses\SftpVersionResponse.cs</Link>
     </Compile>
-    <Compile Include="..\Renci.SshNet\Sftp\Responses\StatVfsResponse.cs">
-      <Link>Sftp\Responses\StatVfsResponse.cs</Link>
-    </Compile>
     <Compile Include="..\Renci.SshNet\Sftp\SftpDataMessage.cs">
       <Link>Sftp\SftpDataMessage.cs</Link>
     </Compile>

Renci.SshClient/Renci.SshNet/Renci.SshNet.csproj

@@ -358,7 +358,8 @@
     </Compile>
     <Compile Include="SftpClient.NET40.cs" />
     <Compile Include="Sftp\Flags.cs" />
-    <Compile Include="Sftp\Requests\PosixRenameRequest.cs">
+    <Compile Include="Sftp\Requests\SftpExtendedRequest.cs" />
+    <Compile Include="Sftp\Requests\ExtendedRequests\PosixRenameRequest.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Sftp\Requests\SftpCloseRequest.cs" />
@@ -381,9 +382,11 @@
     <Compile Include="Sftp\Requests\SftpStatRequest.cs" />
     <Compile Include="Sftp\Requests\SftpSymLinkRequest.cs" />
     <Compile Include="Sftp\Requests\SftpWriteRequest.cs" />
-    <Compile Include="Sftp\Requests\StatVfsRequest.cs">
+    <Compile Include="Sftp\Requests\ExtendedRequests\StatVfsRequest.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Sftp\Responses\ExtendedReplies\ExtendedReplyInfo.cs" />
+    <Compile Include="Sftp\Responses\ExtendedReplies\StatVfsReplyInfo.cs" />
     <Compile Include="Sftp\Responses\SftpAttrsResponse.cs" />
     <Compile Include="Sftp\Responses\SftpDataResponse.cs" />
     <Compile Include="Sftp\Responses\SftpExtendedReplyResponse.cs" />
@@ -392,9 +395,6 @@
     <Compile Include="Sftp\Responses\SftpResponse.cs" />
     <Compile Include="Sftp\Responses\SftpStatusResponse.cs" />
     <Compile Include="Sftp\Responses\SftpVersionResponse.cs" />
-    <Compile Include="Sftp\Responses\StatVfsResponse.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Sftp\SftpDataMessage.cs">
       <SubType>Code</SubType>
     </Compile>

Renci.SshClient/Renci.SshNet/Sftp/Requests/ExtendedRequests/PosixRenameRequest.cs

@@ -0,0 +1,36 @@
+using System;
+using Renci.SshNet.Sftp.Responses;
+
+namespace Renci.SshNet.Sftp.Requests
+{
+    internal class PosixRenameRequest : SftpExtendedRequest
+    {
+        public override SftpMessageTypes SftpMessageType
+        {
+            get { return SftpMessageTypes.Extended; }
+        }
+        
+        public override string Name
+        {
+            get { return "posix-rename@openssh.com"; }
+        }
+
+        public string OldPath { get; private set; }
+
+        public string NewPath { get; private set; }
+
+        public PosixRenameRequest(uint protocolVersion, uint requestId, string oldPath, string newPath, Action<SftpStatusResponse> statusAction)
+            : base(protocolVersion, requestId, statusAction)
+        {
+            this.OldPath = oldPath;
+            this.NewPath = newPath;
+        }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+            this.Write(this.OldPath);
+            this.Write(this.NewPath);
+        }
+    }
+}

Renci.SshClient/Renci.SshNet/Sftp/Requests/ExtendedRequests/StatVfsRequest.cs

@@ -0,0 +1,33 @@
+using System;
+using Renci.SshNet.Sftp.Responses;
+
+namespace Renci.SshNet.Sftp.Requests
+{
+    internal class StatVfsRequest : SftpExtendedRequest
+    {
+        public override SftpMessageTypes SftpMessageType
+        {
+            get { return SftpMessageTypes.Extended; }
+        }
+
+        public override string Name
+        {
+            get { return "statvfs@openssh.com"; }
+        }
+
+        public string Path { get; private set; }
+
+        public StatVfsRequest(uint protocolVersion, uint requestId, string path, Action<SftpExtendedReplyResponse> extendedAction, Action<SftpStatusResponse> statusAction)
+            : base(protocolVersion, requestId, statusAction)
+        {
+            this.Path = path;
+            this.SetAction(extendedAction);
+        }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+            this.Write(this.Path);
+        }
+    }
+}

Renci.SshClient/Renci.SshNet/Sftp/Requests/SftpExtendedRequest.cs

@@ -0,0 +1,28 @@
+using System;
+using Renci.SshNet.Sftp.Responses;
+
+namespace Renci.SshNet.Sftp.Requests
+{
+    internal abstract class SftpExtendedRequest : SftpRequest
+    {
+        public const string NAME = "posix-rename@openssh.com";
+
+        public override SftpMessageTypes SftpMessageType
+        {
+            get { return SftpMessageTypes.Extended; }
+        }
+
+        public abstract string Name { get; }
+
+        public SftpExtendedRequest(uint protocolVersion, uint requestId, Action<SftpStatusResponse> statusAction)
+            : base(protocolVersion, requestId, statusAction)
+        {
+        }
+
+        protected override void SaveData()
+        {
+            base.SaveData();
+            this.Write(this.Name);
+        }
+    }
+}

Renci.SshClient/Renci.SshNet/Sftp/Responses/ExtendedReplies/ExtendedReplyInfo.cs

@@ -0,0 +1,25 @@
+using Renci.SshNet.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Renci.SshNet.Sftp.Responses
+{
+    internal abstract class ExtendedReplyInfo : SshData
+    {
+        protected override void LoadData()
+        {
+            //  Read Message Type
+            var messageType = this.ReadByte();
+
+            //  Read Response ID
+            var responseId = this.ReadUInt32();
+        }
+
+        protected override void SaveData()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Renci.SshClient/Renci.SshNet/Sftp/Responses/ExtendedReplies/StatVfsReplyInfo.cs

@@ -0,0 +1,26 @@
+using Renci.SshNet.Common;
+
+namespace Renci.SshNet.Sftp.Responses
+{
+    internal class StatVfsReplyInfo : ExtendedReplyInfo
+    {
+        public SftpFileSytemInformation Information { get; private set; }
+
+        protected override void LoadData()
+        {
+            base.LoadData();
+
+            this.Information = new SftpFileSytemInformation(this.ReadUInt64(), this.ReadUInt64(),
+                                                                     this.ReadUInt64(), this.ReadUInt64(),
+                                                                     this.ReadUInt64(), this.ReadUInt64(),
+                                                                     this.ReadUInt64(), this.ReadUInt64(),
+                                                                     this.ReadUInt64(), this.ReadUInt64(),
+                                                                     this.ReadUInt64());
+        }
+
+        protected override void SaveData()
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}

Renci.SshClient/Renci.SshNet/Sftp/Responses/SftpExtendedReplyResponse.cs

@@ -1,4 +1,5 @@
-using System;
+using Renci.SshNet.Common;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -16,5 +17,10 @@ namespace Renci.SshNet.Sftp.Responses
             : base(protocolVersion)
         {
         }
+
+        public T GetReply<T>() where T : SshData, new()
+        {
+            return this.OfType<T>();
+        }
     }
 }

Renci.SshClient/Renci.SshNet/Sftp/SftpSession.cs

@@ -861,6 +861,10 @@ namespace Renci.SshNet.Sftp
             }
         }
 
+        #endregion
+        
+        #region SFTP Extended API functions
+
         /// <summary>
         /// Performs posix-rename@openssh.com extended request.
         /// </summary>
@@ -913,7 +917,8 @@ namespace Renci.SshNet.Sftp
                 var request = new StatVfsRequest(this.ProtocolVersion, this.NextRequestId, path,
                     (response) =>
                     {
-                        information = response.OfType<StatVfsResponse>().Information;
+                        information = response.GetReply<StatVfsReplyInfo>().Information;
+
                         wait.Set();
                     },
                     (response) =>