diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/ipf/lib/common/printfraginfo.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/ipf/tools/ipfstat.c | 9 | ||||
| -rw-r--r-- | usr/src/uts/common/inet/ipf/ip_state.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/inet/ipf/netinet/ip_fil.h | 8 |
4 files changed, 13 insertions, 10 deletions
diff --git a/usr/src/cmd/ipf/lib/common/printfraginfo.c b/usr/src/cmd/ipf/lib/common/printfraginfo.c index 557b031a6b..0dc5f56576 100644 --- a/usr/src/cmd/ipf/lib/common/printfraginfo.c +++ b/usr/src/cmd/ipf/lib/common/printfraginfo.c @@ -21,7 +21,7 @@ struct ipfr *ifr; sizeof(fr)) == -1) return; printf("%s id %d ttl %d pr %d seen0 %d ifp %p tos %#02x = %#x\n", - hostname(4, &ifr->ipfr_dst), ifr->ipfr_id, ifr->ipfr_seen0, - ifr->ipfr_ttl, ifr->ipfr_p, ifr->ipfr_ifp, ifr->ipfr_tos, + hostname(4, &ifr->ipfr_dst), ifr->ipfr_id, ifr->ipfr_ttl, + ifr->ipfr_p, ifr->ipfr_seen0, ifr->ipfr_ifp, ifr->ipfr_tos, fr.fr_flags); } diff --git a/usr/src/cmd/ipf/tools/ipfstat.c b/usr/src/cmd/ipf/tools/ipfstat.c index 1262b86921..27b018e273 100644 --- a/usr/src/cmd/ipf/tools/ipfstat.c +++ b/usr/src/cmd/ipf/tools/ipfstat.c @@ -131,7 +131,7 @@ typedef struct statetop { int main __P((int, char *[])); static void showstats __P((friostat_t *, u_32_t)); -static void showfrstates __P((ipfrstat_t *)); +static void showfrstates __P((ipfrstat_t *, u_long)); static void showlist __P((friostat_t *)); static void showipstates __P((ips_stat_t *)); static void showauthstates __P((fr_authstat_t *)); @@ -385,7 +385,7 @@ char *argv[]; showlist(fiop); } } else if (opts & OPT_FRSTATES) - showfrstates(ifrstp); + showfrstates(ifrstp, fiop->f_ticks); #ifdef STATETOP else if (opts & OPT_STATETOP) topipstates(saddr, daddr, sport, dport, protocol, @@ -1565,8 +1565,9 @@ out: /* * Show fragment cache information that's held in the kernel. */ -static void showfrstates(ifsp) +static void showfrstates(ifsp, ticks) ipfrstat_t *ifsp; +u_long ticks; { struct ipfr *ipfrtab[IPFT_SIZE], ifr; int i; @@ -1593,6 +1594,7 @@ ipfrstat_t *ifsp; if (kmemcpy((char *)&ifr, (u_long)ipfrtab[i], sizeof(ifr)) == -1) break; + ifr.ipfr_ttl -= ticks; printfraginfo("", &ifr); ipfrtab[i] = ifr.ipfr_next; } @@ -1606,6 +1608,7 @@ ipfrstat_t *ifsp; if (kmemcpy((char *)&ifr, (u_long)ipfrtab[i], sizeof(ifr)) == -1) break; + ifr.ipfr_ttl -= ticks; printfraginfo("NAT: ", &ifr); ipfrtab[i] = ifr.ipfr_next; } diff --git a/usr/src/uts/common/inet/ipf/ip_state.c b/usr/src/uts/common/inet/ipf/ip_state.c index eb8bd6a748..1c1a8f82c1 100644 --- a/usr/src/uts/common/inet/ipf/ip_state.c +++ b/usr/src/uts/common/inet/ipf/ip_state.c @@ -1459,7 +1459,7 @@ u_int flags; is->is_ifp[out << 1] = fin->fin_ifp; if (fin->fin_ifp != NULL) { - COPYIFNAME(fin->fin_ifp, is->is_ifname[out << 1], fr->fr_v); + COPYIFNAME(fin->fin_ifp, is->is_ifname[out << 1], fin->fin_v); } /* diff --git a/usr/src/uts/common/inet/ipf/netinet/ip_fil.h b/usr/src/uts/common/inet/ipf/netinet/ip_fil.h index 815914836f..48993b0614 100644 --- a/usr/src/uts/common/inet/ipf/netinet/ip_fil.h +++ b/usr/src/uts/common/inet/ipf/netinet/ip_fil.h @@ -294,13 +294,13 @@ typedef struct fr_ip { /* * For use in fi_flx */ -#define FI_MULTICAST 0x0001 -#define FI_BROADCAST 0x0002 +#define FI_TCPUDP 0x0001 /* TCP/UCP implied comparison*/ +#define FI_OPTIONS 0x0002 #define FI_FRAG 0x0004 #define FI_SHORT 0x0008 #define FI_NATED 0x0010 -#define FI_TCPUDP 0x0020 /* TCP/UCP implied comparison*/ -#define FI_OPTIONS 0x0040 +#define FI_MULTICAST 0x0020 +#define FI_BROADCAST 0x0040 #define FI_MBCAST 0x0080 #define FI_STATE 0x0100 #define FI_BADNAT 0x0200 |