netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH libnetfilter_queue] src: Stop users from accidentally using legacy linux_nfnetlink_queue.h
@ 2021-07-18  5:10 Duncan Roe
  2021-07-24 10:12 ` Duncan Roe
  0 siblings, 1 reply; 2+ messages in thread
From: Duncan Roe @ 2021-07-18  5:10 UTC (permalink / raw)
  To: pablo; +Cc: netfilter-devel

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@optusnet.com.au>
---
 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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH libnetfilter_queue] src: Stop users from accidentally using legacy linux_nfnetlink_queue.h
  2021-07-18  5:10 [PATCH libnetfilter_queue] src: Stop users from accidentally using legacy linux_nfnetlink_queue.h Duncan Roe
@ 2021-07-24 10:12 ` Duncan Roe
  0 siblings, 0 replies; 2+ messages in thread
From: Duncan Roe @ 2021-07-24 10:12 UTC (permalink / raw)
  To: Pablo Neira Ayuso; +Cc: Netfilter Development

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@optusnet.com.au>
> ---
>  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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-24 10:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-18  5:10 [PATCH libnetfilter_queue] src: Stop users from accidentally using legacy linux_nfnetlink_queue.h Duncan Roe
2021-07-24 10:12 ` Duncan Roe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).