Changeset ce0bf2c

Timestamp:

04/27/07 21:15:02 (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:

9514ca0

Parents:

6ba9d7b

Message:

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

Location:

lib

Files:

• format_pcapfile.c (modified) (1 diff)
• libtrace_int.h (modified) (1 diff)

lib/format_pcapfile.c

@@ -432 +432 @@
                 /* Include the missing FCS */
                 return swapl(packet->trace,pcapptr->wirelen)+4; 
-        else if (packet->type==pcap_linktype_to_rt(TRACE_DLT_IEEE802_11_RADIO)) {
+        else if (packet->type==pcap_linktype_to_rt(TRACE_DLT_IEEE802_11_RADIO)){
                 /* If the packet is Radiotap and the flags field indicates
                  * that the FCS is not included in the 802.11 frame, then
                  * we need to add 4 to the wire-length to account for it.
                  */
-                uint16_t flags;
-                trace_get_wireless_flags(trace_get_link(packet), trace_get_link_type(packet), &flags);
+                uint8_t flags;
+                trace_get_wireless_flags(trace_get_link(packet),
+                                trace_get_link_type(packet), &flags);
                 if ((flags & TRACE_RADIOTAP_F_FCS) == 0)
                         return swapl(packet->trace,pcapptr->wirelen)+4;

lib/libtrace_int.h

@@ -362 +362 @@
 
 libtrace_linktype_t pcap_linktype_to_libtrace(libtrace_dlt_t linktype);
+libtrace_rt_types_t pcap_linktype_to_rt(libtrace_dlt_t linktype);
 libtrace_dlt_t libtrace_to_pcap_linktype(libtrace_linktype_t type);
 libtrace_dlt_t libtrace_to_pcap_dlt(libtrace_linktype_t type);
-libtrace_rt_types_t pcap_dlt_to_rt(libtrace_dlt_t linktype);
 libtrace_dlt_t rt_to_pcap_linktype(libtrace_rt_types_t rt_type);
 libtrace_linktype_t erf_type_to_libtrace(uint8_t erf);