---

yaml --- r: 56987 b: refs/heads/master c: f8f1c08 h: refs/heads/master i: 56985: b94b2ae 56983: 863c7dd v: v3
git-mirror · May 24, 2007 · bc1a75a · bc1a75a
1 parent 750d247
commit bc1a75a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596830f1a1e5d26a83fe83b99ced1456d9d7f39b
+refs/heads/master: f8f1c08eaef838e22bf427665da87cfa73e5074d
diff --git a/trunk/net/netfilter/nf_conntrack_h323_main.c b/trunk/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;
 }