Changeset f0c639b for test/test-wireless.c

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:

• test/test-wireless.c (modified) (4 diffs)

test/test-wireless.c

@@ -65 +65 @@
         uint64_t tsft;
         uint16_t freq, tmp16;
-        uint32_t fcs;
         uint8_t flags, rate, sdbm, ndbm, sdb, antenna, tmp8;
         
-        uint32_t total_fcs, expected_fcs = 3012874435;
         uint16_t total_freq, expected_freq = 24170;
         
@@ -98 +96 @@
         assert(trace_get_wireless_signal_strength_db(l,lt,&sdb));
         assert(trace_get_wireless_antenna(l,lt,&antenna));
-        assert(trace_get_wireless_fcs(l,lt,&fcs));
 
         /* Check that the fields that do not exist in this trace are
@@ -111 +108 @@
          * TODO: Check all fields :)
          */
-        total_fcs = fcs;
         total_freq = freq;
         
         while((result = trace_read_packet(trace, packet)) > 0) {
-                if(trace_get_wireless_fcs(l,lt,&fcs)) 
-                        total_fcs += fcs;
+                /* This trace has no FCS at the end of packets, so ensure
+                 * that wire-length is 4 bytes greater than capture length */
+                int caplen = trace_get_capture_length(packet);
+                int wirelen = trace_get_wire_length(packet);
+                assert(wirelen == caplen + 4);
                 if(trace_get_wireless_freq(l,lt,&freq)) 
                         total_freq += freq;
         }
 
-        assert(total_fcs == expected_fcs);
         assert(total_freq == expected_freq);
 
@@ -146 +144 @@
         assert(!trace_get_wireless_signal_strength_db(l,lt,&sdb));
         assert(!trace_get_wireless_antenna(l,lt,&antenna));
-        assert(!trace_get_wireless_fcs(l,lt,&fcs));
         assert(!trace_get_wireless_noise_strength_db(l,lt,&tmp8));
         assert(!trace_get_wireless_tx_attenuation(l,lt,&tmp16));