Skip to contentSkip to conversation

H.323: update get_h225_addr() for IPv6 address access

PATCH Applied Jing Min Zhao 2 participants 2 messages May 17, 2007 – May 24, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/4 H.323: update 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.

---
 net/netfilter/nf_conntrack_h323_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/netfilter/nf_conntrack_h323_main.c +1 -1
index b284db7..8bb99b3 100644
@@ -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:
Signature · 1 line
1.4.4.3
#1 lore raw
Quoted 3 lines · Jing Min Zhao

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.

Also applied, thanks.

BTW, I've replaced "update" by "fix" in the patch title since these really are fixes and the merge window is already closed.