Check for HAVE_LZ4FRAME_H in the LZ4 detection process and use it
Change-Id: I919621b8c4c809eb181d563251eeb099b767ad82 Reviewed-on: https://code.wireshark.org/review/26940 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
08c2344458
commit
0d31ec328f
|
@ -2014,6 +2014,10 @@ AC_DEFUN([AC_WIRESHARK_LZ4_CHECK],
|
||||||
# in order to read compressed capture files.
|
# in order to read compressed capture files.
|
||||||
#
|
#
|
||||||
AC_CHECK_FUNCS(LZ4_decompress_safe)
|
AC_CHECK_FUNCS(LZ4_decompress_safe)
|
||||||
|
#
|
||||||
|
# Check for (optional) lz4frame.h
|
||||||
|
#
|
||||||
|
AC_CHECK_HEADERS(lz4frame.h)
|
||||||
LIBS="$ac_save_LIBS"
|
LIBS="$ac_save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -36,8 +36,17 @@ include(FindPackageHandleStandardArgs)
|
||||||
find_package_handle_standard_args( LZ4 DEFAULT_MSG LZ4_INCLUDE_DIR LZ4_LIBRARY )
|
find_package_handle_standard_args( LZ4 DEFAULT_MSG LZ4_INCLUDE_DIR LZ4_LIBRARY )
|
||||||
|
|
||||||
if( LZ4_FOUND )
|
if( LZ4_FOUND )
|
||||||
|
include( CheckIncludeFile )
|
||||||
|
include( CMakePushCheckState )
|
||||||
|
|
||||||
set( LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR} )
|
set( LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR} )
|
||||||
set( LZ4_LIBRARIES ${LZ4_LIBRARY} )
|
set( LZ4_LIBRARIES ${LZ4_LIBRARY} )
|
||||||
|
|
||||||
|
cmake_push_check_state()
|
||||||
|
set( CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIRS} )
|
||||||
|
check_include_file( lz4frame.h HAVE_LZ4FRAME_H )
|
||||||
|
cmake_pop_check_state()
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set ( LZ4_DLL_DIR "${LZ4_HINTS}/bin"
|
set ( LZ4_DLL_DIR "${LZ4_HINTS}/bin"
|
||||||
CACHE PATH "Path to LZ4 DLL"
|
CACHE PATH "Path to LZ4 DLL"
|
||||||
|
|
|
@ -134,6 +134,9 @@
|
||||||
/* Define to use lz4 library */
|
/* Define to use lz4 library */
|
||||||
#cmakedefine HAVE_LZ4 1
|
#cmakedefine HAVE_LZ4 1
|
||||||
|
|
||||||
|
/* Check for lz4frame */
|
||||||
|
#cmakedefine HAVE_LZ4FRAME_H 1
|
||||||
|
|
||||||
/* Define to use snappy library */
|
/* Define to use snappy library */
|
||||||
#cmakedefine HAVE_SNAPPY 1
|
#cmakedefine HAVE_SNAPPY 1
|
||||||
|
|
||||||
|
|
|
@ -21,12 +21,9 @@
|
||||||
#ifdef HAVE_SNAPPY
|
#ifdef HAVE_SNAPPY
|
||||||
#include <snappy-c.h>
|
#include <snappy-c.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_LZ4
|
#ifdef HAVE_LZ4FRAME_H
|
||||||
#include <lz4.h>
|
#include <lz4.h>
|
||||||
#if LZ4_VERSION_NUMBER >= 10500
|
|
||||||
#include <lz4frame.h>
|
#include <lz4frame.h>
|
||||||
#define HAVE_LZ4_FRAME
|
|
||||||
#endif /* LZ4_VERSION_NUMBER >= 10500 */
|
|
||||||
#endif
|
#endif
|
||||||
#include "packet-tcp.h"
|
#include "packet-tcp.h"
|
||||||
|
|
||||||
|
@ -346,7 +343,7 @@ dissect_kafka_message_set(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i
|
||||||
|
|
||||||
/* HELPERS */
|
/* HELPERS */
|
||||||
|
|
||||||
#ifdef HAVE_LZ4_FRAME
|
#ifdef HAVE_LZ4FRAME_H
|
||||||
/* Local copy of XXH32() algorithm as found in https://github.com/lz4/lz4/blob/v1.7.5/lib/xxhash.c
|
/* Local copy of XXH32() algorithm as found in https://github.com/lz4/lz4/blob/v1.7.5/lib/xxhash.c
|
||||||
as some packagers are not providing xxhash.h in liblz4 */
|
as some packagers are not providing xxhash.h in liblz4 */
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -459,7 +456,7 @@ static guint XXH32(const void* input, size_t len, guint seed)
|
||||||
else
|
else
|
||||||
return XXH32_endian(input, len, seed, XXH_bigEndian);
|
return XXH32_endian(input, len, seed, XXH_bigEndian);
|
||||||
}
|
}
|
||||||
#endif /* HAVE_LZ4_FRAME */
|
#endif /* HAVE_LZ4FRAME_H */
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
kafka_error_to_str(kafka_error_t error)
|
kafka_error_to_str(kafka_error_t error)
|
||||||
|
@ -820,7 +817,7 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case KAFKA_MESSAGE_CODEC_LZ4:
|
case KAFKA_MESSAGE_CODEC_LZ4:
|
||||||
#ifdef HAVE_LZ4_FRAME
|
#ifdef HAVE_LZ4FRAME_H
|
||||||
raw = kafka_get_bytes(subtree, tvb, pinfo, offset);
|
raw = kafka_get_bytes(subtree, tvb, pinfo, offset);
|
||||||
offset += 4;
|
offset += 4;
|
||||||
if (raw) {
|
if (raw) {
|
||||||
|
@ -910,7 +907,7 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s
|
||||||
offset += compressed_size;
|
offset += compressed_size;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#endif /* HAVE_LZ4_FRAME */
|
#endif /* HAVE_LZ4FRAME_H */
|
||||||
|
|
||||||
case KAFKA_MESSAGE_CODEC_NONE:
|
case KAFKA_MESSAGE_CODEC_NONE:
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue