Changeset 11c0f44

Timestamp:

06/18/08 11:06:45 (13 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

41c254d

Parents:

c5f3398

Message:

• Added support for skipping past PPPoE headers when calling trace_get_layer3
• Fixed byte order issues in the libpacketdump PPPoE decoder
• Fixed PPP header definition to match the RFC definition

Files:

• lib/libtrace.h.in (modified) (1 diff)
• lib/protocols.h (modified) (1 diff)
• lib/protocols_l2.c (modified) (2 diffs)
• lib/protocols_l3.c (modified) (2 diffs)
• libpacketdump/eth_34916.c (modified) (1 diff)

lib/libtrace.h.in

@@ -579 +579 @@
 
 /** PPP header */
-typedef struct libtrace_pps
+typedef struct libtrace_ppp
 {
- uint8_t addres;                /**< PPP Address (0xFF - All stations) */
- uint8_t header;                /**< PPP Control (0x03 - Unnumbered info) */
+ /* I can't figure out where the hell these two variables come from. They're
+  * definitely not in RFC 1661 which defines PPP. Probably some weird thing
+  * relating to the lack of distinction between PPP, HDLC and CHDLC */
+        
+/* uint8_t address; */          /**< PPP Address (0xFF - All stations) */
+/* uint8_t header;  */          /**< PPP Control (0x03 - Unnumbered info) */
  uint16_t protocol;             /**< PPP Protocol (htons(0x0021) - IPv4 */
 } PACKED libtrace_ppp_t;
+
+/** PPPoE header */
+typedef struct libtrace_pppoe
+{
+ LT_BITFIELD8 version:4;        /**< Protocol version number */
+ LT_BITFIELD8 type:4;           /**< PPPoE Type */
+ uint8_t code;                  /**< PPPoE Code */
+ uint16_t session_id;           /**< Session Identifier */
+ uint16_t length;               /**< Total Length of the PPP packet */
+} PACKED libtrace_pppoe_t;
 
 /** 802.11 header */

lib/protocols.h

@@ -18 +18 @@
                 uint16_t *type,
                 uint32_t *remaining);
+void *trace_get_payload_from_pppoe(void *link, uint16_t *type, 
+                uint32_t *remaining);
 /* l3 definitions */
 struct ports_t {

lib/protocols_l2.c

@@ -182 +182 @@
                 switch(ntohs(ppp->protocol)) {
                         case 0x0021: *type = 0x0800; break;
+                        /* If it isn't IP, then it is probably PPP control and
+                         * I can't imagine anyone caring about that too much
+                         */
+                        default: *type = 0; break;
                 }
         }
@@ -188 +192 @@
         return (void*)((char *)ppp+sizeof(*ppp));
 }
+
+void *trace_get_payload_from_pppoe(void *link, uint16_t *type, 
+                uint32_t *remaining) {
+        if (remaining) {
+                if (*remaining <= sizeof(libtrace_pppoe_t)) {
+                        *remaining = 0;
+                        return NULL;
+                }
+                *remaining -= sizeof(libtrace_pppoe_t);
+        }
+        
+        /* PPPoE is always followed by PPP */
+        return trace_get_payload_from_ppp(link + sizeof(libtrace_pppoe_t),
+                        type, remaining);
+}
+        
 
 typedef struct libtrace_chdlc_t {

lib/protocols_l3.c

@@ -153 +153 @@
         for(;;) {
                 if (!iphdr || *remaining == 0)
-                        return NULL;
+                        break;
                 switch(*ethertype) {
                 case 0x8100: /* VLAN */
@@ -167 +167 @@
                                                 iphdr,ethertype,remaining);
                         }
+                        continue;
+                case 0x8864: /* PPPoE */
+                        iphdr = trace_get_payload_from_pppoe(iphdr, ethertype,
+                                        remaining);
                         continue;
                 default:

libpacketdump/eth_34916.c

@@ -27 +27 @@
         printf(" PPPoE: Type: %d\n",pppoe->type);
         printf(" PPPoE: Code: %d\n",pppoe->code);
-        printf(" PPPoE: Session: %d\n",pppoe->session);
-        printf(" PPPoE: Length: %d\n",pppoe->length);
+        printf(" PPPoE: Session: %d\n",ntohs(pppoe->session));
+        printf(" PPPoE: Length: %d\n",ntohs(pppoe->length));
 
         /* Meh.. pass it off to eth decoder */