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

STP is now serialized correctly. LLC behaves correctly when it contains an STP is its inner pdu.

Browse Source
This commit is contained in:
Matias Fontanini
2013-04-16 01:05:06 -03:00
parent 9631734805
commit 38ccb4413b
5 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/llc.cpp
View File

@@ -30,9 +30,8 @@
#include <stdexcept>
#include <cstring>
#include <cassert>
#include "pdu.h"
#include "llc.h"
#include "stp.h"
#include "rawpdu.h"
using std::list;
@@ -86,8 +85,12 @@ LLC::LLC(const uint8_t *buffer, uint32_t total_sz) {
buffer += 2;
total_sz -= 2;
}
if(total_sz > 0)
inner_pdu(new Tins::RawPDU(buffer, total_sz));
if(total_sz > 0) {
if(dsap() == 0x42 && ssap() == 0x42)
inner_pdu(new Tins::STP(buffer, total_sz));
else
inner_pdu(new Tins::RawPDU(buffer, total_sz));
}
}
void LLC::group(bool value) {
@@ -201,6 +204,10 @@ void LLC::clear_information_fields() {
void LLC::write_serialization(uint8_t *buffer, uint32_t total_sz, const Tins::PDU *parent) {
assert(total_sz >= header_size());
if(inner_pdu() && inner_pdu()->pdu_type() == PDU::STP) {
dsap(0x42);
ssap(0x42);
}
std::memcpy(buffer, &_header, sizeof(_header));
buffer += sizeof(_header);
switch (type()) {
@@ -219,7 +226,6 @@ void LLC::write_serialization(uint8_t *buffer, uint32_t total_sz, const Tins::PD
}
for (list<field_type>::const_iterator it = information_fields.begin(); it != information_fields.end(); it++) {
//std::memcpy(buffer, it->second, it->first);
std::copy(it->begin(), it->end(), buffer);
buffer += it->size();
}