This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Re: glibc-2.1.97 fixes from USAGI Project
- To: drepper at redhat dot com
- Subject: Re: glibc-2.1.97 fixes from USAGI Project
- From: Hideaki YOSHIFUJI ($B5HF#1QL@(B
) <yoshfuji at ecei dot tohoku dot ac dot jp>
- Date: Tue, 07 Nov 2000 13:48:57 +0900
- Cc: libc-alpha at sources dot redhat dot com, usagi-core at linux-ipv6 dot org
- References: <20001107125313X.yoshfuji@linux-ipv6.org><m3y9yw77lw.fsf@otr.mynet.cygnus.com>
In article <m3y9yw77lw.fsf@otr.mynet.cygnus.com> (at 06 Nov 2000 20:02:03 -0800), Ulrich Drepper <drepper@redhat.com> says:
> Thanks for the patch but it's far too late for 2.2. I'll not add it
> before the release.
We're so disappointed to hear that.
We may provide such patches in our site and we should tell
distibutors to appply them in their distribution.
> Also, I won't add the patches for #4 above. IPv6 ins Linux 2.2 is
> broken. Therefore people who are honest about using IPv6 have to
> update. It is wrong to pollute the code with compatibility code for
> non-standard broken code.
It is not broken even it is based on old standard.
Anyway, this removes it.
Index: inet/getnameinfo.c
===================================================================
RCS file: /cvsroot/usagi/libc/glibc22/inet/getnameinfo.c,v
retrieving revision 1.1.1.2.4.6
retrieving revision 1.1.1.2.4.7
diff -u -r1.1.1.2.4.6 -r1.1.1.2.4.7
--- inet/getnameinfo.c 2000/11/06 04:59:00 1.1.1.2.4.6
+++ inet/getnameinfo.c 2000/11/07 04:26:49 1.1.1.2.4.7
@@ -1,4 +1,4 @@
-/* $USAGI: getnameinfo.c,v 1.1.1.2.4.6 2000/11/06 04:59:00 yoshfuji Exp $ */
+/* $USAGI: getnameinfo.c,v 1.1.1.2.4.7 2000/11/07 04:26:49 yoshfuji Exp $ */
/* The Inner Net License, Version 2.00
@@ -195,7 +195,7 @@
return -1;
break;
case AF_INET6:
- if (addrlen < sizeof (struct __sockaddr_in6_rfc2133))
+ if (addrlen < sizeof (struct sockaddr_in6))
return -1;
break;
default:
@@ -304,8 +304,7 @@
c = inet_ntop (AF_INET6,
(void *) &sin6p->sin6_addr, host, hostlen);
- if (addrlen >= sizeof (struct sockaddr_in6)
- && (scopeid = sin6p->sin6_scope_id))
+ if (scopeid = sin6p->sin6_scope_id)
{
/* Buffer is >= IFNAMSIZ+1. */
char scopebuf[IFNAMSIZ + 1]={SCOPE_DELIMITER};
Index: inet/netinet/in.h
===================================================================
RCS file: /cvsroot/usagi/libc/glibc22/inet/netinet/in.h,v
retrieving revision 1.1.1.1.4.2
retrieving revision 1.1.1.1.4.3
diff -u -r1.1.1.1.4.2 -r1.1.1.1.4.3
--- inet/netinet/in.h 2000/11/06 04:59:00 1.1.1.1.4.2
+++ inet/netinet/in.h 2000/11/07 04:26:49 1.1.1.1.4.3
@@ -1,5 +1,3 @@
-/* $USAGI: in.h,v 1.1.1.1.4.2 2000/11/06 04:59:00 yoshfuji Exp $ */
-
/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -214,15 +212,6 @@
struct in6_addr sin6_addr; /* IPv6 address */
uint32_t sin6_scope_id; /* IPv6 scope-id */
};
-#ifdef __USE_GNU
-struct __sockaddr_in6_rfc2133
- {
- __SOCKADDR_COMMON (__sin6_);
- in_port_t __sin6_port;
- uint32_t __sin6_flowinfo;
- struct in6_addr __sin6_addr;
- };
-#endif
/* IPv6 multicast request. */
struct ipv6_mreq
--
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@linux-ipv6.org>
PGP5i FP: F731 6599 5EB2 BBA7 1515 1323 1806 A96F 5700 6B25