[netfilter-cvslog] r4087 - trunk/patch-o-matic-ng/patchlets/nf-log

kadlec at netfilter.org kadlec at netfilter.org
Fri Jul 1 23:42:19 CEST 2005


Author: kadlec at netfilter.org
Date: 2005-07-01 23:42:18 +0200 (Fri, 01 Jul 2005)
New Revision: 4087

Modified:
   trunk/patch-o-matic-ng/patchlets/nf-log/linux-2.4.patch
Log:
Patch against netsyms.c was missing. (JK)


Modified: trunk/patch-o-matic-ng/patchlets/nf-log/linux-2.4.patch
===================================================================
--- trunk/patch-o-matic-ng/patchlets/nf-log/linux-2.4.patch	2005-06-29 17:01:21 UTC (rev 4086)
+++ trunk/patch-o-matic-ng/patchlets/nf-log/linux-2.4.patch	2005-07-01 21:42:18 UTC (rev 4087)
@@ -11,6 +11,43 @@
  #define ULOG_MAC_LEN	80
  #define ULOG_PREFIX_LEN	32
  
+diff -urN --exclude-from=/usr/src/diff.exclude linux-2.4.31-orig/include/linux/netfilter_logging.h linux-2.4.31-nf-log/include/linux/netfilter_logging.h
+--- linux-2.4.31-orig/include/linux/netfilter_logging.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.31-nf-log/include/linux/netfilter_logging.h	2005-06-27 17:40:34.000000000 +0200
+@@ -0,0 +1,33 @@
++/* Internal logging interface, which relies on the real 
++   LOG target modules */
++#ifndef __LINUX_NETFILTER_LOGGING_H
++#define __LINUX_NETFILTER_LOGGING_H
++
++#ifdef __KERNEL__
++#include <asm/atomic.h>
++
++struct nf_logging_t {
++	void (*nf_log_packet)(struct sk_buff **pskb,
++			      unsigned int hooknum,
++			      const struct net_device *in,
++			      const struct net_device *out,
++			      const char *prefix);
++	void (*nf_log)(char *pfh, size_t len,
++		       const char *prefix);
++};
++
++extern void nf_log_register(int pf, const struct nf_logging_t *logging);
++extern void nf_log_unregister(int pf, const struct nf_logging_t *logging);
++
++extern void nf_log_packet(int pf,
++			  struct sk_buff **pskb,
++			  unsigned int hooknum,
++			  const struct net_device *in,
++			  const struct net_device *out,
++			  const char *fmt, ...);
++extern void nf_log(int pf,
++		   char *pfh, size_t len,
++		   const char *fmt, ...);
++#endif /*__KERNEL__*/
++
++#endif /*__LINUX_NETFILTER_LOGGING_H*/
 diff -urN --exclude-from=/usr/src/diff.exclude linux-2.4.31-orig/net/core/netfilter.c linux-2.4.31-nf-log/net/core/netfilter.c
 --- linux-2.4.31-orig/net/core/netfilter.c	2005-01-19 15:10:13.000000000 +0100
 +++ linux-2.4.31-nf-log/net/core/netfilter.c	2005-06-27 17:42:30.000000000 +0200
@@ -567,3 +604,25 @@
  	ip6t_unregister_target(&ip6t_log_reg);
  }
  
+diff -urN --exclude-from=/usr/src/diff.exclude linux-2.4.31-orig/net/netsyms.c linux-2.4.31-nf-log/net/netsyms.c
+--- linux-2.4.31-orig/net/netsyms.c	2005-04-04 03:42:20.000000000 +0200
++++ linux-2.4.31-nf-log/net/netsyms.c	2005-07-01 23:19:44.000000000 +0200
+@@ -594,6 +594,7 @@
+ #endif
+ #ifdef CONFIG_NETFILTER
+ #include <linux/netfilter.h>
++#include <linux/netfilter_logging.h>
+ EXPORT_SYMBOL(nf_register_hook);
+ EXPORT_SYMBOL(nf_unregister_hook);
+ EXPORT_SYMBOL(nf_register_sockopt);
+@@ -607,6 +608,10 @@
+ EXPORT_SYMBOL(nf_getsockopt);
+ EXPORT_SYMBOL(ip_ct_attach);
+ EXPORT_SYMBOL(nf_ct_attach);
++EXPORT_SYMBOL(nf_log_register);
++EXPORT_SYMBOL(nf_log_unregister);
++EXPORT_SYMBOL(nf_log_packet);
++EXPORT_SYMBOL(nf_log);
+ #ifdef CONFIG_INET
+ #include <linux/netfilter_ipv4.h>
+ EXPORT_SYMBOL(ip_route_me_harder);




More information about the netfilter-cvslog mailing list