Re: [netfilter-core] [PATCH 07/11] UAPI: netfilter: Fix symbol collision issues [ver #2]
From: Pablo Neira Ayuso
Date: Fri Sep 28 2018 - 09:07:14 EST
On Thu, Sep 06, 2018 at 10:19:11AM +0100, David Howells wrote:
> The netfilter UAPI headers have some symbol collision issues:
>
> (1) "enum nfnl_acct_msg_types" is defined twice, and each definition is
> completely different.
>
> Fix this by renaming the one in nfnetlink_cthelper.h to be "enum
> nfnl_cthelper_types" to be consistent with the other things in that
> file.
>
> (2) There's a disagreement between ipt_ECN.h and ipt_ecn.h over the
> definition of various IPT_ECN_* constants, leading to an error over
> IPT_ECN_IP_MASK being substituted when being defined as an enum value
> in ipt_ecn.h if ipt_ECN.h is #included first.
>
> Fix this by removing the conflicting constants from ipt_ECN.h and
> including ipt_ecn.h instead.
David, may I upstream this or you will pass it to Greg? I can just
take this, as you prefer.
Thanks.