From 4671afe9004432879ff4cfb79d09569ada37eb62 Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Fri, 10 May 2013 19:57:53 +1000
Subject: [PATCH] Basic connection between server and unit

---
 client/makefile               |   6 +-
 client/network.cpp            |  39 +++++++
 client/network.hpp            | 107 ++++++++++++++++++++
 client/network_tcp.cpp        | 184 ++++++++++++++++++++++++++++++++++
 docs/server.txt               |  45 ++++-----
 rsc/graphics/sprites/coa2.bmp | Bin 0 -> 73782 bytes
 server/delta.hpp              |  45 +++++++++
 server/main.cpp               |   2 +-
 server/makefile               |   9 +-
 server/network.cpp            |  39 +++++++
 server/network.hpp            | 107 ++++++++++++++++++++
 server/network_tcp.cpp        | 184 ++++++++++++++++++++++++++++++++++
 server/player.hpp             |  25 +++++
 server/player_manager.hpp     |   4 +
 server/server.cpp             |  34 +++++--
 server/server.hpp             |   5 +
 server/unit.cpp               |  22 ++++
 server/vector2.hpp            |  76 ++++++++++++++
 18 files changed, 891 insertions(+), 42 deletions(-)
 create mode 100644 client/network.cpp
 create mode 100644 client/network.hpp
 create mode 100644 client/network_tcp.cpp
 create mode 100644 rsc/graphics/sprites/coa2.bmp
 create mode 100644 server/delta.hpp
 create mode 100644 server/network.cpp
 create mode 100644 server/network.hpp
 create mode 100644 server/network_tcp.cpp
 create mode 100644 server/player.hpp
 create mode 100644 server/player_manager.hpp
 create mode 100644 server/vector2.hpp

diff --git a/client/makefile b/client/makefile
index ac3c556..bdc723f 100644
--- a/client/makefile
+++ b/client/makefile
@@ -1,17 +1,17 @@
 #config
 CXXFLAGS+=-std=c++11 -DDEBUG
-LIB=-lmingw32 -lSDLmain -lSDL -lwsock32 -liphlpapi
+LIB=-lmingw32 -lSDLmain -lSDL -lwsock32 -lWS2_32
 
 #objects
 OBJDIR=obj
-OBJ=$(addprefix $(OBJDIR)/,base_scene.o scene_manager.o main.o surface_manager.o image.o sprite_sheet.o player.o player_manager.o config_utility.o)
+OBJ=$(addprefix $(OBJDIR)/,base_scene.o scene_manager.o surface_manager.o image.o sprite_sheet.o player.o player_manager.o config_utility.o network.o network_tcp.o)
 
 #output
 OUTDIR=out
 OUT=$(addprefix $(OUTDIR)/,a)
 
 #source
-SRC=test_systems.cpp in_game.cpp
+SRC=test_systems.cpp in_game.cpp main.cpp
 
 #targets
 all: $(OBJ) $(OUT)
diff --git a/client/network.cpp b/client/network.cpp
new file mode 100644
index 0000000..b4a2e29
--- /dev/null
+++ b/client/network.cpp
@@ -0,0 +1,39 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "network.hpp"
+
+#include <stdexcept>
+
+void NetworkInit() {
+	WSADATA wsaData;   // if this doesn't work
+	//WSAData wsaData; // then try this instead
+
+	// MAKEWORD(1,1) for Winsock 1.1, MAKEWORD(2,0) for Winsock 2.0:
+
+	if (WSAStartup(MAKEWORD(2,0), &wsaData) != 0) {
+		throw(std::runtime_error("WSAStartup failed"));
+	}
+}
+
+void NetworkQuit() {
+	WSACleanup();
+}
diff --git a/client/network.hpp b/client/network.hpp
new file mode 100644
index 0000000..7c8bffe
--- /dev/null
+++ b/client/network.hpp
@@ -0,0 +1,107 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef NETWORK_HPP_
+#define NETWORK_HPP_
+
+#include <cstdint>
+
+#define WIN32_LEAN_AND_MEAN
+#define _WIN32_WINNT 0x501
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+void NetworkInit();
+void NetworkQuit();
+
+class TCPSocket {
+public:
+	TCPSocket();
+	TCPSocket(const char* ip, int port);
+	~TCPSocket();
+
+	/* param 1: ip address to connect to
+	 * param 2: port to open the server socket on
+	*/
+	void Open(const char* ip, int port);
+	void Close();
+
+	/* Send() and Receive()
+	 * param 1: data to be sent/received
+	 * param 2: length/maxlength of the data
+	 * param 3: flags to the internal function
+	 * return:
+	 *     the amount of data sent/received (not necessarily the same value as len/maxlen)
+	*/
+	int Send(const void* data, int len, int flags = 0);
+	int Recv(void* data, int maxlen, int flags = 0);
+private:
+	SOCKET sock;
+	friend class TCPServerSocket;
+};
+
+class TCPServerSocket {
+public:
+	TCPServerSocket();
+	TCPServerSocket(int port);
+	~TCPServerSocket();
+
+	void Open(int port);
+	void Close();
+
+	int Accept(TCPSocket*, int uSeconds = 0);
+private:
+	SOCKET sock;
+};
+
+//TODO: Write the UDP systems
+//
+//class UDPRemote {
+//public:
+//	UDPRemote();
+//	UDPRemote(const char* ip, int port);
+//
+//	/* param 1: ip of the remote to connect to, null to clear
+//	 * param 2: port of the remote to connect to
+//	*/
+//	void Set(const char* ip, int port);
+//	//TODO: Get?
+//private:
+//	sockaddr addr;
+//	friend class UDPSocket;
+//};
+//
+//class UDPSocket {
+//public:
+//	UDPSocket();
+//	UDPSocket(int port);
+//	~UDPSocket();
+//
+//	int Open(int port);
+//	void Close();
+//
+//	int Send(const void* data, int len, UDPRemote* rem, int flags = 0);
+//	int Recv(void* data, int maxlen, UDPRemote* rem, int flags = 0);
+//private:
+//	SOCKET sock;
+//};
+
+#endif
diff --git a/client/network_tcp.cpp b/client/network_tcp.cpp
new file mode 100644
index 0000000..93d0ad6
--- /dev/null
+++ b/client/network_tcp.cpp
@@ -0,0 +1,184 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "network.hpp"
+
+#include <stdexcept>
+#include <cstdio>
+
+/* TCPSocket definition
+*/
+
+TCPSocket::TCPSocket() {
+	sock = INVALID_SOCKET;
+}
+
+TCPSocket::TCPSocket(const char* ip, int port) {
+	Open(ip, port);
+}
+
+TCPSocket::~TCPSocket() {
+	Close();
+}
+
+void TCPSocket::Open(const char* ip, int port) {
+	addrinfo *ptr = nullptr, hints;
+	char buf[100];
+	sprintf(buf, "%d",port); //std compliant itoa()
+
+	memset(&hints, 0, sizeof(hints));
+
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+
+	if (getaddrinfo(ip, buf, &hints, &ptr)) {
+		throw(std::runtime_error("TCPSocket failed to access address info"));
+	}
+
+	sock = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol);
+
+	if (sock == INVALID_SOCKET) {
+		freeaddrinfo(ptr);
+		throw(std::runtime_error("Failed to create a TCPSocket"));
+	}
+
+	bool connected = false;
+	for(addrinfo *it = ptr; it; it = it->ai_next) {
+		if (!connect(sock, it->ai_addr, it->ai_addrlen)) {
+			connected = true;
+			break;
+		}
+	}
+
+	freeaddrinfo(ptr);
+
+	if (!connected) {
+		closesocket(sock);
+		sock = INVALID_SOCKET;
+		throw(std::runtime_error("Failed to connect a TCPSocket"));
+	}
+}
+
+void TCPSocket::Close() {
+	closesocket(sock);
+	sock = INVALID_SOCKET;
+}
+
+int TCPSocket::Send(const void* data, int len, int flags) {
+	if (sock == INVALID_SOCKET) {
+		throw(std::runtime_error("Failed to send, TCPSocket is invalid"));
+	}
+	int ret = send(sock, (const char*)data, len, flags);
+	if (ret == SOCKET_ERROR) {
+		Close();
+		throw(std::runtime_error("Failed to send, unknown error, TCPSocket automatically closed"));
+	}
+	return ret;
+}
+
+int TCPSocket::Recv(void* data, int maxlen, int flags) {
+	if (sock == INVALID_SOCKET) {
+		throw(std::runtime_error("Failed to receive, TCPSocket is invalid"));
+	}
+	int ret = recv(sock, (char*)data, maxlen, flags);
+	if (ret == SOCKET_ERROR) {
+		Close();
+		throw(std::runtime_error("Failed to receive, unknown error, TCPSocket automatically closed"));
+	}
+	return ret;
+}
+
+/* TCPServerSocket definition
+*/
+
+TCPServerSocket::TCPServerSocket() {
+	sock = INVALID_SOCKET;
+}
+
+TCPServerSocket::TCPServerSocket(int port) {
+	Open(port);
+}
+
+TCPServerSocket::~TCPServerSocket() {
+	Close();
+}
+
+void TCPServerSocket::Open(int port) {
+	addrinfo *ptr = nullptr, hints;
+	char buf[100];
+	sprintf(buf, "%d",port); //std compliant itoa()
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+	hints.ai_flags = AI_PASSIVE;
+
+	if (getaddrinfo(nullptr, buf, &hints, &ptr)) {
+		throw(std::runtime_error("TCPServerSocket failed to access address info"));
+	}
+
+	sock = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol);
+
+	if (sock == INVALID_SOCKET) {
+		freeaddrinfo(ptr);
+		throw(std::runtime_error("Failed to create a TCPServerSocket"));
+	}
+
+	if (bind(sock, ptr->ai_addr, ptr->ai_addrlen) == SOCKET_ERROR) {
+		closesocket(sock);
+		freeaddrinfo(ptr);
+		throw(std::runtime_error("Failed to bind TCPServerSocket"));
+	}
+
+	freeaddrinfo(ptr);
+}
+
+void TCPServerSocket::Close() {
+	closesocket(sock);
+}
+
+int TCPServerSocket::Accept(TCPSocket* s, int uSeconds) {
+	if (listen(sock, SOMAXCONN) == SOCKET_ERROR) {
+		throw(std::runtime_error("TCPServerSocket: listen() error"));
+	}
+
+	//file descriptor sets are to prevent blocking
+	fd_set readfds;
+	timeval tv = {0, uSeconds};
+
+	FD_ZERO(&readfds);
+	FD_SET(sock, &readfds);
+
+	if (select(0, &readfds, nullptr, nullptr, &tv) == SOCKET_ERROR) {
+		throw(std::runtime_error("TCPServerSocket: select() error"));
+	}
+
+	//I don't want this to block
+	if (FD_ISSET(sock, &readfds)) {
+		if ((s->sock = accept(sock, nullptr, nullptr)) == INVALID_SOCKET) {
+			throw(std::runtime_error("TCPServerSocket: accept() error"));
+		}
+		return 1;
+	}
+	return 0;
+}
diff --git a/docs/server.txt b/docs/server.txt
index 2f15fa6..1ace583 100644
--- a/docs/server.txt
+++ b/docs/server.txt
@@ -24,36 +24,35 @@ This outline is only the most basic example of the server's operation possible,
 
 -------------------------
 
-class Client:
+Player:
 	ID --unique, incremental
-	socket --connection socket
+	position
+	motion
+	avatarName --make sure you've transfered the assets first
 
-	GetID
-	GetSocket
-	GetIP --wrapper for GetPeerAddress
+	Update(int)
 
-	--handle dropped connections by destroying this client
-	int Send(data, len);
-	int Recv(data, maxlen);
+	Set
+	Get
 
-	--close the socket, and cleanup any other stuff
-	CloseSocket()
+	GetPosition()
+	GetMotion()
+	GetAvatarName()
+end
 
-	[stuff]
-	[things]
+class PlayerManager:
+	maxPlayers
+	currentPlayers
+	ticker --incremental
 
-class ClientManager:
-	Init(max)
+	Init(maxPlayers)
 	Quit()
 
-	CheckNewClients()
-	Send(id, data, len)
-	SendAll(data, len)
-	Recv(id, data, maxlen)
+	UpdateAll(int)
 
-	Get(id)
-	Close(id)
+	NewPlayer(...)
+	GetPlayer(index)
+	DeletePlayer(...)
 
-	GetRaw() --the internal container
-
-	--iteratable
+	DeleteAll()
+end
diff --git a/rsc/graphics/sprites/coa2.bmp b/rsc/graphics/sprites/coa2.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..bd7b3c0e68a27ce935b84bbda7a7f184e1556bcc
GIT binary patch
literal 73782
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
Ia)1u}4>E?7uK)l5

literal 0
HcmV?d00001

diff --git a/server/delta.hpp b/server/delta.hpp
new file mode 100644
index 0000000..25423a0
--- /dev/null
+++ b/server/delta.hpp
@@ -0,0 +1,45 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef DELTA_HPP_
+#define DELTA_HPP_
+
+#include <ctime>
+
+class Delta {
+public:
+	Delta() {
+		time = tick = 0;
+	}
+	int Calculate() {
+		int c = clock();
+		time = c - tick;
+		tick = c;
+		return time;
+	}
+	int GetDelta() const {
+		return time;
+	};
+private:
+	int time, tick;
+};
+
+#endif
diff --git a/server/main.cpp b/server/main.cpp
index 3e762ec..4e58cee 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -9,8 +9,8 @@ int main(int, char**) {
 #ifdef DEBUG
 	cout << "Beginning server" << endl;
 #endif
-	Server app;
 	try {
+		Server app;
 		app.Init();
 		app.Proc();
 		app.Quit();
diff --git a/server/makefile b/server/makefile
index c0d4c30..7534020 100644
--- a/server/makefile
+++ b/server/makefile
@@ -1,17 +1,17 @@
 #config
 CXXFLAGS+=-std=c++11 -DDEBUG
-LIB=-lmingw32 -lSDLmain -lSDL -lwsock32 -liphlpapi
+LIB=-lwsock32 -lWS2_32
 
 #objects
 OBJDIR=obj
-OBJ=$(addprefix $(OBJDIR)/,main.o config_utility.o)
+OBJ=$(addprefix $(OBJDIR)/,config_utility.o network.o network_tcp.o)
 
 #output
 OUTDIR=out
-OUT=$(addprefix $(OUTDIR)/,a)
+OUT=$(addprefix $(OUTDIR)/,server)
 
 #source
-SRC=server.cpp
+SRC=server.cpp main.cpp
 
 #targets
 all: $(OBJ) $(OUT)
@@ -36,3 +36,4 @@ clean:
 rebuild: clean all
 
 unit:
+	$(CXX) $(CXXFLAGS) -o $(OUTDIR)\unit unit.cpp $(OBJ) $(LIB)
\ No newline at end of file
diff --git a/server/network.cpp b/server/network.cpp
new file mode 100644
index 0000000..b4a2e29
--- /dev/null
+++ b/server/network.cpp
@@ -0,0 +1,39 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "network.hpp"
+
+#include <stdexcept>
+
+void NetworkInit() {
+	WSADATA wsaData;   // if this doesn't work
+	//WSAData wsaData; // then try this instead
+
+	// MAKEWORD(1,1) for Winsock 1.1, MAKEWORD(2,0) for Winsock 2.0:
+
+	if (WSAStartup(MAKEWORD(2,0), &wsaData) != 0) {
+		throw(std::runtime_error("WSAStartup failed"));
+	}
+}
+
+void NetworkQuit() {
+	WSACleanup();
+}
diff --git a/server/network.hpp b/server/network.hpp
new file mode 100644
index 0000000..7c8bffe
--- /dev/null
+++ b/server/network.hpp
@@ -0,0 +1,107 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef NETWORK_HPP_
+#define NETWORK_HPP_
+
+#include <cstdint>
+
+#define WIN32_LEAN_AND_MEAN
+#define _WIN32_WINNT 0x501
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+void NetworkInit();
+void NetworkQuit();
+
+class TCPSocket {
+public:
+	TCPSocket();
+	TCPSocket(const char* ip, int port);
+	~TCPSocket();
+
+	/* param 1: ip address to connect to
+	 * param 2: port to open the server socket on
+	*/
+	void Open(const char* ip, int port);
+	void Close();
+
+	/* Send() and Receive()
+	 * param 1: data to be sent/received
+	 * param 2: length/maxlength of the data
+	 * param 3: flags to the internal function
+	 * return:
+	 *     the amount of data sent/received (not necessarily the same value as len/maxlen)
+	*/
+	int Send(const void* data, int len, int flags = 0);
+	int Recv(void* data, int maxlen, int flags = 0);
+private:
+	SOCKET sock;
+	friend class TCPServerSocket;
+};
+
+class TCPServerSocket {
+public:
+	TCPServerSocket();
+	TCPServerSocket(int port);
+	~TCPServerSocket();
+
+	void Open(int port);
+	void Close();
+
+	int Accept(TCPSocket*, int uSeconds = 0);
+private:
+	SOCKET sock;
+};
+
+//TODO: Write the UDP systems
+//
+//class UDPRemote {
+//public:
+//	UDPRemote();
+//	UDPRemote(const char* ip, int port);
+//
+//	/* param 1: ip of the remote to connect to, null to clear
+//	 * param 2: port of the remote to connect to
+//	*/
+//	void Set(const char* ip, int port);
+//	//TODO: Get?
+//private:
+//	sockaddr addr;
+//	friend class UDPSocket;
+//};
+//
+//class UDPSocket {
+//public:
+//	UDPSocket();
+//	UDPSocket(int port);
+//	~UDPSocket();
+//
+//	int Open(int port);
+//	void Close();
+//
+//	int Send(const void* data, int len, UDPRemote* rem, int flags = 0);
+//	int Recv(void* data, int maxlen, UDPRemote* rem, int flags = 0);
+//private:
+//	SOCKET sock;
+//};
+
+#endif
diff --git a/server/network_tcp.cpp b/server/network_tcp.cpp
new file mode 100644
index 0000000..93d0ad6
--- /dev/null
+++ b/server/network_tcp.cpp
@@ -0,0 +1,184 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "network.hpp"
+
+#include <stdexcept>
+#include <cstdio>
+
+/* TCPSocket definition
+*/
+
+TCPSocket::TCPSocket() {
+	sock = INVALID_SOCKET;
+}
+
+TCPSocket::TCPSocket(const char* ip, int port) {
+	Open(ip, port);
+}
+
+TCPSocket::~TCPSocket() {
+	Close();
+}
+
+void TCPSocket::Open(const char* ip, int port) {
+	addrinfo *ptr = nullptr, hints;
+	char buf[100];
+	sprintf(buf, "%d",port); //std compliant itoa()
+
+	memset(&hints, 0, sizeof(hints));
+
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+
+	if (getaddrinfo(ip, buf, &hints, &ptr)) {
+		throw(std::runtime_error("TCPSocket failed to access address info"));
+	}
+
+	sock = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol);
+
+	if (sock == INVALID_SOCKET) {
+		freeaddrinfo(ptr);
+		throw(std::runtime_error("Failed to create a TCPSocket"));
+	}
+
+	bool connected = false;
+	for(addrinfo *it = ptr; it; it = it->ai_next) {
+		if (!connect(sock, it->ai_addr, it->ai_addrlen)) {
+			connected = true;
+			break;
+		}
+	}
+
+	freeaddrinfo(ptr);
+
+	if (!connected) {
+		closesocket(sock);
+		sock = INVALID_SOCKET;
+		throw(std::runtime_error("Failed to connect a TCPSocket"));
+	}
+}
+
+void TCPSocket::Close() {
+	closesocket(sock);
+	sock = INVALID_SOCKET;
+}
+
+int TCPSocket::Send(const void* data, int len, int flags) {
+	if (sock == INVALID_SOCKET) {
+		throw(std::runtime_error("Failed to send, TCPSocket is invalid"));
+	}
+	int ret = send(sock, (const char*)data, len, flags);
+	if (ret == SOCKET_ERROR) {
+		Close();
+		throw(std::runtime_error("Failed to send, unknown error, TCPSocket automatically closed"));
+	}
+	return ret;
+}
+
+int TCPSocket::Recv(void* data, int maxlen, int flags) {
+	if (sock == INVALID_SOCKET) {
+		throw(std::runtime_error("Failed to receive, TCPSocket is invalid"));
+	}
+	int ret = recv(sock, (char*)data, maxlen, flags);
+	if (ret == SOCKET_ERROR) {
+		Close();
+		throw(std::runtime_error("Failed to receive, unknown error, TCPSocket automatically closed"));
+	}
+	return ret;
+}
+
+/* TCPServerSocket definition
+*/
+
+TCPServerSocket::TCPServerSocket() {
+	sock = INVALID_SOCKET;
+}
+
+TCPServerSocket::TCPServerSocket(int port) {
+	Open(port);
+}
+
+TCPServerSocket::~TCPServerSocket() {
+	Close();
+}
+
+void TCPServerSocket::Open(int port) {
+	addrinfo *ptr = nullptr, hints;
+	char buf[100];
+	sprintf(buf, "%d",port); //std compliant itoa()
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+	hints.ai_flags = AI_PASSIVE;
+
+	if (getaddrinfo(nullptr, buf, &hints, &ptr)) {
+		throw(std::runtime_error("TCPServerSocket failed to access address info"));
+	}
+
+	sock = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol);
+
+	if (sock == INVALID_SOCKET) {
+		freeaddrinfo(ptr);
+		throw(std::runtime_error("Failed to create a TCPServerSocket"));
+	}
+
+	if (bind(sock, ptr->ai_addr, ptr->ai_addrlen) == SOCKET_ERROR) {
+		closesocket(sock);
+		freeaddrinfo(ptr);
+		throw(std::runtime_error("Failed to bind TCPServerSocket"));
+	}
+
+	freeaddrinfo(ptr);
+}
+
+void TCPServerSocket::Close() {
+	closesocket(sock);
+}
+
+int TCPServerSocket::Accept(TCPSocket* s, int uSeconds) {
+	if (listen(sock, SOMAXCONN) == SOCKET_ERROR) {
+		throw(std::runtime_error("TCPServerSocket: listen() error"));
+	}
+
+	//file descriptor sets are to prevent blocking
+	fd_set readfds;
+	timeval tv = {0, uSeconds};
+
+	FD_ZERO(&readfds);
+	FD_SET(sock, &readfds);
+
+	if (select(0, &readfds, nullptr, nullptr, &tv) == SOCKET_ERROR) {
+		throw(std::runtime_error("TCPServerSocket: select() error"));
+	}
+
+	//I don't want this to block
+	if (FD_ISSET(sock, &readfds)) {
+		if ((s->sock = accept(sock, nullptr, nullptr)) == INVALID_SOCKET) {
+			throw(std::runtime_error("TCPServerSocket: accept() error"));
+		}
+		return 1;
+	}
+	return 0;
+}
diff --git a/server/player.hpp b/server/player.hpp
new file mode 100644
index 0000000..de0c599
--- /dev/null
+++ b/server/player.hpp
@@ -0,0 +1,25 @@
+#ifndef PLAYER_HPP_
+#define PLAYER_HPP_
+
+#include "vector2.hpp"
+
+#include <string>
+
+//TODO
+
+class Player {
+public:
+	Player();
+	~Player();
+
+	void Update(int);
+
+	Vector2 GetPosition();
+private:
+	int clientID;
+	Vector2 position;
+	Vector2 motion;
+	std::string avatarName;
+};
+
+#endif
diff --git a/server/player_manager.hpp b/server/player_manager.hpp
new file mode 100644
index 0000000..f6f0356
--- /dev/null
+++ b/server/player_manager.hpp
@@ -0,0 +1,4 @@
+#ifndef PLAYERMANAGER_H_
+#define PLAYERMANAGER_H_
+
+#endif
diff --git a/server/server.cpp b/server/server.cpp
index f14be06..b347687 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -1,16 +1,12 @@
 #include "server.hpp"
 
-#include "SDL/SDL.h"
-#include "SDL_net/SDL_net.h"
-
 #include <stdexcept>
 #include <iostream>
 
 using namespace std;
 
 Server::Server() {
-	running = true;
-	config.Load("config.cfg");
+	running = false;
 }
 
 Server::~Server() {
@@ -18,9 +14,12 @@ Server::~Server() {
 }
 
 void Server::Init() {
-	if (SDLNet_Init()) {
-		throw(runtime_error("Failed to init SDL_net"));
-	}
+	NetworkInit();
+
+	config.Load("config.cfg");
+	servSock.Open(config.Int("port"));
+
+	running = true;
 }
 
 void Server::Proc() {
@@ -30,17 +29,25 @@ void Server::Proc() {
 		HandleOutput();
 
 		//debug
-		running = false;
+//		running = false;
 	}
 }
 
 void Server::Quit() {
-	SDLNet_Quit();
+	for (auto it : sockVec) {
+		it->Close();
+		delete it;
+	}
+	servSock.Close();
+	NetworkQuit();
 }
 
 void Server::HandleInput() {
 	//accept new connections
-	//...
+	TCPSocket* sock = new TCPSocket;
+	if (servSock.Accept(sock)) {
+		sockVec.push_back(sock);
+	}
 	//accept updates from the clients
 	//...
 	//read the updates from the clients into internal containers
@@ -55,5 +62,10 @@ void Server::UpdateWorld() {
 
 void Server::HandleOutput() {
 	//send all information to new connections
+	//...
 	//selective updates to existing connectons
+	string s = "hello world";
+	for (auto it : sockVec) {
+		it->Send(s.c_str(), s.length());
+	}
 }
diff --git a/server/server.hpp b/server/server.hpp
index 25c2ad8..13f4736 100644
--- a/server/server.hpp
+++ b/server/server.hpp
@@ -2,6 +2,9 @@
 #define SERVER_HPP_
 
 #include "config_utility.hpp"
+#include "network.hpp"
+
+#include <vector>
 
 class Server {
 public:
@@ -18,6 +21,8 @@ public:
 private:
 	bool running;
 	ConfigUtility config;
+	TCPServerSocket servSock;
+	std::vector<TCPSocket*> sockVec;
 };
 
 #endif
diff --git a/server/unit.cpp b/server/unit.cpp
index e69de29..a87a571 100644
--- a/server/unit.cpp
+++ b/server/unit.cpp
@@ -0,0 +1,22 @@
+#include "network.hpp"
+
+#include <iostream>
+
+using namespace std;
+
+//receive any amount of info and print it
+
+int main(int, char**) {
+	NetworkInit();
+	TCPSocket sock("127.0.0.1",2000);
+	char buffer[512];
+
+	while(true) {
+		memset(buffer, 0, 512);
+		if (sock.Recv(buffer, 512)) {
+			cout << buffer << endl;
+		}
+	}
+	NetworkQuit();
+	return 0;
+}
\ No newline at end of file
diff --git a/server/vector2.hpp b/server/vector2.hpp
new file mode 100644
index 0000000..1cd36aa
--- /dev/null
+++ b/server/vector2.hpp
@@ -0,0 +1,76 @@
+/* Copyright: (c) Kayne Ruse 2013
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef VECTOR2_HPP_
+#define VECTOR2_HPP_
+
+#include <stdexcept>
+#include <cmath>
+
+class Vector2 {
+public:
+	double x, y;
+	Vector2() {
+		x = y = 0;
+	}
+	Vector2(double i, double j) {
+		x = i; y = j;
+	}
+	double Length() const {
+		return sqrt(x*x+y*y);
+	}
+	double SquaredLength() const {
+		return x*x+y*y;
+	}
+	double operator[](size_t i) {
+		if (i >= 2)
+			throw(std::runtime_error("Out of range"));
+		return *(&x+i);
+	}
+	//Arithmetic operators
+	Vector2 operator+(Vector2 v) const { return Vector2(x + v.x, y + v.y); }
+	Vector2 operator-(Vector2 v) const { return Vector2(x - v.x, y - v.y); }
+	Vector2 operator*(Vector2 v) const { return Vector2(x * v.x, y * v.y); }
+	Vector2 operator*(double d) const { return Vector2(x * d, y * d); }
+
+	Vector2 operator/(Vector2 v) {
+		if (!v.x || !v.y)
+			throw(std::runtime_error("Divide by zero"));
+		return Vector2(x / v.x, y / v.y);
+	}
+	Vector2 operator/(double d) {
+		if (!d)
+			throw(std::runtime_error("Divide by zero"));
+		return Vector2(x / d, y / d);
+	}
+
+	bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
+	bool operator!=(Vector2 v) { return (x != v.x || y != v.y); }
+
+	template<typename T> Vector2 operator+=(T t) { return *this = *this + t; }
+	template<typename T> Vector2 operator-=(T t) { return *this = *this - t; }
+	template<typename T> Vector2 operator*=(T t) { return *this = *this * t; }
+	template<typename T> Vector2 operator/=(T t) { return *this = *this / t; }
+	template<typename T> bool operator==(T t) { return (x == t && y == t); }
+	template<typename T> bool operator!=(T t) { return (x != t || y != t); }
+};
+
+#endif