decode/ppp: add missing types definitions

Recognize PPP_CCP, PPP_CBCP and PPP_COMP_DGRAM.

Does not implement decoders for these record types, so these
are logged as unsupported types. Was "wrong_type" before.

(cherry picked from commit 516441b6005f4200ae155f5234cfd0ad20d2dfbc)

diff --git a/src/decode-ppp.c b/src/decode-ppp.c
index 2e558ab5bf51aabcd1489846282120774cb409a7..1d22b255893fa383e46bedce14c39f6faf6fd1ac 100644 (file)
--- a/src/decode-ppp.c
+++ b/src/decode-ppp.c
@@ -158,6 +158,9 @@ static int DecodePPPUncompressedProto(ThreadVars *tv, DecodeThreadVars *dtv, Pac
         case PPP_PAP:
         case PPP_LQM:
         case PPP_CHAP:
+        case PPP_CCP:
+        case PPP_CBCP:
+        case PPP_COMP_DGRAM:
             ENGINE_SET_EVENT(p,PPP_UNSUP_PROTO);
             return TM_ECODE_OK;
 

diff --git a/src/decode-ppp.h b/src/decode-ppp.h
index f8914cf2e77dd9d6f11857e7d329bd1c0c11ec45..66894b03d710a9793765802c83fde1e2cb400670 100644 (file)
--- a/src/decode-ppp.h
+++ b/src/decode-ppp.h
@@ -59,6 +59,9 @@
 #define PPP_PAP        0xc023       /* Password Authentication Protocol */
 #define PPP_LQM        0xc025       /* Link Quality Monitoring */
 #define PPP_CHAP       0xc223       /* Challenge Handshake Authentication Protocol */
+#define PPP_CCP        0x80fd       /* Compression Control Protocol */
+#define PPP_CBCP       0xc029       /* Callback Control Protocol CBCP */
+#define PPP_COMP_DGRAM 0x00fd       /* Compressed datagram */
 
 /** PPP Packet header */
 typedef struct PPPHdr_ {