summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJing Min Zhao <zhaojingmin@vivecode.com>2007-05-24 16:44:11 -0700
committerDavid S. Miller <davem@davemloft.net>2007-05-24 16:44:11 -0700
commitf8f1c08eaef838e22bf427665da87cfa73e5074d (patch)
treed4e6132e854f1792360121215080889753d089e6 /net
parent596830f1a1e5d26a83fe83b99ced1456d9d7f39b (diff)
downloadop-kernel-dev-f8f1c08eaef838e22bf427665da87cfa73e5074d.zip
op-kernel-dev-f8f1c08eaef838e22bf427665da87cfa73e5074d.tar.gz
[NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA
Add missing process of T.120 address in OpenLogicalChannelAck signal. 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.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 6d668af..a1b95ac 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -520,6 +520,16 @@ static int process_olca(struct sk_buff **pskb, struct nf_conn *ct,
}
}
+ if ((olca->options & eOpenLogicalChannelAck_separateStack) &&
+ olca->separateStack.networkAddress.choice ==
+ eNetworkAccessParameters_networkAddress_localAreaAddress) {
+ ret = expect_t120(pskb, ct, ctinfo, data, dataoff,
+ &olca->separateStack.networkAddress.
+ localAreaAddress);
+ if (ret < 0)
+ return -1;
+ }
+
return 0;
}
OpenPOWER on IntegriCloud