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

Remove inclusion of algorithm almost everywhere

Browse Source
This commit is contained in:
Matias Fontanini
2017-04-30 18:51:55 -07:00
parent 58a4d336b9
commit a07b3e8a3a
19 changed files with 87 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ethernetII.cpp
View File

@@ -28,7 +28,6 @@
*/
#include <cstring>
#include <algorithm>
#include "macros.h"
#ifndef _WIN32
#if defined(BSD) || defined(__FreeBSD_kernel__)
@@ -48,8 +47,6 @@
#include "memory_helpers.h"
#include "detail/pdu_helpers.h"
using std::equal;
using Tins::Memory::InputMemoryStream;
using Tins::Memory::OutputMemoryStream;
@@ -144,10 +141,9 @@ bool EthernetII::matches_response(const uint8_t* ptr, uint32_t total_sz) const {
if (total_sz < sizeof(header_)) {
return false;
}
const size_t addr_sz = address_type::address_size;
const ethernet_header* eth_ptr = (const ethernet_header*)ptr;
if (equal(header_.src_mac, header_.src_mac + addr_sz, eth_ptr->dst_mac)) {
if (equal(header_.src_mac, header_.src_mac + addr_sz, eth_ptr->dst_mac) ||
if (address_type(header_.src_mac) == address_type(eth_ptr->dst_mac)) {
if (address_type(header_.src_mac) == address_type(eth_ptr->dst_mac) ||
!dst_addr().is_unicast()) {
return inner_pdu() ?
inner_pdu()->matches_response(ptr + sizeof(header_), total_sz - sizeof(header_)) :