From ca2695293f5ed7b795bdb8fad05a5865c4e9cca9 Mon Sep 17 00:00:00 2001
From: Pontus Fransson <pontus.fransson92@gmail.com>
Date: Wed, 19 Feb 2014 09:25:40 +0100
Subject: [PATCH] Added reconnect (not tested). Added check for level parser
 not finding file.

---
 Code/Network/NetworkAPI/NetworkClient.cpp     |  5 +++
 Code/Network/NetworkAPI/NetworkClient.h       |  5 +++
 .../NetworkDependencies/Connection.cpp        | 34 +++++++++++++++++++
 Code/Network/NetworkDependencies/Connection.h |  6 ++++
 .../Network/NetworkDependencies/IConnection.h |  3 ++
 5 files changed, 53 insertions(+)

diff --git a/Code/Network/NetworkAPI/NetworkClient.cpp b/Code/Network/NetworkAPI/NetworkClient.cpp
index 69872fc1..6f2998e9 100644
--- a/Code/Network/NetworkAPI/NetworkClient.cpp
+++ b/Code/Network/NetworkAPI/NetworkClient.cpp
@@ -317,6 +317,11 @@ bool NetworkClient::Connect(unsigned short port, std::wstring serverIP)
 	return this->Connect(port, ip.c_str());
 }
 
+bool NetworkClient::Reconnect()
+{
+	return this->privateData->connection.Reconnect();
+}
+
 void NetworkClient::Disconnect()
 {
 	if(!privateData) return;
diff --git a/Code/Network/NetworkAPI/NetworkClient.h b/Code/Network/NetworkAPI/NetworkClient.h
index 6f037117..a7f3b0bb 100644
--- a/Code/Network/NetworkAPI/NetworkClient.h
+++ b/Code/Network/NetworkAPI/NetworkClient.h
@@ -93,6 +93,11 @@ namespace Oyster
 				*/
 				bool Connect(unsigned short port, std::wstring serverIP);
 
+				/**Tries to connect with the same port and ip it earlier used for Connect.
+				*	
+				*/
+				bool Reconnect();
+
 				/**
 				*	
 				*/
diff --git a/Code/Network/NetworkDependencies/Connection.cpp b/Code/Network/NetworkDependencies/Connection.cpp
index 99cb8a71..a9abf75c 100644
--- a/Code/Network/NetworkDependencies/Connection.cpp
+++ b/Code/Network/NetworkDependencies/Connection.cpp
@@ -58,6 +58,9 @@ int Connection::Connect(unsigned short port , const char serverName[], bool bloc
 {
 	if(this->socket == -1 || this->socket == 0) InitiateSocket();
 
+	lastConnectPort = port;
+	lastConnectAddr = serverName;
+
 	struct hostent *hostEnt;
 	if((hostEnt = gethostbyname(serverName)) == NULL)
 	{
@@ -83,6 +86,37 @@ int Connection::Connect(unsigned short port , const char serverName[], bool bloc
 	return 0;
 }
 
+int Connection::Reconnect()
+{
+	if(this->socket == -1 || this->socket == 0) InitiateSocket();
+
+	struct hostent *hostEnt;
+	if((hostEnt = gethostbyname(lastConnectAddr.c_str())) == NULL)
+	{
+		return WSAGetLastError();
+	}
+
+	struct sockaddr_in server;
+	server.sin_family = AF_INET;
+	server.sin_port = htons(lastConnectPort);
+	server.sin_addr.s_addr = *(unsigned long*) hostEnt->h_addr;
+
+	SetBlockingMode(true);
+
+	if(connect(this->socket, (sockaddr*)&server, sizeof(server)) == SOCKET_ERROR)
+	{
+		return WSAGetLastError();
+	}
+	
+	closed = false;
+	stillSending = true;
+
+	SetBlockingMode(blocking);
+
+	//connection succesfull!
+	return 0;
+}
+
 int Connection::InitiateServer(unsigned short port)
 {
 	int errorCode = 0;
diff --git a/Code/Network/NetworkDependencies/Connection.h b/Code/Network/NetworkDependencies/Connection.h
index 0f46a599..054537fc 100644
--- a/Code/Network/NetworkDependencies/Connection.h
+++ b/Code/Network/NetworkDependencies/Connection.h
@@ -28,6 +28,7 @@ namespace Oyster
 			virtual int Disconnect();
 			virtual int Connect(ConnectionInfo info, bool blocking = false);
 			virtual int Connect(unsigned short port , const char serverName[], bool blocking = false);
+			virtual int Reconnect();
 			
 			virtual ConnectionInfo Listen();
 
@@ -47,6 +48,11 @@ namespace Oyster
 			bool stillSending;
 			bool closed;
 			std::string addr;
+
+			std::string lastConnectAddr;
+			unsigned short lastConnectPort;
+
+			bool blocking;
 		};
 	}
 }
diff --git a/Code/Network/NetworkDependencies/IConnection.h b/Code/Network/NetworkDependencies/IConnection.h
index 7c92f318..debdfe7b 100644
--- a/Code/Network/NetworkDependencies/IConnection.h
+++ b/Code/Network/NetworkDependencies/IConnection.h
@@ -39,6 +39,9 @@ namespace Oyster
 			//(servers uses Listen instead of connect)
 			virtual int Connect( unsigned short port, const char serverName[] ) { return false; };
 
+			//Tries to connect with the same port and ip used for Connect.
+			virtual int Reconnect() = 0;
+
 			//Disconnects the client or server TODO: optimize!
 			virtual int Disconnect() = 0;
 		};