Changeset ce0bf2c


Ignore:
Timestamp:
04/27/07 21:15:02 (15 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:
9514ca0
Parents:
6ba9d7b
Message:

Deal with the wrong function name (it was renamed)
Pass the right type

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/format_pcapfile.c

    r73dd29f rce0bf2c  
    432432                /* Include the missing FCS */
    433433                return swapl(packet->trace,pcapptr->wirelen)+4;
    434         else if (packet->type==pcap_linktype_to_rt(TRACE_DLT_IEEE802_11_RADIO)) {
     434        else if (packet->type==pcap_linktype_to_rt(TRACE_DLT_IEEE802_11_RADIO)){
    435435                /* If the packet is Radiotap and the flags field indicates
    436436                 * that the FCS is not included in the 802.11 frame, then
    437437                 * we need to add 4 to the wire-length to account for it.
    438438                 */
    439                 uint16_t flags;
    440                 trace_get_wireless_flags(trace_get_link(packet), trace_get_link_type(packet), &flags);
     439                uint8_t flags;
     440                trace_get_wireless_flags(trace_get_link(packet),
     441                                trace_get_link_type(packet), &flags);
    441442                if ((flags & TRACE_RADIOTAP_F_FCS) == 0)
    442443                        return swapl(packet->trace,pcapptr->wirelen)+4;
  • lib/libtrace_int.h

    r4c00a35 rce0bf2c  
    362362
    363363libtrace_linktype_t pcap_linktype_to_libtrace(libtrace_dlt_t linktype);
     364libtrace_rt_types_t pcap_linktype_to_rt(libtrace_dlt_t linktype);
    364365libtrace_dlt_t libtrace_to_pcap_linktype(libtrace_linktype_t type);
    365366libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type);
    366 libtrace_rt_types_t pcap_dlt_to_rt(libtrace_dlt_t linktype);
    367367libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type);
    368368libtrace_linktype_t erf_type_to_libtrace(uint8_t erf);
Note: See TracChangeset for help on using the changeset viewer.