initial PPPoE decoder commit

src/Makefile.am

@@ -10,6 +10,7 @@ decode.c decode.h \
 decode-ethernet.c decode-ethernet.h \
 decode-sll.c decode-sll.h \
 decode-ppp.c decode-ppp.h \
+decode-pppoe.c decode-pppoe.h \
 decode-ipv4.c decode-ipv4.h \
 decode-ipv6.c decode-ipv6.h \
 decode-icmpv4.c decode-icmpv4.h \

src/decode-ethernet.c

@@ -27,6 +27,10 @@ void DecodeEthernet(ThreadVars *t, Packet *p, u_int8_t *pkt, u_int16_t len, Pack
     } else if(ntohs(ethh->eth_type) == ETHERNET_TYPE_IPV6) {
         //printf("DecodeEthernet ip6\n");
         DecodeIPV6(t, p, pkt + ETHERNET_HEADER_LEN, len - ETHERNET_HEADER_LEN);
+	} else if(ntohs(ethh->eth_type) == ETHERNET_TYPE_PPPoE_SESS) {
+		//printf("DecodeEthernet PPPoE\n");
+		PerfCounterIncr(COUNTER_DECODER_PPPOE, t->pca);
+		DecodePPPoE(t, p, pkt + PPPOE_HEADER_LEN, len - PPPOE_HEADER_LEN, pq);
 	}
 
     return;

src/decode-events.h

@@ -47,6 +47,10 @@ enum {
     PPPIPV4_PKT_TOO_SMALL,
     PPPIPV6_PKT_TOO_SMALL,
     PPP_WRONG_TYPE,
+
+	/* PPPOE EVENTS */
+    PPPOE_PKT_TOO_SMALL,
+ };
 };
 
 #endif /* __DECODE_EVENTS_H__ */

src/decode-pppoe.c

@@ -0,0 +1,80 @@
+/**
+ * \file Copyright (c) 2009 Open Infosec Foundation
+ * \author James Riden <jamesr@europe.com>
+ *
+ * PPPoE Decoder
+ */
+
+#include "eidps.h"
+
+#include "packet-queue.h"
+
+#include "decode.h"
+#include "decode-ppp.h"
+#include "decode-pppoe.h"
+#include "decode-events.h"
+
+#include "util-unittest.h"
+
+/**
+ * \brief Main decoding function for PPPoE packets
+ */
+void DecodePPPoE(ThreadVars *t, Packet *p, u_int8_t *pkt, u_int16_t len, PacketQueue *pq)
+{
+#ifdef DEBUG
+	printf("DecodePPPoEPacket\n");
+#endif
+
+	if (len < PPPOE_HEADER_LEN) {
+		DECODER_SET_EVENT(p, PPPOE_PKT_TOO_SMALL);
+		return;
+	}
+
+	p->pppoeh = (PPPoEHdr *)pkt;
+
+	if (p->pppoeh == NULL)
+		return;
+
+	if (p->pppoeh->pppoe_length>0) {
+		/* decode contained PPP packet */
+		PerfCounterIncr(COUNTER_DECODER_PPP, t->pca);
+		DecodePPP(t, p, pkt + PPPOE_HEADER_LEN, len - PPPOE_HEADER_LEN, pq);
+	}
+
+}
+
+/** DecodePPPoEtest01
+ *  /brief Decode malformed PPPoE packet (too short)
+ *  /retval Expected test value: 1
+ */
+static int DecodePPPoEtest01 (void)   {
+
+	/* 0000  ff ff ff ff ff ff 00 0a e4 13 31 a3 81 00 03 98   ..........1.....
+	   0010  81 00 00 80 88 63 11 09 00 00 00 08 01 01 00 00   .....c..........
+	   0020  01 00 00 00 */
+
+    u_int8_t raw_pppoe[] = { 0x11, 0x00, 0x00, 0x00, 0x00 };
+    Packet p;
+    ThreadVars tv;
+
+    memset(&tv, 0, sizeof(ThreadVars));
+    memset(&p, 0, sizeof(Packet));
+
+    DecodePPPoE(&tv, &p, raw_pppoe, sizeof(raw_pppoe), NULL);
+
+    /* Function my returns here with expected value */
+
+    if(DECODER_ISSET_EVENT(&p,PPPOE_PKT_TOO_SMALL))  {
+	    return 1;
+    }
+
+    return 0;
+}
+
+/**
+ * \brief Registers PPPoE unit test
+ * \todo More PPPoE tests
+ */
+void DecodePPPoERegisterTests(void) {
+    UtRegisterTest("DecodePPPoEtest01", DecodePPPoEtest01, 1);
+}

src/decode-pppoe.h

@@ -0,0 +1,39 @@
+/**
+ * \file Copyright (c) 2009 Open Infosec Foundation
+ * \author James Riden <jamesr@europe.com>
+ *
+ * PPPoE Decoder header file
+ */
+
+#ifndef __DECODE_PPPOE_H__
+#define __DECODE_PPPOE_H__
+
+#include <sys/types.h>
+#include <pcap.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <net/if.h>
+
+#include "decode.h"
+#include "threadvars.h"
+
+#define PPPOE_HEADER_LEN 6
+
+typedef struct _PPPoEHdr
+{
+	unsigned pppoe_version :4;
+	unsigned pppoe_type :4;
+	u_int8_t pppoe_code;
+	u_int16_t sessin_id;
+	u_int16_t pppoe_length;
+} PPPoEHdr;
+
+#define PPPOE_CODE_PADI 0x09
+#define PPPOE_CODE_PADO 0x07
+#define PPPOE_CODE_PADR 0x19
+#define PPPOE_CODE_PADS 0x65
+#define PPPOE_CODE_PADT 0xa7
+
+void DecodePPPoERegisterTests(void);
+
+#endif /* __DECODE_PPPOE_H__ */

src/decode.h

@@ -33,6 +33,7 @@
 
 #include "decode-ethernet.h"
 #include "decode-ppp.h"
+#include "decode-pppoe.h"
 #include "decode-sll.h"
 #include "decode-ipv4.h"
 #include "decode-ipv6.h"
@@ -239,6 +240,7 @@ typedef struct Packet_
     /* header pointers */
     EthernetHdr *ethh;
     PPPHdr *ppph;
+    PPPoEHdr *pppoeh;
 
     IPV4Hdr *ip4h;
     IPV4Vars ip4vars;
@@ -377,6 +379,7 @@ typedef struct PacketQueue_ {
 void DecodeEthernet(ThreadVars *, Packet *, u_int8_t *, u_int16_t, PacketQueue *);
 void DecodeSll(ThreadVars *, Packet *, u_int8_t *, u_int16_t, PacketQueue *);
 void DecodePPP(ThreadVars *, Packet *, u_int8_t *, u_int16_t, PacketQueue *);
+void DecodePPPoE(ThreadVars *, Packet *, u_int8_t *, u_int16_t, PacketQueue *);
 void DecodeTunnel(ThreadVars *, Packet *, u_int8_t *, u_int16_t, PacketQueue *);
 void DecodeIPV4(ThreadVars *, Packet *, u_int8_t *, u_int16_t, PacketQueue *);
 void DecodeIPV6(ThreadVars *, Packet *, u_int8_t *, u_int16_t);

src/eidps.c

@@ -947,6 +947,7 @@ int main(int argc, char **argv)
         PerfRegisterTests();
         DecodePPPRegisterTests();
         HTTPParserRegisterTests();
+		DecodePPPoERegisterTests();
         UtRunTests();
         UtCleanup();
         exit(0);

src/source-pcap.c

@@ -337,6 +337,8 @@ int DecodePcapThreadInit(ThreadVars *tv, void *initdata, void **data)
                         &tv->pctx, TYPE_Q_AVERAGE, 1);
     PerfRegisterCounter("decoder.max_pkt_size", "DecodePcap", TYPE_UINT64, "NULL",
                         &tv->pctx, TYPE_Q_MAXIMUM, 1);
+    PerfRegisterCounter("decoder.pppoe", "DecodePcap", TYPE_UINT64, "NULL",
+                        &tv->pctx, TYPE_Q_NONE, 1);
 
     tv->pca = PerfGetAllCountersArray(&tv->pctx);
 

src/source-pcap.h

@@ -25,6 +25,7 @@ void TmModuleDecodePcapRegister (void);
 #define COUNTER_DECODER_PPP    11
 #define COUNTER_DECODER_AVG_PKT_SIZE 12
 #define COUNTER_DECODER_MAX_PKT_SIZE 13
+#define COUNTER_DECODER_PPPOE  14
 
 /* per packet Pcap vars */
 typedef struct PcapPacketVars_