anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-20 19:44:56 +02:00
Code Issues Releases Wiki Activity

xt_TEE: remove old loop detection

Browse Source 
The loop detection does not work if the kernel is built without
conntrack. In fact, since cloned packets are sent directly and do not
pass through Xtables, there are no loops happening.
This commit is contained in:
Jan Engelhardt
2010-04-02 19:43:42 +02:00
parent 987402dc61
commit a17203e036
1 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
extensions/xt_TEE.c
View File

@@ -129,12 +129,6 @@ static void tee_tg_send(struct sk_buff *skb)
} }
} }
/*
* To detect and deter routed packet loopback when using the --tee option, we
* take a page out of the raw.patch book: on the copied skb, we set up a fake
* ->nfct entry, pointing to the local &route_tee_track. We skip routing
* packets when we see they already have that ->nfct.
*/
static unsigned int static unsigned int
tee_tg4(struct sk_buff **pskb, const struct xt_target_param *par) tee_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
{ {
@@ -142,17 +136,6 @@ tee_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
struct iphdr *iph; struct iphdr *iph;
#ifdef WITH_CONNTRACK
if (skb->nfct == &tee_track.ct_general) {
/*
* Loopback - a packet we already routed, is to be
* routed another time. Avoid that, now.
*/
if (net_ratelimit())
pr_debug(KBUILD_MODNAME "loopback - DROP!\n");
return NF_DROP;
}
#endif
/* /*
* Copy the skb, and route the copy. Will later return %XT_CONTINUE for * Copy the skb, and route the copy. Will later return %XT_CONTINUE for
* the original skb, which should continue on its way as if nothing has * the original skb, which should continue on its way as if nothing has
@@ -181,12 +164,9 @@ tee_tg4(struct sk_buff **pskb, const struct xt_target_param *par)
#ifdef WITH_CONNTRACK #ifdef WITH_CONNTRACK
/* /*
* Tell conntrack to forget this packet since it may get confused * Tell conntrack to forget this packet. It may have side effects to
* when a packet is leaving with dst address == our address. * see the same packet twice, as for example, accounting the original
* Good idea? Dunno. Need advice. * connection for the cloned packet.
*
* NEW: mark the skb with our &tee_track, so we avoid looping
* on any already routed packet.
*/ */
nf_conntrack_put(skb->nfct); nf_conntrack_put(skb->nfct);
skb->nfct = &tee_track.ct_general; skb->nfct = &tee_track.ct_general;
@@ -254,12 +234,6 @@ tee_tg6(struct sk_buff **pskb, const struct xt_target_param *par)
const struct xt_tee_tginfo *info = par->targinfo; const struct xt_tee_tginfo *info = par->targinfo;
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
/* Try silence. */
#ifdef WITH_CONNTRACK
if (skb->nfct == &tee_track.ct_general)
return NF_DROP;
#endif
if ((skb = skb_copy(skb, GFP_ATOMIC)) == NULL) if ((skb = skb_copy(skb, GFP_ATOMIC)) == NULL)
return XT_CONTINUE; return XT_CONTINUE;
@@ -317,8 +291,7 @@ static int __init tee_tg_init(void)
{ {
#ifdef WITH_CONNTRACK #ifdef WITH_CONNTRACK
/* /*
* Set up fake conntrack (stolen from raw.patch): * Set up fake conntrack - to never be deleted, not in any hashes
* - to never be deleted, not in any hashes
*/ */
atomic_set(&tee_track.ct_general.use, 1); atomic_set(&tee_track.ct_general.use, 1);