Initialization of WinSock librarry

Client/Client.vcxproj

@@ -100,7 +100,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -114,7 +114,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -132,7 +132,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -150,7 +150,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Client/Debug/Client.log

@@ -1,2 +1 @@
-  client.cpp
-  Client.vcxproj -> C:\Users\bartool\MyData\MyCode\Cpp\VisualStudio_lap\LanChat\Debug\Client.exe
+  Client.vcxproj -> C:\Users\bartool\MyData\MyCode\Cpp\VisualStudio_lap\LanChat\Debug\Client.exe

Client/client.cpp

@@ -1,9 +1,17 @@
 //Client
 #include <SocketLibrary/SocketLibrary.h>
 
+using namespace SocketLibrary;
+
 int main()
 {
-	int value = SocketLibrary::ReturnFive();
+	if (Network::Initialize() == true)
+	{
+		Log::Print("[CLIENT] Winsok zostal zainicjolizowany. Mozemy dzialac.");
+	}
+
+
+	Network::Shutdown();
 	return 0;
 }
 
@@ -11,4 +19,5 @@ int main()
 //(VC++ Directories) Add Include Dir -> Solution Dir
 //(VC++ Directories) Add Library Dir -> Output Dir
 //(Linket/Input) Add Additional Dep -> SocketLibrary.lib
-//(Solution/Project Build Order/Dependecies) Correct Oreder Build
+//(Solution/Project Build Order/Dependecies) Correct Oreder Build
+//(Linker/Input) Add Additional Dep -> ws2_32.lib

Server/Debug/Server.Build.CppClean.log

@@ -1,6 +1,6 @@
 c:\users\bartool\mydata\mycode\cpp\visualstudio_lap\lanchat\server\debug\vc142.pdb
 c:\users\bartool\mydata\mycode\cpp\visualstudio_lap\lanchat\server\debug\vc142.idb
-c:\users\bartool\mydata\mycode\cpp\visualstudio_lap\lanchat\server\debug\source.obj
+c:\users\bartool\mydata\mycode\cpp\visualstudio_lap\lanchat\server\debug\server.obj
 c:\users\bartool\mydata\mycode\cpp\visualstudio_lap\lanchat\debug\server.ilk
 c:\users\bartool\mydata\mycode\cpp\visualstudio_lap\lanchat\debug\server.exe
 c:\users\bartool\mydata\mycode\cpp\visualstudio_lap\lanchat\debug\server.pdb

Server/Debug/Server.log

@@ -1,2 +1,2 @@
-  Source.cpp
+  server.cpp
   Server.vcxproj -> C:\Users\bartool\MyData\MyCode\Cpp\VisualStudio_lap\LanChat\Debug\Server.exe

Server/Server.vcxproj

@@ -100,7 +100,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -114,7 +114,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -132,7 +132,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -150,11 +150,11 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;SocketLibrary.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Source.cpp" />
+    <ClCompile Include="server.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Server/Server.vcxproj.filters

@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Source.cpp">
+    <ClCompile Include="server.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

Server/Source.cpp

@@ -1,7 +0,0 @@
-//Server
-#include <SocketLibrary/SocketLibrary.h>
-int main()
-{
-	int value = SocketLibrary::ReturnFive();
-	return 0;
-}

Server/server.cpp

@@ -0,0 +1,22 @@
+//Server
+#include <SocketLibrary/SocketLibrary.h>
+
+using namespace SocketLibrary;
+
+int main()
+{
+	if (Network::Initialize() == true)
+	{
+		Log::Print("[SERVER] Winsok zostal zainicjolizowany. Mozemy dzialac.");
+	}
+
+	
+	Network::Shutdown();
+	return 0;
+}
+
+//(VC++ Directories) Add Include Dir -> Solution Dir
+//(VC++ Directories) Add Library Dir -> Output Dir
+//(Linket/Input) Add Additional Dep -> SocketLibrary.lib
+//(Solution/Project Build Order/Dependecies) Correct Oreder Build
+//(Linker/Input) Add Additional Dep -> ws2_32.lib

SocketLibrary/Debug/SocketLibrary.log

@@ -1,2 +1,2 @@
-  server.cpp
+  Network.cpp
   SocketLibrary.vcxproj -> C:\Users\bartool\MyData\MyCode\Cpp\VisualStudio_lap\LanChat\Debug\SocketLibrary.lib

SocketLibrary/Log.cpp

@@ -0,0 +1,12 @@
+#include <iostream>
+#include "Log.h"
+
+void SocketLibrary::Log::Print(std::string message)
+{
+	std::cout << message << std::endl;
+}
+
+void SocketLibrary::Log::PrintError(std::string message, int error)
+{
+	std::cerr << "[Error Code: " << error << "] "<< message << std::endl;
+}

SocketLibrary/Log.h

@@ -0,0 +1,12 @@
+#pragma once
+#include <string>
+
+namespace SocketLibrary
+{
+	class Log
+	{
+	public:
+		void static Print(std::string message);
+		void static PrintError(std::string message, int error);
+	};
+}

SocketLibrary/Network.cpp

@@ -0,0 +1,37 @@
+#include <WinSock2.h>
+
+#include "Network.h"
+#include "Log.h"
+
+bool SocketLibrary::Network::Initialize()
+{
+	WSADATA wsadata;
+	
+	int result = WSAStartup(MAKEWORD(2,2), &wsadata);
+	if (result != 0)
+	{
+		Log::PrintError("Nie udalo sie uruchomic Winsock", result);
+		return false;
+	}
+	else
+	{
+		Log::Print("Winsock zostal uruchominy");
+	}
+
+	if (LOBYTE(wsadata.wVersion) != 2 || HIBYTE(wsadata.wVersion) != 2)
+	{
+		Log::PrintError("Nie udalo sie uruchomic WinSock w najwyzszej wersji.", result);
+		return false;
+	}
+	else
+	{
+		Log::Print("Udalo sie uchomic WinSock w wersji 2,2.");
+	}
+
+	return true;
+}
+
+void SocketLibrary::Network::Shutdown()
+{
+	WSACleanup();
+}

SocketLibrary/Network.h

@@ -0,0 +1,14 @@
+#pragma once
+#define WIN32_LEAN_AND_MEAN
+
+//#include <WinSock2.h>
+
+namespace SocketLibrary
+{
+	class Network
+	{
+	public:
+		static bool Initialize();
+		static void Shutdown();
+	};
+}

SocketLibrary/SocketLibrary.h

@@ -1,7 +1,3 @@
 #pragma once
-
-
-namespace SocketLibrary
-{
-	int ReturnFive();
-}
+#include "Network.h"
+#include "Log.h"

SocketLibrary/SocketLibrary.vcxproj

@@ -142,10 +142,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="Log.h" />
+    <ClInclude Include="Network.h" />
     <ClInclude Include="SocketLibrary.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="server.cpp" />
+    <ClCompile Include="Log.cpp" />
+    <ClCompile Include="Network.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

SocketLibrary/SocketLibrary.vcxproj.filters

@@ -18,9 +18,18 @@
     <ClInclude Include="SocketLibrary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Network.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="server.cpp">
+    <ClCompile Include="Network.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

SocketLibrary/server.cpp

@@ -1,9 +0,0 @@
-#include "SocketLibrary.h"
-
-namespace SocketLibrary
-{
-	int ReturnFive()
-	{
-		return 5;
-	}
-}