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

Commit 05465343 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Add goto target 



Originally written by Henrik Nordstrom <hno@marasystems.com>, taken
from netfilter patch-o-matic and added ip6_tables support.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 764d8a9f

include/linux/netfilter_ipv4/ip_tables.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,8 @@ struct ipt_counters 




/* Values for "flag" field in struct ipt_ip (general ip structure). */

/* Values for "flag" field in struct ipt_ip (general ip structure). */

#define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */

#define IPT_F_FRAG		0x01	/* Set if rule is a fragment rule */

#define IPT_F_MASK		0x01	/* All possible flag bits mask. */

#define IPT_F_GOTO		0x02	/* Set if jump is a goto */

#define IPT_F_MASK		0x03	/* All possible flag bits mask. */





/* Values for "inv" field in struct ipt_ip. */

/* Values for "inv" field in struct ipt_ip. */

#define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */

#define IPT_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */

include/linux/netfilter_ipv6/ip6_tables.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -111,7 +111,8 @@ struct ip6t_counters 
#define IP6T_F_PROTO		0x01	/* Set if rule cares about upper 

#define IP6T_F_PROTO		0x01	/* Set if rule cares about upper 

					   protocols */

					   protocols */

#define IP6T_F_TOS		0x02	/* Match the TOS. */

#define IP6T_F_TOS		0x02	/* Match the TOS. */

#define IP6T_F_MASK		0x03	/* All possible flag bits mask. */

#define IP6T_F_GOTO		0x04	/* Set if jump is a goto */

#define IP6T_F_MASK		0x07	/* All possible flag bits mask. */





/* Values for "inv" field in struct ip6t_ip6. */

/* Values for "inv" field in struct ip6t_ip6. */

#define IP6T_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */

#define IP6T_INV_VIA_IN		0x01	/* Invert the sense of IN IFACE. */

net/ipv4/netfilter/ip_tables.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -340,8 +340,8 @@ ipt_do_table(struct sk_buff **pskb, 
							 back->comefrom);

							 back->comefrom);

					continue;

					continue;

				}

				}

				if (table_base + v

				if (table_base + v != (void *)e + e->next_offset

				    != (void *)e + e->next_offset) {

				    && !(e->ip.flags & IPT_F_GOTO)) {

					/* Save old back ptr in next entry */

					/* Save old back ptr in next entry */

					struct ipt_entry *next

					struct ipt_entry *next

						= (void *)e + e->next_offset;

						= (void *)e + e->next_offset;

net/ipv6/netfilter/ip6_tables.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -433,8 +433,8 @@ ip6t_do_table(struct sk_buff **pskb, 
							 back->comefrom);

							 back->comefrom);

					continue;

					continue;

				}

				}

				if (table_base + v

				if (table_base + v != (void *)e + e->next_offset

				    != (void *)e + e->next_offset) {

				    && !(e->ipv6.flags & IP6T_F_GOTO)) {

					/* Save old back ptr in next entry */

					/* Save old back ptr in next entry */

					struct ip6t_entry *next

					struct ip6t_entry *next

						= (void *)e + e->next_offset;

						= (void *)e + e->next_offset;