diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | epan/Makefile.am | 3 | ||||
| -rw-r--r-- | epan/compress/Makefile.am | 41 | ||||
| -rw-r--r-- | epan/compress/lzxpress.c | 134 | ||||
| -rw-r--r-- | epan/compress/lzxpress.h | 46 |
6 files changed, 1 insertions, 232 deletions
diff --git a/configure.ac b/configure.ac index 6147d0898b..3c5c1e0dff 100644 --- a/configure.ac +++ b/configure.ac @@ -2826,7 +2826,6 @@ AC_CONFIG_FILES( doc/Makefile docbook/Makefile epan/Makefile - epan/compress/Makefile epan/crypt/Makefile epan/doxygen.cfg epan/dfilter/Makefile diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 2b1be27c80..2f054effc0 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -41,11 +41,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -set(COMPRESS_FILES - compress/lzxpress.c -) -source_group(compress FILES ${COMPRESS_FILES}) - set(LIBWIRESHARK_ASM_FILES asm_utils.c # todo @@ -371,7 +366,6 @@ ABICHECK(libwireshark) set(TOP_LEVEL_HEADERS ${CMAKE_BINARY_DIR}/config.h ${CMAKE_SOURCE_DIR}/register.h) file(GLOB CRYPT_HEADERS crypt/*.h) -file(GLOB COMPRESS_HEADERS compress/*.h) file(GLOB DFILTER_HEADERS dfilter/*.h ../tools/lemon/cppmagic.h) file(GLOB D_HEADERS dissectors/*.h) file(GLOB FTYPES_HEADERS ftypes/*.h) @@ -382,7 +376,6 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/epan COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/crypt - COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/compress COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/dfilter COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/dissectors COMMAND ${CMAKE_COMMAND} -E make_directory ${ABICHECK_TMPDIR}/ftypes @@ -390,7 +383,6 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz COMMAND ${ABI_COPY_COMMAND} ${TOP_LEVEL_HEADERS} ${ABICHECK_TMPDIR} ${ABI_COPY_FLAGS} COMMAND ${ABI_COPY_COMMAND} ${ABICHECK_HEADERS} ${ABICHECK_TMPDIR}/epan ${ABI_COPY_FLAGS} COMMAND ${ABI_COPY_COMMAND} ${CRYPT_HEADERS} ${ABICHECK_TMPDIR}/crypt ${ABI_COPY_FLAGS} - COMMAND ${ABI_COPY_COMMAND} ${COMPRESS_HEADERS} ${ABICHECK_TMPDIR}/compress ${ABI_COPY_FLAGS} COMMAND ${ABI_COPY_COMMAND} ${DFILTER_HEADERS} ${ABICHECK_TMPDIR}/dfilter ${ABI_COPY_FLAGS} COMMAND ${ABI_COPY_COMMAND} ${D_HEADERS} ${ABICHECK_TMPDIR}/dissectors ${ABI_COPY_FLAGS} COMMAND ${ABI_COPY_COMMAND} ${FTYPES_HEADERS} ${ABICHECK_TMPDIR}/ftypes ${ABI_COPY_FLAGS} diff --git a/epan/Makefile.am b/epan/Makefile.am index c55f50262c..43bfa52103 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -27,7 +27,7 @@ if HAVE_LIBLUA wslua_dir = wslua endif -SUBDIRS = compress crypt ftypes dfilter dissectors wmem $(wslua_dir) +SUBDIRS = crypt ftypes dfilter dissectors wmem $(wslua_dir) AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \ $(GLIB_CFLAGS) $(PCAP_CFLAGS) $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \ @@ -340,7 +340,6 @@ libwireshark_la_LIBADD = \ libwireshark_la_DEPENDENCIES = \ libwireshark_generated.la \ - compress/liblzxpress.la \ libwireshark_asmopt.la \ crypt/libairpdcap.la \ ftypes/libftypes.la \ diff --git a/epan/compress/Makefile.am b/epan/compress/Makefile.am deleted file mode 100644 index f715722c40..0000000000 --- a/epan/compress/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -# Makefile.am -# Automake file for the compress for Wireshark -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -include $(top_srcdir)/Makefile.am.inc - -AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) - -noinst_LTLIBRARIES = liblzxpress.la - -liblzxpress_la_SOURCES = \ - lzxpress.c \ - lzxpress.h - -EXTRA_DIST = - -CLEANFILES = \ - liblzxpress.a \ - liblzxpress.la \ - *~ - -checkapi: - $(PERL) ../../tools/checkAPIs.pl -g termoutput -build \ - $(liblzxpress_la_SOURCES) diff --git a/epan/compress/lzxpress.c b/epan/compress/lzxpress.c deleted file mode 100644 index 381089077c..0000000000 --- a/epan/compress/lzxpress.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) Matthieu Suiche 2008 - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of the author nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#include "lzxpress.h" - -#define __BUF_POS_CONST(buf,ofs)(((const guint8 *)buf)+(ofs)) -#define __PULL_BYTE(buf,ofs) \ - ((guint8)((*__BUF_POS_CONST(buf,ofs)) & 0xFF)) - -#ifndef PULL_LE_UINT16 -#define PULL_LE_UINT16(buf,ofs) ((guint16)( \ - ((guint16)(((guint16)(__PULL_BYTE(buf,(ofs)+0))) << 0)) | \ - ((guint16)(((guint16)(__PULL_BYTE(buf,(ofs)+1))) << 8)) \ -)) -#endif - -#ifndef PULL_LE_UINT32 -#define PULL_LE_UINT32(buf,ofs) ((guint32)( \ - ((guint32)(((guint32)(__PULL_BYTE(buf,(ofs)+0))) << 0)) | \ - ((guint32)(((guint32)(__PULL_BYTE(buf,(ofs)+1))) << 8)) | \ - ((guint32)(((guint32)(__PULL_BYTE(buf,(ofs)+2))) << 16)) | \ - ((guint32)(((guint32)(__PULL_BYTE(buf,(ofs)+3))) << 24)) \ -)) -#endif - -gssize lzxpress_decompress(const guint8 *input, - guint32 input_size, - guint8 *output, - guint32 max_output_size) -{ - guint32 output_index, input_index; - guint32 indicator, indicator_bit; - guint32 length; - guint32 offset; - guint32 nibble_index; - - output_index = 0; - input_index = 0; - indicator = 0; - indicator_bit = 0; - nibble_index = 0; - - do { - if (indicator_bit == 0) { - indicator = PULL_LE_UINT32(input, input_index); - input_index += (guint32)sizeof(guint32); - indicator_bit = 32; - } - indicator_bit--; - - /* - * check whether the bit specified by indicator_bit is set or not - * set in indicator. For example, if indicator_bit has value 4 - * check whether the 4th bit of the value in indicator is set - */ - if (((indicator >> indicator_bit) & 1) == 0) { - output[output_index] = input[input_index]; - input_index += (guint32)sizeof(guint8); - output_index += (guint32)sizeof(guint8); - } else { - length = PULL_LE_UINT16(input, input_index); - input_index += (guint32)sizeof(guint16); - offset = length / 8; - length = length % 8; - - if (length == 7) { - if (nibble_index == 0) { - nibble_index = input_index; - length = input[input_index] % 16; - input_index += (guint32)sizeof(guint8); - } else { - length = input[nibble_index] / 16; - nibble_index = 0; - } - - if (length == 15) { - length = input[input_index]; - input_index += (guint32)sizeof(guint8); - if (length == 255) { - length = PULL_LE_UINT16(input, input_index); - input_index += (guint32)sizeof(guint16); - length -= (15 + 7); - } - length += 15; - } - length += 7; - } - - length += 3; - - do { - if ((output_index >= max_output_size) || ((offset + 1) > output_index)) break; - - output[output_index] = output[output_index - offset - 1]; - - output_index += (guint32)sizeof(guint8); - length -= (guint32)sizeof(guint8); - } while (length != 0); - } - } while ((output_index < max_output_size) && (input_index < (input_size))); - - return output_index; -} diff --git a/epan/compress/lzxpress.h b/epan/compress/lzxpress.h deleted file mode 100644 index d54972ebfa..0000000000 --- a/epan/compress/lzxpress.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) Matthieu Suiche 2008 - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of the author nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ - -#ifndef _LZXPRESS_H -#define _LZXPRESS_H - -#define XPRESS_BLOCK_SIZE 0x10000 -#include <glib.h> - -gssize lzxpress_decompress(const guint8 *input, - guint32 input_size, - guint8 *output, - guint32 max_output_size); - -#endif /* _LZXPRESS_H */ |