Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8237908e authored by Bart De Schuymer's avatar Bart De Schuymer Committed by Patrick McHardy
Browse files

netfilter: bridge-netfilter: cleanup br_netfilter.c 



bridge-netfilter: cleanup br_netfilter.c

- remove some of the graffiti at the head of br_netfilter.c
- remove __br_dnat_complain()
- remove KERN_INFO messages when CONFIG_NETFILTER_DEBUG is defined

Signed-off-by: default avatarBart De Schuymer <bdschuym@pandora.be>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 22068311

net/bridge/br_netfilter.c

+2 −56
Original line number Diff line number Diff line
@@ -4,14 +4,7 @@ 
 *

 *	Authors:

 *	Lennert Buytenhek		<buytenh@gnu.org>

 *	Bart De Schuymer (maintainer)	<bdschuym@pandora.be>

 *

 *	Changes:

 *	Apr 29 2003: physdev module support (bdschuym)

 *	Jun 19 2003: let arptables see bridged ARP traffic (bdschuym)

 *	Oct 06 2003: filter encapsulated IP/ARP VLAN traffic on untagged bridge

 *	             (bdschuym)

 *	Sep 01 2004: add IPv6 filtering (bdschuym)

 *	Bart De Schuymer		<bdschuym@pandora.be>

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License
@@ -252,17 +245,6 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb) 
	return 0;

}



static void __br_dnat_complain(void)

{

	static unsigned long last_complaint;



	if (jiffies - last_complaint >= 5 * HZ) {

		printk(KERN_WARNING "Performing cross-bridge DNAT requires IP "

		       "forwarding to be enabled\n");

		last_complaint = jiffies;

	}

}



/* This requires some explaining. If DNAT has taken place,

 * we will need to fix up the destination Ethernet address,

 * and this is a tricky process.
@@ -378,11 +360,6 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb) 
					skb_dst_set(skb, (struct dst_entry *)rt);

					goto bridged_dnat;

				}

				/* we are sure that forwarding is disabled, so printing

				 * this message is no problem. Note that the packet could

				 * still have a martian destination address, in which case

				 * the packet could be dropped even if forwarding were enabled */

				__br_dnat_complain();

				dst_release((struct dst_entry *)rt);

			}

free_skb:
@@ -820,17 +797,6 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb, 
	struct net_device *realoutdev = bridge_parent(skb->dev);

	u_int8_t pf;



#ifdef CONFIG_NETFILTER_DEBUG

	/* Be very paranoid. This probably won't happen anymore, but let's

	 * keep the check just to be sure... */

	if (skb_mac_header(skb) < skb->head ||

	    skb_mac_header(skb) + ETH_HLEN > skb->data) {

		printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: "

		       "bad mac.raw pointer.\n");

		goto print_error;

	}

#endif



	if (!nf_bridge)

		return NF_ACCEPT;
@@ -849,13 +815,6 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb, 
	else

		return NF_ACCEPT;



#ifdef CONFIG_NETFILTER_DEBUG

	if (skb_dst(skb) == NULL) {

		printk(KERN_INFO "br_netfilter post_routing: skb->dst == NULL\n");

		goto print_error;

	}

#endif



	/* We assume any code from br_dev_queue_push_xmit onwards doesn't care

	 * about the value of skb->pkt_type. */

	if (skb->pkt_type == PACKET_OTHERHOST) {
@@ -870,19 +829,6 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff *skb, 
		br_nf_dev_queue_xmit);



	return NF_STOLEN;



#ifdef CONFIG_NETFILTER_DEBUG

print_error:

	if (skb->dev != NULL) {

		printk("[%s]", skb->dev->name);

		if (realoutdev)

			printk("[%s]", realoutdev->name);

	}

	printk(" head:%p, raw:%p, data:%p\n", skb->head, skb_mac_header(skb),

	       skb->data);

	dump_stack();

	return NF_ACCEPT;

#endif

}



/* IP/SABOTAGE *****************************************************/