From 4b9378aadda0f3b80deec3ef830ab78f29cba8a8 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 6 Oct 2013 20:16:58 +0000 Subject: [PATCH] adding missing files git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6810 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/util/rscompress.cc | 190 +++++++++++++++++++++++++++ libretroshare/src/util/rscompress.h | 34 +++++ 2 files changed, 224 insertions(+) create mode 100644 libretroshare/src/util/rscompress.cc create mode 100644 libretroshare/src/util/rscompress.h diff --git a/libretroshare/src/util/rscompress.cc b/libretroshare/src/util/rscompress.cc new file mode 100644 index 000000000..1d62b4c2a --- /dev/null +++ b/libretroshare/src/util/rscompress.cc @@ -0,0 +1,190 @@ +/* + * libretroshare/src/utils: rscompress.cc + * + * Basic memory chunk compression, based on openpgp-sdk + * + * Copyright 2013 by Cyril Soler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License Version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems to "csoler@users.sourceforge.net". + * + */ + +#include +#include +#include +#include +#include +#include "rscompress.h" +#include "zlib.h" + +// 16K buffer size. +// +static const unsigned int CHUNK = 16384u ; + +bool RsCompress::compress_memory_chunk(const uint8_t *input_mem,const uint32_t input_size,uint8_t *& output_mem,uint32_t& output_size) +{ + + uint32_t remaining_input = input_size ; + uint32_t output_offset = 0 ; + uint32_t input_offset = 0 ; + output_size = 1024 ; + output_mem = (uint8_t*)malloc(output_size) ; + + int ret, flush; + unsigned have; + int level = 9 ; + z_stream strm; + unsigned char in[CHUNK]; + unsigned char out[CHUNK]; + /* allocate deflate state */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + + ret = deflateInit(&strm, level); + if (ret != Z_OK) + return false; + + /* compress until end of file */ + do + { + uint32_t available_in = std::min(CHUNK,remaining_input) ; + memcpy(in,input_mem+input_offset,available_in) ; + strm.avail_in = available_in ; + remaining_input -= available_in ; + input_offset += available_in ; + + flush = /*feof(source)*/ remaining_input ? Z_NO_FLUSH: Z_FINISH ; + strm.next_in = in; + + /* run deflate() on input until output buffer not full, finish + compression if all of source has been read in */ + do + { + strm.avail_out = CHUNK; + strm.next_out = out; + ret = deflate(&strm, flush); /* no bad return value */ + assert(ret != Z_STREAM_ERROR); /* state not clobbered */ + have = CHUNK - strm.avail_out; + + if(output_size < have+output_offset) + { + //std::cerr << "Growing outputbuffer from " << output_size << " to " << have+output_offset << std::endl; + output_mem = (uint8_t*)realloc(output_mem,have+output_offset) ; + output_size = have+output_offset ; + } + + memcpy(output_mem+output_offset,out,have) ; + output_offset += have ; + + //std::cerr << "Copying " << have << " bytes to output. New offset=" << output_offset << std::endl; + } while (strm.avail_out == 0); + assert(strm.avail_in == 0); /* all input will be used */ + + /* done when last data in file processed */ + } while (flush != Z_FINISH); + assert(ret == Z_STREAM_END); /* stream will be complete */ + + /* clean up and return */ + (void)deflateEnd(&strm); + + output_size = output_offset ; + + return true ; +} + +bool RsCompress::uncompress_memory_chunk(const uint8_t *input_mem,const uint32_t input_size,uint8_t *& output_mem,uint32_t& output_size) +{ + uint32_t remaining_input = input_size ; + output_size = input_size ; + uint32_t output_offset = 0 ; + uint32_t input_offset = 0 ; + output_mem = (uint8_t*)malloc(output_size) ; + + int ret; + unsigned have; + z_stream strm; + unsigned char in[CHUNK]; + unsigned char out[CHUNK]; + + /* allocate inflate state */ + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + strm.avail_in = 0; + strm.next_in = Z_NULL; + ret = inflateInit(&strm); + if (ret != Z_OK) + return ret; + + /* decompress until deflate stream ends or end of file */ + do + { + uint32_t available_in = std::min(CHUNK,remaining_input) ; + memcpy(in,input_mem,available_in) ; + strm.avail_in = available_in ; + remaining_input -= available_in ; + input_offset += available_in ; + + if (strm.avail_in == 0) + break; + + strm.next_in = in; + /* run inflate() on input until output buffer not full */ + do { + strm.avail_out = CHUNK; + strm.next_out = out; + + ret = inflate(&strm, Z_NO_FLUSH); + assert(ret != Z_STREAM_ERROR); /* state not clobbered */ + switch (ret) { + case Z_NEED_DICT: + ret = Z_DATA_ERROR; /* and fall through */ + case Z_DATA_ERROR: + case Z_MEM_ERROR: + (void)inflateEnd(&strm); + return ret; + } + + + have = CHUNK - strm.avail_out; + + if(output_size < have+output_offset) + { + output_mem = (uint8_t*)realloc(output_mem,have+output_offset) ; + output_size = have+output_offset ; + } + + memcpy(output_mem+output_offset,out,have) ; + output_offset += have ; + + } while (strm.avail_out == 0); + /* done when inflate() says it's done */ + } while (ret != Z_STREAM_END); + + /* clean up and return */ + (void)inflateEnd(&strm); + + output_size = output_offset ; + return ret == Z_STREAM_END ; +} + + + + + + diff --git a/libretroshare/src/util/rscompress.h b/libretroshare/src/util/rscompress.h new file mode 100644 index 000000000..0d11c3f47 --- /dev/null +++ b/libretroshare/src/util/rscompress.h @@ -0,0 +1,34 @@ +/* + * libretroshare/src/utils: rscompress.h + * + * Basic memory chunk compression, based on openpgp-sdk + * + * Copyright 2013 by Cyril Soler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License Version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + * + * Please report all bugs and problems to "csoler@users.sourceforge.net". + * + */ + +#pragma once + +class RsCompress +{ + public: + static bool compress_memory_chunk(const uint8_t *input_mem,const uint32_t input_size,uint8_t *& output_mem,uint32_t& output_size) ; + static bool uncompress_memory_chunk(const uint8_t *input_mem,const uint32_t input_size,uint8_t *& output_mem,uint32_t& output_size) ; +}; +