Changeset e7d66bf


Ignore:
Timestamp:
12/24/06 15:42:33 (14 years ago)
Author:
Perry Lorier <perry@…>
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:
ac0fdbf
Parents:
2a1a502
Message:

Squash the switch() warnings by defining the conversions we know are invalid,
or unresearched

File:
1 edited

Legend:

Unmodified
Added
Removed

  • lib/linktypes.c

    reb1aab2 re7d66bf  
    4242                case TRACE_DLT_IEEE802_11_RADIO: return TRACE_TYPE_80211_RADIO;
    4343                case TRACE_DLT_ATM_RFC1483: return TRACE_TYPE_LLCSNAP;
     44                /* Unhandled */
     45                case TRACE_DLT_NULL:    /* Raw IP frame with a BSD specific
     46                                         * header If you want raw L3 headers
     47                                         * use TRACE_DLT_RAW
     48                                         */
     49                        break;
    4450        }
    4551        return ~0U;
    … …  
    6066                case TRACE_TYPE_PFLOG: return TRACE_DLT_PFLOG;
    6167                case TRACE_TYPE_80211_RADIO: return TRACE_DLT_IEEE802_11_RADIO;
     68                case TRACE_TYPE_LLCSNAP: return TRACE_DLT_ATM_RFC1483;
     69                /* Below here are unsupported conversions */
     70                /* Dispite hints to the contrary, there is no DLT
     71                 * for 'raw atm packets that happen to be missing
     72                 * the HEC' or even 'raw atm packets that have a hec'.
     73                 *
     74                 * The closest are DLT_ATM_RFC1483 but that doesn't
     75                 * include the ATM header, only the LLCSNAP header.
     76                 */
    6277                case TRACE_TYPE_ATM:
    63                         /* Dispite hints to the contrary, there is no DLT
    64                          * for 'raw atm packets that happen to be missing
    65                          * the HEC' or even 'raw atm packets that have a hec'.
    66                          *
    67                          * The closest are DLT_ATM_RFC1483 but that doesn't
    68                          * include the ATM header, only the LLCSNAP header.
    69                          */
    70                         return ~0U;
    71                 case TRACE_TYPE_LLCSNAP: return TRACE_DLT_ATM_RFC1483;
    72                 default: break;
     78                /* pcap has no DLT for DUCK */
     79                case TRACE_TYPE_DUCK:
     80                /* Used for test traces within WAND */
     81                case TRACE_TYPE_80211_PRISM:   
     82                /* TODO: We haven't researched these yet */
     83                case TRACE_TYPE_POS:
     84                case TRACE_TYPE_HDLC_POS:
     85                case TRACE_TYPE_AAL5:
     86                        break;
    7387        }
    7488        return ~0U;
    … …  
    105119                case TRACE_TYPE_ATM:    return TYPE_ATM;
    106120                case TRACE_TYPE_AAL5:   return TYPE_AAL5;
    107                 case TRACE_TYPE_LLCSNAP: return -1;
    108                 default:                break;
     121                /* Unsupported conversions */
     122                case TRACE_TYPE_LLCSNAP:
     123                case TRACE_TYPE_DUCK:
     124                case TRACE_TYPE_80211_RADIO:
     125                case TRACE_TYPE_80211_PRISM:
     126                case TRACE_TYPE_80211:
     127                case TRACE_TYPE_POS:
     128                case TRACE_TYPE_PFLOG:
     129                case TRACE_TYPE_NONE:
     130                case TRACE_TYPE_LINUX_SLL:
     131                        break;
    109132        }
    110133        return -1;
Note: See TracChangeset for help on using the changeset viewer.