aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJing Min Zhao <zhaojingmin@vivecode.com>2007-05-24 16:43:07 -0700
committerDavid S. Miller <davem@davemloft.net>2007-05-24 16:43:07 -0700
commitbb807245ef981cac7e8550aea365e6f2157d5c4d (patch)
treee4d1b891a08d8503ee3119758ef1773c2e88080a /net
parentd052918688bdd7a1218aa5ae182013bf45a4881a (diff)
[NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access
Update get_h225_addr() to meet the changes in ASN.1 types. It was using field ip6 to access IPv6 TransportAddress, it should be ip according the ASN.1 definition. Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com> 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.c2
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 b284db73ca7..8bb99b3675b 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -640,7 +640,7 @@ int get_h225_addr(struct nf_conn *ct, unsigned char *data,
case eTransportAddress_ip6Address:
if (family != AF_INET6)
return 0;
- p = data + taddr->ip6Address.ip6;
+ p = data + taddr->ip6Address.ip;
len = 16;
break;
default: