Re: [PATCH] Re: ipt->xt

[Patrick McHardy <kaber@trash.net>]

[CC-list trimmed]

Jan Engelhardt wrote:
> How about this for a start?

A few comments below.

> Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
> 
> Index: linux-2.6.20-rc5/net/ipv4/netfilter/ipt_CLUSTERIP.c
> ===================================================================
> --- linux-2.6.20-rc5.orig/net/ipv4/netfilter/ipt_CLUSTERIP.c
> +++ linux-2.6.20-rc5/net/ipv4/netfilter/ipt_CLUSTERIP.c
> @@ -42,7 +43,7 @@
>  
>  MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
> -MODULE_DESCRIPTION("iptables target for CLUSTERIP");
> +MODULE_DESCRIPTION("xtables target for CLUSTERIP");

The MODULE_DESCRIPTION should stay the same, its still an iptables-only
target.

> Index: linux-2.6.20-rc5/net/ipv4/netfilter/ipt_LOG.c
> ===================================================================
> --- linux-2.6.20-rc5.orig/net/ipv4/netfilter/ipt_LOG.c
> +++ linux-2.6.20-rc5/net/ipv4/netfilter/ipt_LOG.c
> @@ -20,12 +20,12 @@
>  #include <net/route.h>
>  
>  #include <linux/netfilter.h>
> -#include <linux/netfilter_ipv4/ip_tables.h>
> +#include <linux/netfilter/x_tables.h>
>  #include <linux/netfilter_ipv4/ipt_LOG.h>

Please keep the _ipv4 entries next to each other.

> @@ -471,7 +472,7 @@ static struct nf_logger ipt_log_logger =
>  
>  static int __init ipt_log_init(void)
>  {
> -	if (ipt_register_target(&ipt_log_reg))
> +	if (xt_register_target(&ipt_log_reg))

While you're at it, this should return the real error.

>  		return -EINVAL;
>  	if (nf_log_register(PF_INET, &ipt_log_logger) < 0) {
>  		printk(KERN_WARNING "ipt_LOG: not logging via system console "

> @@ -400,7 +400,7 @@ static int __init ipt_ulog_init(void)
>  	if (!nflognl)
>  		return -ENOMEM;
>  
> -	if (ipt_register_target(&ipt_ulog_reg) != 0) {
> +	if (xt_register_target(&ipt_ulog_reg) != 0) {
>  		sock_release(nflognl->sk_socket);
>  		return -EINVAL;

Same here. Maybe do a seperate patch for these changes.