Ignore:
Timestamp:
03/26/07 11:47:31 (14 years ago)
Author:
Scott Raynel <smr26@…>
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:
38f9537
Parents:
be22b51
Message:
  • Remove trace_get_wireless_fcs as it is no longer part of the Radiotap standard.
  • Update trace_get_wire_length to account for the presence (or absence) of FCS bytes at the end of wireless frames. (only pcap and pcapfile for now)
  • Update radiotap libpacketdump decoder to no longer output non-standard FCS field.
  • Update test-wireless to ensure new length functions work correctly.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_pcapfile.c

    rc85b715 rf0c639b  
    432432                /* Include the missing FCS */
    433433                return swapl(packet->trace,pcapptr->wirelen)+4;
    434         else
    435                 return swapl(packet->trace,pcapptr->wirelen);
     434        else if (packet->type==pcap_dlt_to_rt(TRACE_DLT_IEEE802_11_RADIO)) {
     435                /* If the packet is Radiotap and the flags field indicates
     436                 * that the FCS is not included in the 802.11 frame, then
     437                 * we need to add 4 to the wire-length to account for it.
     438                 */
     439                uint16_t flags;
     440                trace_get_wireless_flags(trace_get_link(packet), trace_get_link_type(packet), &flags);
     441                if ((flags & TRACE_RADIOTAP_F_FCS) == 0)
     442                        return swapl(packet->trace,pcapptr->wirelen)+4;
     443        }
     444        return swapl(packet->trace,pcapptr->wirelen);
    436445}
    437446
Note: See TracChangeset for help on using the changeset viewer.