16 files changed, 1014 insertions, 143 deletions

diff --git a/Tools/BiomeVisualiser/BiomeRenderer.cpp b/Tools/BiomeVisualiser/BiomeRenderer.cpp
index 569128a12..c0123c08a 100644
--- a/Tools/BiomeVisualiser/BiomeRenderer.cpp
+++ b/Tools/BiomeVisualiser/BiomeRenderer.cpp
@@ -78,7 +78,7 @@ bool cBiomeRenderer::Render(cPixmap & a_Pixmap)
 					{
 						for (int i = 0; i < ARRAYCOUNT(CurBiomes); i++)
 						{
-							CurBiomes[i] = (EMCSBiome)-1;
+							CurBiomes[i] = biInvalidBiome;
 						}
 						break;
 					}
diff --git a/Tools/GeneratorPerformanceTest/CMakeLists.txt b/Tools/GeneratorPerformanceTest/CMakeLists.txt
new file mode 100644
index 000000000..8adc88882
--- /dev/null
+++ b/Tools/GeneratorPerformanceTest/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+cmake_minimum_required(VERSION 2.8)
+project(GeneratorPerformanceTest)
+
+include_directories(../../src/Generating)
+include_directories(../../src)
+include_directories(../../lib)
+
+add_executable(GeneratorPerformanceTest GeneratorPerformanceTest.cpp ../../src/StringUtils ../../src/MCLogger ../../src/Log ../../src/BlockID ../../src/Noise ../../src/Enchantments ../../src/BlockArea)
+
+target_link_libraries(GeneratorPerformanceTest Generating)
+
diff --git a/Tools/GeneratorPerformanceTest/GeneratorPerformanceTest.cpp b/Tools/GeneratorPerformanceTest/GeneratorPerformanceTest.cpp
new file mode 100644
index 000000000..75d18149f
--- /dev/null
+++ b/Tools/GeneratorPerformanceTest/GeneratorPerformanceTest.cpp
@@ -0,0 +1,7 @@
+
+#include "Globals.h"
+#include "ChunkGenerator.h"
+
+int main(int argc, char * argv[]) {
+	cChunkGenerator Generator = cChunkGenerator();
+}
diff --git a/Tools/MCADefrag/.gitignore b/Tools/MCADefrag/.gitignore
new file mode 100644
index 000000000..44a3e1f48
--- /dev/null
+++ b/Tools/MCADefrag/.gitignore
@@ -0,0 +1 @@
+*.mca
diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt
new file mode 100644
index 000000000..2a021049f
--- /dev/null
+++ b/Tools/MCADefrag/CMakeLists.txt
@@ -0,0 +1,97 @@
+
+cmake_minimum_required (VERSION 2.6)
+
+project (MCADefrag)
+
+# Without this, the MSVC variable isn't defined for MSVC builds ( http://www.cmake.org/pipermail/cmake/2011-November/047130.html )
+enable_language(CXX C)
+
+include(../../SetFlags.cmake)
+set_flags()
+set_lib_flags()
+enable_profile()
+
+
+
+
+# Set include paths to the used libraries:
+include_directories("../../lib")
+include_directories("../../src")
+
+
+function(flatten_files arg1)
+	set(res "")
+	foreach(f ${${arg1}})
+		get_filename_component(f ${f} ABSOLUTE)
+		list(APPEND res ${f})
+	endforeach()
+	set(${arg1} "${res}" PARENT_SCOPE)
+endfunction()
+
+
+# Include the libraries:
+
+add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib)
+
+set_exe_flags()
+
+# Include the shared files:
+set(SHARED_SRC
+	../../src/StringCompression.cpp
+	../../src/StringUtils.cpp
+	../../src/Log.cpp
+	../../src/MCLogger.cpp
+)
+set(SHARED_HDR
+	../../src/ByteBuffer.h
+	../../src/StringUtils.h
+	../../src/Log.h
+	../../src/MCLogger.h
+)
+flatten_files(SHARED_SRC)
+flatten_files(SHARED_HDR)
+source_group("Shared" FILES ${SHARED_SRC} ${SHARED_HDR})
+
+set(SHARED_OSS_SRC
+	../../src/OSSupport/CriticalSection.cpp
+	../../src/OSSupport/File.cpp
+	../../src/OSSupport/IsThread.cpp
+	../../src/OSSupport/Timer.cpp
+)
+set(SHARED_OSS_HDR
+	../../src/OSSupport/CriticalSection.h
+	../../src/OSSupport/File.h
+	../../src/OSSupport/IsThread.h
+	../../src/OSSupport/Timer.h
+)
+
+flatten_files(SHARED_OSS_SRC)
+flatten_files(SHARED_OSS_HDR)
+
+source_group("Shared\\OSSupport" FILES ${SHARED_OSS_SRC} ${SHARED_OSS_HDR})
+
+
+
+# Include the main source files:
+set(SOURCES
+	MCADefrag.cpp
+	Globals.cpp
+)
+set(HEADERS
+	MCADefrag.h
+	Globals.h
+)
+
+source_group("" FILES ${SOURCES} ${HEADERS})
+
+add_executable(MCADefrag
+	${SOURCES}
+	${HEADERS}
+	${SHARED_SRC}
+	${SHARED_HDR}
+	${SHARED_OSS_SRC}
+	${SHARED_OSS_HDR}
+)
+
+target_link_libraries(MCADefrag zlib)
+
diff --git a/Tools/MCADefrag/Globals.cpp b/Tools/MCADefrag/Globals.cpp
new file mode 100644
index 000000000..13c6ae709
--- /dev/null
+++ b/Tools/MCADefrag/Globals.cpp
@@ -0,0 +1,10 @@
+
+// Globals.cpp
+
+// This file is used for precompiled header generation in MSVC environments
+
+#include "Globals.h"
+
+
+
+
diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h
new file mode 100644
index 000000000..0f31de7e3
--- /dev/null
+++ b/Tools/MCADefrag/Globals.h
@@ -0,0 +1,232 @@
+
+// Globals.h
+
+// This file gets included from every module in the project, so that global symbols may be introduced easily
+// Also used for precompiled header generation in MSVC environments
+
+
+
+
+
+// Compiler-dependent stuff:
+#if defined(_MSC_VER)
+	// MSVC produces warning C4481 on the override keyword usage, so disable the warning altogether
+	#pragma warning(disable:4481)
+	
+	// Disable some warnings that we don't care about:
+	#pragma warning(disable:4100)
+
+	#define OBSOLETE __declspec(deprecated)
+	
+	// No alignment needed in MSVC
+	#define ALIGN_8
+	#define ALIGN_16
+	
+#elif defined(__GNUC__)
+
+	// TODO: Can GCC explicitly mark classes as abstract (no instances can be created)?
+	#define abstract
+	
+	// TODO: Can GCC mark virtual methods as overriding (forcing them to have a virtual function of the same signature in the base class)
+	#define override
+	
+	#define OBSOLETE __attribute__((deprecated))
+
+	#define ALIGN_8 __attribute__((aligned(8)))
+	#define ALIGN_16 __attribute__((aligned(16)))
+
+	// Some portability macros :)
+	#define stricmp strcasecmp
+	
+	#define FORMATSTRING(formatIndex,va_argsIndex)
+#else
+
+	#error "You are using an unsupported compiler, you might need to #define some stuff here for your compiler"
+	
+	/*
+	// Copy and uncomment this into another #elif section based on your compiler identification
+	
+	// Explicitly mark classes as abstract (no instances can be created)
+	#define abstract
+	
+	// Mark virtual methods as overriding (forcing them to have a virtual function of the same signature in the base class)
+	#define override
+
+	// Mark functions as obsolete, so that their usage results in a compile-time warning
+	#define OBSOLETE
+
+	// Mark types / variables for alignment. Do the platforms need it?
+	#define ALIGN_8
+	#define ALIGN_16
+	*/
+	
+	#define FORMATSTRING(formatIndex,va_argsIndex) __attribute__((format (printf, formatIndex, va_argsIndex)))
+
+#endif
+
+
+
+
+
+// Integral types with predefined sizes:
+typedef long long Int64;
+typedef int       Int32;
+typedef short     Int16;
+
+typedef unsigned long long UInt64;
+typedef unsigned int       UInt32;
+typedef unsigned short     UInt16;
+
+typedef unsigned char Byte;
+
+
+
+
+
+// A macro to disallow the copy constructor and operator= functions
+// This should be used in the private: declarations for any class that shouldn't allow copying itself
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+	TypeName(const TypeName &); \
+	void operator=(const TypeName &)
+
+// A macro that is used to mark unused function parameters, to avoid pedantic warnings in gcc
+#define UNUSED(X) (void)(X)
+
+
+
+
+// OS-dependent stuff:
+#ifdef _WIN32
+	#define WIN32_LEAN_AND_MEAN
+	#include <Windows.h>
+	#include <winsock2.h>
+	#include <ws2tcpip.h>
+	
+	// Windows SDK defines min and max macros, messing up with our std::min and std::max usage
+	#undef min
+	#undef max
+	
+	// Windows SDK defines GetFreeSpace as a constant, probably a Win16 API remnant
+	#ifdef GetFreeSpace
+		#undef GetFreeSpace
+	#endif  // GetFreeSpace
+	
+	#define SocketError WSAGetLastError()
+#else
+	#include <sys/types.h>
+	#include <sys/stat.h>   // for mkdir
+	#include <sys/time.h>
+	#include <sys/socket.h>
+	#include <netinet/in.h>
+	#include <arpa/inet.h>
+	#include <netdb.h>
+	#include <time.h>
+	#include <dirent.h>
+	#include <errno.h>
+	#include <iostream>
+	#include <unistd.h>
+
+	#include <cstdio>
+	#include <cstring>
+	#include <pthread.h>
+	#include <semaphore.h>
+	#include <errno.h>
+	#include <fcntl.h>
+	
+	typedef int SOCKET;
+	enum
+	{
+		INVALID_SOCKET = -1,
+	};
+	#define closesocket close
+	#define SocketError errno
+#if !defined(ANDROID_NDK)
+	#include <tr1/memory>
+#endif
+#endif
+
+#if !defined(ANDROID_NDK)
+	#define USE_SQUIRREL
+#endif
+
+#if defined(ANDROID_NDK)
+	#define FILE_IO_PREFIX "/sdcard/mcserver/"
+#else
+	#define FILE_IO_PREFIX ""
+#endif
+
+
+
+
+
+// CRT stuff:
+#include <assert.h>
+#include <stdio.h>
+#include <math.h>
+#include <stdarg.h>
+#include <time.h>
+
+
+
+
+
+// STL stuff:
+#include <vector>
+#include <list>
+#include <deque>
+#include <string>
+#include <map>
+#include <algorithm>
+#include <memory>
+
+
+
+
+
+// Common headers (without macros):
+#include "StringUtils.h"
+#include "OSSupport/CriticalSection.h"
+#include "OSSupport/IsThread.h"
+#include "OSSupport/File.h"
+
+
+
+
+
+// Common definitions:
+
+/// Evaluates to the number of elements in an array (compile-time!)
+#define ARRAYCOUNT(X) (sizeof(X) / sizeof(*(X)))
+
+/// Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)" )
+#define KiB * 1024
+#define MiB * 1024 * 1024
+
+/// Faster than (int)floorf((float)x / (float)div)
+#define FAST_FLOOR_DIV( x, div ) ( (x) < 0 ? (((int)x / div) - 1) : ((int)x / div) )
+
+// Own version of assert() that writes failed assertions to the log for review
+#ifdef  NDEBUG
+	#define ASSERT(x) ((void)0)
+#else
+	#define ASSERT assert
+#endif
+
+// Pretty much the same as ASSERT() but stays in Release builds
+#define VERIFY( x ) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), exit(1), 0 ) )
+
+
+
+
+
+/// A generic interface used mainly in ForEach() functions
+template <typename Type> class cItemCallback
+{
+public:
+	/// Called for each item in the internal list; return true to stop the loop, or false to continue enumerating
+	virtual bool Item(Type * a_Type) = 0;
+} ;
+
+
+
+
diff --git a/Tools/MCADefrag/MCADefrag.cpp b/Tools/MCADefrag/MCADefrag.cpp
new file mode 100644
index 000000000..a2de7f957
--- /dev/null
+++ b/Tools/MCADefrag/MCADefrag.cpp
@@ -0,0 +1,421 @@
+
+// MCADefrag.cpp
+
+// Implements the main app entrypoint and the cMCADefrag class representing the entire app
+
+#include "Globals.h"
+#include "MCADefrag.h"
+#include "MCLogger.h"
+#include "zlib/zlib.h"
+
+
+
+
+
+// An array of 4096 zero bytes, used for writing the padding
+static const Byte g_Zeroes[4096] = {0};
+
+
+
+
+
+int main(int argc, char ** argv)
+{
+	new cMCLogger(Printf("Defrag_%08x.log", time(NULL)));
+	cMCADefrag Defrag;
+	if (!Defrag.Init(argc, argv))
+	{
+		return 1;
+	}
+	
+	Defrag.Run();
+	
+	return 0;
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cMCADefrag:
+
+cMCADefrag::cMCADefrag(void) :
+	m_NumThreads(4),
+	m_ShouldRecompress(true)
+{
+}
+
+
+
+
+
+bool cMCADefrag::Init(int argc, char ** argv)
+{
+	// Nothing needed yet
+	return true;
+}
+
+
+
+
+
+void cMCADefrag::Run(void)
+{
+	// Fill the queue with MCA files
+	m_Queue = cFile::GetFolderContents(".");
+
+	// Start the processing threads:
+	for (int i = 0; i < m_NumThreads; i++)
+	{
+		StartThread();
+	}
+	
+	// Wait for all the threads to finish:
+	while (!m_Threads.empty())
+	{
+		m_Threads.front()->Wait();
+		delete m_Threads.front();
+		m_Threads.pop_front();
+	}
+}
+
+
+
+
+void cMCADefrag::StartThread(void)
+{
+	cThread * Thread = new cThread(*this);
+	m_Threads.push_back(Thread);
+	Thread->Start();
+}
+
+
+
+
+
+AString cMCADefrag::GetNextFileName(void)
+{
+	cCSLock Lock(m_CS);
+	if (m_Queue.empty())
+	{
+		return AString();
+	}
+	AString res = m_Queue.back();
+	m_Queue.pop_back();
+	return res;
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cMCADefrag::cThread:
+
+cMCADefrag::cThread::cThread(cMCADefrag & a_Parent) :
+	super("MCADefrag thread"),
+	m_Parent(a_Parent),
+	m_IsChunkUncompressed(false)
+{
+}
+
+
+
+
+
+void cMCADefrag::cThread::Execute(void)
+{
+	for (;;)
+	{
+		AString FileName = m_Parent.GetNextFileName();
+		if (FileName.empty())
+		{
+			return;
+		}
+		ProcessFile(FileName);
+	}
+}
+
+
+
+
+
+void cMCADefrag::cThread::ProcessFile(const AString & a_FileName)
+{
+	// Filter out non-MCA files:
+	if ((a_FileName.length() < 4) || (a_FileName.substr(a_FileName.length() - 4, 4) != ".mca"))
+	{
+		return;
+	}
+	LOGINFO("%s", a_FileName.c_str());
+	
+	// Open input and output files:
+	AString OutFileName = a_FileName + ".new";
+	cFile In, Out;
+	if (!In.Open(a_FileName, cFile::fmRead))
+	{
+		LOGWARNING("Cannot open file %s for reading, skipping file.", a_FileName.c_str());
+		return;
+	}
+	if (!Out.Open(OutFileName.c_str(), cFile::fmWrite))
+	{
+		LOGWARNING("Cannot open file %s for writing, skipping file.", OutFileName.c_str());
+		return;
+	}
+	
+	// Read the Locations and Timestamps from the input file:
+	Byte Locations[4096];
+	UInt32 Timestamps[1024];
+	if (In.Read(Locations, sizeof(Locations)) != sizeof(Locations))
+	{
+		LOGWARNING("Cannot read Locations in file %s, skipping file.", a_FileName.c_str());
+		return;
+	}
+	if (In.Read(Timestamps, sizeof(Timestamps)) != sizeof(Timestamps))
+	{
+		LOGWARNING("Cannot read Timestamps in file %s, skipping file.", a_FileName.c_str());
+		return;
+	}
+	
+	// Write dummy Locations to the Out file (will be overwritten once the correct ones are known)
+	if (Out.Write(Locations, sizeof(Locations)) != sizeof(Locations))
+	{
+		LOGWARNING("Cannot write Locations to file %s, skipping file.", OutFileName.c_str());
+		return;
+	}
+	m_CurrentSectorOut = 2;
+	
+	// Write a copy of the Timestamps into the Out file:
+	if (Out.Write(Timestamps, sizeof(Timestamps)) != sizeof(Timestamps))
+	{
+		LOGWARNING("Cannot write Timestamps to file %s, skipping file.", OutFileName.c_str());
+		return;
+	}
+	
+	// Process each chunk:
+	for (size_t i = 0; i < 1024; i++)
+	{
+		size_t idx = i * 4;
+		if (
+			(Locations[idx] == 0) &&
+			(Locations[idx + 1] == 0) &&
+			(Locations[idx + 2] == 0) &&
+			(Locations[idx + 3] == 0)
+		)
+		{
+			// Chunk not present
+			continue;
+		}
+		m_IsChunkUncompressed = false;
+		if (!ReadChunk(In, Locations + idx))
+		{
+			LOGWARNING("Cannot read chunk #%d from file %s. Skipping file.", i, a_FileName.c_str());
+			return;
+		}
+		if (!WriteChunk(Out, Locations + idx))
+		{
+			LOGWARNING("Cannot write chunk #%d to file %s. Skipping file.", i, OutFileName.c_str());
+			return;
+		}
+	}
+	
+	// Write the new Locations into the MCA header:
+	Out.Seek(0);
+	if (Out.Write(Locations, sizeof(Locations)) != sizeof(Locations))
+	{
+		LOGWARNING("Cannot write updated Locations to file %s, skipping file.", OutFileName.c_str());
+		return;
+	}
+	
+	// Close the files, delete orig, rename new:
+	In.Close();
+	Out.Close();
+	cFile::Delete(a_FileName);
+	cFile::Rename(OutFileName, a_FileName);
+}
+
+
+
+
+
+bool cMCADefrag::cThread::ReadChunk(cFile & a_File, const Byte * a_LocationRaw)
+{
+	int SectorNum = (a_LocationRaw[0] << 16) | (a_LocationRaw[1] << 8) | a_LocationRaw[2];
+	int SizeInSectors = a_LocationRaw[3] * (4 KiB);
+	if (a_File.Seek(SectorNum * (4 KiB)) < 0)
+	{
+		LOGWARNING("Failed to seek to chunk data - file pos %llu (%d KiB, %.02f MiB)!", (Int64)SectorNum * (4 KiB), SectorNum * 4, ((double)SectorNum) / 256);
+		return false;
+	}
+	
+	// Read the exact size:
+	Byte Buf[4];
+	if (a_File.Read(Buf, 4) != 4)
+	{
+		LOGWARNING("Failed to read chunk data length");
+		return false;
+	}
+	m_CompressedChunkDataSize = (Buf[0] << 24) | (Buf[1] << 16) | (Buf[2] << 8) | Buf[3];
+	if (m_CompressedChunkDataSize > SizeInSectors)
+	{
+		LOGWARNING("Invalid chunk data - SizeInSectors (%d) smaller that RealSize (%d)", SizeInSectors, m_CompressedChunkDataSize);
+		return false;
+	}
+	
+	// Read the data:
+	if (a_File.Read(m_CompressedChunkData, m_CompressedChunkDataSize) != m_CompressedChunkDataSize)
+	{
+		LOGWARNING("Failed to read chunk data!");
+		return false;
+	}
+	
+	// Uncompress the data if recompression is active
+	if (m_Parent.m_ShouldRecompress)
+	{
+		m_IsChunkUncompressed = UncompressChunk();
+		if (!m_IsChunkUncompressed)
+		{
+			LOGINFO("Chunk failed to uncompress, will be copied verbatim instead.");
+		}
+	}
+	
+	return true;
+}
+
+
+
+
+
+bool cMCADefrag::cThread::WriteChunk(cFile & a_File, Byte * a_LocationRaw)
+{
+	// Recompress the data if recompression is active:
+	if (m_Parent.m_ShouldRecompress)
+	{
+		if (!CompressChunk())
+		{
+			LOGINFO("Chunk failed to recompress, will be coped verbatim instead.");
+		}
+	}
+	
+	// Update the Location:
+	a_LocationRaw[0] = m_CurrentSectorOut >> 16;
+	a_LocationRaw[1] = (m_CurrentSectorOut >> 8) & 0xff;
+	a_LocationRaw[2] = m_CurrentSectorOut & 0xff;
+	a_LocationRaw[3] = (m_CompressedChunkDataSize + (4 KiB) + 3) / (4 KiB);  // +3 because the m_CompressedChunkDataSize doesn't include the exact-length
+	m_CurrentSectorOut += a_LocationRaw[3];
+	
+	// Write the data length:
+	Byte Buf[4];
+	Buf[0] = m_CompressedChunkDataSize >> 24;
+	Buf[1] = (m_CompressedChunkDataSize >> 16) & 0xff;
+	Buf[2] = (m_CompressedChunkDataSize >> 8) & 0xff;
+	Buf[3] = m_CompressedChunkDataSize & 0xff;
+	if (a_File.Write(Buf, 4) != 4)
+	{
+		LOGWARNING("Failed to write chunk length!");
+		return false;
+	}
+	
+	// Write the data:
+	if (a_File.Write(m_CompressedChunkData, m_CompressedChunkDataSize) != m_CompressedChunkDataSize)
+	{
+		LOGWARNING("Failed to write chunk data!");
+		return false;
+	}
+	
+	// Pad onto the next sector:
+	int NumPadding = a_LocationRaw[3] * 4096 - (m_CompressedChunkDataSize + 4);
+	ASSERT(NumPadding >= 0);
+	if ((NumPadding > 0) && (a_File.Write(g_Zeroes, NumPadding) != NumPadding))
+	{
+		LOGWARNING("Failed to write padding");
+		return false;
+	}
+	
+	return true;
+}
+
+
+
+
+
+bool cMCADefrag::cThread::UncompressChunk(void)
+{
+	switch (m_CompressedChunkData[0])
+	{
+		case COMPRESSION_GZIP: return UncompressChunkGzip();
+		case COMPRESSION_ZLIB: return UncompressChunkZlib();
+	}
+	LOGINFO("Chunk is compressed with in an unknown algorithm");
+	return false;
+}
+
+
+
+
+
+bool cMCADefrag::cThread::UncompressChunkGzip(void)
+{
+	// TODO
+	// This format is not used in practice
+	return false;
+}
+
+
+
+
+
+bool cMCADefrag::cThread::UncompressChunkZlib(void)
+{
+	// Uncompress the data:
+	z_stream strm;
+	strm.zalloc = (alloc_func)NULL;
+	strm.zfree = (free_func)NULL;
+	strm.opaque = NULL;
+	inflateInit(&strm);
+	strm.next_out  = m_RawChunkData;
+	strm.avail_out = sizeof(m_RawChunkData);
+	strm.next_in   = m_CompressedChunkData + 1;  // The first byte is the compression method, skip it
+	strm.avail_in  = m_CompressedChunkDataSize;
+	int res = inflate(&strm, Z_FINISH);
+	inflateEnd(&strm);
+	if (res != Z_STREAM_END)
+	{
+		LOGWARNING("Failed to uncompress chunk data: %s", strm.msg);
+		return false;
+	}
+	m_RawChunkDataSize = strm.total_out;
+
+	return true;
+}
+
+
+
+
+
+bool cMCADefrag::cThread::CompressChunk(void)
+{
+	// Check that the compressed data can fit:
+	uLongf CompressedSize = compressBound(m_RawChunkDataSize);
+	if (CompressedSize > sizeof(m_CompressedChunkData))
+	{
+		LOGINFO("Too much data for the internal compression buffer!");
+		return false;
+	}
+	
+	// Compress the data using the highest compression factor:
+	int errorcode = compress2(m_CompressedChunkData + 1, &CompressedSize, m_RawChunkData, m_RawChunkDataSize, Z_BEST_COMPRESSION);
+	if (errorcode != Z_OK)
+	{
+		LOGINFO("Recompression failed: %d", errorcode);
+		return false;
+	}
+	m_CompressedChunkData[0] = COMPRESSION_ZLIB;
+	m_CompressedChunkDataSize = CompressedSize + 1;
+	return true;
+}
+
+
+
+
diff --git a/Tools/MCADefrag/MCADefrag.h b/Tools/MCADefrag/MCADefrag.h
new file mode 100644
index 000000000..d7fa1fc6e
--- /dev/null
+++ b/Tools/MCADefrag/MCADefrag.h
@@ -0,0 +1,144 @@
+
+// MCADefrag.h
+
+// Interfaces to the cMCADefrag class encapsulating the entire app
+
+
+
+
+
+#pragma once
+
+
+
+
+
+
+class cMCADefrag
+{
+public:
+	enum
+	{
+		MAX_COMPRESSED_CHUNK_DATA_SIZE = (1 MiB),
+		MAX_RAW_CHUNK_DATA_SIZE        = (100 MiB),
+	} ;
+	
+	cMCADefrag(void);
+	
+	/** Reads the cmdline params and initializes the app.
+	Returns true if the app should continue, false if not. */
+	bool Init(int argc, char ** argv);
+	
+	/** Runs the entire app. */
+	void Run(void);
+	
+protected:
+	/** A single thread processing MCA files from the queue */
+	class cThread :
+		public cIsThread
+	{
+		typedef cIsThread super;
+		
+	public:
+		cThread(cMCADefrag & a_Parent);
+		
+	protected:
+		/** The compression methods, as specified by the MCA compression method byte. */
+		enum
+		{
+			COMPRESSION_GZIP = 1,
+			COMPRESSION_ZLIB = 2,
+		} ;
+
+		
+		cMCADefrag & m_Parent;
+		
+		/** The current compressed chunk data. Valid after a successful ReadChunk().
+		This contains only the compression method byte and the compressed data,
+		but not the exact-length preceding the data in the MCA file. */
+		unsigned char m_CompressedChunkData[MAX_COMPRESSED_CHUNK_DATA_SIZE];
+		
+		/** Size of the actual current compressed chunk data, excluding the 4 exact-length bytes.
+		This is the amount of bytes in m_CompressedChunkData[] that are valid. */
+		int m_CompressedChunkDataSize;
+		
+		/** The current raw chunk data. Valid after a successful ReadChunk(), if recompression is active. */
+		unsigned char m_RawChunkData[MAX_RAW_CHUNK_DATA_SIZE];
+		
+		/** Size of the actual current raw chunk data. */
+		int m_RawChunkDataSize;
+		
+		/** Number of the sector where the next chunk will be written by WriteChunk(). */
+		int m_CurrentSectorOut;
+		
+		/** Set to true when the chunk has been successfully uncompressed. Only used if recompression is active.
+		WriteChunk() tests this flag to decide whether to call Compress(). */
+		bool m_IsChunkUncompressed;
+		
+		
+		/** Processes the specified file. */
+		void ProcessFile(const AString & a_FileName);
+		
+		/** Reads the chunk data into m_CompressedChunkData.
+		Calls DecompressChunkData() if recompression is active.
+		a_LocationRaw is the pointer to the first byte of the Location data in the MCA header.
+		Returns true if successful. */
+		bool ReadChunk(cFile & a_File, const Byte * a_LocationRaw);
+
+		/** Writes the chunk data from m_CompressedData or m_RawChunkData (performing recompression) into file.
+		Calls CompressChunkData() for the actual compression, if recompression is active.
+		a_LocationRaw is the pointer to the first byte of the Location data to be put into the MCA header,
+		the chunk's location is stored in that memory area. Updates m_CurrentSectorOut.
+		Returns true if successful. */
+		bool WriteChunk(cFile & a_File, Byte * a_LocationRaw);		
+		
+		/** Uncompresses the chunk data from m_CompressedChunkData into m_RawChunkData.
+		Returns true if successful, false on failure. */
+		bool UncompressChunk(void);
+		
+		/** Uncompresses the chunk data from m_CompressedChunkData into m_RawChunkData, using Gzip.
+		Returns true if successful, false on failure. */
+		bool UncompressChunkGzip(void);
+		
+		/** Uncompresses the chunk data from m_CompressedChunkData into m_RawChunkData, using Zlib.
+		Returns true if successful, false on failure. */
+		bool UncompressChunkZlib(void);
+		
+		/** Compresses the chunk data from m_RawChunkData into m_CompressedChunkData.
+		Returns true if successful, false on failure. */
+		bool CompressChunk(void);
+		
+		// cIsThread overrides:
+		virtual void Execute(void) override;
+	} ;
+	
+	typedef std::list<cThread *> cThreads;
+	
+	
+	/** The mutex protecting m_Files agains multithreaded access. */
+	cCriticalSection m_CS;
+	
+	/** The queue of MCA files to be processed by the threads. Protected by m_CS. */
+	AStringVector m_Queue;
+	
+	/** List of threads that the server has running. */
+	cThreads m_Threads;
+	
+	/** The number of threads that should be started. Configurable on the command line. */
+	int m_NumThreads;
+	
+	/** If set to true, the chunk data is recompressed while saving each MCA file. */
+	bool m_ShouldRecompress;
+	
+	
+	/** Starts a new processing thread and adds it to cThreads. */
+	void StartThread(void);
+	
+	/** Retrieves one file from the queue (and removes it from the queue).
+	Returns an empty string when queue empty. */
+	AString GetNextFileName(void);
+} ;
+
+
+
+
diff --git a/Tools/ProtoProxy/.gitignore b/Tools/ProtoProxy/.gitignore
index 8def77d0b..158a30080 100644
--- a/Tools/ProtoProxy/.gitignore
+++ b/Tools/ProtoProxy/.gitignore
@@ -1,6 +1,7 @@
 Debug
 Release
 Logs/
+lib/
 *.log
 *.nbt
 *.sln
diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt
index f8a01a134..01f1e88ad 100644
--- a/Tools/ProtoProxy/CMakeLists.txt
+++ b/Tools/ProtoProxy/CMakeLists.txt
@@ -3,69 +3,19 @@ cmake_minimum_required (VERSION 2.6)
 
 project (ProtoProxy)
 
+include(../../SetFlags.cmake)
 
-
-macro(add_flags_cxx FLAGS)
-	set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS}         ${FLAGS}")
-	set(CMAKE_C_FLAGS           "${CMAKE_C_FLAGS}           ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   ${FLAGS}")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     ${FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAGS}")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   ${FLAGS}")
-endmacro()
-
-
-
-
-# Add the preprocessor macros used for distinguishing between debug and release builds (CMake does this automatically for MSVC):
-if (NOT MSVC)
-	set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}   -D_DEBUG")
-	set(CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}     -D_DEBUG")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   -DNDEBUG")
-endif()
-
-
-
-if(MSVC)
-	# Make build use multiple threads under MSVC:
-	add_flags_cxx("/MP")
-
-	# Make release builds use link-time code generation:
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-	set(CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}   /GL")
-	set(CMAKE_EXE_LINKER_FLAGS_RELEASE    "${CMAKE_EXE_LINKER_FLAGS_RELEASE}    /LTCG")
-	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-	set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
-elseif(APPLE)
-	#on os x clang adds pthread for us but we need to add it for gcc
-	if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		add_flags_cxx("-pthread")
-	endif()
-else()
-	# Let gcc / clang know that we're compiling a multi-threaded app:
-	add_flags_cxx("-pthread")
-endif()
-
-
-
-
-# Use static CRT in MSVC builds:
-if (MSVC)
-	string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-	string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG}")
-	string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS_DEBUG}")
-endif()
-
-
+set_flags()
+set_lib_flags()
 
 
 # Set include paths to the used libraries:
 include_directories("../../lib")
+include_directories("../../lib/polarssl/include")
 include_directories("../../src")
 
 
+
 function(flatten_files arg1)
 	set(res "")
 	foreach(f ${${arg1}})
@@ -75,20 +25,10 @@ function(flatten_files arg1)
 	set(${arg1} "${res}" PARENT_SCOPE)
 endfunction()
 
+include(../../lib/polarssl.cmake)
+add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib)
 
-# Include the libraries:
-file(GLOB CRYPTOPP_SRC "../../lib/cryptopp/*.cpp")
-file(GLOB CRYPTOPP_HDR "../../lib/cryptopp/*.h")
-flatten_files(CRYPTOPP_SRC)
-flatten_files(CRYPTOPP_HDR)
-source_group("CryptoPP" FILES ${CRYPTOPP_SRC} ${CRYPTOPP_HDR})
-
-file(GLOB ZLIB_SRC "../../lib/zlib/*.c")
-file(GLOB ZLIB_HDR "../../lib/zlib/*.h")
-flatten_files(ZLIB_SRC)
-flatten_files(ZLIB_HDR)
-source_group("ZLib" FILES ${ZLIB_SRC} ${ZLIB_HDR})
-
+set_exe_flags()
 
 # Include the shared files:
 set(SHARED_SRC
@@ -96,12 +36,14 @@ set(SHARED_SRC
 	../../src/StringUtils.cpp
 	../../src/Log.cpp
 	../../src/MCLogger.cpp
+	../../src/Crypto.cpp
 )
 set(SHARED_HDR
 	../../src/ByteBuffer.h
 	../../src/StringUtils.h
 	../../src/Log.h
 	../../src/MCLogger.h
+	../../src/Crypto.h
 )
 set(SHARED_OSS_SRC
 	../../src/OSSupport/CriticalSection.cpp
@@ -145,9 +87,7 @@ add_executable(ProtoProxy
 	${SHARED_HDR}
 	${SHARED_OSS_SRC}
 	${SHARED_OSS_HDR}
-	${CRYPTOPP_SRC}
-	${CRYPTOPP_HDR}
-	${ZLIB_SRC}
-	${ZLIB_HDR}
 )
 
+target_link_libraries(ProtoProxy zlib polarssl)
+
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp
index cd66e2dfd..d9b8e3dd1 100644
--- a/Tools/ProtoProxy/Connection.cpp
+++ b/Tools/ProtoProxy/Connection.cpp
@@ -131,8 +131,6 @@
 		} \
 	}
 	
-	
-#define MAX_ENC_LEN 1024
 
 
 
@@ -243,7 +241,8 @@ void cConnection::Run(void)
 		FD_ZERO(&ReadFDs);
 		FD_SET(m_ServerSocket, &ReadFDs);
 		FD_SET(m_ClientSocket, &ReadFDs);
-		int res = select(2, &ReadFDs, NULL, NULL, NULL);
+		SOCKET MaxSocket = std::max(m_ServerSocket, m_ClientSocket);
+		int res = select(MaxSocket + 1, &ReadFDs, NULL, NULL, NULL);
 		if (res <= 0)
 		{
 			printf("select() failed: %d; aborting client", SocketError);
@@ -377,19 +376,19 @@ bool cConnection::RelayFromServer(void)
 		}
 		case csEncryptedUnderstood:
 		{
-			m_ServerDecryptor.ProcessData((byte *)Buffer, (byte *)Buffer, res);
+			m_ServerDecryptor.ProcessData((Byte *)Buffer, (Byte *)Buffer, res);
 			DataLog(Buffer, res, "Decrypted %d bytes from the SERVER", res);
 			return DecodeServersPackets(Buffer, res);
 		}
 		case csEncryptedUnknown:
 		{
-			m_ServerDecryptor.ProcessData((byte *)Buffer, (byte *)Buffer, res);
+			m_ServerDecryptor.ProcessData((Byte *)Buffer, (Byte *)Buffer, res);
 			DataLog(Buffer, res, "Decrypted %d bytes from the SERVER", res);
 			return CLIENTSEND(Buffer, res);
 		}
 	}
-	
-	return true;
+	ASSERT(!"Unhandled server state while relaying from server");
+	return false;
 }
 
 
@@ -422,12 +421,12 @@ bool cConnection::RelayFromClient(void)
 		case csEncryptedUnknown:
 		{
 			DataLog(Buffer, res, "Decrypted %d bytes from the CLIENT", res);
-			m_ServerEncryptor.ProcessData((byte *)Buffer, (byte *)Buffer, res);
+			m_ServerEncryptor.ProcessData((Byte *)Buffer, (Byte *)Buffer, res);
 			return SERVERSEND(Buffer, res);
 		}
 	}
-	
-	return true;
+	ASSERT(!"Unhandled server state while relaying from client");
+	return false;
 }
 
 
@@ -443,11 +442,11 @@ double cConnection::GetRelativeTime(void)
 
 
 
-bool cConnection::SendData(SOCKET a_Socket, const char * a_Data, int a_Size, const char * a_Peer)
+bool cConnection::SendData(SOCKET a_Socket, const char * a_Data, size_t a_Size, const char * a_Peer)
 {
-	DataLog(a_Data, a_Size, "Sending data to %s, %d bytes", a_Peer, a_Size);
+	DataLog(a_Data, a_Size, "Sending data to %s, %u bytes", a_Peer, (unsigned)a_Size);
 	
-	int res = send(a_Socket, a_Data, a_Size, 0);
+	int res = send(a_Socket, a_Data, (int)a_Size, 0);
 	if (res <= 0)
 	{
 		Log("%s closed the socket: %d, %d; aborting connection", a_Peer, res, SocketError);
@@ -472,14 +471,14 @@ bool cConnection::SendData(SOCKET a_Socket, cByteBuffer & a_Data, const char * a
 
 
 
-bool cConnection::SendEncryptedData(SOCKET a_Socket, Encryptor & a_Encryptor, const char * a_Data, int a_Size, const char * a_Peer)
+bool cConnection::SendEncryptedData(SOCKET a_Socket, cAESCFBEncryptor & a_Encryptor, const char * a_Data, size_t a_Size, const char * a_Peer)
 {
 	DataLog(a_Data, a_Size, "Encrypting %d bytes to %s", a_Size, a_Peer);
-	const byte * Data = (const byte *)a_Data;
+	const Byte * Data = (const Byte *)a_Data;
 	while (a_Size > 0)
 	{
-		byte Buffer[64 KiB];
-		int NumBytes = (a_Size > sizeof(Buffer)) ? sizeof(Buffer) : a_Size;
+		Byte Buffer[64 KiB];
+		size_t NumBytes = (a_Size > sizeof(Buffer)) ? sizeof(Buffer) : a_Size;
 		a_Encryptor.ProcessData(Buffer, Data, NumBytes);
 		bool res = SendData(a_Socket, (const char *)Buffer, NumBytes, a_Peer);
 		if (!res)
@@ -496,7 +495,7 @@ bool cConnection::SendEncryptedData(SOCKET a_Socket, Encryptor & a_Encryptor, co
 
 
 
-bool cConnection::SendEncryptedData(SOCKET a_Socket, Encryptor & a_Encryptor, cByteBuffer & a_Data, const char * a_Peer)
+bool cConnection::SendEncryptedData(SOCKET a_Socket, cAESCFBEncryptor & a_Encryptor, cByteBuffer & a_Data, const char * a_Peer)
 {
 	AString All;
 	a_Data.ReadAll(All);
@@ -1301,6 +1300,7 @@ bool cConnection::HandleServerLoginEncryptionKeyRequest(void)
 	}
 	Log("Got PACKET_ENCRYPTION_KEY_REQUEST from the SERVER:");
 	Log("  ServerID = %s", ServerID.c_str());
+	DataLog(PublicKey.data(), PublicKey.size(), "  Public key (%u bytes)", (unsigned)PublicKey.size());
 	
 	// Reply to the server:
 	SendEncryptionKeyResponse(PublicKey, Nonce);
@@ -2261,7 +2261,9 @@ bool cConnection::HandleServerSpawnObjectVehicle(void)
 	HANDLE_SERVER_PACKET_READ(ReadByte,    Byte,   Yaw);
 	HANDLE_SERVER_PACKET_READ(ReadBEInt,   int,    DataIndicator);
 	AString ExtraData;
-	short VelocityX, VelocityY, VelocityZ;
+	short VelocityX = 0;
+	short VelocityY = 0;
+	short VelocityZ = 0;
 	if (DataIndicator != 0)
 	{
 		HANDLE_SERVER_PACKET_READ(ReadBEShort, short, SpeedX);
@@ -2695,12 +2697,12 @@ bool cConnection::ParseMetadata(cByteBuffer & a_Buffer, AString & a_Metadata)
 	a_Metadata.push_back(x);
 	while (x != 0x7f)
 	{
-		int Index = ((unsigned)((unsigned char)x)) & 0x1f;  // Lower 5 bits = index
+		// int Index = ((unsigned)((unsigned char)x)) & 0x1f;  // Lower 5 bits = index
 		int Type  = ((unsigned)((unsigned char)x)) >> 5;    // Upper 3 bits = type
 		int Length = 0;
 		switch (Type)
 		{
-			case 0: Length = 1; break;  // byte
+			case 0: Length = 1; break;  // Byte
 			case 1: Length = 2; break;  // short
 			case 2: Length = 4; break;  // int
 			case 3: Length = 4; break;  // float
@@ -2770,7 +2772,7 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount)
 	{
 		int Index = ((unsigned)((unsigned char)a_Metadata[pos])) & 0x1f;  // Lower 5 bits = index
 		int Type  = ((unsigned)((unsigned char)a_Metadata[pos])) >> 5;    // Upper 3 bits = type
-		int Length = 0;
+		// int Length = 0;
 		switch (Type)
 		{
 			case 0:
@@ -2825,7 +2827,7 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount)
 					ASSERT(!"Cannot parse item description from metadata");
 					return;
 				}
-				int After = bb.GetReadableSpace();
+				// int After = bb.GetReadableSpace();
 				int BytesConsumed = BytesLeft - bb.GetReadableSpace();
 
 				Log("%sslot[%d] = %s (%d bytes)", Indent.c_str(), Index, ItemDesc.c_str(), BytesConsumed);
@@ -2859,37 +2861,42 @@ void cConnection::LogMetadata(const AString & a_Metadata, size_t a_IndentCount)
 void cConnection::SendEncryptionKeyResponse(const AString & a_ServerPublicKey, const AString & a_Nonce)
 {
 	// Generate the shared secret and encrypt using the server's public key
-	byte SharedSecret[16];
-	byte EncryptedSecret[128];
+	Byte SharedSecret[16];
+	Byte EncryptedSecret[128];
 	memset(SharedSecret, 0, sizeof(SharedSecret));  // Use all zeroes for the initial secret
-	RSA::PublicKey pk;
-	CryptoPP::StringSource src(a_ServerPublicKey, true);
-	ByteQueue bq;
-	src.TransferTo(bq);
-	bq.MessageEnd();
-	pk.Load(bq);
-	RSAES<PKCS1v15>::Encryptor rsaEncryptor(pk);
-	RandomPool rng;
-	time_t CurTime = time(NULL);
-	rng.Put((const byte *)&CurTime, sizeof(CurTime));
-	int EncryptedLength = rsaEncryptor.FixedCiphertextLength();
-	ASSERT(EncryptedLength <= sizeof(EncryptedSecret));
-	rsaEncryptor.Encrypt(rng, SharedSecret, sizeof(SharedSecret), EncryptedSecret);
-	m_ServerEncryptor.SetKey(SharedSecret, 16, MakeParameters(Name::IV(), ConstByteArrayParameter(SharedSecret, 16, true))(Name::FeedbackSize(), 1));
-	m_ServerDecryptor.SetKey(SharedSecret, 16, MakeParameters(Name::IV(), ConstByteArrayParameter(SharedSecret, 16, true))(Name::FeedbackSize(), 1));
+	cPublicKey PubKey(a_ServerPublicKey);
+	int res = PubKey.Encrypt(SharedSecret, sizeof(SharedSecret), EncryptedSecret, sizeof(EncryptedSecret));
+	if (res < 0)
+	{
+		Log("Shared secret encryption failed: %d (0x%x)", res, res);
+		return;
+	}
+
+	m_ServerEncryptor.Init(SharedSecret, SharedSecret);
+	m_ServerDecryptor.Init(SharedSecret, SharedSecret);
 	
 	// Encrypt the nonce:
-	byte EncryptedNonce[128];
-	rsaEncryptor.Encrypt(rng, (const byte *)(a_Nonce.data()), a_Nonce.size(), EncryptedNonce);
+	Byte EncryptedNonce[128];
+	res = PubKey.Encrypt((const Byte *)a_Nonce.data(), a_Nonce.size(), EncryptedNonce, sizeof(EncryptedNonce));
+	if (res < 0)
+	{
+		Log("Nonce encryption failed: %d (0x%x)", res, res);
+		return;
+	}
 	
 	// Send the packet to the server:
 	Log("Sending PACKET_ENCRYPTION_KEY_RESPONSE to the SERVER");
 	cByteBuffer ToServer(1024);
 	ToServer.WriteByte(0x01);  // To server: Encryption key response
-	ToServer.WriteBEShort(EncryptedLength);
-	ToServer.WriteBuf(EncryptedSecret, EncryptedLength);
-	ToServer.WriteBEShort(EncryptedLength);
-	ToServer.WriteBuf(EncryptedNonce, EncryptedLength);
+	ToServer.WriteBEShort((short)sizeof(EncryptedSecret));
+	ToServer.WriteBuf(EncryptedSecret, sizeof(EncryptedSecret));
+	ToServer.WriteBEShort((short)sizeof(EncryptedNonce));
+	ToServer.WriteBuf(EncryptedNonce, sizeof(EncryptedNonce));
+	DataLog(EncryptedSecret, sizeof(EncryptedSecret), "Encrypted secret (%u bytes)", (unsigned)sizeof(EncryptedSecret));
+	DataLog(EncryptedNonce,  sizeof(EncryptedNonce),  "Encrypted nonce (%u bytes)",  (unsigned)sizeof(EncryptedNonce));
+	cByteBuffer Len(5);
+	Len.WriteVarInt(ToServer.GetReadableSpace());
+	SERVERSEND(Len);
 	SERVERSEND(ToServer);
 	m_ServerState = csEncryptedUnderstood;
 	m_IsServerEncrypted = true;
diff --git a/Tools/ProtoProxy/Connection.h b/Tools/ProtoProxy/Connection.h
index abb8b6cd0..9e04994b7 100644
--- a/Tools/ProtoProxy/Connection.h
+++ b/Tools/ProtoProxy/Connection.h
@@ -62,14 +62,12 @@ public:
 	void LogFlush(void);
 	
 protected:
-	typedef CFB_Mode<AES>::Encryption Encryptor;
-	typedef CFB_Mode<AES>::Decryption Decryptor;
-	
+
 	cByteBuffer m_ClientBuffer;
 	cByteBuffer m_ServerBuffer;
 	
-	Decryptor m_ServerDecryptor;
-	Encryptor m_ServerEncryptor;
+	cAESCFBDecryptor m_ServerDecryptor;
+	cAESCFBEncryptor m_ServerEncryptor;
 
 	AString m_ServerEncryptionBuffer;  // Buffer for the data to be sent to the server once encryption is established
 	
@@ -105,16 +103,16 @@ protected:
 	double GetRelativeTime(void);
 	
 	/// Sends data to the specified socket. If sending fails, prints a fail message using a_Peer and returns false.
-	bool SendData(SOCKET a_Socket, const char * a_Data, int a_Size, const char * a_Peer);
+	bool SendData(SOCKET a_Socket, const char * a_Data, size_t a_Size, const char * a_Peer);
 	
 	/// Sends data to the specified socket. If sending fails, prints a fail message using a_Peer and returns false.
 	bool SendData(SOCKET a_Socket, cByteBuffer & a_Data, const char * a_Peer);
 	
 	/// Sends data to the specfied socket, after encrypting it using a_Encryptor. If sending fails, prints a fail message using a_Peer and returns false
-	bool SendEncryptedData(SOCKET a_Socket, Encryptor & a_Encryptor, const char * a_Data, int a_Size, const char * a_Peer);
+	bool SendEncryptedData(SOCKET a_Socket, cAESCFBEncryptor & a_Encryptor, const char * a_Data, size_t a_Size, const char * a_Peer);
 	
 	/// Sends data to the specfied socket, after encrypting it using a_Encryptor. If sending fails, prints a fail message using a_Peer and returns false
-	bool SendEncryptedData(SOCKET a_Socket, Encryptor & a_Encryptor, cByteBuffer & a_Data, const char * a_Peer);
+	bool SendEncryptedData(SOCKET a_Socket, cAESCFBEncryptor & a_Encryptor, cByteBuffer & a_Data, const char * a_Peer);
 	
 	/// Decodes packets coming from the client, sends appropriate counterparts to the server; returns false if the connection is to be dropped
 	bool DecodeClientsPackets(const char * a_Data, int a_Size);
diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h
index 7415c9e62..e2f5aa860 100644
--- a/Tools/ProtoProxy/Globals.h
+++ b/Tools/ProtoProxy/Globals.h
@@ -22,6 +22,8 @@
 	#define ALIGN_8
 	#define ALIGN_16
 	
+	#define FORMATSTRING(formatIndex, va_argsIndex)
+
 #elif defined(__GNUC__)
 
 	// TODO: Can GCC explicitly mark classes as abstract (no instances can be created)?
@@ -37,6 +39,8 @@
 
 	// Some portability macros :)
 	#define stricmp strcasecmp
+	
+	#define FORMATSTRING(formatIndex, va_argsIndex)
 
 #else
 
@@ -59,6 +63,9 @@
 	#define ALIGN_16
 	*/
 
+	#define FORMATSTRING(formatIndex, va_argsIndex) __attribute__((format (printf, formatIndex, va_argsIndex)))
+
+
 #endif
 
 
@@ -74,6 +81,8 @@ typedef unsigned long long UInt64;
 typedef unsigned int       UInt32;
 typedef unsigned short     UInt16;
 
+typedef unsigned char Byte;
+
 
 
 
@@ -223,16 +232,12 @@ public:
 
 
 
-#include "cryptopp/randpool.h"
-#include "cryptopp/aes.h"
-#include "cryptopp/rsa.h"
-#include "cryptopp/modes.h"
+#include "../../src/Crypto.h"
 
-using namespace CryptoPP;
 
 
 
 
 #define LOGERROR   printf
 #define LOGINFO    printf
-#define LOGWARNING printf
\ No newline at end of file
+#define LOGWARNING printf
diff --git a/Tools/ProtoProxy/Server.cpp b/Tools/ProtoProxy/Server.cpp
index 71b5ecb94..bb042b259 100644
--- a/Tools/ProtoProxy/Server.cpp
+++ b/Tools/ProtoProxy/Server.cpp
@@ -34,12 +34,8 @@ int cServer::Init(short a_ListenPort, short a_ConnectPort)
 	#endif  // _WIN32
 	
 	printf("Generating protocol encryption keypair...\n");
-	time_t CurTime = time(NULL);
-	RandomPool rng;
-	rng.Put((const byte *)&CurTime, sizeof(CurTime));
-	m_PrivateKey.GenerateRandomWithKeySize(rng, 1024);
-	RSA::PublicKey pk(m_PrivateKey);
-	m_PublicKey = pk;
+	m_PrivateKey.Generate();
+	m_PublicKeyDER = m_PrivateKey.GetPubKeyDER();
 
 	m_ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	sockaddr_in local;
diff --git a/Tools/ProtoProxy/Server.h b/Tools/ProtoProxy/Server.h
index e69dbb5e0..85f817a4d 100644
--- a/Tools/ProtoProxy/Server.h
+++ b/Tools/ProtoProxy/Server.h
@@ -17,8 +17,8 @@
 class cServer
 {
 	SOCKET m_ListenSocket;
-	RSA::PrivateKey m_PrivateKey;
-	RSA::PublicKey  m_PublicKey;
+	cRSAPrivateKey m_PrivateKey;
+	AString m_PublicKeyDER;
 	short m_ConnectPort;
 	
 public:
@@ -27,8 +27,8 @@ public:
 	int  Init(short a_ListenPort, short a_ConnectPort);
 	void Run(void);
 	
-	RSA::PrivateKey & GetPrivateKey(void) { return m_PrivateKey; }
-	RSA::PublicKey  & GetPublicKey (void) { return m_PublicKey; }
+	cRSAPrivateKey & GetPrivateKey(void) { return m_PrivateKey; }
+	const AString & GetPublicKeyDER (void) { return m_PublicKeyDER; }
 	
 	short GetConnectPort(void) const { return m_ConnectPort; }
 } ;