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

* Fix table sets handling.

Browse Source 
* Simplify formatting.

Suggested by:	luigi
This commit is contained in:
Alexander V. Chernikov 2014-10-17 20:47:55 +00:00
parent 06796b6791
commit d3de6c1d2f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=273241
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sbin/ipfw/ipfw2.c
View File

@ -2138,7 +2138,7 @@ ipfw_sets_handler(char *av[])
{
uint32_t masks[2];
int i;
uint8_t cmd, new_set, rulenum;
uint8_t cmd, rulenum;
ipfw_range_tlv rt;
char *msg;
size_t size;
@ -2202,7 +2202,7 @@ ipfw_sets_handler(char *av[])
if (!isdigit(*(av[0])) || (cmd == 3 && rt.set > RESVD_SET) ||
(cmd == 2 && rt.start_rule == IPFW_DEFAULT_RULE) )
errx(EX_DATAERR, "invalid source number %s\n", av[0]);
if (!isdigit(*(av[2])) || new_set > RESVD_SET)
if (!isdigit(*(av[2])) || rt.new_set > RESVD_SET)
errx(EX_DATAERR, "invalid dest. set %s\n", av[1]);
i = do_range_cmd(cmd, &rt);
} else if (_substrcmp(*av, "disable") == 0 ||
@ -2543,6 +2543,7 @@ ipfw_show_config(struct cmdline_opts *co, struct format_opts *fo,
dynbase = NULL;
dynsz = 0;
read = sizeof(*cfg);
rcnt = 0;
fo->set_mask = cfg->set_mask;

2
sbin/ipfw/tables.c
View File

@ -1908,7 +1908,7 @@ ipfw_list_values(int ac, char *av[])
for (i = 0; i < olh->count; i++) {
table_show_value(buf, sizeof(buf), (ipfw_table_value *)v,
vmask, 0);
printf("[%u] refs=%ju %s\n", v->spare1, v->refcnt, buf);
printf("[%u] refs=%lu %s\n", v->spare1, (u_long)v->refcnt, buf);
v = (struct _table_value *)((caddr_t)v + olh->objsize);
}