3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-29 04:54:28 +01:00
Code Issues Releases Wiki Activity

Fix IP fragment reassemble when packet has flags DF+MF

Browse Source
This commit is contained in:
Matias Fontanini
2016-02-21 09:23:44 -08:00
parent 8812153491
commit 9dabb6f570
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ip.cpp
View File

@@ -177,7 +177,7 @@ void IP::init_ip_fields() {
}
bool IP::is_fragmented() const {
return flags() == IP::MORE_FRAGMENTS || fragment_offset() != 0;
return (flags() & IP::MORE_FRAGMENTS) != 0 || fragment_offset() != 0;
}
// Setters

3
src/ip_reassembler.cpp
View File

@@ -55,7 +55,8 @@ void IPv4Stream::add_fragment(IP* ip) {
}
fragments_.insert(it, IPv4Fragment(ip->inner_pdu(), offset));
received_size_ += ip->inner_pdu()->size();
if (ip->flags() != IP::MORE_FRAGMENTS) {
// If the MF flag is off
if ((ip->flags() & IP::MORE_FRAGMENTS) == 0) {
total_size_ = offset + ip->inner_pdu()->size();
received_end_ = true;
}