Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/ftp sync with recent kAME.



details:   https://anonhg.NetBSD.org/src/rev/68a7f779d3bb
branches:  trunk
changeset: 476006:68a7f779d3bb
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Sep 03 04:29:57 1999 +0000

description:
sync with recent kAME.
- avoid s6_addr{8,16,32} which are nonstanard.

diffstat:

 usr.bin/ftp/ftp.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r b89230e4df24 -r 68a7f779d3bb usr.bin/ftp/ftp.c
--- a/usr.bin/ftp/ftp.c Fri Sep 03 04:26:31 1999 +0000
+++ b/usr.bin/ftp/ftp.c Fri Sep 03 04:29:57 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftp.c,v 1.59 1999/09/01 05:03:42 itojun Exp $  */
+/*     $NetBSD: ftp.c,v 1.60 1999/09/03 04:29:57 itojun Exp $  */
 
 /*
  * Copyright (C) 1997 and 1998 WIDE Project.
@@ -67,7 +67,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c      8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.59 1999/09/01 05:03:42 itojun Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.60 1999/09/03 04:29:57 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -1512,14 +1512,14 @@
                                memset(&data_addr, 0, sizeof(data_addr));
                                data_addr.su_family = AF_INET6;
                                data_addr.su_len = sizeof(struct sockaddr_in6);
-                               data_addr.su_sin6.sin6_addr.s6_addr32[0] =
-                                       htonl(pack4(addr, 0));
-                               data_addr.su_sin6.sin6_addr.s6_addr32[1] =
-                                       htonl(pack4(addr, 4));
-                               data_addr.su_sin6.sin6_addr.s6_addr32[2] =
-                                       htonl(pack4(addr, 8));
-                               data_addr.su_sin6.sin6_addr.s6_addr32[3] =
-                                       htonl(pack4(addr, 12));
+                           {
+                               u_int32_t *p32;
+                               p32 = (u_int32_t *)&data_addr.su_sin6.sin6_addr;
+                               p32[0] = htonl(pack4(addr, 0));
+                               p32[1] = htonl(pack4(addr, 4));
+                               p32[2] = htonl(pack4(addr, 8));
+                               p32[3] = htonl(pack4(addr, 12));
+                           }
                                data_addr.su_port = htons(pack2(port, 0));
                                break;
                        default:



Home | Main Index | Thread Index | Old Index