move bouncer files into the bouncer directory

1 files changed, 0 insertions, 330 deletions

diff --git a/netcore.cpp b/netcore.cpp
deleted file mode 100644
index dee6ef7..0000000
--- a/netcore.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-#include "core.h"
-
-
-NetCore::NetCore() {
-	clientCount = 0;
-	for (int i = 0; i < CLIENT_LIMIT; i++)
-		clients[i] = NULL;
-	serverCount = 0;
-	for (int i = 0; i < SERVER_LIMIT; i++)
-		servers[i] = NULL;
-
-	nextWindowID = 1;
-}
-
-Client *NetCore::findClientWithSessionKey(uint8_t *key) const {
-	for (int i = 0; i < clientCount; i++)
-		if (!memcmp(clients[i]->sessionKey, key, SESSION_KEY_SIZE))
-			return clients[i];
-
-	return 0;
-}
-
-int NetCore::registerServer(Server *server) {
-	if (serverCount >= SERVER_LIMIT)
-		return -1;
-
-	int id = serverCount++;
-	servers[id] = server;
-	server->attachedToCore();
-	return id;
-}
-void NetCore::deregisterServer(int id) {
-	Server *server = servers[id];
-	server->close();
-	delete server;
-
-	serverCount--;
-	servers[id] = servers[serverCount];
-}
-int NetCore::findServerID(Server *server) const {
-	for (int i = 0; i < SERVER_LIMIT; i++)
-		if (servers[i] == server)
-			return i;
-	return -1;
-}
-
-int NetCore::execute() {
-	// prepare the listen socket
-	int listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-	if (listener == -1) {
-		perror("Could not create the listener socket");
-		return -1;
-	}
-
-	int v = 1;
-	if (setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, &v, sizeof(v)) == -1) {
-		perror("Could not set SO_REUSEADDR");
-		return -2;
-	}
-
-	sockaddr_in listenAddr;
-	listenAddr.sin_family = AF_INET;
-	listenAddr.sin_port = htons(5454);
-	listenAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-	if (bind(listener, (sockaddr *)&listenAddr, sizeof(listenAddr)) == -1) {
-		perror("Could not bind to the listener socket");
-		return -3;
-	}
-
-	if (!SocketRWCommon::setSocketNonBlocking(listener)) {
-		perror("[Listener] Could not set non-blocking");
-		return -4;
-	}
-
-	if (listen(listener, 10) == -1) {
-		perror("Could not listen()");
-		return -5;
-	}
-
-	printf("Listening!\n");
-
-
-	// do stuff!
-	while (!quitFlag) {
-		fd_set readSet, writeSet;
-		FD_ZERO(&readSet);
-		FD_ZERO(&writeSet);
-
-		int maxFD = listener;
-		FD_SET(listener, &readSet);
-
-		time_t now = time(NULL);
-
-		for (int i = 0; i < clientCount; i++) {
-#ifdef USE_GNUTLS
-			if (clients[i]->state == Client::CS_TLS_HANDSHAKE)
-				clients[i]->tryTLSHandshake();
-#endif
-
-			if (clients[i]->sock != -1) {
-				if (clients[i]->sock > maxFD)
-					maxFD = clients[i]->sock;
-
-				if (clients[i]->state == Client::CS_CONNECTED)
-					FD_SET(clients[i]->sock, &readSet);
-				if (clients[i]->outputBuf.size() > 0)
-					FD_SET(clients[i]->sock, &writeSet);
-
-			} else {
-				// Outdated session, can we kill it?
-				if (now >= clients[i]->deadTime) {
-					printf("[%d] Session expired, deleting\n", now);
-
-					// Yep.
-					Client *client = clients[i];
-					if (client->authState == Client::AS_AUTHED)
-						client->sessionEndEvent();
-					delete client;
-
-					// If this is the last socket in the list, we can just
-					// decrement clientCount and all will be fine.
-					clientCount--;
-
-					// Otherwise, we move that pointer into this slot, and
-					// we subtract one from i so that we'll process that slot
-					// on the next loop iteration.
-					if (i != clientCount) {
-						clients[i] = clients[clientCount];
-						i--;
-					}
-				}
-			}
-		}
-
-		for (int i = 0; i < serverCount; i++) {
-			if (servers[i]->state == Server::CS_WAITING_DNS)
-				servers[i]->tryConnectPhase();
-#ifdef USE_GNUTLS
-			else if (servers[i]->state == Server::CS_TLS_HANDSHAKE) {
-				if (servers[i]->tryTLSHandshake())
-					servers[i]->connectedEvent();
-			}
-#endif
-
-			if (servers[i]->sock != -1) {
-				if (servers[i]->sock > maxFD)
-					maxFD = servers[i]->sock;
-
-				if (servers[i]->state == Server::CS_CONNECTED)
-					FD_SET(servers[i]->sock, &readSet);
-				if (servers[i]->outputBuf.size() > 0 || servers[i]->state == Server::CS_WAITING_CONNECT)
-					FD_SET(servers[i]->sock, &writeSet);
-			}
-		}
-
-		timeval timeout;
-		timeout.tv_sec = 1;
-		timeout.tv_usec = 0;
-		int numFDs = select(maxFD+1, &readSet, &writeSet, NULL, &timeout);
-
-		now = time(NULL);
-		//printf("[%lu select:%d]\n", now, numFDs);
-
-
-		for (int i = 0; i < clientCount; i++) {
-			if (clients[i]->sock != -1) {
-				if (FD_ISSET(clients[i]->sock, &writeSet))
-					clients[i]->writeAction();
-
-				if (FD_ISSET(clients[i]->sock, &readSet)
-#ifdef USE_GNUTLS
-					|| clients[i]->hasTlsPendingData()
-#endif
-					)
-				{
-					clients[i]->readAction();
-				}
-			}
-		}
-
-		for (int i = 0; i < serverCount; i++) {
-			if (servers[i]->sock != -1) {
-				if (FD_ISSET(servers[i]->sock, &writeSet)) {
-					Server *server = servers[i];
-
-					if (server->state == Server::CS_WAITING_CONNECT) {
-						// Welp, this means we're connected!
-						// Maybe.
-						// We might have an error condition, in which case,
-						// we're screwed.
-						bool didSucceed = false;
-						int sockErr;
-						socklen_t sockErrSize = sizeof(sockErr);
-
-						if (getsockopt(server->sock, SOL_SOCKET, SO_ERROR, &sockErr, &sockErrSize) == 0) {
-							if (sockErr == 0)
-								didSucceed = true;
-						}
-
-						if (didSucceed) {
-							// WE'RE IN fuck yeah
-							printf("[%d] Connection succeeded!\n", i);
-							server->connectionSuccessful();
-						} else {
-							// Nope. Nuke it.
-							printf("[%d] Connection failed: %d\n", i, sockErr);
-							server->close();
-						}
-
-					} else {
-						server->writeAction();
-					}
-				}
-
-
-				if (FD_ISSET(servers[i]->sock, &readSet)
-#ifdef USE_GNUTLS
-					|| servers[i]->hasTlsPendingData()
-#endif
-					)
-				{
-					servers[i]->readAction();
-				}
-			}
-		}
-
-
-
-		if (FD_ISSET(listener, &readSet)) {
-			// Yay, we have a new connection
-			int sock = accept(listener, NULL, NULL);
-
-			if (clientCount >= CLIENT_LIMIT) {
-				// We can't accept it.
-				printf("Too many connections, we can't accept this one. THIS SHOULD NEVER HAPPEN.\n");
-				shutdown(sock, SHUT_RDWR);
-				close(sock);
-			} else {
-				// Create a new connection
-				printf("[%d] New connection, fd=%d\n", clientCount, sock);
-
-				Client *client = constructClient();
-
-				clients[clientCount] = client;
-				++clientCount;
-
-				client->startService(sock, SERVE_VIA_TLS);
-			}
-		}
-	}
-
-	// Need to shut down all sockets here
-	for (int i = 0; i < serverCount; i++)
-		servers[i]->close();
-
-	for (int i = 0; i < clientCount; i++)
-		clients[i]->close();
-
-	shutdown(listener, SHUT_RDWR);
-	close(listener);
-
-	for (int i = 0; i < serverCount; i++)
-		delete servers[i];
-	for (int i = 0; i < clientCount; i++)
-		delete clients[i];
-
-	serverCount = clientCount = 0;
-
-	return 0;
-}
-
-
-
-int NetCore::registerWindow(Window *window) {
-	window->id = nextWindowID;
-	nextWindowID++;
-
-	windows.push_back(window);
-
-
-	Buffer pkt;
-	pkt.writeU32(1);
-	window->syncStateForClient(pkt);
-
-	for (int i = 0; i < clientCount; i++)
-		if (clients[i]->isAuthed())
-			clients[i]->sendPacket(Packet::B2C_WINDOW_ADD, pkt);
-}
-
-void NetCore::deregisterWindow(Window *window) {
-	Buffer pkt;
-	pkt.writeU32(1);
-	pkt.writeU32(window->id);
-
-	for (int i = 0; i < clientCount; i++)
-		if (clients[i]->isAuthed())
-			clients[i]->sendPacket(Packet::B2C_WINDOW_REMOVE, pkt);
-
-	windows.remove(window);
-}
-
-Window *NetCore::findWindow(int id) const {
-	std::list<Window *>::const_iterator
-		i = windows.begin(),
-		e = windows.end();
-
-	for (; i != e; ++i)
-		if ((*i)->id == id)
-			return *i;
-
-	return 0;
-}
-
-
-void NetCore::sendToClients(Packet::Type type, const Buffer &data) {
-	for (int i = 0; i < clientCount; i++)
-		if (clients[i]->isAuthed())
-			clients[i]->sendPacket(type, data);
-}
-
-
-
-Client *Bouncer::constructClient() {
-	return new MobileClient(this);
-}
-
-
-
-