From 0ff702ff0fab85153e7783784e7f2b6baba97579 Mon Sep 17 00:00:00 2001 From: Pierre LALET <pierre.lalet@cea.fr> Date: Wed, 9 Aug 2017 15:01:54 +0200 Subject: [PATCH] Add PPP link types --- scapy/data.py | 3 +++ scapy/layers/ppp.py | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/scapy/data.py b/scapy/data.py index 33224223..a3a9b588 100644 --- a/scapy/data.py +++ b/scapy/data.py @@ -32,6 +32,9 @@ ARPHDR_TUN = 65534 # From pcap/dlt.h DLT_NULL = 0 +DLT_PPP = 9 +DLT_PPP_SERIAL = 50 +DLT_PPP_ETHER = 51 DLT_RAW = 101 DLT_IPV4 = 228 DLT_IPV6 = 229 diff --git a/scapy/layers/ppp.py b/scapy/layers/ppp.py index 8ebd2cea..f195ac2c 100644 --- a/scapy/layers/ppp.py +++ b/scapy/layers/ppp.py @@ -10,6 +10,8 @@ PPP (Point to Point Protocol) """ import struct +from scapy.config import conf +from scapy.data import DLT_PPP, DLT_PPP_SERIAL, DLT_PPP_ETHER from scapy.packet import Packet, bind_layers from scapy.layers.eap import EAP from scapy.layers.l2 import Ether, CookedLinux, GRE_PPTP @@ -709,3 +711,8 @@ bind_layers( PPP, PPP_PAP, proto=0xc023) bind_layers( Ether, PPP_IPCP, type=0x8021) bind_layers( Ether, PPP_ECP, type=0x8053) bind_layers( GRE_PPTP, PPP, proto=0x880b) + + +conf.l2types.register(DLT_PPP, PPP) +conf.l2types.register(DLT_PPP_SERIAL, HDLC) +conf.l2types.register(DLT_PPP_ETHER, PPPoE) -- GitLab