Changeset 11c0f44 for lib/libtrace.h.in


Ignore:
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
File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace.h.in

    rae8ec56 r11c0f44  
    579579
    580580/** PPP header */
    581 typedef struct libtrace_pps
     581typedef struct libtrace_ppp
    582582{
    583  uint8_t addres;                /**< PPP Address (0xFF - All stations) */
    584  uint8_t header;                /**< PPP Control (0x03 - Unnumbered info) */
     583 /* I can't figure out where the hell these two variables come from. They're
     584  * definitely not in RFC 1661 which defines PPP. Probably some weird thing
     585  * relating to the lack of distinction between PPP, HDLC and CHDLC */
     586       
     587/* uint8_t address; */          /**< PPP Address (0xFF - All stations) */
     588/* uint8_t header;  */          /**< PPP Control (0x03 - Unnumbered info) */
    585589 uint16_t protocol;             /**< PPP Protocol (htons(0x0021) - IPv4 */
    586590} PACKED libtrace_ppp_t;
     591
     592/** PPPoE header */
     593typedef struct libtrace_pppoe
     594{
     595 LT_BITFIELD8 version:4;        /**< Protocol version number */
     596 LT_BITFIELD8 type:4;           /**< PPPoE Type */
     597 uint8_t code;                  /**< PPPoE Code */
     598 uint16_t session_id;           /**< Session Identifier */
     599 uint16_t length;               /**< Total Length of the PPP packet */
     600} PACKED libtrace_pppoe_t;
    587601
    588602/** 802.11 header */
Note: See TracChangeset for help on using the changeset viewer.