svn commit: r332772 - stable/11/sys/netpfil/ipfw

[Oleg Bulyzhin]

Author: oleg
Date: Thu Apr 19 15:02:42 2018
New Revision: 332772
URL: https://svnweb.freebsd.org/changeset/base/332772

Log:
  Fix ipfw table creation when net.inet.ip.fw.tables_sets = 0 and non zero set
  specified on table creation. This fixes following:
  
  # sysctl net.inet.ip.fw.tables_sets
  net.inet.ip.fw.tables_sets: 0
  # ipfw table all info
  # ipfw set 1 table 1 create type addr
  # ipfw set 1 table 1 create type addr
  # ipfw add 10 set 1 count ip from table\(1\) to any
  00010 count ip from table(1) to any
  # ipfw add 10 set 1 count ip from table\(1\) to any
  00010 count ip from table(1) to any
  # ipfw table all info
   --- table(1), set(1) ---
    kindex: 4, type: addr
    references: 1, valtype: legacy
    algorithm: addr:radix
    items: 0, size: 296
   --- table(1), set(1) ---
    kindex: 3, type: addr
    references: 1, valtype: legacy
    algorithm: addr:radix
    items: 0, size: 296
   --- table(1), set(1) ---
    kindex: 2, type: addr
    references: 0, valtype: legacy
    algorithm: addr:radix
    items: 0, size: 296
   --- table(1), set(1) ---
    kindex: 1, type: addr
    references: 0, valtype: legacy
    algorithm: addr:radix
    items: 0, size: 296
  #

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	Thu Apr 19 14:09:44 2018	(r332771)
+++ stable/11/sys/netpfil/ipfw/ip_fw_table.c	Thu Apr 19 15:02:42 2018	(r332772)
@@ -3169,7 +3169,7 @@ alloc_table_config(struct ip_fw_chain *ch, struct tid_
 		if (ntlv == NULL)
 			return (NULL);
 		name = ntlv->name;
-		set = ntlv->set;
+		set = (V_fw_tables_sets == 0) ? 0 : ntlv->set;
 	} else {
 		/* Compat part: convert number to string representation */
 		snprintf(bname, sizeof(bname), "%d", ti->uidx);