svn commit: r300302 - head/sys/netpfil/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Fri May 20 15:00:12 2016
New Revision: 300302
URL: https://svnweb.freebsd.org/changeset/base/300302

Log:
  Fix the regression introduced in r300143.
  When we are creating new dynamic state use MATCH_FORWARD direction to
  correctly initialize protocol's state.

Modified:
  head/sys/netpfil/ipfw/ip_fw_dynamic.c

Modified: head/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_dynamic.c	Fri May 20 14:36:49 2016	(r300301)
+++ head/sys/netpfil/ipfw/ip_fw_dynamic.c	Fri May 20 15:00:12 2016	(r300302)
@@ -687,7 +687,7 @@ ipfw_install_state(struct ip_fw_chain *c
     ipfw_insn_limit *cmd, struct ip_fw_args *args, uint32_t tablearg)
 {
 	ipfw_dyn_rule *q;
-	int i, dir;
+	int i;
 
 	DEB(print_dyn_rule(&args->f_id, cmd->o.opcode, "install_state", "");)
 	
@@ -695,7 +695,7 @@ ipfw_install_state(struct ip_fw_chain *c
 
 	IPFW_BUCK_LOCK(i);
 
-	q = lookup_dyn_rule_locked(&args->f_id, i, &dir, NULL);
+	q = lookup_dyn_rule_locked(&args->f_id, i, NULL, NULL);
 	if (q != NULL) {	/* should never occur */
 		DEB(
 		if (last_log != time_uptime) {
@@ -816,7 +816,7 @@ ipfw_install_state(struct ip_fw_chain *c
 		return (1);	/* Notify caller about failure */
 	}
 
-	dyn_update_proto_state(q, &args->f_id, NULL, dir);
+	dyn_update_proto_state(q, &args->f_id, NULL, MATCH_FORWARD);
 	IPFW_BUCK_UNLOCK(i);
 	return (0);
 }