Various fixes

Infinest · Apr 18, 2024 · 49d3df9 · 49d3df9
1 parent c2422d6
commit 49d3df9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/FSP Server/FSP Server.cpp b/FSP Server/FSP Server.cpp
@@ -1,5 +1,5 @@
 #include "FSP Server.h"
-#include "UdpClient.h"
+#include "UdpSocket.h"
 #include "winsock2.h"
 #include <iostream>
 #include <vector>
@@ -89,7 +89,7 @@ int main(int argumentCount, char* arguments[])
 		return EXIT_SUCCESS;
 	}
 
-	std::cout << "Starting server with passwort \"" << password << "\" in directory \"" << path.string() << "\"" << std::endl;
+	std::cout << "Starting server with password \"" << password << "\" in directory \"" << path.string() << "\"" << std::endl;
 
 	UdpSocket::basePath = path;
 	UdpSocket client = UdpSocket(ip, port, password);
@@ -105,7 +105,7 @@ void printHelp() {
 	std::cout << std::noskipws << "    -d, --directory:         Determines the directory in which the server should run." << std::endl;
 	std::cout << std::noskipws << "    -p, --password:          Sets a password that clients need to supply to access files. [Default: none]" << std::endl;
 	std::cout << std::noskipws << "    -a, --address:           Determines which address the socket should be bound to. [Default: 0:0.0:0:21]" << std::endl;
-	std::cout << std::noskipws << "    -i  -ignore-keys;        Determines whether or not FSP packet keys should be checked or not. [Default: 0]" << std::endl;
+	std::cout << std::noskipws << "    -i  -ignore-keys;        Determines whether or not FSP packet key validation should be skipped. [Default: 1]" << std::endl;
 	std::cout << std::noskipws << "    -v, --version:           Display version info." << std::endl;
 }
 

diff --git a/FSP Server/FSP Server.vcxproj b/FSP Server/FSP Server.vcxproj
@@ -140,15 +140,15 @@
     <ClCompile Include="FspDirEnt.cpp" />
     <ClCompile Include="FspHelper.cpp" />
     <ClCompile Include="FspPacket.cpp" />
-    <ClCompile Include="UdpClient.cpp" />
+    <ClCompile Include="UdpSocket.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FSP Server.h" />
     <ClInclude Include="FspClient.h" />
     <ClInclude Include="FspDirEnt.h" />
     <ClInclude Include="FspHelper.h" />
     <ClInclude Include="FspPacket.h" />
-    <ClInclude Include="UdpClient.h" />
+    <ClInclude Include="UdpSocket.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/FSP Server/FSP Server.vcxproj.filters b/FSP Server/FSP Server.vcxproj.filters
@@ -18,7 +18,7 @@
     <ClCompile Include="FSP Server.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="UdpClient.cpp">
+    <ClCompile Include="UdpSocket.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
     <ClCompile Include="FspPacket.cpp">
@@ -35,7 +35,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="UdpClient.h">
+    <ClInclude Include="UdpSocket.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
     <ClInclude Include="FspPacket.h">

diff --git a/FSP Server/FspHelper.cpp b/FSP Server/FspHelper.cpp
@@ -1,6 +1,6 @@
 #include "FspHelper.h"
 #include "FspPacket.h"
-#include "UdpClient.h"
+#include "UdpSocket.h"
 #include <regex>
 #include <filesystem>
 #include <vector>

diff --git a/FSP Server/FspPacket.cpp b/FSP Server/FspPacket.cpp
@@ -2,7 +2,7 @@
 #include "FspHelper.h"
 #include <vector>
 #include <stdexcept>
-#include "UdpClient.h"
+#include "UdpSocket.h"
 #include <filesystem>
 #include <fstream>
 #include <iostream>

diff --git a/FSP Server/UdpClient.cpp → FSP Server/UdpSocket.cpp b/FSP Server/UdpClient.cpp → FSP Server/UdpSocket.cpp
@@ -1,4 +1,4 @@
-#include "UdpClient.h"
+#include "UdpSocket.h"
 #include "FspClient.h"
 #include "FspPacket.h"
 #include <iostream>

diff --git a/FSP Server/UdpClient.h → FSP Server/UdpSocket.h b/FSP Server/UdpClient.h → FSP Server/UdpSocket.h