Fix parsing of DLT_PPP datalink type (#1042)

This commit is contained in:
Ivan Nardi
2020-10-21 22:27:42 +02:00
committed by GitHub
parent 9dac9945c9
commit 6027a7c799
3 changed files with 16 additions and 3 deletions
+8 -3
View File
@@ -1637,9 +1637,14 @@ struct ndpi_proto ndpi_workflow_process_packet(struct ndpi_workflow * workflow,
/* Cisco PPP - 9 or 104 */
case DLT_C_HDLC:
case DLT_PPP:
chdlc = (struct ndpi_chdlc *) &packet[eth_offset];
ip_offset = sizeof(struct ndpi_chdlc); /* CHDLC_OFF = 4 */
type = ntohs(chdlc->proto_code);
if(packet[0] == 0x0f || packet[0] == 0x8f) {
chdlc = (struct ndpi_chdlc *) &packet[eth_offset];
ip_offset = sizeof(struct ndpi_chdlc); /* CHDLC_OFF = 4 */
type = ntohs(chdlc->proto_code);
} else {
ip_offset = 2;
type = ntohs(*((u_int16_t*)&packet[eth_offset]));
}
break;
/* IEEE 802.3 Ethernet - 1 */