Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Oct 2016 17:34:33 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r307970 - stable/11/sys/netpfil/ipfw
Message-ID:  <201610261734.u9QHYXAt036699@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Wed Oct 26 17:34:33 2016
New Revision: 307970
URL: https://svnweb.freebsd.org/changeset/base/307970

Log:
  MFC r307628:
    Fix `ipfw table lookup` handler to return entry value, but not its index.

Modified:
  stable/11/sys/netpfil/ipfw/ip_fw_table.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- stable/11/sys/netpfil/ipfw/ip_fw_table.c	Wed Oct 26 17:07:53 2016	(r307969)
+++ stable/11/sys/netpfil/ipfw/ip_fw_table.c	Wed Oct 26 17:34:33 2016	(r307970)
@@ -1087,6 +1087,7 @@ find_table_entry(struct ip_fw_chain *ch,
 	struct table_config *tc;
 	struct table_algo *ta;
 	struct table_info *kti;
+	struct table_value *pval;
 	struct namedobj_instance *ni;
 	int error;
 	size_t sz;
@@ -1132,7 +1133,10 @@ find_table_entry(struct ip_fw_chain *ch,
 		return (ENOTSUP);
 
 	error = ta->find_tentry(tc->astate, kti, tent);
-
+	if (error == 0) {
+		pval = get_table_value(ch, tc, tent->v.kidx);
+		ipfw_export_table_value_v1(pval, &tent->v.value);
+	}
 	IPFW_UH_RUNLOCK(ch);
 
 	return (error);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610261734.u9QHYXAt036699>