diff options
| author | Alexandr Nedvedicky <Alexandr.Nedvedicky@Sun.COM> | 2008-09-26 10:17:59 +0200 |
|---|---|---|
| committer | Alexandr Nedvedicky <Alexandr.Nedvedicky@Sun.COM> | 2008-09-26 10:17:59 +0200 |
| commit | 40cdc2e8babc6bb3ab847f6a129fc9eb76c5f4d5 (patch) | |
| tree | afff4137cfd216cca21b4873597c4d71614a01a0 /usr/src/cmd/ipf | |
| parent | b29057431058f049213acfca99fa74ca4badffa0 (diff) | |
| download | illumos-joyent-40cdc2e8babc6bb3ab847f6a129fc9eb76c5f4d5.tar.gz | |
6743637 ipfstat prints certain certain counters two times
6744095 fix c-style in ip_state.c in fr_matchstate() et. al.
6744100 add a comment for CR 6653172 to fil.c
6725139 OOW problem still present after a patch 127888-09 has been applied
6657378 IPF address pools does not match addresses reliably for IPv6
6726717 IPF persistent tunables still don't work with stack instances
6743002 ipf_property_update() is too picky
6731974 incorrect calculation in fr_pullup
6749974 IPF does not know whether packet comes from local client (loopback) or from NIC interface
Diffstat (limited to 'usr/src/cmd/ipf')
| -rw-r--r-- | usr/src/cmd/ipf/tools/ipfstat.c | 13 | ||||
| -rw-r--r-- | usr/src/cmd/ipf/tools/ipmon.c | 8 |
2 files changed, 12 insertions, 9 deletions
diff --git a/usr/src/cmd/ipf/tools/ipfstat.c b/usr/src/cmd/ipf/tools/ipfstat.c index 46707d6a34..1262b86921 100644 --- a/usr/src/cmd/ipf/tools/ipfstat.c +++ b/usr/src/cmd/ipf/tools/ipfstat.c @@ -1055,12 +1055,10 @@ ips_stat_t *ipsp; if (!(opts & OPT_SHOWLIST)) { PRINTF("IP states added:\n\t%lu TCP\n\t%lu UDP\n\t%lu ICMP\n", ipsp->iss_tcp, ipsp->iss_udp, ipsp->iss_icmp); - PRINTF("\t%lu hits\n\t%lu misses\n", ipsp->iss_hits, - ipsp->iss_miss); - PRINTF("\t%lu maximum\n\t%lu no memory\n\t%lu max bucket\n", - 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 hits\n\t%lu misses\n", + ipsp->iss_hits, ipsp->iss_miss); + PRINTF("\t%lu maximum\n\t%lu no memory\n", ipsp->iss_max, + ipsp->iss_nomem); PRINTF("\t%lu active\n\t%lu expired\n", ipsp->iss_active, ipsp->iss_expire); PRINTF("\t%lu closed\n\t%u orphans\n", @@ -1070,7 +1068,8 @@ ips_stat_t *ipsp; state_logging ? "en" : "dis"); PRINTF("\nState table bucket statistics:\n"); - PRINTF("\t%lu in use\t\n", ipsp->iss_inuse); + PRINTF("\t%lu in use\n\t%lu max bucket\n", ipsp->iss_inuse, + ipsp->iss_bucketfull); minlen = ipsp->iss_max; totallen = 0; diff --git a/usr/src/cmd/ipf/tools/ipmon.c b/usr/src/cmd/ipf/tools/ipmon.c index e9d37720ef..d4a351b015 100644 --- a/usr/src/cmd/ipf/tools/ipmon.c +++ b/usr/src/cmd/ipf/tools/ipmon.c @@ -7,7 +7,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" #ifndef SOLARIS #define SOLARIS (defined(__SVR4) || defined(__svr4__)) && defined(sun) @@ -1278,8 +1277,13 @@ printipflog: t += 8; } if ((ipf->fl_lflags & FI_OOW) != 0) { + if (ipf->fl_lflags & FI_NEG_OOW) { + strcpy(t, " NEG_OOW"); + t += sizeof (" NEG_OOW") - 1; + } else { strcpy(t, " OOW"); - t += 4; + t += sizeof (" OOW") - 1; + } } if ((ipf->fl_lflags & FI_BAD) != 0) { strcpy(t, " bad"); |