diff options
| author | John Ojemann <John.Ojemann@Sun.COM> | 2008-08-28 16:54:08 -0400 |
|---|---|---|
| committer | John Ojemann <John.Ojemann@Sun.COM> | 2008-08-28 16:54:08 -0400 |
| commit | 5b48165c6e9472ee88f4eaa23389c4c16eb16ca1 (patch) | |
| tree | 0087263eec9e0226614f98fd86b862806297c58a /usr/src/cmd/ipf | |
| parent | 6723e17f4e092e7f275f0791f9fce3ea061339d7 (diff) | |
| download | illumos-joyent-5b48165c6e9472ee88f4eaa23389c4c16eb16ca1.tar.gz | |
6713984 if a nat entry is created, but the packet gets blocked, the entry should be removed
6718524 ipfilter incorrectly tracks and handles orphan state table and nat table entries
6742115 IPfilter: NAT entries added with SIOCSTPUT are ignored if no rules exist.
6528443 ipnat -l shows more sessions than ipf_nattable_max
Diffstat (limited to 'usr/src/cmd/ipf')
| -rw-r--r-- | usr/src/cmd/ipf/tools/ipfstat.c | 8 | ||||
| -rw-r--r-- | usr/src/cmd/ipf/tools/ipnat.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/usr/src/cmd/ipf/tools/ipfstat.c b/usr/src/cmd/ipf/tools/ipfstat.c index 4945ffe8be..46707d6a34 100644 --- a/usr/src/cmd/ipf/tools/ipfstat.c +++ b/usr/src/cmd/ipf/tools/ipfstat.c @@ -7,8 +7,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __FreeBSD__ # ifndef __FreeBSD_cc_version # include <osreldate.h> @@ -1063,8 +1061,10 @@ ips_stat_t *ipsp; ipsp->iss_max, ipsp->iss_nomem, ipsp->iss_bucketfull); PRINTF("\t%lu maximum\n\t%lu no memory\n\t%lu bkts in use\n", ipsp->iss_max, ipsp->iss_nomem, ipsp->iss_inuse); - PRINTF("\t%lu active\n\t%lu expired\n\t%lu closed\n", - ipsp->iss_active, ipsp->iss_expire, ipsp->iss_fin); + PRINTF("\t%lu active\n\t%lu expired\n", + ipsp->iss_active, ipsp->iss_expire); + PRINTF("\t%lu closed\n\t%u orphans\n", + ipsp->iss_fin, ipsp->iss_orphans); PRINTF("State logging %sabled\n", state_logging ? "en" : "dis"); diff --git a/usr/src/cmd/ipf/tools/ipnat.c b/usr/src/cmd/ipf/tools/ipnat.c index 57a0bab951..83b2a416c3 100644 --- a/usr/src/cmd/ipf/tools/ipnat.c +++ b/usr/src/cmd/ipf/tools/ipnat.c @@ -9,8 +9,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <string.h> #include <fcntl.h> @@ -304,8 +302,8 @@ int fd, opts, alive; nsp->ns_added, nsp->ns_expire); printf("no memory\t%lu\tbad nat\t%lu\n", nsp->ns_memfail, nsp->ns_badnat); - printf("inuse\t%lu\nrules\t%lu\n", - nsp->ns_inuse, nsp->ns_rules); + printf("inuse\t%lu\norphans\t%u\nrules\t%lu\n", + nsp->ns_inuse, nsp->ns_orphans, nsp->ns_rules); printf("wilds\t%u\n", nsp->ns_wilds); if (opts & OPT_VERBOSE) printf("table %p list %p\n", |