diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2015-01-03 13:58:15 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2015-01-03 13:58:15 +0100 |
| commit | 4aca87515a5083ae0e31ce3177189fd43b6d05ac (patch) | |
| tree | 7b1d9a31393ca090757dc6f0d3859b4fcd93f271 /release/src/linux/linux/net/ipv4/netfilter/ipt_TRIGGER.c | |
| parent | 008d0be72b2f160382c6e880765e96b64a050c65 (diff) | |
| download | tomato-4aca87515a5083ae0e31ce3177189fd43b6d05ac.tar.gz tomato-4aca87515a5083ae0e31ce3177189fd43b6d05ac.tar.bz2 | |
patch to Vanilla Tomato 1.28
Diffstat (limited to 'release/src/linux/linux/net/ipv4/netfilter/ipt_TRIGGER.c')
| -rw-r--r-- | release/src/linux/linux/net/ipv4/netfilter/ipt_TRIGGER.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/release/src/linux/linux/net/ipv4/netfilter/ipt_TRIGGER.c b/release/src/linux/linux/net/ipv4/netfilter/ipt_TRIGGER.c index 99e7dfe7..07103fa5 100644 --- a/release/src/linux/linux/net/ipv4/netfilter/ipt_TRIGGER.c +++ b/release/src/linux/linux/net/ipv4/netfilter/ipt_TRIGGER.c @@ -62,7 +62,8 @@ LIST_HEAD(trigger_list); static void trigger_refresh(struct ipt_trigger *trig, unsigned long extra_jiffies) { - DEBUGP("%s: \n", __FUNCTION__); + DEBUGP("%s: mport=%u-%u\n", __FUNCTION__, trig->ports.mport[0], trig->ports.mport[1]); + IP_NF_ASSERT(trig); WRITE_LOCK(&ip_conntrack_lock); @@ -77,7 +78,8 @@ static void trigger_refresh(struct ipt_trigger *trig, unsigned long extra_jiffie static void __del_trigger(struct ipt_trigger *trig) { - DEBUGP("%s: \n", __FUNCTION__); + DEBUGP("%s: mport=%u-%u\n", __FUNCTION__, trig->ports.mport[0], trig->ports.mport[1]); + IP_NF_ASSERT(trig); MUST_BE_WRITE_LOCKED(&ip_conntrack_lock); @@ -90,7 +92,9 @@ static void trigger_timeout(unsigned long ul_trig) { struct ipt_trigger *trig= (void *) ul_trig; - DEBUGP("trigger list %p timed out\n", trig); +// DEBUGP("trigger list %p timed out\n", trig); + DEBUGP("%s: mport=%u-%u\n", __FUNCTION__, trig->ports.mport[0], trig->ports.mport[1]); + WRITE_LOCK(&ip_conntrack_lock); __del_trigger(trig); WRITE_UNLOCK(&ip_conntrack_lock); @@ -250,7 +254,7 @@ trigger_dnat(struct sk_buff **pskb, IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW)); DEBUGP("%s: got ", __FUNCTION__); - DUMP_TUPLE(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); + DUMP_TUPLE_RAW(&ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple); /* Alter the destination of imcoming packet. */ newrange = ((struct ip_nat_multi_range) @@ -310,7 +314,7 @@ trigger_check(const char *tablename, DEBUGP("trigger_check: size %u.\n", targinfosize); return 0; } - if (hook_mask & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_FORWARD))) { + if (hook_mask & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_FORWARD) | (1 << NF_IP_LOCAL_OUT) | (1 << NF_IP_POST_ROUTING))) { DEBUGP("trigger_check: bad hooks %x.\n", hook_mask); return 0; } |