From: zhaojingmin@vivecode.com (Jing Min Zhao) Subject: [PATCH] H.323: Add missing T.120 address in OLCA Date: Thu, 17 May 2007 16:00:33 -0400 (EDT) Message-ID: <20070517200033.B49F93DA1F7@jzhao.vivecode.com> Cc: Netfilter Development Mailinglist To: Patrick McHardy Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: netfilter-devel-bounces@lists.netfilter.org Errors-To: netfilter-devel-bounces@lists.netfilter.org List-Id: netfilter-devel.vger.kernel.org Add missing process of T.120 address in OpenLogicalChannelAck signal. Signed-off-by: Jing Min Zhao --- net/netfilter/nf_conntrack_h323_main.c | 10 ++++++++++ 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; } -- 1.4.4.3