Changeset 539

Timestamp:

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

Author:

eagle

Message:

pointer dereferences recoded in respect to strict alias checking of compiler

Location:

trunk/src

Files:

• ocat.h (modified) (1 diff)
• ocateth.c (modified) (2 diffs)
• ocatroute.c (modified) (5 diffs)

trunk/src/ocat.h

@@ -524 +524 @@
 void set_select_timeout(struct timeval *);
 void set_nonblock(int);
+void set_tunheader(char *, uint32_t);
+uint32_t get_tunheader(char *);
 
 /* ocatthread.c */

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");

trunk/src/ocatroute.c

@@ -265 +265 @@
 
 
+void set_tunheader(char *buf, uint32_t tunhdr)
+{
+   uint32_t *ibuf = (uint32_t*) buf;
+   *ibuf = tunhdr;
+}
+
+
+uint32_t get_tunheader(char *buf)
+{
+   uint32_t *ibuf = (uint32_t*) buf;
+   return *ibuf;
+}
+
+
 void *socket_receiver(void *p)
 {
@@ -512 +526 @@
                   else
                   {
-                     *((uint32_t*) buf) = *peer->tunhdr;
+                     set_tunheader(buf, *peer->tunhdr);
                      memcpy(buf + 4 + sizeof(struct ether_header), peer->fragbuf, len);
                      memcpy(eh->ether_shost, CNF(ocat_hwaddr), ETHER_ADDR_LEN);
@@ -864 +878 @@
       }
 
-      if (*((uint32_t*) buf) == CNF(fhd_key[IPV6_KEY]))
+      if (get_tunheader(buf) == CNF(fhd_key[IPV6_KEY]))
       {
          if (((rlen - 4) < IP6HLEN))
@@ -883 +897 @@
             dest = &((struct ip6_hdr*) &buf[4])->ip6_dst;
       }
-      else if (*((uint32_t*) buf) == CNF(fhd_key[IPV4_KEY]))
+      else if (get_tunheader(buf) == CNF(fhd_key[IPV4_KEY]))
       {
          if (((rlen - 4) < IPHDLEN))
@@ -904 +918 @@
       else
       {
-         log_msg(LOG_ERR, "protocol 0x%08x not supported. dropping frame.", ntohl(*((uint32_t*) buf)));
+         log_msg(LOG_ERR, "protocol 0x%08x not supported. dropping frame.", ntohl(get_tunheader(buf)));
          continue;
       }