Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/pcapInterface.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,24 @@ void profinet_pcap_callback(unsigned char *args, const struct pcap_pkthdr *packe
struct ether_header header;
memcpy(&header, packet, sizeof(header));

if (header.ether_type != htons(ETH_P_8021Q)) return;

const int packetLength = packetInfo->len;
int payloadOffset;

if (header.ether_type == htons(ETH_P_8021Q)) {
/* 802.1Q tagged frame: 4-byte VLAN tag after Ethernet header */
payloadOffset = (int) sizeof(struct ether_header) + 4;
} else if (header.ether_type == htons(0x8892)) {
/* Untagged Profinet frame */
payloadOffset = (int) sizeof(struct ether_header);
} else {
return;
}

const int profinetPacketSize = packetLength - (int) sizeof(struct ether_header) - 4;
const int profinetPacketSize = packetLength - payloadOffset;
if (profinetPacketSize <= 0) return;

unsigned char profinetPacketRaw[profinetPacketSize];
memcpy(profinetPacketRaw, packet + sizeof(struct ether_header) + 4, profinetPacketSize);
memcpy(profinetPacketRaw, packet + payloadOffset, profinetPacketSize);

struct profinet_dcp_header dcpHeader;
memcpy(&dcpHeader, profinetPacketRaw, sizeof(dcpHeader));
Expand Down