sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

POSIX PCAP: Platform agnostic MAC address discovery

Browse Source
This commit is contained in:
Paul Hollinsky
2019-05-06 13:48:42 -04:00
parent ea8e6e6316
commit 4e0ed09d71
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/posix/pcap.cpp
+3 -4
View File
@@ -2,13 +2,13 @@
#include "icsneo/communication/network.h"
#include "icsneo/communication/communication.h"
#include "icsneo/communication/packetizer.h"
#include "icsneo/platform/posix/macaddr.h"
#include <codecvt>
#include <chrono>
#include <iostream>
#include <cstring>
#include <sys/types.h>
#include <sys/socket.h>
#include <netpacket/packet.h>
using namespace icsneo;
@@ -52,9 +52,8 @@ std::vector<PCAP::PCAPFoundDevice> PCAP::FindAll() {
pcap_addr* currentAddress = dev->addresses;
bool hasAddress = false;
while(!hasAddress && currentAddress != nullptr) {
if(currentAddress->addr && currentAddress->addr->sa_family == AF_PACKET) {
struct sockaddr_ll* s = (struct sockaddr_ll*)currentAddress->addr;
memcpy(netif.macAddress, s->sll_addr, sizeof(netif.macAddress));
if(currentAddress->addr && currentAddress->addr->sa_family == ICSNEO_AF_MACADDR) {
memcpy(netif.macAddress, PLATFORM_MAC_FROM_SOCKADDR(currentAddress->addr), sizeof(netif.macAddress));
hasAddress = true;
break;
}