Changeset 512:8fb7528db636 in roaraudio

Timestamp:

08/15/08 03:55:36 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use an union for all the sockaddr_*s

File:

• libroar/socket.c (modified) (4 diffs)

libroar/socket.c

@@ -227 +227 @@
 // int type = ROAR_SOCKET_TYPE_INET;
  int fh;
- struct sockaddr_in   socket_addr;
- struct sockaddr_un   socket_addr_un;
+ union {
+  struct sockaddr_in  in;
+  struct sockaddr_un  un;
+ } socket_addr;
  struct hostent     * he;
  //unsigned int host_div = 0;
@@ -295 +297 @@
  }
 
- memset(&socket_addr   , 0, sizeof(socket_addr));
- memset(&socket_addr_un, 0, sizeof(socket_addr_un));
+ memset(&socket_addr,    0, sizeof(socket_addr));
  memset(&he,             0, sizeof(he));               // FIXME: we have a valid pointer in here????
 
@@ -308 +309 @@
   }
 
-  memcpy((struct in_addr *)&socket_addr.sin_addr, he->h_addr, sizeof(struct in_addr));
+  memcpy((struct in_addr *)&socket_addr.in.sin_addr, he->h_addr, sizeof(struct in_addr));
 
   /* set the connect information */
-  socket_addr.sin_family = AF_INET;
-  socket_addr.sin_port = htons( port );
+  socket_addr.in.sin_family = AF_INET;
+  socket_addr.in.sin_port = htons( port );
 
   fh = roar_socket_new_tcp();
 
-  if ( mode_func(fh, (struct sockaddr *)&socket_addr, sizeof(struct sockaddr_in)) == -1 ) {
+  if ( mode_func(fh, (struct sockaddr *)&socket_addr.in, sizeof(struct sockaddr_in)) == -1 ) {
    ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno));
    close(fh);
@@ -323 +324 @@
   // hey! we have a socket...
  } else if ( type == ROAR_SOCKET_TYPE_UNIX ) {
-  socket_addr_un.sun_family = AF_UNIX;
-  strncpy(socket_addr_un.sun_path, host, sizeof(socket_addr_un.sun_path) - 1);
+  socket_addr.un.sun_family = AF_UNIX;
+  strncpy(socket_addr.un.sun_path, host, sizeof(socket_addr.un.sun_path) - 1);
 
   fh = roar_socket_new_unix();
 
-  if ( mode_func(fh, (struct sockaddr *)&socket_addr_un, sizeof(struct sockaddr_un)) == -1 ) {
+  if ( mode_func(fh, (struct sockaddr *)&socket_addr.un, sizeof(struct sockaddr_un)) == -1 ) {
    ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno));
    close(fh);