diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2016-05-10 21:03:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-10 21:03:57 +0000 |
| commit | 37816ede8b912ee97b394e8a23a72a850b65c6b9 (patch) | |
| tree | 349be03d3d548ec3c41645a1a72b432ec7873db3 | |
| parent | a8af23f86857c2918e18e1181654ea647d0d43c9 (diff) | |
| parent | 0c09af5884d948bea675291db3b88172729bccff (diff) | |
| download | tcpdump-37816ede8b912ee97b394e8a23a72a850b65c6b9.tar.gz | |
Merge changes I8ae9ec5b,I71bd5c50,I450cca83,I30d77415android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3
* changes:
Enable -Werror in external/tcpdump
Clean up version test.
Add a missing space to a printout.
ISOCLNS: Fix some warnings
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | print-isoclns.c | 15 | ||||
| -rw-r--r-- | print-nflog.c | 2 |
3 files changed, 10 insertions, 8 deletions
@@ -164,6 +164,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(tcpdump_src_files) LOCAL_CFLAGS += -DHAVE_CONFIG_H LOCAL_CFLAGS += -D_U_="__attribute__((unused))" +LOCAL_CFLAGS += -Werror LOCAL_SHARED_LIBRARIES += libssl libcrypto LOCAL_STATIC_LIBRARIES += libpcap LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) diff --git a/print-isoclns.c b/print-isoclns.c index f8de7bce..4536f65b 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -559,8 +559,8 @@ struct isis_tlv_ptp_adj { uint8_t neighbor_extd_local_circuit_id[4]; }; -static void osi_print_cksum(netdissect_options *, const uint8_t *pptr, uint16_t checksum, - u_int checksum_offset, u_int length); +static void osi_print_cksum(netdissect_options *, const uint8_t *pptr, + uint16_t checksum, int checksum_offset, int length); static int clnp_print(netdissect_options *, const uint8_t *, u_int); static void esis_print(netdissect_options *, const uint8_t *, u_int); static int isis_print(netdissect_options *, const uint8_t *, u_int); @@ -3075,9 +3075,8 @@ isis_print(netdissect_options *ndo, } static void -osi_print_cksum(netdissect_options *ndo, - const uint8_t *pptr, uint16_t checksum, - u_int checksum_offset, u_int length) +osi_print_cksum(netdissect_options *ndo, const uint8_t *pptr, + uint16_t checksum, int checksum_offset, int length) { uint16_t calculated_checksum; @@ -3087,12 +3086,14 @@ osi_print_cksum(netdissect_options *ndo, * or the base pointer is not sane */ if (!checksum + || length < 0 + || checksum_offset < 0 || length > ndo->ndo_snaplen || checksum_offset > ndo->ndo_snaplen || checksum_offset > length) { - ND_PRINT((ndo, "(unverified)")); + ND_PRINT((ndo, " (unverified)")); } else { - unsigned char *truncated = "trunc"; + const char *truncated = "trunc"; #if 0 printf("\nosi_print_cksum: %p %u %u %u\n", pptr, checksum_offset, length, ndo->ndo_snaplen); ND_TCHECK2(pptr, checksum_offset+length); diff --git a/print-nflog.c b/print-nflog.c index 95da4cba..4234022c 100644 --- a/print-nflog.c +++ b/print-nflog.c @@ -81,7 +81,7 @@ nflog_if_print(netdissect_options *ndo, return h_size; } - if (!(hdr->nflog_version) == 0) { + if (hdr->nflog_version != 0) { ND_PRINT((ndo, "version %u (unknown)", hdr->nflog_version)); return h_size; } |