Changeset 6654714

Timestamp:

11/15/17 11:59:35 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

9993cde

Parents:

e844ff2

Message:

Fix various -Waddress-of-packed-member warnings on clang

Most of these fixes are casts to simply hide the issue from the
compiler -- not sure how (or even if) we can fix these properly.

Files:

• lib/protocols_l3.c (modified) (3 diffs)
• lib/protocols_transport.c (modified) (5 diffs)
• libpacketdump/libpacketdump.h (modified) (1 diff)
• libpacketdump/link_15.c (modified) (1 diff)

lib/protocols_l3.c

@@ -682 +682 @@
         uint16_t ethertype;
         uint32_t remaining;
-        uint16_t *csum_ptr;
+        char *csum_ptr;
 
         uint8_t safety[65536];
@@ -699 +699 @@
                         return NULL;
 
-                csum_ptr = &ip->ip_sum;
+                csum_ptr = (char *)(&ip->ip_sum);
 
                 /* I hate memcpys, but this is the only truly safe way to
@@ -716 +716 @@
                 *csum = ntohs(*csum);
                 
-                return csum_ptr;
+                return (uint16_t *)csum_ptr;
         }
 

lib/protocols_transport.c

@@ -448 +448 @@
         uint32_t sum = 0;
         uint8_t proto = 0;
-        uint16_t *csum_ptr = NULL;
+        char *csum_ptr = NULL;
         int plen = 0;
 
@@ -483 +483 @@
                 header = trace_get_payload_from_tcp(tcp, &remaining);
                 
-                csum_ptr = &tcp->check;
+                csum_ptr = (char *)(&tcp->check);
 
                 memcpy(ptr, tcp, tcp->doff * 4);
@@ -498 +498 @@
                 header = trace_get_payload_from_udp(udp, &remaining);
                 
-                csum_ptr = &udp->check;
+                csum_ptr = (char *)(&udp->check);
                 memcpy(ptr, udp, sizeof(libtrace_udp_t));
 
@@ -514 +514 @@
                 header = trace_get_payload_from_icmp(icmp, &remaining);
                 
-                csum_ptr = &icmp->checksum;
+                csum_ptr = (char *)(&icmp->checksum);
                 memcpy(ptr, icmp, sizeof(libtrace_icmp_t));
 
@@ -543 +543 @@
         //assert(0);
         
-        return csum_ptr;
+        return (uint16_t *)csum_ptr;
 }
 

libpacketdump/libpacketdump.h

@@ -47 +47 @@
 #define DISPLAYS(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,htons(hdr->x))
 #define DISPLAYL(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,htonl(hdr->x))
-#define DISPLAYIP(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,inet_ntoa(*(struct in_addr*)&hdr->x))
+#define DISPLAYIP(hdr,x,fmt) DISPLAY_EXP(hdr,x,fmt,inet_ntoa(*(struct in_addr*)(void *)(&hdr->x)))
 
 

libpacketdump/link_15.c

@@ -69 +69 @@
         
         /* Check for extended bitmasks */
-        ptr = (uint32_t *) &(rtap->it_present);
+        ptr = (uint32_t *) (char *)(&(rtap->it_present));
         
         if ( (rtap_pres) & (1 << TRACE_RADIOTAP_EXT) )