3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Move ICMP extension helpers into their own file

Browse Source
This commit is contained in:
Matias Fontanini
2017-04-30 10:53:21 -07:00
parent ec59194232
commit 6e1d1d3dc4
7 changed files with 150 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
include/tins/detail/icmp_extension_helpers.h Normal file
View File

@@ -0,0 +1,61 @@
/*
* Copyright (c) 2017, Matias Fontanini
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#ifndef TINS_ICMP_EXTENSION_HELPERS_H
#define TINS_ICMP_EXTENSION_HELPERS_H
#include <stdint.h>
/**
* \cond
*/
namespace Tins {
class PDU;
class ICMPExtensionsStructure;
namespace Memory {
class InputMemoryStream;
} // Memory
namespace Internals {
uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment);
void try_parse_icmp_extensions(Memory::InputMemoryStream& stream, uint32_t payload_length,
ICMPExtensionsStructure& extensions);
} // Internals
} // Tins
/**
* \endcond
*/
#endif // TINS_ICMP_EXTENSION_HELPERS_H

4
include/tins/internals.h
View File

@@ -67,10 +67,6 @@ PDU::PDUType ether_type_to_pdu_flag(Constants::Ethernet::e flag);
Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag);
PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag);
uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment);
void try_parse_icmp_extensions(Memory::InputMemoryStream& stream,
uint32_t payload_length, ICMPExtensionsStructure& extensions);
// Compares sequence numbers as defined by RFC 1982.
int seq_compare(uint32_t seq1, uint32_t seq2);

1
src/CMakeLists.txt
View File

@@ -22,6 +22,7 @@ set(SOURCES
pppoe.cpp
crypto.cpp
detail/address_helpers.cpp
detail/icmp_extension_helpers.cpp
dhcp.cpp
dhcpv6.cpp
dns.cpp

86
src/detail/icmp_extension_helpers.cpp Normal file
View File

@@ -0,0 +1,86 @@
/*
* Copyright (c) 2017, Matias Fontanini
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "detail/icmp_extension_helpers.h"
#include "memory_helpers.h"
#include "pdu.h"
#include "icmp_extension.h"
using Tins::Memory::InputMemoryStream;
namespace Tins {
namespace Internals {
uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment) {
// This gets the size of the next pdu, padded to the next 32 bit word boundary
if (inner_pdu) {
uint32_t inner_pdu_size = inner_pdu->size();
uint32_t padding = inner_pdu_size % pad_alignment;
inner_pdu_size = padding ? (inner_pdu_size - padding + pad_alignment) : inner_pdu_size;
return inner_pdu_size;
}
else {
return 0;
}
}
void try_parse_icmp_extensions(InputMemoryStream& stream,
uint32_t payload_length,
ICMPExtensionsStructure& extensions) {
if (!stream) {
return;
}
// Check if this is one of the types defined in RFC 4884
const uint32_t minimum_payload = ICMPExtensionsStructure::MINIMUM_ICMP_PAYLOAD;
// Check if we actually have this amount of data and whether it's more than
// the minimum encapsulated packet size
const uint8_t* extensions_ptr;
uint32_t extensions_size;
if (stream.can_read(payload_length) && payload_length >= minimum_payload) {
extensions_ptr = stream.pointer() + payload_length;
extensions_size = stream.size() - payload_length;
}
else if (stream.can_read(minimum_payload)) {
// This packet might be non-rfc compliant. In that case the length
// field can contain garbage.
extensions_ptr = stream.pointer() + minimum_payload;
extensions_size = stream.size() - minimum_payload;
}
else {
// No more special cases, this doesn't have extensions
return;
}
if (ICMPExtensionsStructure::validate_extensions(extensions_ptr, extensions_size)) {
extensions = ICMPExtensionsStructure(extensions_ptr, extensions_size);
stream.size(stream.size() - extensions_size);
}
}
} // Internals
} // Tins

2
src/icmp.cpp
View File

@@ -36,8 +36,8 @@
#include "utils.h"
#include "exceptions.h"
#include "icmp.h"
#include "internals.h"
#include "memory_helpers.h"
#include "detail/icmp_extension_helpers.h"
using std::memset;
using std::max;

2
src/icmpv6.cpp
View File

@@ -36,7 +36,7 @@
#include "constants.h"
#include "exceptions.h"
#include "memory_helpers.h"
#include "internals.h"
#include "detail/icmp_extension_helpers.h"
using std::memset;
using std::vector;

45
src/internals.cpp
View File

@@ -279,51 +279,6 @@ Constants::IP::e pdu_flag_to_ip_type(PDU::PDUType flag) {
};
}
uint32_t get_padded_icmp_inner_pdu_size(const PDU* inner_pdu, uint32_t pad_alignment) {
// This gets the size of the next pdu, padded to the next 32 bit word boundary
if (inner_pdu) {
uint32_t inner_pdu_size = inner_pdu->size();
uint32_t padding = inner_pdu_size % pad_alignment;
inner_pdu_size = padding ? (inner_pdu_size - padding + pad_alignment) : inner_pdu_size;
return inner_pdu_size;
}
else {
return 0;
}
}
void try_parse_icmp_extensions(InputMemoryStream& stream,
uint32_t payload_length,
ICMPExtensionsStructure& extensions) {
if (!stream) {
return;
}
// Check if this is one of the types defined in RFC 4884
const uint32_t minimum_payload = ICMPExtensionsStructure::MINIMUM_ICMP_PAYLOAD;
// Check if we actually have this amount of data and whether it's more than
// the minimum encapsulated packet size
const uint8_t* extensions_ptr;
uint32_t extensions_size;
if (stream.can_read(payload_length) && payload_length >= minimum_payload) {
extensions_ptr = stream.pointer() + payload_length;
extensions_size = stream.size() - payload_length;
}
else if (stream.can_read(minimum_payload)) {
// This packet might be non-rfc compliant. In that case the length
// field can contain garbage.
extensions_ptr = stream.pointer() + minimum_payload;
extensions_size = stream.size() - minimum_payload;
}
else {
// No more special cases, this doesn't have extensions
return;
}
if (ICMPExtensionsStructure::validate_extensions(extensions_ptr, extensions_size)) {
extensions = ICMPExtensionsStructure(extensions_ptr, extensions_size);
stream.size(stream.size() - extensions_size);
}
}
PDU::PDUType ip_type_to_pdu_flag(Constants::IP::e flag) {
switch(flag) {
case Constants::IP::PROTO_IPIP: