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

Fix some big endian issues

Browse Source
This commit is contained in:
Matias Fontanini
2017-05-31 19:42:22 -07:00
parent 77d965784e
commit ca3127ffbc
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/radiotap_parser.cpp
View File

@@ -290,8 +290,7 @@ bool RadioTapParser::skip_current_field() {
bool RadioTapParser::advance_to_next_namespace() {
const uint32_t initial_index = namespace_index_;
load_current_flags();
const RadioTapFlags* flags = (const RadioTapFlags*)&current_flags_;
const RadioTapFlags* flags = get_flags_ptr();
while (flags->ext == 1) {
if (is_field_set(29, flags)) {
current_namespace_ = RADIOTAP_NS;
@@ -303,9 +302,9 @@ bool RadioTapParser::advance_to_next_namespace() {
current_namespace_ = UNKNOWN_NS;
}
namespace_index_++;
load_current_flags();
flags = (const RadioTapFlags*)&current_flags_;
flags++;
}
load_current_flags();
return initial_index != namespace_index_;
}
@@ -325,6 +324,7 @@ const RadioTapFlags* RadioTapParser::get_flags_ptr() const {
void RadioTapParser::load_current_flags() {
memcpy(&current_flags_, get_flags_ptr(), sizeof(current_flags_));
current_flags_ = Endian::le_to_host(current_flags_);
}
} // Utils

4
tests/src/ipv6_test.cpp
View File

@@ -192,10 +192,6 @@ TEST_F(IPv6Test, Serialize) {
TEST_F(IPv6Test, Broken1) {
EthernetII pkt(broken1, sizeof(broken1));
for (auto c : pkt.serialize()) {
printf("%2d, ", (int)c);
}
printf("\n");
EXPECT_EQ(
PDU::serialization_type(broken1, broken1 + sizeof(broken1)),
pkt.serialize()