Commit 7a6b1c46 authored by Jan Engelhardt's avatar Jan Engelhardt

netfilter: xtables: remove another level of indent

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 9452258d
...@@ -313,23 +313,24 @@ unsigned int arpt_do_table(struct sk_buff *skb, ...@@ -313,23 +313,24 @@ unsigned int arpt_do_table(struct sk_buff *skb,
} }
e = get_entry(table_base, v); e = get_entry(table_base, v);
} else { continue;
/* Targets which reenter must return
* abs. verdicts
*/
tgpar.target = t->u.kernel.target;
tgpar.targinfo = t->data;
verdict = t->u.kernel.target->target(skb, &tgpar);
/* Target might have changed stuff. */
arp = arp_hdr(skb);
if (verdict == ARPT_CONTINUE)
e = arpt_next_entry(e);
else
/* Verdict */
break;
} }
/* Targets which reenter must return
* abs. verdicts
*/
tgpar.target = t->u.kernel.target;
tgpar.targinfo = t->data;
verdict = t->u.kernel.target->target(skb, &tgpar);
/* Target might have changed stuff. */
arp = arp_hdr(skb);
if (verdict == ARPT_CONTINUE)
e = arpt_next_entry(e);
else
/* Verdict */
break;
} while (!hotdrop); } while (!hotdrop);
xt_info_rdunlock_bh(); xt_info_rdunlock_bh();
......
...@@ -402,37 +402,35 @@ ipt_do_table(struct sk_buff *skb, ...@@ -402,37 +402,35 @@ ipt_do_table(struct sk_buff *skb,
} }
e = get_entry(table_base, v); e = get_entry(table_base, v);
} else { continue;
/* Targets which reenter must return }
abs. verdicts */
tgpar.target = t->u.kernel.target; /* Targets which reenter must return
tgpar.targinfo = t->data; abs. verdicts */
tgpar.target = t->u.kernel.target;
tgpar.targinfo = t->data;
#ifdef CONFIG_NETFILTER_DEBUG #ifdef CONFIG_NETFILTER_DEBUG
((struct ipt_entry *)table_base)->comefrom ((struct ipt_entry *)table_base)->comefrom = 0xeeeeeeec;
= 0xeeeeeeec;
#endif #endif
verdict = t->u.kernel.target->target(skb, &tgpar); verdict = t->u.kernel.target->target(skb, &tgpar);
#ifdef CONFIG_NETFILTER_DEBUG #ifdef CONFIG_NETFILTER_DEBUG
if (((struct ipt_entry *)table_base)->comefrom if (((struct ipt_entry *)table_base)->comefrom != 0xeeeeeeec &&
!= 0xeeeeeeec verdict == IPT_CONTINUE) {
&& verdict == IPT_CONTINUE) { printk("Target %s reentered!\n",
printk("Target %s reentered!\n", t->u.kernel.target->name);
t->u.kernel.target->name); verdict = NF_DROP;
verdict = NF_DROP;
}
((struct ipt_entry *)table_base)->comefrom
= 0x57acc001;
#endif
/* Target might have changed stuff. */
ip = ip_hdr(skb);
datalen = skb->len - ip->ihl * 4;
if (verdict == IPT_CONTINUE)
e = ipt_next_entry(e);
else
/* Verdict */
break;
} }
((struct ipt_entry *)table_base)->comefrom = 0x57acc001;
#endif
/* Target might have changed stuff. */
ip = ip_hdr(skb);
datalen = skb->len - ip->ihl * 4;
if (verdict == IPT_CONTINUE)
e = ipt_next_entry(e);
else
/* Verdict */
break;
} while (!hotdrop); } while (!hotdrop);
xt_info_rdunlock_bh(); xt_info_rdunlock_bh();
......
...@@ -431,35 +431,33 @@ ip6t_do_table(struct sk_buff *skb, ...@@ -431,35 +431,33 @@ ip6t_do_table(struct sk_buff *skb,
} }
e = get_entry(table_base, v); e = get_entry(table_base, v);
} else { continue;
/* Targets which reenter must return }
abs. verdicts */
tgpar.target = t->u.kernel.target; /* Targets which reenter must return
tgpar.targinfo = t->data; abs. verdicts */
tgpar.target = t->u.kernel.target;
tgpar.targinfo = t->data;
#ifdef CONFIG_NETFILTER_DEBUG #ifdef CONFIG_NETFILTER_DEBUG
((struct ip6t_entry *)table_base)->comefrom ((struct ip6t_entry *)table_base)->comefrom = 0xeeeeeeec;
= 0xeeeeeeec;
#endif #endif
verdict = t->u.kernel.target->target(skb, &tgpar); verdict = t->u.kernel.target->target(skb, &tgpar);
#ifdef CONFIG_NETFILTER_DEBUG #ifdef CONFIG_NETFILTER_DEBUG
if (((struct ip6t_entry *)table_base)->comefrom if (((struct ip6t_entry *)table_base)->comefrom != 0xeeeeeeec &&
!= 0xeeeeeeec verdict == IP6T_CONTINUE) {
&& verdict == IP6T_CONTINUE) { printk("Target %s reentered!\n",
printk("Target %s reentered!\n", t->u.kernel.target->name);
t->u.kernel.target->name); verdict = NF_DROP;
verdict = NF_DROP;
}
((struct ip6t_entry *)table_base)->comefrom
= 0x57acc001;
#endif
if (verdict == IP6T_CONTINUE)
e = ip6t_next_entry(e);
else
/* Verdict */
break;
} }
((struct ip6t_entry *)table_base)->comefrom = 0x57acc001;
#endif
if (verdict == IP6T_CONTINUE)
e = ip6t_next_entry(e);
else
/* Verdict */
break;
} while (!hotdrop); } while (!hotdrop);
#ifdef CONFIG_NETFILTER_DEBUG #ifdef CONFIG_NETFILTER_DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment