diff --git a/FTPClient/FTPClient/Client.cs b/FTPClient/FTPClient/Client.cs index 4b4200af5318a602acd096141e9b36b49587d9fd..fa5a3a8e24cf67ac7a55a22f366d73368f75c0ca 100644 --- a/FTPClient/FTPClient/Client.cs +++ b/FTPClient/FTPClient/Client.cs @@ -15,7 +15,10 @@ namespace FTPClient client.Initialize(); client.LogIn(); client.Epsv(); +<<<<<<< HEAD client.List(); +======= +>>>>>>> 1f3e362981b7d78bee0fcad2d22cf6eb5d38da0a client.Quit(); Console.ReadKey(); } diff --git a/FTPClient/FTPClient/FtpClient.cs b/FTPClient/FTPClient/FtpClient.cs index 31ff7d9a50f4e0eeace4daf434cec827823c7d6d..7fb5ec4da851f370701ce3ffd246111a48dd797f 100644 --- a/FTPClient/FTPClient/FtpClient.cs +++ b/FTPClient/FTPClient/FtpClient.cs @@ -81,6 +81,9 @@ namespace FTPClient ftpNs = new NetworkStream(ftpSocket); ftpSr = new StreamReader(ftpNs); ftpSw = new StreamWriter(ftpNs); + + string response = ftpSr.ReadLine(); + handleResponse(response); } private void handleEpsvResponse(string response)