From 6027a7c7995eda54905f126f3495b4fea8515c5c Mon Sep 17 00:00:00 2001 From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> Date: Wed, 21 Oct 2020 22:27:42 +0200 Subject: [PATCH] Fix parsing of DLT_PPP datalink type (#1042) --- example/reader_util.c | 11 ++++++++--- tests/pcap/dlt_ppp.pcap | Bin 0 -> 1270 bytes tests/result/dlt_ppp.pcap.out | 8 ++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 tests/pcap/dlt_ppp.pcap create mode 100644 tests/result/dlt_ppp.pcap.out diff --git a/example/reader_util.c b/example/reader_util.c index 3853aa919..c212597ac 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -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 */ diff --git a/tests/pcap/dlt_ppp.pcap b/tests/pcap/dlt_ppp.pcap new file mode 100644 index 0000000000000000000000000000000000000000..feef559d04ade6c250bc4aff13d73c9f245f126e GIT binary patch literal 1270 zcmVn;;1ONce1ONa4Aw>cN z%t1Xs06!58Gr^|-{K2PWWUMm*y9BrZ0MGvb038gs5-B>H6!HwvS=^`um}$Y+07RB_ zI>t@WxqMWY?>i|ddh2a7M~ql)Pch;-@aZwrfe_5ebE9~z~)&6@F zJ7ac8qS28pqs6>xW88gK^mA4OLXHmZ;Sn`9Ie*P*n~jVH-^UV_OfP8YwK1VJV`>g1 zdf{5YZRr!G%fwiHed*s{CM=|Zvg1kD?@fNrd5_5}p{}+dghHwvRK?Ht<8Pd~_MAhj z2l3hr{?gLpH4{uN(^%99J_eInJpfq`6tzQ%1jGh@OF8$|anAr>`4{Wq#1K7C_^bwq(`? z476Uk!9TQg(~vLU>RrBq6L}4@5{~-W{DYWTTcEb)iB)^ghcaCA&@ZD8$*%k#Hc~A) z=G}a6@b5cp+*uRk^e5KZOMTDubZBz2?*cN#0c4CpwevHiK*vk2+wG*qD|jr_5wGKK zhCgCvZ6f>IRNHXXSm-)XRld5V4;M#l`Z|4G)j>bz`cN(2@7RWS^b>=FJ2{Jcrr!CY zIoq%1W5jVh2SJ(Dv*8^`Q2&kniilGZ>*CJh=&}#}5j50M*4nal;q*WLNbYq25GQ8y zI!H2gragP?W(dKr*{db5YP2a!jYkwxuHhCbKzPnip0TO~qpYzOUni@PF&Fa4S|+74 zP5mLdo3aR>z&)+`8sxa22NEK#>NuxAze(VadiOLvS=m=8$#Yw%^2wuVDP5`;l_$=9Ea*$%SfSu| zs>^@f8S^5O8lUDLjYTR<3jiPKU?rNKUREeOE! z|GnH&0N?XP5Hk|E++*ubWJnKE^ki#Hk?cpBEL&a<+ZIt5@M2#q`|Q2{Ic@nW@iWfh zmk*FBn%{Ke$0u?`K3mF0X6U-rpEdZ}L=Gio=l<}Zp--v;XZG@y<7(63HRVM*3G%9Q zE$6Ry-TFp%aG>7 193.167.100.100:443 [proto: 188/QUIC][cat: Web/5][1 pkts/1230 bytes -> 0 pkts/0 bytes][Goodput ratio: 97/0][< 1 sec][ALPN: hq-29][TLS Supported Versions: TLSv1.3;TLSv1.3 (draft);TLSv1.3 (draft);TLSv1.3 (draft)][TLSv1.3][Client: server4][JA3C: fe94e313a5d76fb687c85443cdfa8170][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0]