[PATCH 1/2] define NETLINK_NETFILTER if it's undefined

[PATCH 1/2] define NETLINK_NETFILTER if it's undefined

[Pablo Neira]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

Hi Harald,

This patch applies to libnfnetlink.

o It define NETLINK_NETFILTER if it's not defined.
o Kill KERNELDIR in Makefile.am, it's not set anymore.

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

[-- Attachment #2: 01-libnfnetlink.patch --]
[-- Type: text/plain, Size: 1075 bytes --]

Index: include/libnfnetlink/libnfnetlink.h
===================================================================
--- include/libnfnetlink/libnfnetlink.h	(revision 4511)
+++ include/libnfnetlink/libnfnetlink.h	(working copy)
@@ -4,6 +4,8 @@
  *
  * 2005-10-29 Pablo Neira Ayuso <pablo@netfilter.org>:
  * 	Fix NFNL_HEADER_LEN
+ * 2005-11-13 Pablo Neira Ayuso <pablo@netfilter.org>:
+ * 	Define NETLINK_NETFILTER if it's undefined
  */
 
 #ifndef __LIBNFNETLINK_H
@@ -18,6 +20,10 @@
 #include <linux/netlink.h>
 #include <libnfnetlink/linux_nfnetlink.h>
 
+#ifndef NETLINK_NETFILTER
+#define NETLINK_NETFILTER 12
+#endif
+
 #define NLMSG_TAIL(nlh) \
 	(((void *) (nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))
 
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 4511)
+++ src/Makefile.am	(working copy)
@@ -2,7 +2,7 @@
 
 #EXTRA_DIST = $(man_MANS) acinclude.m4
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I${KERNELDIR} 
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-fPIC -Wall
 LIBS=
 

Re: [PATCH 1/2] define NETLINK_NETFILTER if it's undefined

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

On Sun, Nov 13, 2005 at 06:14:04PM +0100, Pablo Neira wrote:
> Hi Harald,
> 
> This patch applies to libnfnetlink.

thanks, applied.

-- 
- Harald Welte <laforge@netfilter.org>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]