Merge

Code/Network/NetworkDependencies/Connection.cpp

@@ -3,15 +3,7 @@
 #include <winsock2.h>
 #include <iostream>
 
-Connection::Connection()
+using namespace Oyster::Network; 
-{
-	mySocket = NULL;
-}
-
-Connection::Connection(int socket)
-{
-	mySocket = socket;
-}
 
 Connection::~Connection()
 {

Code/Network/NetworkDependencies/Connection.h

@@ -7,23 +7,30 @@
 
 #include "IConnection.h"
 
-class Connection : public ::Oyster::Network::IConnection
+namespace Oyster
 {
-	private:
+	namespace Network
-		int mySocket;
+	{
+		class Connection : public IConnection
+		{
 
-	public:
+		public:
-		Connection();
+			Connection()           { mySocket = 0; };
-		Connection(int socket);
+			Connection(int socket) { mySocket = socket; };
-		~Connection();
+			~Connection();
 
-		virtual bool Connect( unsigned short port , const char serverName[] );
+			virtual bool Connect( unsigned short port , const char serverName[] );
-		virtual bool InitiateServer( unsigned short port ); 
+			virtual bool InitiateServer( unsigned short port ); 
-		virtual void Disconnect();
+			virtual void Disconnect();
-		virtual bool Send(const char message[]);
+			virtual bool Send(const char message[]);
-		virtual int  Recieve(char message[]);
+			virtual int  Recieve(char message[]);
-		virtual int  Listen();
+			virtual int  Listen();
 
-};
+		private:
+			int mySocket;
+
+		};
+	}
+}
 
 #endif

Code/Network/NetworkDependencies/IConnection.h

@@ -11,13 +11,14 @@ namespace Oyster
 	{
 		class IConnection
 		{
-			public:
+
-				virtual void Disconnect() = 0;
+		public:
-				virtual bool Send( const char message[] ) = 0;
+			virtual void Disconnect() = 0;
-				virtual int  Recieve(char message[]) = 0;
+			virtual bool Send( const char message[] ) = 0;
-				virtual bool InitiateServer( unsigned short port ) { return false; };
+			virtual int  Recieve(char message[]) = 0;
-				virtual int  Listen() { return -1; };
+			virtual bool InitiateServer( unsigned short port ) { return false; };
-				virtual bool Connect( unsigned short port, const char serverName[] ) { return false; };
+			virtual int  Listen() { return -1; };
+			virtual bool Connect( unsigned short port, const char serverName[] ) { return false; };
 		};
 	}
 }

Code/Network/NetworkDependencies/ITranslate.h

@@ -0,0 +1,18 @@
+#ifndef NETWORK_DEPENDENCIES_I_TRANSLATE
+#define NETWORK_DEPENDENCIES_I_TRANSLATE
+
+namespace Oyster
+{
+	namespace Network
+	{
+		class ITranslate
+		{
+
+		public:
+			virtual char* Translate (const Protocols::ProtocolHeader &header ) = 0;
+			virtual Protocols::ProtocolHeader& Translate ( char message[] ) = 0;
+
+		};
+	}
+}
+#endif

Code/Network/NetworkDependencies/NetworkDependencies.vcxproj

@@ -156,6 +156,7 @@
     <ClCompile Include="Messages\MessageHeader.cpp" />
     <ClCompile Include="Messages\MessageTest.cpp" />
     <ClCompile Include="Packing.cpp" />
+    <ClCompile Include="Translator.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Connection.h" />
@@ -163,6 +164,9 @@
     <ClInclude Include="Messages\MessageHeader.h" />
     <ClInclude Include="Messages\MessageTest.h" />
     <ClInclude Include="Packing.h" />
+    <ClInclude Include="ITranslate.h" />
+    <ClInclude Include="Protocols.h" />
+    <ClInclude Include="Translator.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters

@@ -28,6 +28,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Messages\MessageTest.cpp">
+    <ClCompile Include="Translator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -45,6 +46,13 @@
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Messages\MessageHeader.h">
+    <ClInclude Include="Protocols.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ITranslate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Translator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Code/Network/NetworkDependencies/Protocols.h

@@ -0,0 +1,35 @@
+#include "string";
+
+namespace Oyster
+{
+	namespace Network
+	{
+		namespace Protocols
+		{
+			enum PackageType
+			{
+				package_type_header,
+				package_type_test,
+				package_type_input,
+				package_type_update_position
+
+			};
+
+
+			struct ProtocolHeader
+			{
+				int size;
+				int packageType;
+				int clientID;
+
+				ProtocolHeader() { this->packageType = package_type_header; }  
+			};
+
+			struct ProtocolTest : public ProtocolHeader
+			{
+				std::string textMessage;
+				ProtocolTest() { this->packageType = package_type_test; }
+			};
+		}
+	}
+}

Code/Network/NetworkDependencies/Translator.cpp

@@ -0,0 +1,50 @@
+//#include "Translator.h"
+//
+//using namespace Oyster::Network;
+//using namespace ::Protocols;
+//using namespace ::Messages;
+//
+//char* Translate ( const ProtocolHeader &header )
+//{
+//	MessageHeader *message;
+//
+//	switch(header.packageType)
+//	{
+//
+//	case package_type_header:
+//		message = new MessageHeader();
+//		break;
+//
+//	case package_type_test:
+//		message = new MessageTest();
+//		break;
+//	}
+//
+//	message->Translate(header);
+//	return message->GetMsg();
+//}
+//
+//ProtocolHeader& Translator::Translate( char msg[] )
+//{
+//	ProtocolHeader header;
+//	MessageHeader *message = new MessageHeader();
+//
+//	header = message->translate(message);
+//
+//	switch(header.packageType)
+//	{
+//
+//	case package_type_header:
+//		message = new MessageHeader();
+//		break;
+//
+//	case package_type_test:
+//		message = new MessageTest();
+//		break;
+//	}
+//
+//	message->Translate(msg);
+//	return message->GetProtocol();
+//}
+
+

Code/Network/NetworkDependencies/Translator.h

@@ -0,0 +1,27 @@
+//#ifndef NETWORK_DEPENDENCIES_TRANSLATOR_H
+//#define NETWORK_DEPENDENCIES_TRANSLATOR_H
+//
+////#include "MessageHeader.h"
+//#include "Protocols.h"
+//#include "ITranslate.h"
+//
+//namespace Oyster
+//{
+//	namespace Network
+//	{
+//		namespace Messages
+//		{
+//			class Translator
+//			{
+//			public:
+//				Translator (){};
+//				~Translator(){};
+//
+//				char* Translate (const Protocols::ProtocolHeader &header );
+//				Protocols::ProtocolHeader& Translate ( char msg[] ); 
+//			};
+//		}
+//	}
+//}
+//
+//#endif

Code/Network/OysterNetworkClient/Client.cpp

@@ -1,5 +1,7 @@
 #include "Client.h"
 
+using namespace Oyster::Network::Client;
+
 Client::Client()
 {
 	connection = new Connection();

Code/Network/OysterNetworkClient/Client.h

@@ -7,20 +7,28 @@
 
 #include "../NetworkDependencies/Connection.h"
 
-class Client
+namespace Oyster
 {
-public:
+	namespace Network
-	Client();
+	{
-	~Client();
+		namespace Client
+		{
+			class Client
+			{
+			public:
+				Client();
+				~Client();
 
-	bool Connect(unsigned int port, char filename[]);
+				bool Connect(unsigned int port, char filename[]);
 
-	void Send(char msg[]);
+				void Send(char msg[]);
-	void Recv(char msg[]);
+				void Recv(char msg[]);
 
-private:
+			private:
-	Connection* connection;
+				::Oyster::Network::Connection* connection;
-
+			};
-};
+		}
+	}
+}
 
 #endif

Code/Network/OysterNetworkClient/ClientMain.cpp

@@ -2,6 +2,7 @@
 #include "Client.h"
 #include <WinSock2.h>
 using namespace std;
+using namespace Oyster::Network::Client;
 #pragma comment(lib, "ws2_32.lib")
 
 void ShutdownSockets();

Code/Network/OysterNetworkServer/Client.cpp

@@ -1,5 +1,7 @@
 #include "Client.h"
 
+using namespace Oyster::Network::Server;
+
 Client::Client(unsigned int socket)
 {
 	connection = new Connection(socket);

Code/Network/OysterNetworkServer/Client.h

@@ -7,18 +7,28 @@
 
 #include "../NetworkDependencies/Connection.h"
 
-class Client
+namespace Oyster
 {
-public:
+	namespace Network
-	Client(unsigned int socket);
+	{
-	~Client();
+		namespace Server
+		{
+			class Client
+			{
 
-	void Send(char buffer[]);
+			public:
-	void Recv(char buffer[]);
+				Client(unsigned int socket);
+				~Client();
 
-private:
+				void Send(char buffer[]);
-	Connection* connection;
+				void Recv(char buffer[]);
 
+			private:
+				::Oyster::Network::Connection* connection;
+
+			};
+		}
+	}
 };
 
 #endif

Code/Network/OysterNetworkServer/Listener.cpp

@@ -1,5 +1,7 @@
 #include "Listener.h"
 
+using namespace Oyster::Network;
+
 Listener::Listener()
 {
 

Code/Network/OysterNetworkServer/Listener.h

@@ -18,7 +18,7 @@ public:
 	int Accept();
 
 private:
-	Connection* connection;
+	::Oyster::Network::Connection* connection;
 
 };
 

Code/Network/OysterNetworkServer/ServerMain.cpp

@@ -3,6 +3,7 @@
 #include "Listener.h"
 #include "Client.h"
 using namespace std;
+using namespace Oyster::Network::Server;
 
 #pragma comment(lib, "ws2_32.lib")