Changeset 5d233a5

Timestamp:

08/21/06 23:18:19 (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:

8e6ac85

Parents:

37168af

Message:

Convert pcapfile over to using byteswap{16,32}.
Fix typos in previous commit

Location:

lib

Files:

• format_pcap.c (modified) (1 diff)
• format_pcapfile.c (modified) (3 diffs)

lib/format_pcap.c

@@ -380 +380 @@
          * rt to do it for us 
          */
-        linktype = rt_to_pcap_dlt(packet->type);
+        int linktype = rt_to_pcap_dlt(packet->type);
         return pcap_dlt_to_libtrace(linktype);
 }

lib/format_pcapfile.c

@@ -80 +80 @@
                 return num;
         if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
-                return ((num<<8)&0xFF00)|((num>>8)&0x00FF);
+                return byteswap16(num);
+
         return num;
 }
@@ -92 +93 @@
                 return num;
         if (DATA(libtrace)->header.magic_number == 0xd4c3b2a1)
-                return 
-                           ((num&0x000000FF)<<24)
-                        || ((num&0x0000FF00)<<8)
-                        || ((num&0x00FF0000)>>8)
-                        || ((num&0xFF000000)>>24);
+                return byteswap32(num);
+
         return num;
 }
@@ -154 +152 @@
 }
 
-static int pcapfile_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
+static int pcapfile_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet)
+{
         int err;