decode/pppoe: CDPCP as a known protocol

Cisco Discovery Protocol Control Protocol may be sent over pppoe.
We should allow it to help network functions.

diff --git a/src/decode-ppp.c b/src/decode-ppp.c
index 7d502e290e218e09fc57c715b26f6af075ce430c..8820e1121a805e7b92ccfaa8825b79790dc0b552 100644 (file)
--- a/src/decode-ppp.c
+++ b/src/decode-ppp.c
@@ -138,6 +138,7 @@ static int DecodePPPUncompressedProto(ThreadVars *tv, DecodeThreadVars *dtv, Pac
         case PPP_LQM:
         case PPP_CBCP:
         case PPP_COMP_DGRAM:
+        case PPP_CDPCP:
             /* Valid types to be in PPP but don't inspect validity. */
             return TM_ECODE_OK;
 

diff --git a/src/decode-ppp.h b/src/decode-ppp.h
index a5ed9766d593dcb77ccb42e964e043017d193210..caefd413233549cd90d03693d9e85a24351cf900 100644 (file)
--- a/src/decode-ppp.h
+++ b/src/decode-ppp.h
@@ -54,6 +54,7 @@
 #define PPP_STIICP     0x8033 /* Stream Protocol Control Protocol */
 #define PPP_VINESCP    0x8035 /* Banyan Vines Control Protocol */
 #define PPP_IPV6CP     0x8057 /* IPv6 Control Protocol */
+#define PPP_CDPCP      0x8207 /* Cisco Discovery Protocol Control Protocol */
 #define PPP_MPLSCP     0x8281 /* rfc 3022 */
 #define PPP_LCP        0xc021 /* Link Control Protocol */
 #define PPP_PAP        0xc023 /* Password Authentication Protocol */

diff --git a/src/decode-pppoe.c b/src/decode-pppoe.c
index bf138878465c019981302c515ae365c53fd7c088..d5998f9d819fd2f3a1a5f8d199ab52a2dc90d6bc 100644 (file)
--- a/src/decode-pppoe.c
+++ b/src/decode-pppoe.c
@@ -199,6 +199,7 @@ int DecodePPPOESession(
             case PPP_LQM:
             case PPP_CBCP:
             case PPP_COMP_DGRAM:
+            case PPP_CDPCP:
                 /* Valid types to be in PPP but don't inspect validity. */
                 break;