From: Wesley van der Ree <wesley.vanderree@fox-it.com>
Date: Tue, 15 Oct 2019 13:08:58 +0000 (+0200)
Subject: mpls: Allow MPLS after vlan.
X-Git-Tag: suricata-5.0.1~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf1b65558b23f8a70dd07529c3c4234cf2a51297;p=thirdparty%2Fsuricata.git

mpls: Allow MPLS after vlan.

Fixes #2771
---

diff --git a/src/decode-vlan.c b/src/decode-vlan.c
index d9424c9f9a..979014bc9b 100644
--- a/src/decode-vlan.c
+++ b/src/decode-vlan.c
@@ -130,6 +130,11 @@ int DecodeVLAN(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
             break;
         case ETHERNET_TYPE_ARP:
             break;
+        case ETHERNET_TYPE_MPLS_UNICAST:
+        case ETHERNET_TYPE_MPLS_MULTICAST:
+            DecodeMPLS(tv, dtv, p, pkt + VLAN_HEADER_LEN,
+                       len - VLAN_HEADER_LEN, pq);
+            break;
         default:
             SCLogDebug("unknown VLAN type: %" PRIx32 "", proto);
             ENGINE_SET_INVALID_EVENT(p, VLAN_UNKNOWN_TYPE);