Changeset dc6dc11

Timestamp:

11/08/07 12:45:37 (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:

3996329

Parents:

8f18776

Message:

Fix a bug in the previous commit

Files:

• lib/trace.c (modified) (1 diff)
• libpacketdump/link_15.c (modified) (3 diffs)
• libpacketdump/link_4.c (modified) (2 diffs)

lib/trace.c

@@ -710 +710 @@
                 return -1;
         }
-        if (packet->buf_control==TRACE_CTRL_PACKET || packet->buf_control==TRACE_CTRL_EXTERNAL) {
+        if (!(packet->buf_control==TRACE_CTRL_PACKET || packet->buf_control==TRACE_CTRL_EXTERNAL)) {
                 trace_set_err(libtrace,TRACE_ERR_BAD_STATE,"Packet passed to trace_read_packet() is invalid\n");
                 return -1;

libpacketdump/link_15.c

@@ -18 +18 @@
 void decode(int link_type,char *packet,unsigned len)
 {
+        uint8_t has_fcs = 0;
         uint32_t *ptr; 
         uint8_t *p; /* Our current field "cursor" */
@@ -62 +63 @@
         if (rtap->it_present & (1 << TRACE_RADIOTAP_FLAGS)) {
                 printf(" Radiotap: Flags = 0x%02x\n", *p);
+                has_fcs = *p & 0x10; /* Determine if the packet has an FCS attached */
                 p += sizeof (uint8_t);
                 rtap_real_len += sizeof(uint8_t);
+                
         }
 
@@ -178 +181 @@
                 printf(" Radiotap: WARNING: Header contains un-decoded fields.\n");
 
-        if (len > rtap_len) 
-                decode_next(packet + rtap_len, len - rtap_len, "link", TRACE_TYPE_80211);
+        if (len > rtap_len) {
+                unsigned pktlen = len - rtap_len;
+                if (has_fcs && pktlen >= 4) pktlen -= 4;
+                decode_next(packet + rtap_len, pktlen, "link", TRACE_TYPE_80211);
+                if (has_fcs && pktlen >= 4) {
+                        uint32_t *fcs;
+                        fcs = packet + rtap_len + pktlen - 4;
+                        printf(" 802.11MAC: FCS = 0x%4x\n", *fcs);
+                }
+        }
+                
                 
         return;

libpacketdump/link_4.c

@@ -201 +201 @@
                 if ( len < ( sizeof(ieee80211_ie) + ie->length)) {
                         printf("  [Truncated]\n");
+                        printf("  len = %u, sizeof_ie = %u, ie->len = %u\n",
+                                        len, sizeof(ieee80211_ie), ie->length);
                         return;
                 }
@@ -363 +365 @@
                                 printf("  Unknown IE Element ID, 0x%02x\n", ie->id);
                 }
-                len -= sizeof(ieee80211_ie) + ie->length;
+                len -= (sizeof(ieee80211_ie) + ie->length);
                 pkt = ((char *)pkt + sizeof(ieee80211_ie) + ie->length);
         }