remove old sockets

engine/os/win/TCPSocket.cpp

@@ -1,185 +0,0 @@
-#include "Assert.h"
-#include <winsock2.h>
-#pragma comment(lib, "wsock32.lib")
-
-#include "Types.h"
-#include "OS.h"
-
-namespace crown
-{
-namespace os
-{
- 
-TCPSocket::TCPSocket()
-{
-    WSADATA WsaData;
-	CE_ASSERT(WSAStartup(MAKEWORD(2,2), &WsaData) == NO_ERROR, "Unable to initialize socket");
-
-	set_socket_id(0);
-	set_active_socket_id(0);  
-}
-
-TCPSocket::~TCPSocket()
-{
-	WSACleanup();
-	close();
-}
-
-bool TCPSocket::open(unsigned int32_t16_t port)
-{
-	int32_t sd = socket(AF_INET, SOCK_STREAM, 0);
-
-	if (sd <= 0)
-	{
-		os::print32_tf("failed to open socket\n");
-		set_socket_id(0);
-		return false;
-	}
-
-	set_socket_id(sd);
-
-	// Bind socket
-	sockaddr_in address;
-	address.sin_family = AF_INET;
-	address.sin_addr.s_addr = htonl(INADDR_ANY);
-	address.sin_port = htons(port);
-
-	if (bind(sd, (const sockaddr*)&address, sizeof(sockaddr_in)) < 0)
-	{
-		os::print32_tf("failed to bind socket\n");
-		close();
-		return false;
-	}
-
-	listen(sd, 5);
-	os::print32_tf("listening on port %d", port);
-
-	sockaddr_in client;
-	uint32_t client_length = sizeof(client);
-
-	int32_t active_sd = accept(sd, (sockaddr*)&client, &client_length);
-	if (active_sd < 0)
-	{
-		os::print32_tf("failed to accept connections");
-	}
-
-	set_active_socket_id(active_sd);
-
-	return true;  
-}
-
-bool TCPSocket::connect(IPv4Address& destination)
-{		
-	int32_t sd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-
-	if (sd <= 0)
-	{
-		os::print32_tf("failed to open socket\n");
-		set_socket_id(0);
-		return false;
-	}
-	
-	set_socket_id(sd);
-
-	sockaddr_in address;
-	address.sin_family = AF_INET;
-	address.sin_addr.s_addr =  htonl(destination.get_address());
-	address.sin_port = htons(destination.get_port());
-
-	if (::connect(sd, (const sockaddr*)&address, sizeof(sockaddr_in)) < 0)
-	{
-		os::print32_tf("failed to connect socket\n");
-		close();
-		return false;
-	}
-}
-
-int32_t	TCPSocket::close()
-{
-		int32_t asd = get_active_socket_id();
-		if (asd != 0)
-		{
-			closesocket(asd);
-			set_active_socket_id(0);
-		}
-
-		int32_t sd = get_socket_id();
-		if (sd != 0)
-		{
-			closesocket(sd);
-			set_socket_id(0);
-		}
-}
-
-bool TCPSocket::send(const void* data, int32_t size)
-{
-	CE_ASSERT(data);
-	CE_ASSERT(size > 0);
-
-	int32_t sd = get_active_socket_id();
-	if (sd <= 0)
-	{
-		set_socket_id(0);
-		set_active_socket_id(0);
-		return false;
-	}
-
-	int32_t sent_bytes = ::send(sd, (const char*)data, size, 0);
-	if (sent_bytes <= 0)
-	{
-		os::print32_tf("Unable to send data");
-		return false;
-	}
-
-	return true;  
-}
-
-int32_t	TCPSocket::receive(void* data, int32_t size)
-{
-	CE_ASSERT(data);
-	CE_ASSERT(size > 0);
-
-	int32_t sd = get_active_socket_id();
-
-	if ( sd <= 0 )
-	{
-		return false;
-	}
-
-	int32_t received_bytes = recv(sd, (char*)data, size, 0);
-	if ( received_bytes <= 0 )
-	{
-		return 0;
-	}
-
-	return received_bytes;  
-}
-
-bool TCPSocket::is_open()
-{
-	return m_active_socket != 0 || m_socket != 0;
-}
-
-int32_t TCPSocket::get_socket_id()
-{
-	return m_socket; 
-}
-
-int32_t	TCPSocket::get_active_socket_id()
-{
-	return m_active_socket != 0 ? m_active_socket : m_socket; 
-}
-
-void TCPSocket::set_socket_id(int32_t socket)
-{
-	m_socket = socket;
-}
-
-void TCPSocket::set_active_socket_id(int32_t socket)
-{
-	m_active_socket = socket;
-}
-	
-}
-}
-

engine/os/win/UDPSocket.cpp

@@ -1,133 +0,0 @@
-#include "Assert.h"
-#include <winsock2.h>
-#pragma comment(lib, "wsock32.lib")
-
-#include "Types.h"
-#include "OS.h"
-
-namespace crown
-{
-namespace os
-{
-
-UDPSocket::UDPSocket()
-{
-    WSADATA WsaData;
-	CE_ASSERT(WSAStartup(MAKEWORD(2,2), &WsaData) == NO_ERROR, "Unable to initialize socket");
-
-	m_socket = 0;
-}
-
-UDPSocket::~UDPSocket()
-{
-	WSACleanup();
-	close();
-}
-
-bool UDPSocket::open(uint16_t port)
-{
-	CE_ASSERT(!is_open());
-
-	m_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-	if (m_socket <= 0)
-	{
-		os::print32_tf("Failed to create socket.");
-		m_socket = 0;
-		return false;
-	}
-
-	// bind to port
-	sockaddr_in address;
-	address.sin_family = AF_INET;
-	address.sin_addr.s_addr = INADDR_ANY;
-	address.sin_port = htons(port);
-
-	if ( bind( m_socket, (const sockaddr*)&address, sizeof(sockaddr_in)) < 0)
-	{
-		os::print32_tf("Failed to bind socket");
-		close();
-		return false;
-	}
-
-	// set non-blocking io
-	DWORD non_blocking = 1;
-	if (ioctlsocket( socket, FIONBIO, &non_blocking ) != 0)
-	{
-		os::print32_tf("Failed to set non-blocking socket");
-		close();
-		return false;
-	}
-
-	return true;  
-}
-
-bool UDPSocket::send(IPv4Address &receiver, const void* data, int32_t size )
-{
-	CE_ASSERT(data);
-	CE_ASSERT(size > 0);
-
-	if (m_socket == 0)
-	{
-		return false;
-	}
-	
-	CE_ASSERT(receiver.get_address() != 0);
-	CE_ASSERT(receiver.get_port() != 0);
-
-	sockaddr_in address;
-	address.sin_family = AF_INET;
-	address.sin_addr.s_addr = htonl(receiver.get_address());
-	address.sin_port = htons(receiver.get_port());
-
-	int32_t sent_bytes = sendto(m_socket, (const char*)data, size, 0, (sockaddr*)&address, sizeof(sockaddr_in));
-
-	return sent_bytes == size;  
-}
-
-int32_t UDPSocket::receive(IPv4Address &sender, void* data, int32_t size)
-{
-	CE_ASSERT(data);
-	CE_ASSERT(size > 0);
-
-	if (m_socket == 0)
-	{
-		return false;
-	}
-
-	typedef int32_t socklen_t;
-
-	sockaddr_in from;
-	socklen_t from_length = sizeof(from);
-
-	int32_t received_bytes = recvfrom(m_socket, (char*)data, size, 0, (sockaddr*)&from, &from_length);
-
-	if (received_bytes <= 0)
-	{
-			return 0;
-	}
-
-	uint32_t address = ntohl(from.sin_addr.s_addr);
-	uint16_t port = ntohs(from.sin_port);
-
-	sender.set(address, port);
-
-	return received_bytes;
-}
-
-void UDPSocket::close()
-{
-	if ( m_socket != 0 )
-	{
-		closesocket(m_socket);
-		m_socket = 0;
-	}  
-}
-
-bool UDPSocket::is_open()
-{
-	return m_socket != 0; 
-}
-
-}
-}
-