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

Added correct parsing of PPPoE session packets.

Browse Source
This commit is contained in:
Matias Fontanini
2014-09-24 09:15:20 -03:00
parent 1bc9bd1504
commit 3ad96422b9
4 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/internals.cpp
View File

@@ -86,6 +86,7 @@ Tins::PDU *pdu_from_flag(Constants::Ethernet::e flag, const uint8_t *buffer,
case Tins::Constants::Ethernet::ARP:
return new ARP(buffer, size);
case Tins::Constants::Ethernet::PPPOED:
case Tins::Constants::Ethernet::PPPOES:
return new PPPoE(buffer, size);
case Tins::Constants::Ethernet::EAPOL:
return EAPOL::from_bytes(buffer, size);

53
src/pppoe.cpp
View File

@@ -32,6 +32,7 @@
#endif
#include <cstring>
#include "pppoe.h"
#include "rawpdu.h"
#include "exceptions.h"
namespace Tins {
@@ -52,27 +53,37 @@ PPPoE::PPPoE(const uint8_t *buffer, uint32_t total_sz)
buffer += sizeof(_header);
total_sz -= sizeof(_header);
total_sz = std::min(total_sz, (uint32_t)payload_length());
const uint8_t *end = buffer + total_sz;
while(buffer < end) {
if(buffer + sizeof(uint32_t) * 2 > end)
throw malformed_packet();
uint16_t opt_type;
std::memcpy(&opt_type, buffer, sizeof(uint16_t));
uint16_t opt_len;
std::memcpy(&opt_len, buffer + sizeof(uint16_t), sizeof(uint16_t));
buffer += sizeof(uint16_t) * 2;
total_sz -= sizeof(uint16_t) * 2;
if(Endian::be_to_host(opt_len) > total_sz)
throw malformed_packet();
add_tag(
tag(
static_cast<TagTypes>(opt_type),
Endian::be_to_host(opt_len),
buffer
)
);
buffer += Endian::be_to_host(opt_len);
total_sz -= Endian::be_to_host(opt_len);
// If this is a session data packet
if(code() == 0) {
if(total_sz > 0) {
inner_pdu(
new RawPDU(buffer, total_sz)
);
}
}
else {
const uint8_t *end = buffer + total_sz;
while(buffer < end) {
if(buffer + sizeof(uint32_t) * 2 > end)
throw malformed_packet();
uint16_t opt_type;
std::memcpy(&opt_type, buffer, sizeof(uint16_t));
uint16_t opt_len;
std::memcpy(&opt_len, buffer + sizeof(uint16_t), sizeof(uint16_t));
buffer += sizeof(uint16_t) * 2;
total_sz -= sizeof(uint16_t) * 2;
if(Endian::be_to_host(opt_len) > total_sz)
throw malformed_packet();
add_tag(
tag(
static_cast<TagTypes>(opt_type),
Endian::be_to_host(opt_len),
buffer
)
);
buffer += Endian::be_to_host(opt_len);
total_sz -= Endian::be_to_host(opt_len);
}
}
}