Basic connection between server and unit

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)

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();
+}

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

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;
+}

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
+	Update(int)
-	GetSocket
-	GetIP --wrapper for GetPeerAddress
 
-	--handle dropped connections by destroying this client
+	Set
-	int Send(data, len);
+	Get
-	int Recv(data, maxlen);
 
-	--close the socket, and cleanup any other stuff
+	GetPosition()
-	CloseSocket()
+	GetMotion()
+	GetAvatarName()
+end
 
-	[stuff]
+class PlayerManager:
-	[things]
+	maxPlayers
+	currentPlayers
+	ticker --incremental
 
-class ClientManager:
+	Init(maxPlayers)
-	Init(max)
 	Quit()
 
-	CheckNewClients()
+	UpdateAll(int)
-	Send(id, data, len)
-	SendAll(data, len)
-	Recv(id, data, maxlen)
 
-	Get(id)
+	NewPlayer(...)
-	Close(id)
+	GetPlayer(index)
+	DeletePlayer(...)
 
-	GetRaw() --the internal container
+	DeleteAll()
-
+end
-	--iteratable

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

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();

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)

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();
+}

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

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;
+}

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

server/player_manager.hpp

@@ -0,0 +1,4 @@
+#ifndef PLAYERMANAGER_H_
+#define PLAYERMANAGER_H_
+
+#endif

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;
+	running = false;
-	config.Load("config.cfg");
 }
 
 Server::~Server() {
@@ -18,9 +14,12 @@ Server::~Server() {
 }
 
 void Server::Init() {
-	if (SDLNet_Init()) {
+	NetworkInit();
-		throw(runtime_error("Failed to init SDL_net"));
+
-	}
+	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());
+	}
 }

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

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;
+}

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