diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2008-03-20 15:06:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-20 15:06:23 -0700 |
| commit | 6aebb9b280e5662ece41cf570e25e61795443985 (patch) | |
| tree | 97f654f3f7833f583e34e576e0c852a3000ff6f0 /net | |
| parent | 247df4548fdbb0f263aaa0386bbaf52bc359a972 (diff) | |
| download | linux-3.10-6aebb9b280e5662ece41cf570e25e61795443985.tar.gz linux-3.10-6aebb9b280e5662ece41cf570e25e61795443985.tar.bz2 linux-3.10-6aebb9b280e5662ece41cf570e25e61795443985.zip | |
[NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup()
logical-bitwise & confusion
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_h323_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 62137879e6a..898f1922b5b 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -842,7 +842,7 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct, set_h225_addr = rcu_dereference(set_h225_addr_hook); if ((setup->options & eSetup_UUIE_destCallSignalAddress) && - (set_h225_addr) && ct->status && IPS_NAT_MASK && + (set_h225_addr) && ct->status & IPS_NAT_MASK && get_h225_addr(ct, *data, &setup->destCallSignalAddress, &addr, &port) && memcmp(&addr, &ct->tuplehash[!dir].tuple.src.u3, sizeof(addr))) { |