Re: [PATCH 01/10] netfilter: x_tables: Merge xt_DSCP.h to xt_dscp.h

[Szőke Benjamin]

2025. 01. 07. 20:23 keltezéssel, Jozsef Kadlecsik írta:
> On Tue, 7 Jan 2025, egyszeregy@xxxxxxxxxxx wrote:
>
> > From: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>
> >
> > Merge xt_DSCP.h to xt_dscp.h header file.
>
> I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h
> header file." (and in the other patches as well).
>   

There will be no any new patchset refactoring anymore just of some cosmetics 
change. If you like to change it, feel free to modify it in my pacthfiles before 
the final merging. You can do it as a maintainer.

> > Signed-off-by: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>
> > ---
> >   include/uapi/linux/netfilter/xt_DSCP.h | 22 +---------------------
> >   include/uapi/linux/netfilter/xt_dscp.h | 20 ++++++++++++++++----
> >   2 files changed, 17 insertions(+), 25 deletions(-)
> >
> > diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
> > index 223d635e8b6f..fcff72347256 100644
> > --- a/include/uapi/linux/netfilter/xt_DSCP.h
> > +++ b/include/uapi/linux/netfilter/xt_DSCP.h
> > @@ -1,27 +1,7 @@
> >   /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> > -/* x_tables module for setting the IPv4/IPv6 DSCP field
> > - *
> > - * (C) 2002 Harald Welte <laforge@xxxxxxxxxxxx>
> > - * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@xxxxxxxxxxxxx>
> > - * This software is distributed under GNU GPL v2, 1991
> > - *
> > - * See RFC2474 for a description of the DSCP field within the IP Header.
> > - *
> > - * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
> > -*/
> >   #ifndef _XT_DSCP_TARGET_H
> >   #define _XT_DSCP_TARGET_H
> > -#include <linux/netfilter/xt_dscp.h>
> > -#include <linux/types.h>
> > -
> > -/* target info */
> > -struct xt_DSCP_info {
> > -	__u8 dscp;
> > -};
> >   
> > -struct xt_tos_target_info {
> > -	__u8 tos_value;
> > -	__u8 tos_mask;
> > -};
> > +#include <linux/netfilter/xt_dscp.h>
> >   
> >   #endif /* _XT_DSCP_TARGET_H */
> > diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
> > index 7594e4df8587..bcfe4afa6351 100644
> > --- a/include/uapi/linux/netfilter/xt_dscp.h
> > +++ b/include/uapi/linux/netfilter/xt_dscp.h
> > @@ -1,15 +1,17 @@
> >   /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> > -/* x_tables module for matching the IPv4/IPv6 DSCP field
> > +/* x_tables module for matching/modifying the IPv4/IPv6 DSCP field
> >    *
> >    * (C) 2002 Harald Welte <laforge@xxxxxxxxxxxx>
> > + * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@xxxxxxxxxxxxx>
> >    * This software is distributed under GNU GPL v2, 1991
> >    *
> >    * See RFC2474 for a description of the DSCP field within the IP Header.
> >    *
> > + * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
> >    * xt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
> >   */
>
> For the sake of history it'd worth to prepend the last two lines with
> something like: "Original version informations before merging the contents
> of the files:"
This was a question a day ago, what do you like to see in each top of header 
files's comments. You did not care about it, you was not willing to say 
something which to be implemented, but now you have new ideas, please it is too 
late.

I will not plan to make any new patchset version just for this new thing which 
is just a cosmetic change not a critical bugfix. If you like to change it, lets 
do it, feel free to modify it in my pacthfiles before the final merging or apply 
your a new patch later.


> > -#ifndef _XT_DSCP_H
> > -#define _XT_DSCP_H
> > +#ifndef _UAPI_XT_DSCP_H
> > +#define _UAPI_XT_DSCP_H
>
> In the first four patches you added the _UAPI_ prefix to the header
> guards while in the next three ones you kept the original ones. Please
> use one style consistently.

Style consistently is done in the following files:

- All of xt_*.h files in uppercase name format (old headers for "target")
- All of xt_*.h files in lowercase name format (merged header files)

Originally, in these files there was a chaotic state before, it was a painful 
for my eyes, this is why they got these changes. In ipt_*.h files the original 
codes got a far enough consistently style before, they was not changed.

In my patchsets, It's not my scope/job to make up for the 
improvements/refactoring of the last 10 years.

> >   #include <linux/types.h>
> >   
> > @@ -29,4 +31,14 @@ struct xt_tos_match_info {
> >   	__u8 invert;
> >   };
> >   
> > -#endif /* _XT_DSCP_H */
> > +/* target info */
> > +struct xt_DSCP_info {
> > +	__u8 dscp;
> > +};
> > +
> > +struct xt_tos_target_info {
> > +	__u8 tos_value;
> > +	__u8 tos_mask;
> > +};
> > +
> > +#endif /* _UAPI_XT_DSCP_H */
> > --
> > 2.43.5
>
> Best regards,
> Jozsef