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

Use RadioTapParser/Writer in RadioTap

Browse Source
This commit is contained in:
Matias Fontanini
2017-05-25 07:56:23 -07:00
parent 8c7bf7d779
commit e1571e19a8
7 changed files with 224 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/utils/radiotap_writer.cpp
View File

@@ -29,6 +29,7 @@
#include <cmath>
#include "utils/radiotap_writer.h"
#include "utils/radiotap_parser.h"
#include "exceptions.h"
using std::vector;
@@ -48,7 +49,7 @@ RadioTapWriter::RadioTapWriter(vector<uint8_t>& buffer)
: buffer_(buffer) {
}
bool RadioTapWriter::write_option(const RadioTapParser::option& option) {
void RadioTapWriter::write_option(const RadioTap::option& option) {
const uint32_t bit = get_bit(option.option());
if (bit > RadioTapParser::MAX_RADIOTAP_FIELD) {
throw malformed_option();
@@ -62,8 +63,9 @@ bool RadioTapWriter::write_option(const RadioTapParser::option& option) {
break;
}
else if (parser.current_field() == option.option()) {
// We can't add the same option twice
return false;
memcpy(const_cast<uint8_t*>(parser.current_option_ptr()),
option.data_ptr(), option.data_size());
return;
}
else {
const uint32_t bit = get_bit(parser.current_field());
@@ -97,7 +99,6 @@ bool RadioTapWriter::write_option(const RadioTapParser::option& option) {
}
flags |= Endian::host_to_le<uint32_t>(option.option());
memcpy(&*buffer_.begin(), &flags, sizeof(flags));
return true;
}
// Builds a vector that will contain the padding required for every position.