Date: Tue, 12 May 2015 20:42:42 +0000 (UTC) From: "Alexander V. Chernikov" <melifaro@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282825 - head/sys/netpfil/ipfw Message-ID: <201505122042.t4CKgg9L083195@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: melifaro Date: Tue May 12 20:42:42 2015 New Revision: 282825 URL: https://svnweb.freebsd.org/changeset/base/282825 Log: Remove ptei->value check from ipfw_link_table_values(): even if there was non-zero number of restarts, we would unref/clear all value references and start ipfw_link_table_values() once again with (mostly) cleared "tei" buffer. Additionally, ptei->ptv stores only to-be-added values, not existing ones. This is a forgotten piece of previous value refconting implementation, and now it is simply incorrect. Modified: head/sys/netpfil/ipfw/ip_fw_table_value.c Modified: head/sys/netpfil/ipfw/ip_fw_table_value.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw_table_value.c Tue May 12 20:04:17 2015 (r282824) +++ head/sys/netpfil/ipfw/ip_fw_table_value.c Tue May 12 20:42:42 2015 (r282825) @@ -563,17 +563,6 @@ ipfw_link_table_values(struct ip_fw_chai /* Let's try to link values */ for (i = 0; i < count; i++) { ptei = &tei[i]; - if (ptei->value != 0) { - - /* - * We may be here after several process restarts, - * so we need to update all fields that might - * have changed. - */ - ptv = (struct table_val_link *)ptei->ptv; - ptv->pval = &pval[i]; - continue; - } /* Check if record has appeared */ mask_table_value(ptei->pvalue, &tval, ts->vmask);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505122042.t4CKgg9L083195>