X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserialization.cpp;h=36ddb467cbbc5a7fa82fac1f51fff8e6acba225a;hb=5506e97ed897dde2d4820fe1b021a4622bae03b3;hp=28e3d81321898d701caa8312368391899b940038;hpb=d0ea6f9920d30f46d1f5d44e8823a8d932f9f29d;p=dragonfireclient.git

diff --git a/src/serialization.cpp b/src/serialization.cpp
index 28e3d8132..36ddb467c 100644
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,14 +20,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 
 #include "util/serialize.h"
-#ifdef _WIN32
-	#define ZLIB_WINAPI
-#endif
+
 #include "zlib.h"
 
 /* report a zlib or i/o error */
 void zerr(int ret)
-{   
+{
     dstream<<"zerr: ";
     switch (ret) {
     case Z_ERRNO:
@@ -53,13 +51,11 @@ void zerr(int ret)
     }
 }
 
-void compressZlib(SharedBuffer<u8> data, std::ostream &os)
+void compressZlib(const u8 *data, size_t data_size, std::ostream &os, int level)
 {
 	z_stream z;
 	const s32 bufsize = 16384;
-	//char input_buffer[bufsize];
 	char output_buffer[bufsize];
-	int input_i = 0;
 	int status = 0;
 	int ret;
 
@@ -67,30 +63,20 @@ void compressZlib(SharedBuffer<u8> data, std::ostream &os)
 	z.zfree = Z_NULL;
 	z.opaque = Z_NULL;
 
-	ret = deflateInit(&z, -1);
+	ret = deflateInit(&z, level);
 	if(ret != Z_OK)
 		throw SerializationError("compressZlib: deflateInit failed");
-	
-	z.avail_in = 0;
-	
+
+	// Point zlib to our input buffer
+	z.next_in = (Bytef*)&data[0];
+	z.avail_in = data_size;
+	// And get all output
 	for(;;)
 	{
-		int flush = Z_NO_FLUSH;
 		z.next_out = (Bytef*)output_buffer;
 		z.avail_out = bufsize;
 
-		if(z.avail_in == 0)
-		{
-			//z.next_in = (char*)&data[input_i];
-			z.next_in = (Bytef*)&data[input_i];
-			z.avail_in = data.getSize() - input_i;
-			input_i += z.avail_in;
-			if(input_i == (int)data.getSize())
-				flush = Z_FINISH;
-		}
-		if(z.avail_in == 0)
-			break;
-		status = deflate(&z, flush);
+		status = deflate(&z, Z_FINISH);
 		if(status == Z_NEED_DICT || status == Z_DATA_ERROR
 				|| status == Z_MEM_ERROR)
 		{
@@ -100,16 +86,17 @@ void compressZlib(SharedBuffer<u8> data, std::ostream &os)
 		int count = bufsize - z.avail_out;
 		if(count)
 			os.write(output_buffer, count);
+		// This determines zlib has given all output
+		if(status == Z_STREAM_END)
+			break;
 	}
 
 	deflateEnd(&z);
-
 }
 
-void compressZlib(const std::string &data, std::ostream &os)
+void compressZlib(const std::string &data, std::ostream &os, int level)
 {
-	SharedBuffer<u8> databuf((u8*)data.c_str(), data.size());
-	compressZlib(databuf, os);
+	compressZlib((u8*)data.c_str(), data.size(), os, level);
 }
 
 void decompressZlib(std::istream &is, std::ostream &os)
@@ -130,9 +117,9 @@ void decompressZlib(std::istream &is, std::ostream &os)
 	ret = inflateInit(&z);
 	if(ret != Z_OK)
 		throw SerializationError("dcompressZlib: inflateInit failed");
-	
+
 	z.avail_in = 0;
-	
+
 	//dstream<<"initial fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
 
 	for(;;)
@@ -143,7 +130,8 @@ void decompressZlib(std::istream &is, std::ostream &os)
 		if(z.avail_in == 0)
 		{
 			z.next_in = (Bytef*)input_buffer;
-			input_buffer_len = is.readsome(input_buffer, bufsize);
+			is.read(input_buffer, bufsize);
+			input_buffer_len = is.gcount();
 			z.avail_in = input_buffer_len;
 			//dstream<<"read fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
 		}
@@ -152,7 +140,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
 			//dstream<<"z.avail_in == 0"<<std::endl;
 			break;
 		}
-			
+
 		//dstream<<"1 z.avail_in="<<z.avail_in<<std::endl;
 		status = inflate(&z, Z_NO_FLUSH);
 		//dstream<<"2 z.avail_in="<<z.avail_in<<std::endl;
@@ -172,10 +160,11 @@ void decompressZlib(std::istream &is, std::ostream &os)
 		if(status == Z_STREAM_END)
 		{
 			//dstream<<"Z_STREAM_END"<<std::endl;
-			
+
 			//dstream<<"z.avail_in="<<z.avail_in<<std::endl;
 			//dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
 			// Unget all the data that inflate didn't take
+			is.clear(); // Just in case EOF is set
 			for(u32 i=0; i < z.avail_in; i++)
 			{
 				is.unget();
@@ -186,7 +175,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
 					throw SerializationError("decompressZlib: unget failed");
 				}
 			}
-			
+
 			break;
 		}
 	}
@@ -194,23 +183,23 @@ void decompressZlib(std::istream &is, std::ostream &os)
 	inflateEnd(&z);
 }
 
-void compress(SharedBuffer<u8> data, std::ostream &os, u8 version)
+void compress(const SharedBuffer<u8> &data, std::ostream &os, u8 version)
 {
 	if(version >= 11)
 	{
-		compressZlib(data, os);
+		compressZlib(*data ,data.getSize(), os);
 		return;
 	}
 
 	if(data.getSize() == 0)
 		return;
-	
+
 	// Write length (u32)
 
 	u8 tmp[4];
 	writeU32(tmp, data.getSize());
 	os.write((char*)tmp, 4);
-	
+
 	// We will be writing 8-bit pairs of more_count and byte
 	u8 more_count = 0;
 	u8 current_byte = data[0];
@@ -250,7 +239,7 @@ void decompress(std::istream &is, std::ostream &os, u8 version)
 	u8 tmp[4];
 	is.read((char*)tmp, 4);
 	u32 len = readU32(tmp);
-	
+
 	// We will be reading 8-bit pairs of more_count and byte
 	u32 count = 0;
 	for(;;)
@@ -259,7 +248,7 @@ void decompress(std::istream &is, std::ostream &os, u8 version)
 		u8 byte=0;
 
 		is.read((char*)&more_count, 1);
-		
+
 		is.read((char*)&byte, 1);
 
 		if(is.eof())