Changeset fa8f439

Timestamp:

May 5, 2009, 1:43:48 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e1b136bf

Parents:

c0b1a40

Message:

Woah!  I know strict aliasing!

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• libfaim/ft.c (modified) (3 diffs)

libfaim/ft.c

@@ -253 +253 @@
 {
         int acceptfd = 0;
-        struct sockaddr addr;
+        union { struct sockaddr sa; struct sockaddr_in sin; } addr;
         socklen_t addrlen = sizeof(addr);
         int ret = 0;
@@ -260 +260 @@
         int port;
 
-        if ((acceptfd = accept(cur->fd, &addr, &addrlen)) == -1)
+        if ((acceptfd = accept(cur->fd, &addr.sa, &addrlen)) == -1)
                 return 0; /* not an error */
 
-        if ((addr.sa_family != AF_INET) && (addr.sa_family != AF_INET6)) { /* just in case IPv6 really is happening */
+        if (addr.sa.sa_family != AF_INET) { /* This code needs way more help to get IPv6 right. */
                 close(acceptfd);
                 aim_conn_close(cur);
@@ -269 +269 @@
         }
 
-        strncpy(ip, inet_ntoa(((struct sockaddr_in *)&addr)->sin_addr), sizeof(ip));
-        port = ntohs(((struct sockaddr_in *)&addr)->sin_port);
+        strncpy(ip, inet_ntoa(addr.sin.sin_addr), sizeof(ip));
+        port = ntohs(addr.sin.sin_port);
 
         if (!(newconn = aim_cloneconn(sess, cur))) {