From 7c03f4dec0b3c693e61f7f8177b03f739e76b36a Mon Sep 17 00:00:00 2001 From: Johanna Amann Date: Tue, 5 Dec 2017 09:49:00 -0800 Subject: [PATCH] Fix compile warnings raised by gcc7. /home/johanna/bro/master/src/Sessions.cc: In member function 'void NetSessions::DoNextPacket(double, const Packet*, const IP_Hdr*, const EncapsulationStack*)': /home/johanna/bro/master/src/Sessions.cc:343:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if ( ip_hdr_len > len ) ~~~~~~~~~~~^~~~~ /home/johanna/bro/master/src/Sessions.cc:349:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if ( ip_hdr_len > caplen ) ~~~~~~~~~~~^~~~~~~~ /home/johanna/bro/master/src/Sessions.cc:399:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if ( ip_hdr_len > len ) ~~~~~~~~~~~^~~~~ In file included from /usr/include/machine/endian.h:6:0, from /usr/include/sys/types.h:44, from /usr/include/unistd.h:37, from /home/johanna/bro/master/src/Anon.cc:2: /home/johanna/bro/master/src/Anon.cc: In member function 'virtual ipaddr32_t AnonymizeIPAddr_Seq::anonymize(ipaddr32_t)': /home/johanna/bro/master/src/Anon.cc:85:18: warning: operation on '((AnonymizeIPAddr_Seq*)this)->AnonymizeIPAddr_Seq::seq' may be undefined [-Wsequence-point] return htonl(seq++); ^ --- src/Anon.cc | 3 ++- src/Sessions.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Anon.cc b/src/Anon.cc index 87791501a4..a2afc489ca 100644 --- a/src/Anon.cc +++ b/src/Anon.cc @@ -82,7 +82,8 @@ int AnonymizeIPAddr::PreserveNet(ipaddr32_t input) ipaddr32_t AnonymizeIPAddr_Seq::anonymize(ipaddr32_t /* input */) { - return htonl(seq++); + ++seq; + return htonl(seq); } ipaddr32_t AnonymizeIPAddr_RandomMD5::anonymize(ipaddr32_t input) diff --git a/src/Sessions.cc b/src/Sessions.cc index a1e685a608..9dc569daa7 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -339,7 +339,7 @@ void NetSessions::DoNextPacket(double t, const Packet* pkt, const IP_Hdr* ip_hdr // For both of these it is safe to pass ip_hdr because the presence // is guaranteed for the functions that pass data to us. - int ip_hdr_len = ip_hdr->HdrLen(); + uint16 ip_hdr_len = ip_hdr->HdrLen(); if ( ip_hdr_len > len ) { Weird("invalid_IP_header_size", ip_hdr, encapsulation);