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

Code cleanup and use same syntax on the entire project

Browse Source 
Initial code cleanup

More code cleanup

Cleanup more code

Cleanup Dot11 code

Fix OSX build issue

Cleanup examples

Fix ref and pointer declaration syntax

Fix braces
This commit is contained in:
Matias Fontanini
2016-01-02 08:17:59 -08:00
parent f5a82b1a17
commit d84f10cf08
177 changed files with 13203 additions and 12272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/stp.cpp
View File

@@ -33,89 +33,89 @@
#include "exceptions.h"
#include "memory_helpers.h"
using std::copy;
using Tins::Memory::InputMemoryStream;
using Tins::Memory::OutputMemoryStream;
namespace Tins {
STP::STP()
: _header()
{
: header_() {
}
STP::STP(const uint8_t *buffer, uint32_t total_sz)
{
STP::STP(const uint8_t* buffer, uint32_t total_sz) {
InputMemoryStream stream(buffer, total_sz);
stream.read(_header);
stream.read(header_);
}
void STP::proto_id(uint16_t new_proto_id) {
_header.proto_id = Endian::host_to_be(new_proto_id);
header_.proto_id = Endian::host_to_be(new_proto_id);
}
void STP::proto_version(uint8_t new_proto_version) {
_header.proto_version = new_proto_version;
header_.proto_version = new_proto_version;
}
void STP::bpdu_type(uint8_t new_bpdu_type) {
_header.bpdu_type = new_bpdu_type;
header_.bpdu_type = new_bpdu_type;
}
void STP::bpdu_flags(uint8_t new_bpdu_flags) {
_header.bpdu_flags = new_bpdu_flags;
header_.bpdu_flags = new_bpdu_flags;
}
void STP::root_path_cost(uint32_t new_root_path_cost) {
_header.root_path_cost = Endian::host_to_be(new_root_path_cost);
header_.root_path_cost = Endian::host_to_be(new_root_path_cost);
}
void STP::port_id(uint16_t new_port_id) {
_header.port_id = Endian::host_to_be(new_port_id);
header_.port_id = Endian::host_to_be(new_port_id);
}
void STP::msg_age(uint16_t new_msg_age) {
_header.msg_age = Endian::host_to_be<uint16_t>(new_msg_age * 256);
header_.msg_age = Endian::host_to_be<uint16_t>(new_msg_age * 256);
}
void STP::max_age(uint16_t new_max_age) {
_header.max_age = Endian::host_to_be<uint16_t>(new_max_age * 256);
header_.max_age = Endian::host_to_be<uint16_t>(new_max_age * 256);
}
void STP::hello_time(uint16_t new_hello_time) {
_header.hello_time = Endian::host_to_be<uint16_t>(new_hello_time * 256);
header_.hello_time = Endian::host_to_be<uint16_t>(new_hello_time * 256);
}
void STP::fwd_delay(uint16_t new_fwd_delay) {
_header.fwd_delay = Endian::host_to_be<uint16_t>(new_fwd_delay * 256);
header_.fwd_delay = Endian::host_to_be<uint16_t>(new_fwd_delay * 256);
}
STP::bpdu_id_type STP::root_id() const {
return convert(_header.root_id);
return convert(header_.root_id);
}
STP::bpdu_id_type STP::bridge_id() const {
return convert(_header.bridge_id);
return convert(header_.bridge_id);
}
void STP::root_id(const bpdu_id_type &id) {
_header.root_id = convert(id);
void STP::root_id(const bpdu_id_type& id) {
header_.root_id = convert(id);
}
void STP::bridge_id(const bpdu_id_type &id) {
_header.bridge_id = convert(id);
void STP::bridge_id(const bpdu_id_type& id) {
header_.bridge_id = convert(id);
}
void STP::write_serialization(uint8_t *buffer, uint32_t total_sz, const PDU *) {
void STP::write_serialization(uint8_t* buffer, uint32_t total_sz, const PDU *) {
OutputMemoryStream stream(buffer, total_sz);
stream.write(_header);
stream.write(header_);
}
uint32_t STP::header_size() const {
return sizeof(_header);
return sizeof(header_);
}
STP::bpdu_id_type STP::convert(const pvt_bpdu_id &id) {
STP::bpdu_id_type STP::convert(const pvt_bpdu_id& id) {
bpdu_id_type result(id.priority, 0, id.id);
#if TINS_IS_LITTLE_ENDIAN
result.ext_id = (id.ext_id << 8) | id.ext_idL;
@@ -125,10 +125,10 @@ STP::bpdu_id_type STP::convert(const pvt_bpdu_id &id) {
return result;
}
STP::pvt_bpdu_id STP::convert(const bpdu_id_type &id) {
STP::pvt_bpdu_id STP::convert(const bpdu_id_type& id) {
pvt_bpdu_id result;
result.priority = id.priority;
std::copy(id.id.begin(), id.id.end(), result.id);
copy(id.id.begin(), id.id.end(), result.id);
#if TINS_IS_LITTLE_ENDIAN
result.ext_id = (id.ext_id >> 8) & 0xf;
result.ext_idL = id.ext_id & 0xff;
@@ -137,5 +137,5 @@ STP::pvt_bpdu_id STP::convert(const bpdu_id_type &id) {
#endif
return result;
}
}
} // Tins