diff --git a/CHANGES b/CHANGES index 2901486e17..f7627f71bd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ + +4.1.0-dev.497 | 2021-04-07 15:54:21 -0700 + + * GH-1493: Fix build with -DENABLE_MOBILE_IPV6 (Tim Wojtulewicz, Corelight) + 4.1.0-dev.495 | 2021-04-07 11:12:13 -0700 * Change TableVal::ToMap() to return ValPtr-indexed maps (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index be01695475..0fb85a9ee5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.495 +4.1.0-dev.497 diff --git a/src/IP.cc b/src/IP.cc index d086997645..149be6a41c 100644 --- a/src/IP.cc +++ b/src/IP.cc @@ -245,7 +245,7 @@ RecordValPtr IPv6_Hdr::ToVal(VectorValPtr chain) const case 5: { auto m = make_intrusive(ip6_mob_bu_type); - m->Assign(0, ntohs(*((uint16_t*)msg_data)))); + m->Assign(0, ntohs(*((uint16_t*)msg_data))); m->Assign(1, static_cast(ntohs(*((uint16_t*)(msg_data + sizeof(uint16_t)))) & 0x8000)); m->Assign(2, static_cast(ntohs(*((uint16_t*)(msg_data + sizeof(uint16_t)))) & 0x4000)); m->Assign(3, static_cast(ntohs(*((uint16_t*)(msg_data + sizeof(uint16_t)))) & 0x2000)); diff --git a/src/packet_analysis/protocol/ip/IP.cc b/src/packet_analysis/protocol/ip/IP.cc index dcc79cc4d8..00676d3154 100644 --- a/src/packet_analysis/protocol/ip/IP.cc +++ b/src/packet_analysis/protocol/ip/IP.cc @@ -200,9 +200,9 @@ bool IPAnalyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet) // last if present. if ( packet->ip_hdr->LastHeader() == IPPROTO_MOBILITY ) { - dump_this_packet = true; + packet->dump_packet = true; - if ( ! ignore_checksums && mobility_header_checksum(packet->ip_hdr) != 0xffff ) + if ( ! detail::ignore_checksums && mobility_header_checksum(packet->ip_hdr.get()) != 0xffff ) { Weird("bad_MH_checksum", packet); return false;