Re: [PATCH libnetfilter_queue] src: Stop users from accidentally using legacy linux_nfnetlink_queue.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Jul 18, 2021 at 03:10:27PM +1000, Duncan Roe wrote:
> If a user coded
>   #include <libnetfilter_queue/libnetfilter_queue.h>
>   #include <linux/netfilter/nfnetlink_queue.h>
> then instead of nfnetlink_queue.h they would get linux_nfnetlink_queue.h.
> Internally, this only affects libnetfilter_queue.c
>
> Signed-off-by: Duncan Roe <duncan_roe@xxxxxxxxxxxxxxx>
> ---
>  include/libnetfilter_queue/libnetfilter_queue.h | 2 --
>  src/libnetfilter_queue.c                        | 1 +
>  2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h
> index a19122f..42a3a45 100644
> --- a/include/libnetfilter_queue/libnetfilter_queue.h
> +++ b/include/libnetfilter_queue/libnetfilter_queue.h
> @@ -16,8 +16,6 @@
>  #include <sys/time.h>
>  #include <libnfnetlink/libnfnetlink.h>
>
> -#include <libnetfilter_queue/linux_nfnetlink_queue.h>
> -
>  #ifdef __cplusplus
>  extern "C" {
>  #endif
> diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c
> index ef3b211..899c765 100644
> --- a/src/libnetfilter_queue.c
> +++ b/src/libnetfilter_queue.c
> @@ -32,6 +32,7 @@
>
>  #include <libnfnetlink/libnfnetlink.h>
>  #include <libnetfilter_queue/libnetfilter_queue.h>
> +#include <libnetfilter_queue/linux_nfnetlink_queue.h>
>  #include "internal.h"
>
>  /**
> --
> 2.17.5
>
Scrub this - will be sending a V2.

Forgot to update utils/nfqnl_test.c,

Cheers ... Duncan.



[Index of Archives]     [Netfitler Users]     [Berkeley Packet Filter]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux