cvs commit: apr/network_io/win32 sockets.c

[trawick]

trawick     02/02/22 12:12:27

  Modified:    network_io/os2 sockets.c
               network_io/unix sockets.c
               network_io/win32 sockets.c
  Log:
  add a little reminder that in this new code, as in existing
  code, we assume that sin_port and sin6_port are at the same
  offset
  
  Revision  Changes    Path
  1.50      +2 -0      apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sockets.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- sockets.c 22 Feb 2002 15:55:23 -0000      1.49
  +++ sockets.c 22 Feb 2002 20:12:27 -0000      1.50
  @@ -278,6 +278,7 @@
           memcpy(&(*apr_sock)->local_addr->sa.sin, 
                  os_sock_info->local, 
                  (*apr_sock)->local_addr->salen);
  +        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
           (*apr_sock)->local_addr->port = 
ntohs((*apr_sock)->local_addr->sa.sin.sin_port);
       }
       else {
  @@ -287,6 +288,7 @@
           memcpy(&(*apr_sock)->remote_addr->sa.sin, 
                  os_sock_info->remote,
                  (*apr_sock)->remote_addr->salen);
  +        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
           (*apr_sock)->remote_addr->port = 
ntohs((*apr_sock)->remote_addr->sa.sin.sin_port);
       }
           
  
  
  
  1.93      +2 -0      apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- sockets.c 22 Feb 2002 15:55:23 -0000      1.92
  +++ sockets.c 22 Feb 2002 20:12:27 -0000      1.93
  @@ -358,6 +358,7 @@
           memcpy(&(*apr_sock)->local_addr->sa.sin, 
                  os_sock_info->local, 
                  (*apr_sock)->local_addr->salen);
  +        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
           (*apr_sock)->local_addr->port = 
ntohs((*apr_sock)->local_addr->sa.sin.sin_port);
       }
       else {
  @@ -370,6 +371,7 @@
           memcpy(&(*apr_sock)->remote_addr->sa.sin, 
                  os_sock_info->remote,
                  (*apr_sock)->remote_addr->salen);
  +        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
           (*apr_sock)->remote_addr->port = 
ntohs((*apr_sock)->remote_addr->sa.sin.sin_port);
       }
           
  
  
  
  1.72      +3 -1      apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- sockets.c 22 Feb 2002 15:55:23 -0000      1.71
  +++ sockets.c 22 Feb 2002 20:12:27 -0000      1.72
  @@ -390,6 +390,7 @@
                  os_sock_info->local, 
                  (*apr_sock)->local_addr->salen);
           (*apr_sock)->local_addr->pool = cont;
  +        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
           (*apr_sock)->local_addr->port = 
ntohs((*apr_sock)->local_addr->sa.sin.sin_port);
       }
       else {
  @@ -400,6 +401,7 @@
                  os_sock_info->remote,
                  (*apr_sock)->remote_addr->salen);
           (*apr_sock)->remote_addr->pool = cont;
  +        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
           (*apr_sock)->remote_addr->port = 
ntohs((*apr_sock)->remote_addr->sa.sin.sin_port);
       }
           
  @@ -432,4 +434,4 @@
   
   APR_DECLARE_UNSET_INHERIT(socket) {
       return;
  -}
  \ No newline at end of file
  +}