git-ip_mreqn

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>
Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name git-ip_mreqn.diff

diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index 1633bc64e43b22bb6600341096be0e4b3c6218f2..362eb9e9e7296ee7d95cba1621314b794552100a 100644 (file)
--- 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 af6898a5ceaf9cd34039db6773b5470dce0bb354..00d10d812c0c0c647b59f02aaec69c062b645fe8 100644 (file)
--- 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
   {