aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampus <campus@ntop.org>2017-07-29 23:44:47 +0200
committerCampus <campus@ntop.org>2017-07-29 23:44:47 +0200
commita90b97bc10a392b34344c89c59d059260c184b50 (patch)
tree77e6fa5debd373473503fa26bbbe777b4411faee
parentf336f1a340b4d6bf417fab56e76b5a7937b8b368 (diff)
fix wrong datalink type for Cisco PPP
-rw-r--r--example/ndpi_util.c3
-rwxr-xr-xtests/do.sh1
-rw-r--r--tests/result/BGP_Cisco_hdlc_slarp.pcap.out3
3 files changed, 5 insertions, 2 deletions
diff --git a/example/ndpi_util.c b/example/ndpi_util.c
index 96a88a8e5..1fc3af15a 100644
--- a/example/ndpi_util.c
+++ b/example/ndpi_util.c
@@ -652,8 +652,9 @@ struct ndpi_proto ndpi_workflow_process_packet (struct ndpi_workflow * workflow,
type = ntohs(chdlc->proto_code);
break;
- /* Cisco PPP with HDLC framing - 104 */
+ /* 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);
diff --git a/tests/do.sh b/tests/do.sh
index 55f94a3e9..7516e5997 100755
--- a/tests/do.sh
+++ b/tests/do.sh
@@ -1,4 +1,3 @@
-
READER="../example/ndpiReader -p ../example/protos.txt"
RC=0
diff --git a/tests/result/BGP_Cisco_hdlc_slarp.pcap.out b/tests/result/BGP_Cisco_hdlc_slarp.pcap.out
index e69de29bb..719f185b6 100644
--- a/tests/result/BGP_Cisco_hdlc_slarp.pcap.out
+++ b/tests/result/BGP_Cisco_hdlc_slarp.pcap.out
@@ -0,0 +1,3 @@
+BGP 14 969 1
+
+ 1 TCP 100.16.1.2:18324 <-> 100.16.1.1:179 [proto: 13/BGP][7 pkts/388 bytes <-> 7 pkts/581 bytes]