3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-25 03:31:36 +01:00
Code Issues Releases Wiki Activity

Fix IPv6 extension headers parsing/serialization

Browse Source
This commit is contained in:
Matias Fontanini
2016-01-01 14:39:09 -08:00
parent d7e0d17154
commit 2c16aaaecd
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ipv6.cpp
View File

@@ -68,10 +68,10 @@ IPv6::IPv6(const uint8_t *buffer, uint32_t total_sz)
const uint8_t ext_type = stream.read<uint8_t>();
// every ext header is at least 8 bytes long
// minus one, from the next_header field.
const uint32_t ext_size = static_cast<uint32_t>(stream.read<uint8_t>()) + 8;
const uint32_t ext_size = (static_cast<uint32_t>(stream.read<uint8_t>()) + 1) * 8;
const uint32_t payload_size = ext_size - sizeof(uint8_t) * 2;
// -1 -> next header identifier
if(!stream.can_read(ext_size)) {
if (!stream.can_read(ext_size)) {
throw malformed_packet();
}
// minus one, from the size field
@@ -245,7 +245,7 @@ void IPv6::set_last_next_header(uint8_t value) {
}
void IPv6::write_header(const ext_header &header, OutputMemoryStream& stream) {
const uint8_t length = (header.length_field() > 8) ? (header.length_field() - 8) : 0;
const uint8_t length = header.length_field() / 8;
stream.write(header.option());
stream.write(length);
stream.write(header.data_ptr(), header.data_size());