d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need for ipfw_flush_tables(), we just need ipfw_destroy_tables()

Browse Source
This commit is contained in:
Luigi Rizzo 2010-03-21 15:54:07 +00:00
parent 2baa9be5d7
commit b4eacea680
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/netinet/ipfw/ip_fw_private.h
View File

@ -274,7 +274,6 @@ int ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr,
int ipfw_init_tables(struct ip_fw_chain *ch);
void ipfw_destroy_tables(struct ip_fw_chain *ch);
int ipfw_flush_table(struct ip_fw_chain *ch, uint16_t tbl);
void ipfw_flush_tables(struct ip_fw_chain *ch);
int ipfw_add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr,
uint8_t mlen, uint32_t value);
int ipfw_dump_table_entry(struct radix_node *rn, void *arg);

23
sys/netinet/ipfw/ip_fw_table.c
View File

@ -176,14 +176,18 @@ ipfw_flush_table(struct ip_fw_chain *ch, uint16_t tbl)
}
void
ipfw_flush_tables(struct ip_fw_chain *ch)
ipfw_destroy_tables(struct ip_fw_chain *ch)
{
uint16_t tbl;
struct radix_node_head *rnh;
IPFW_WLOCK_ASSERT(ch);
for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++)
for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++) {
ipfw_flush_table(ch, tbl);
rnh = ch->tables[tbl];
rn_detachhead((void **)&rnh);
}
}
int
@ -203,21 +207,6 @@ ipfw_init_tables(struct ip_fw_chain *ch)
return (0);
}
void
ipfw_destroy_tables(struct ip_fw_chain *ch)
{
int tbl;
struct radix_node_head *rnh;
IPFW_WLOCK_ASSERT(ch);
ipfw_flush_tables(ch);
for (tbl = 0; tbl < IPFW_TABLES_MAX; tbl++) {
rnh = ch->tables[tbl];
rn_detachhead((void **)&rnh);
}
}
int
ipfw_lookup_table(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr,
uint32_t *val)