Changeset 539 for trunk/src/ocateth.c

Timestamp:

02/05/10 11:59:17 (2 years ago)

Author:

eagle

Message:

pointer dereferences recoded in respect to strict alias checking of compiler

File:

• trunk/src/ocateth.c (modified) (2 diffs)

trunk/src/ocateth.c

@@ -250 +250 @@
 
    // tunnel header
-   *((uint32_t*) buf) = htonl(CNF(fhd_key[IPV6_KEY]));
+   set_tunheader(buf, htonl(CNF(fhd_key[IPV6_KEY])));
 
    // ethernet header
-   *((uint16_t*) ndp6->eth.ether_dhost) = 0x3333;
+   ndp6->eth.ether_dhost[0] = 0x33;
+   ndp6->eth.ether_dhost[1] = 0x33;
    memcpy(&ndp6->eth.ether_dhost[2], ((char*) &mcastd) + 12, 4);
    memcpy(ndp6->eth.ether_shost, CNF(ocat_hwaddr), ETHER_ADDR_LEN);
@@ -449 +450 @@
 
    // check ethernet destination
-   if ((*((uint16_t*) &ndp6->eth.ether_dhost) != 0x3333) && memcmp(ndp6->eth.ether_dhost, CNF(ocat_hwaddr), ETHER_ADDR_LEN))
+   if ((ndp6->eth.ether_dhost[0] != 0x33) && (ndp6->eth.ether_dhost[1] != 0x33) && memcmp(ndp6->eth.ether_dhost, CNF(ocat_hwaddr), ETHER_ADDR_LEN))
    {
       log_debug("unknown destination MAC");