Changeset 204872da


Ignore:
Timestamp:
09/15/11 11:58:07 (9 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:
24ca459
Parents:
e19ada0
Message:
  • Fixed annoying warnings caused by ERF types being defined multiple times, which happens if you build libtrace with DAG support
File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/erftypes.h

    r2c743a7 r204872da  
    5353 * a particular filter or classification */
    5454
     55#ifndef TYPE_LEGACY
    5556#define TYPE_LEGACY             0       /**< Legacy */
     57#endif
     58
     59#ifndef TYPE_HDLC_POS
    5660#define TYPE_HDLC_POS           1       /**< PoS with HDLC framing */
     61#endif
     62
     63#ifndef TYPE_ETH
    5764#define TYPE_ETH                2       /**< Ethernet */
     65#endif
     66
     67#ifndef TYPE_ATM
    5868#define TYPE_ATM                3       /**< ATM Cell */
     69#endif
     70
     71#ifndef TYPE_AAL5
    5972#define TYPE_AAL5               4       /**< AAL5 Frame */
     73#endif
     74
     75#ifndef TYPE_MC_HDLC
    6076#define TYPE_MC_HDLC            5       /**< Multi-channel HDLC */
     77#endif
     78
     79#ifndef TYPE_MC_RAW
    6180#define TYPE_MC_RAW             6       /**< Multi-channel Raw link record */
     81#endif
     82
     83#ifndef TYPE_MC_ATM
    6284#define TYPE_MC_ATM             7       /**< Multi-channel ATM Cell */
     85#endif
     86
     87#ifndef TYPE_MC_RAW_CHANNEL
    6388#define TYPE_MC_RAW_CHANNEL     8       /**< Multi-channel Raw link data */
     89#endif
     90
     91#ifndef TYPE_MC_AAL5
    6492#define TYPE_MC_AAL5            9       /**< Multi-channel AAL5 */
     93#endif
    6594
    6695/** PoS with HDLC framing and classification information in the loss counter
    6796 *  field */
     97#ifndef TYPE_COLOR_HDLC_POS
    6898#define TYPE_COLOR_HDLC_POS     10     
     99#endif
    69100
    70101/** Ethernet with classification information in the loss counter field */
     102#ifndef TYPE_COLOR_ETH
    71103#define TYPE_COLOR_ETH          11
     104#endif
    72105
    73106/** Multi-channel AAL2 */
     107#ifndef TYPE_MC_AAL2
    74108#define TYPE_MC_AAL2            12
     109#endif
    75110
    76111/** IP counter ERF record */
     112#ifndef TYPE_IP_COUNTER
    77113#define TYPE_IP_COUNTER         13
     114#endif
    78115
    79116/** TCP flow counter ERF record */
     117#ifndef TYPE_TCP_FLOW_COUNTER
    80118#define TYPE_TCP_FLOW_COUNTER   14
     119#endif
    81120
    82121/** PoS with HDLC framing with DSM color information in the loss counter field*/
     122#ifndef TYPE_DSM_COLOR_HDLC_POS
    83123#define TYPE_DSM_COLOR_HDLC_POS 15
     124#endif
    84125
    85126/** Ethernet with DSM color information in the loss counter field */
     127#ifndef TYPE_DSM_COLOR_ETH
    86128#define TYPE_DSM_COLOR_ETH      16
     129#endif
    87130
    88131/** Multi-channel HDLC with classification information in the loss counter
    89132 *  field */
     133#ifndef TYPE_COLOR_MC_HDLC_POS
    90134#define TYPE_COLOR_MC_HDLC_POS  17
     135#endif
    91136
    92137/** AAL2 Frame */
     138#ifndef TYPE_AAL2
    93139#define TYPE_AAL2               18
     140#endif
    94141
    95142/** Colored PoS HDLC record with Hash load balancing */
     143#ifndef TYPE_COLOR_HASH_POS
    96144#define TYPE_COLOR_HASH_POS     19
     145#endif
    97146
    98147/** Colored Ethernet with Hash load balancing */
     148#ifndef TYPE_COLOR_HASH_ETH
    99149#define TYPE_COLOR_HASH_ETH     20
     150#endif
    100151
    101152/** Infiniband */
     153#ifndef TYPE_INFINIBAND
    102154#define TYPE_INFINIBAND         21
     155#endif
    103156
    104157/** IPv4 */
     158#ifndef TYPE_IPV4
    105159#define TYPE_IPV4               22
     160#endif
    106161
    107162/** IPv6 */
     163#ifndef TYPE_IPV6
    108164#define TYPE_IPV6               23
     165#endif
    109166
    110167/** Raw link data, usually SONET or SDH */
     168#ifndef TYPE_RAW_LINK
    111169#define TYPE_RAW_LINK           24
     170#endif
    112171
    113172/** Padding record */
     173#ifndef TYPE_PAD
    114174#define TYPE_PAD                48
    115175#endif
     176
     177
     178#endif /* _ERFTYPES_H_ */
Note: See TracChangeset for help on using the changeset viewer.