r5922 - in glibc-package/branches/eglibc-2.18/debian: . patches/hurd-i386
Author: sthibault
Date: 2014-01-30 09:05:16 +0000 (Thu, 30 Jan 2014)
New Revision: 5922
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/tg-ifaddrs_v6.diff
Log:
* patches/hurd-i386/tg-ifaddrs_v6.diff: Add missing initialization of sa_len
fields.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-30 09:03:16 UTC (rev 5921)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-30 09:05:16 UTC (rev 5922)
@@ -258,6 +258,14 @@
-- Adam Conrad <adconrad@0c3.net> Mon, 09 Dec 2013 22:14:44 -0700
+eglibc (2.17-98) UNRELEASED; urgency=low
+
+ [ Samuel Thibault ]
+ * patches/hurd-i386/tg-ifaddrs_v6.diff: Add missing initialization of sa_len
+ fields.
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 29 Nov 2013 18:11:34 +0100
+
eglibc (2.17-97) unstable; urgency=medium
[ Aurelien Jarno ]
Modified: glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/tg-ifaddrs_v6.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/tg-ifaddrs_v6.diff 2014-01-30 09:03:16 UTC (rev 5921)
+++ glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/tg-ifaddrs_v6.diff 2014-01-30 09:05:16 UTC (rev 5922)
@@ -8,15 +8,15 @@
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
- sysdeps/mach/hurd/ifaddrs.c | 295 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 295 insertions(+)
+ sysdeps/mach/hurd/ifaddrs.c | 306 ++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 306 insertions(+)
diff --git a/sysdeps/mach/hurd/ifaddrs.c b/sysdeps/mach/hurd/ifaddrs.c
new file mode 100644
-index 0000000..31ec85c
+index 0000000..4afc749
--- /dev/null
+++ b/sysdeps/mach/hurd/ifaddrs.c
-@@ -0,0 +1,295 @@
+@@ -0,0 +1,306 @@
+/* getifaddrs -- get names and addresses of all network interfaces
+ Copyright (C) 2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -121,12 +121,14 @@
+ storage[i].ia.ifa_addr = (struct sockaddr *) &storage[i].addr;
+ sin = ((struct sockaddr_in *) &storage[i].addr);
+ sin->sin_family = AF_INET;
++ sin->sin_len = sizeof(*sin);
+ sin->sin_port = 0;
+ sin->sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+
+ storage[i].ia.ifa_netmask = (struct sockaddr *) &storage[i].netmask;
+ sin = ((struct sockaddr_in *) &storage[i].netmask);
+ sin->sin_family = AF_INET;
++ sin->sin_len = sizeof(*sin);
+ sin->sin_port = 0;
+ sin->sin_addr.s_addr = htonl (IN_CLASSA_NET);
+
@@ -145,6 +147,7 @@
+ storage[i].ia.ifa_addr = (struct sockaddr *) &storage[i].addr;
+ sin6 = ((struct sockaddr_in6 *) &storage[i].addr);
+ sin6->sin6_family = AF_INET6;
++ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_port = 0;
+ sin6->sin6_flowinfo = 0;
+ inet_pton (AF_INET6, "::1", &sin6->sin6_addr);
@@ -153,6 +156,7 @@
+ storage[i].ia.ifa_netmask = (struct sockaddr *) &storage[i].netmask;
+ sin6 = ((struct sockaddr_in6 *) &storage[i].netmask);
+ sin6->sin6_family = AF_INET6;
++ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_port = 0;
+ sin6->sin6_flowinfo = 0;
+ inet_pton (AF_INET6, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", &sin6->sin6_addr);
@@ -184,6 +188,7 @@
+ storage[i].ia.ifa_addr = (struct sockaddr *) &storage[i].addr;
+ sin = ((struct sockaddr_in *) &storage[i].addr);
+ sin->sin_family = AF_INET;
++ sin->sin_len = sizeof(*sin);
+ sin->sin_port = 0;
+ inet_pton (AF_INET, addr, &sin->sin_addr);
+
@@ -202,12 +207,14 @@
+ storage[i].ia.ifa_netmask = (struct sockaddr *) &storage[i].netmask;
+ sin = ((struct sockaddr_in *) &storage[i].netmask);
+ sin->sin_family = AF_INET;
++ sin->sin_len = sizeof(*sin);
+ sin->sin_port = 0;
+ inet_pton (AF_INET, addr, &sin->sin_addr);
+
+ storage[i].ia.ifa_broadaddr = (struct sockaddr *) &storage[i].broadaddr;
+ sin = ((struct sockaddr_in *) &storage[i].broadaddr);
+ sin->sin_family = AF_INET;
++ sin->sin_len = sizeof(*sin);
+ sin->sin_port = 0;
+ sin->sin_addr.s_addr =
+ ((struct sockaddr_in *) &storage[i].addr)->sin_addr.s_addr
@@ -222,6 +229,7 @@
+ storage[i].ia.ifa_dstaddr = (struct sockaddr *) &storage[i].broadaddr;
+ sin = ((struct sockaddr_in *) &storage[i].broadaddr);
+ sin->sin_family = AF_INET;
++ sin->sin_len = sizeof(*sin);
+ sin->sin_port = 0;
+ inet_pton (AF_INET, addr, &sin->sin_addr);
+
@@ -253,6 +261,7 @@
+ storage[i].ia.ifa_addr = (struct sockaddr *) &storage[i].addr;
+ sin6 = ((struct sockaddr_in6 *) &storage[i].addr);
+ sin6->sin6_family = AF_INET6;
++ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_port = 0;
+ sin6->sin6_flowinfo = 0;
+ inet_pton (AF_INET6, addr, &sin6->sin6_addr);
@@ -261,6 +270,7 @@
+ storage[i].ia.ifa_netmask = (struct sockaddr *) &storage[i].netmask;
+ sin6 = ((struct sockaddr_in6 *) &storage[i].netmask);
+ sin6->sin6_family = AF_INET6;
++ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_port = 0;
+ sin6->sin6_flowinfo = 0;
+ sin6->sin6_addr.s6_addr32[0] = htonl (cidr >= 32 ? 0xffffffffUL : cidr <= 0 ? 0 : ~((1UL << ( 32 - cidr)) - 1));
@@ -283,6 +293,7 @@
+ storage[i].ia.ifa_dstaddr = (struct sockaddr *) &storage[i].broadaddr;
+ sin6 = ((struct sockaddr_in6 *) &storage[i].broadaddr);
+ sin6->sin6_family = AF_INET6;
++ sin6->sin6_len = sizeof(*sin6);
+ sin6->sin6_port = 0;
+ sin6->sin6_flowinfo = 0;
+ inet_pton (AF_INET6, addr, &sin6->sin6_addr);
Reply to: