1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
commit a2ee8c6500fdaff03019928d916d166ee266e1f5
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Aug 13 23:02:51 2022 +0200
Move ip_mreqn structure from Linux to generic
I.e. from sysdeps/unix/sysv/linux/bits/in.h to netinet/in.h
It is following both the BSD and Linux definitions.
Reviewed-by: Florian Weimer <fweimer@redhat.com>
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index 1633bc64e4..362eb9e9e7 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -278,6 +278,19 @@ struct ip_mreq
struct in_addr imr_interface;
};
+/* IPv4 multicast request with interface index. */
+struct ip_mreqn
+ {
+ /* IP multicast address of group. */
+ struct in_addr imr_multiaddr;
+
+ /* Local IP address of interface. */
+ struct in_addr imr_address;
+
+ /* Interface index. */
+ int imr_ifindex;
+ };
+
struct ip_mreq_source
{
/* IP multicast address of group. */
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index af6898a5ce..00d10d812c 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -146,14 +146,6 @@ struct ip_opts
char ip_opts[40]; /* Actually variable in size. */
};
-/* Like `struct ip_mreq' but including interface specification by index. */
-struct ip_mreqn
- {
- struct in_addr imr_multiaddr; /* IP multicast address of group */
- struct in_addr imr_address; /* local IP address of interface */
- int imr_ifindex; /* Interface index */
- };
-
/* Structure used for IP_PKTINFO. */
struct in_pktinfo
{
|
