[NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA
authorJing Min Zhao <zhaojingmin@vivecode.com>
Thu, 24 May 2007 23:44:11 +0000 (16:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 May 2007 23:44:11 +0000 (16:44 -0700)
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>
net/netfilter/nf_conntrack_h323_main.c

index 6d668af4f999b1b7959aa99045a9e9f676a9a9b9..a1b95acad297471c0d65973a5a1678ebf648ceb4 100644 (file)
@@ -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;
 }
 
        return 0;
 }