ad422ed7ea
- deprecate MPLSoEth and MPLSoGRE; replace with generic MPLS tunnel. - deprecates CLI 'mpls encap ..'; replace with addition of MPLS out label to a route/tunnel. - support for MPLS 'routes', e.g. MPLS x-connects. - deprecates CLI 'mpls decap ..'; replace with 'mpls route .. ' Change-Id: Ibda46544912f880d0200f22bf9ff9b52828fcc2f Signed-off-by: Neale Ranns <nranns@cisco.com>
14 lines
425 B
Diff
14 lines
425 B
Diff
diff --git a/scapy/contrib/mpls.py b/scapy/contrib/mpls.py
|
|
index 640a0c5..6af1d4a 100644
|
|
--- a/scapy/contrib/mpls.py
|
|
+++ b/scapy/contrib/mpls.py
|
|
@@ -18,6 +18,8 @@ class MPLS(Packet):
|
|
|
|
def guess_payload_class(self, payload):
|
|
if len(payload) >= 1:
|
|
+ if not self.s:
|
|
+ return MPLS
|
|
ip_version = (ord(payload[0]) >> 4) & 0xF
|
|
if ip_version == 4:
|
|
return IP
|