Changeset 7c3be58


Ignore:
Timestamp:
10/12/06 11:33:59 (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:
73da4ae
Parents:
be5bd17
Message:

Get mac addresses through radiotap headers, cleans up some warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/protocols.c

    r5069b69 r7c3be58  
    158158{
    159159        libtrace_sll_header_t *sll;
    160         void *ret;
    161160
    162161        sll = (libtrace_sll_header_t*) link;
     
    700699                        wifi=(libtrace_80211_t*)link;
    701700                        return (uint8_t*)&wifi->mac2;
     701                case TRACE_TYPE_80211_RADIO:
     702                        wifi=(libtrace_80211_t*)trace_get_payload_from_radiotap(
     703                                        link,NULL,NULL);
     704                        return (uint8_t*)&wifi->mac1;
    702705                case TRACE_TYPE_80211_PRISM:
    703706                        wifi=(libtrace_80211_t*)((char*)link+144);
     
    728731                case TRACE_TYPE_80211:
    729732                        wifi=(libtrace_80211_t*)link;
     733                        return (uint8_t*)&wifi->mac1;
     734                case TRACE_TYPE_80211_RADIO:
     735                        wifi=(libtrace_80211_t*)trace_get_payload_from_radiotap(
     736                                        link,NULL,NULL);
    730737                        return (uint8_t*)&wifi->mac1;
    731738                case TRACE_TYPE_80211_PRISM:
Note: See TracChangeset for help on using the changeset viewer.