Update the prebuilt glibc <*/igmp.h> headers.
Test: treehugger
Change-Id: I1ce05716fe243e6b4e47f080d2d8d894c0cc14a9
diff --git a/sysroot/usr/include/linux/igmp.h b/sysroot/usr/include/linux/igmp.h
index 2ead5c5..8ce306e 100644
--- a/sysroot/usr/include/linux/igmp.h
+++ b/sysroot/usr/include/linux/igmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
/*
* Linux NET3: Internet Group Management Protocol [IGMP]
*
@@ -47,22 +48,22 @@
__u8 grec_auxwords;
__be16 grec_nsrcs;
__be32 grec_mca;
- __be32 grec_src[0];
+ __be32 grec_src[];
};
struct igmpv3_report {
__u8 type;
__u8 resv1;
- __be16 csum;
+ __sum16 csum;
__be16 resv2;
__be16 ngrec;
- struct igmpv3_grec grec[0];
+ struct igmpv3_grec grec[];
};
struct igmpv3_query {
__u8 type;
__u8 code;
- __be16 csum;
+ __sum16 csum;
__be32 group;
#if defined(__LITTLE_ENDIAN_BITFIELD)
__u8 qrv:3,
@@ -77,7 +78,7 @@
#endif
__u8 qqic;
__be16 nsrcs;
- __be32 srcs[0];
+ __be32 srcs[];
};
#define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */
@@ -92,6 +93,7 @@
#define IGMP_MTRACE_RESP 0x1e
#define IGMP_MTRACE 0x1f
+#define IGMP_MRDISC_ADV 0x30 /* From RFC4286 */
/*
* Use the BSD names for these for compatibility
diff --git a/sysroot/usr/include/netinet/igmp.h b/sysroot/usr/include/netinet/igmp.h
index e40fbab..e4d9928 100644
--- a/sysroot/usr/include/netinet/igmp.h
+++ b/sysroot/usr/include/netinet/igmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1999, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2023 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
+ <https://www.gnu.org/licenses/>. */
#ifndef _NETINET_IGMP_H
#define _NETINET_IGMP_H 1
@@ -21,7 +21,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#ifdef __USE_BSD
+#ifdef __USE_MISC
#include <netinet/in.h>
@@ -64,10 +64,10 @@
*/
struct igmp {
- u_int8_t igmp_type; /* IGMP type */
- u_int8_t igmp_code; /* routing code */
- u_int16_t igmp_cksum; /* checksum */
- struct in_addr igmp_group; /* group address */
+ uint8_t igmp_type; /* IGMP type */
+ uint8_t igmp_code; /* routing code */
+ uint16_t igmp_cksum; /* checksum */
+ struct in_addr igmp_group; /* group address */
};
#define IGMP_MINLEN 8
@@ -86,6 +86,7 @@
#define IGMP_MTRACE_RESP 0x1e /* traceroute resp.(to sender)*/
#define IGMP_MTRACE 0x1f /* mcast traceroute messages */
+#define IGMP_MRDISC_ADV 0x30 /* From RFC4286. */
#define IGMP_MAX_HOST_REPORT_DELAY 10 /* max delay for response to */
/* query (in seconds) according */