Skip to contentSkip to conversation

: fixed multiple bugs in ipv6 version of ULOG

PATCH Applied Jonas Berlin 2 participants 2 messages Mar 14, 2005 – Mar 15, 2005 netfilter

lore
Share & tools
lore

Jonas Berlin

author
#0 lore raw

PATCH 1/1 : fixed multiple bugs in ipv6 version of ULOG

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

To apply, do

~ patch -p1 < ULOGv6-2.patch

in your patch-o-matic-ng directory

- -----------------

Fixes in 2.4 version:
~ - wrong dependency in Config.in
~ - patch was based on some patched 2.4 version, didn't work with vanilla kernel

Fixes in 2.6 version:
~ - registered itself with wrong protocol family to nf_log

Cleanups in both versions:

~  - improved help
~  - dropped unnecessary includes
~  - updated author

- --
- - xkr47
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCNXQHxyF48ZTvn+4RAjUNAKDQq9UqvK1pUdVbdw40c727HAt+/gCg5xFk sBiDaVyMRcj2XWmam9HLhQA=
=4iK/
-----END PGP SIGNATURE-----

ULOG/linux/Documentation/Configure.help.ladd +2 -1
diff -ur --exclude-from=/tmp/srcdiff.excludes.BQ5XVc -N debug-patch-o-matic-ng-20050220/ULOG/linux/Documentation/Configure.help.ladd patch-o-matic-ng-20050312/ULOG/linux/Documentation/Configure.help.ladd
@@ -6,7 +6,8 @@
   daemon using netlink multicast sockets; unlike the LOG target
   which can only be viewed through syslog.
 
-  This target requires the ipv4 version to be compiled as well.
+  NOTE: This target requires the ipv4 version of ULOG to be compiled as
+        well.
 
   The apropriate userspace logging daemon (ulogd) may be obtained from
   <http://www.gnumonks.org/projects/ulogd/>
ULOG/linux/net/ipv6/netfilter/Config.in.ladd +2 -2
diff -ur --exclude-from=/tmp/srcdiff.excludes.BQ5XVc -N debug-patch-o-matic-ng-20050220/ULOG/linux/net/ipv6/netfilter/Config.in.ladd patch-o-matic-ng-20050312/ULOG/linux/net/ipv6/netfilter/Config.in.ladd
@@ -1,4 +1,4 @@
     dep_tristate '    LOG target support' CONFIG_IP6_NF_TARGET_LOG $CONFIG_IP6_NF_FILTER
-    if [ "$CONFIG_IP_NF_TARGET_LOG" != "n" ]; then
-      dep_tristate '    ULOG target support' CONFIG_IP6_NF_TARGET_ULOG $CONFIG_IP6_NF_FILTER $CONFIG_IP_NF_TARGET_LOG
+    if [ "$CONFIG_IP_NF_TARGET_ULOG" != "n" ]; then
+      dep_tristate '    ULOG target support' CONFIG_IP6_NF_TARGET_ULOG $CONFIG_IP6_NF_FILTER $CONFIG_IP_NF_TARGET_ULOG
     fi
ULOG/linux/net/ipv6/netfilter/ip6t_ULOG.c +12 -54

111 lines not on this page · raw message

ULOG/linux-2.6/net/ipv6/netfilter/Kconfig.ladd +2 -1
diff -ur --exclude-from=/tmp/srcdiff.excludes.BQ5XVc -N debug-patch-o-matic-ng-20050220/ULOG/linux-2.6/net/ipv6/netfilter/Kconfig.ladd patch-o-matic-ng-20050312/ULOG/linux-2.6/net/ipv6/netfilter/Kconfig.ladd
@@ -7,7 +7,8 @@
 	  daemon using netlink multicast sockets; unlike the LOG target
 	  which can only be viewed through syslog.
 
-	  This target requires the ipv4 version to be compiled as well.
+	  NOTE: This target requires the ipv4 version of ULOG to be compiled as
+	        well.
 
 	  The apropriate userspace logging daemon (ulogd) may be obtained from
 	  <http://www.gnumonks.org/projects/ulogd/>
ULOG/linux-2.6/net/ipv6/netfilter/ip6t_ULOG.c +4 -18
diff -ur --exclude-from=/tmp/srcdiff.excludes.BQ5XVc -N debug-patch-o-matic-ng-20050220/ULOG/linux-2.6/net/ipv6/netfilter/ip6t_ULOG.c patch-o-matic-ng-20050312/ULOG/linux-2.6/net/ipv6/netfilter/ip6t_ULOG.c
@@ -26,25 +26,11 @@
  */
 
 #include <linux/module.h>
-#include <linux/config.h>
-#include <linux/spinlock.h>
-#include <linux/socket.h>
-#include <linux/skbuff.h>
-#include <linux/kernel.h>
-#include <linux/timer.h>
-#include <linux/netlink.h>
-#include <linux/netdevice.h>
-#include <linux/mm.h>
-#include <linux/moduleparam.h>
-#include <linux/netfilter.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv4/ipt_ULOG.h>
-#include <linux/netfilter_ipv4/lockhelp.h>
-#include <net/sock.h>
-#include <linux/bitops.h>
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jonas Berlin <[email protected]>");
+MODULE_AUTHOR("Jonas Berlin <[email protected]>");
 MODULE_DESCRIPTION("ip6tables userspace logging module");
 
 #if 0

@@ -72,7 +58,7 @@
 				    unsigned int hooknum,
 				    const void *targinfo, void *userinfo)
 {
-	struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) targinfo;
+	const struct ipt_ulog_info *loginfo = (const struct ipt_ulog_info *) targinfo;
 
 	ipt_ulog_packet(hooknum, *pskb, in, out, loginfo, NULL);
  

@@ -138,7 +124,7 @@
 		return -EINVAL;
 	}
 	if (nflog)
-		nf_log_register(PF_INET, &ip6t_logfn);
+		nf_log_register(PF_INET6, &ip6t_logfn);
 	
 	return 0;
 }

@@ -148,7 +134,7 @@
 	DEBUGP("ip6t_ULOG: cleanup_module\n");
 
 	if (nflog)
-		nf_log_unregister(PF_INET, &ip6t_logfn);
+		nf_log_unregister(PF_INET6, &ip6t_logfn);
 	ip6t_unregister_target(&ip6t_ulog_reg);
 }
Applied
#1 lore raw
Quoted 5 lines · Jonas Berlin

Fixes in 2.4 version:
~ - wrong dependency in Config.in
~ - patch was based on some patched 2.4 version, didn't work with vanilla kernel

Quoted 7 lines

Fixes in 2.6 version:
~ - registered itself with wrong protocol family to nf_log

Cleanups in both versions:

~  - improved help
~  - dropped unnecessary includes
~  - updated author

Applied, thanks Jonas.

Regards
Patrick