From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 1B9E43858C2F for ; Mon, 15 Aug 2022 20:44:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B9E43858C2F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id EF4152012C; Mon, 15 Aug 2022 22:44:11 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0us2MA_q0UWf; Mon, 15 Aug 2022 22:44:10 +0200 (CEST) Received: from begin.home (lfbn-orl-1-1261-6.w86-244.abo.wanadoo.fr [86.244.81.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id D80242011A; Mon, 15 Aug 2022 22:44:10 +0200 (CEST) Received: from samy by begin.home with local (Exim 4.96) (envelope-from ) id 1oNgwV-008cdL-1b; Mon, 15 Aug 2022 22:44:11 +0200 Date: Mon, 15 Aug 2022 22:44:11 +0200 From: Samuel Thibault To: Florian Weimer Cc: libc-alpha@sourceware.org Subject: Re: [PATCHv2] Move ip_mreqn structure from Linux to generic Message-ID: <20220815204411.wem62uqe2tw2cawv@begin> References: <20220815171550.1747664-1-samuel.thibault@ens-lyon.org> <875yiti8i8.fsf@oldenburg.str.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <875yiti8i8.fsf@oldenburg.str.redhat.com> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2022 20:44:14 -0000 Florian Weimer, le lun. 15 août 2022 21:58:39 +0200, a ecrit: > * Samuel Thibault: > > > I.e. from sysdeps/unix/sysv/linux/bits/in.h to netinet/in.h > > > > It is following both the BSD and Linux definitions. > > --- > > inet/netinet/in.h | 13 +++++++++++++ > > sysdeps/unix/sysv/linux/bits/in.h | 8 -------- > > 2 files changed, 13 insertions(+), 8 deletions(-) > > > > 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 > > { > > This version looks okay to me. Same definition, still under __USE_MISC. > > Reviewed-by: Florian Weimer Pushed, thanks!