osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

kafka: check lz4 version in a single point. 

This allows a better check of the required version.

Change-Id: I6c4aab67c73434aff4ad744caa2d0add9ec6225c
Reviewed-on: https://code.wireshark.org/review/26889
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2018-04-11 14:37:21 +02:00 committed by Anders Broman
parent 205505d9c8
commit 0c30760c95
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-kafka.c
View File

@ -25,6 +25,7 @@
#include <lz4.h>
#if LZ4_VERSION_NUMBER >= 10301
#include <lz4frame.h>
#define HAVE_LZ4_FRAME
#endif /* LZ4_VERSION_NUMBER >= 10301 */
#endif
#include "packet-tcp.h"
@ -345,7 +346,7 @@ dissect_kafka_message_set(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i
/* HELPERS */
#if defined HAVE_LZ4 && LZ4_VERSION_NUMBER >= 10301
#if defined HAVE_LZ4_FRAME
/* 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 */
typedef struct {
@ -458,7 +459,7 @@ static guint XXH32(const void* input, size_t len, guint seed)
else
return XXH32_endian(input, len, seed, XXH_bigEndian);
}
#endif /* HAVE_LZ4 && LZ4_VERSION_NUMBER >= 10301 */
#endif /* HAVE_LZ4_FRAME */
static const char *
kafka_error_to_str(kafka_error_t error)
@ -819,7 +820,7 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s
break;
#endif
case KAFKA_MESSAGE_CODEC_LZ4:
#if defined HAVE_LZ4 && LZ4_VERSION_NUMBER >= 10301
#ifdef HAVE_LZ4_FRAME
raw = kafka_get_bytes(subtree, tvb, pinfo, offset);
offset += 4;
if (raw) {
@ -909,7 +910,7 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s
offset += compressed_size;
}
break;
#endif /* HAVE_LZ4 && LZ4_VERSION_NUMBER >= 10301 */
#endif /* HAVE_LZ4_FRAME */
case KAFKA_MESSAGE_CODEC_NONE:
default: