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

Fix more build issues on appveyor

Browse Source
This commit is contained in:
Matias Fontanini
2017-05-08 21:51:27 -07:00
parent bd0db1354e
commit b0d66a01d2
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/icmp.cpp
View File

@@ -40,7 +40,6 @@
#include "utils/checksum_utils.h"
using std::memset;
using std::max;
using Tins::Memory::InputMemoryStream;
using Tins::Memory::OutputMemoryStream;
@@ -148,7 +147,8 @@ uint32_t ICMP::trailer_size() const {
// If the next pdu size is lower than 128 bytes, then padding = 128 - pdu size
// If the next pdu size is greater than 128 bytes,
// then padding = pdu size padded to next 32 bit boundary - pdu size
const uint32_t upper_bound = max(get_adjusted_inner_pdu_size(), 128U);
const uint32_t adjusted_size = get_adjusted_inner_pdu_size();
const uint32_t upper_bound = adjusted_size > 128U ? adjusted_size : 128U;
output += upper_bound - inner_pdu()->size();
}
}
@@ -228,8 +228,9 @@ void ICMP::write_serialization(uint8_t* buffer, uint32_t total_sz) {
if (length_value) {
// If we have extensions, we'll have at least 128 bytes.
// Otherwise, just use the length
length_value = has_extensions() ? max(length_value, 128U)
: length_value;
if (has_extensions()) {
length_value = length_value > 128U ? length_value : 128U;
}
}
else {
length_value = 0;