Changeset 17ffb8a for lib/libtrace.h

Timestamp:

10/21/05 15:06:26 (16 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:

006bbf7

Parents:

41660d5

Message:

• Fixed packed vs packed issues
• Fixed wrong prototype for format_wag

File:

• lib/libtrace.h (modified) (6 diffs)

lib/libtrace.h

@@ -122 +122 @@
     struct in_addr ip_src;              /**< source address */
     struct in_addr ip_dst;              /**< dest address */
-} __attribute__ ((__packed__));
+} __attribute__ ((packed));
 
 /** Structure for dealing with TCP packets */
@@ -157 +157 @@
     u_int16_t check;            /**< Checksum */
     u_int16_t urg_ptr;          /**< Urgent Pointer */
-} __attribute__ ((__packed__));
+} __attribute__ ((packed));
 
 /** UDP Header for dealing with UDP packets */
@@ -165 +165 @@
   u_int16_t     len;            /**< Length */
   u_int16_t     check;          /**< Checksum */
-} __attribute__ ((__packed__));
+} __attribute__ ((packed));
 
 /** ICMP Header for dealing with icmp packets */
@@ -187 +187 @@
     } frag;                     /**< path mtu discovery */
   } un;                         /**< Union for payloads of various icmp codes */
-} __attribute__ ((__packed__));
+} __attribute__ ((packed));
 
 /** 802.3 frame */
@@ -195 +195 @@
   u_int8_t ether_shost[6];      /* source ether addr */
   u_int16_t ether_type;         /* packet type ID field (next-header) */
-} __attribute__ ((__packed__));
+} __attribute__ ((packed));
 
 /** 802.1Q frame */
@@ -207 +207 @@
   u_int16_t vlan_id:12;          /* vlan id */
   u_int16_t vlan_ether_type;     /* vlan sub-packet type ID field (next-header)*/
-} __attribute__ ((__packed__));
+} __attribute__ ((packed));
 
 /** Prints help information for libtrace