Deleted Added
full compact
1c1
< /* $FreeBSD: head/usr.bin/netstat/ipsec.c 153809 2005-12-28 20:36:55Z kbyanc $ */
---
> /* $FreeBSD: head/usr.bin/netstat/ipsec.c 160787 2006-07-28 16:09:19Z yar $ */
99c99
< __FBSDID("$FreeBSD: head/usr.bin/netstat/ipsec.c 153809 2005-12-28 20:36:55Z kbyanc $");
---
> __FBSDID("$FreeBSD: head/usr.bin/netstat/ipsec.c 160787 2006-07-28 16:09:19Z yar $");
117a118
> #include <stdint.h>
207c208
< printf("\t\t%s: %llu\n", p->str, (unsigned long long)hist[proto]);
---
> printf("\t\t%s: %ju\n", p->str, (uintmax_t)hist[proto]);
209,210c210,211
< printf("\t\t#%ld: %llu\n", (long)proto,
< (unsigned long long)hist[proto]);
---
> printf("\t\t#%ld: %ju\n", (long)proto,
> (uintmax_t)hist[proto]);
219c220
< printf(m, (unsigned long long)ipsecstat->f, plural(ipsecstat->f))
---
> printf(m, (uintmax_t)ipsecstat->f, plural(ipsecstat->f))
221c222
< printf(m, (unsigned long long)ipsecstat->f, plurales(ipsecstat->f))
---
> printf(m, (uintmax_t)ipsecstat->f, plurales(ipsecstat->f))
225,226c226,227
< p(in_success, "\t%llu inbound packet%s processed successfully\n");
< p(in_polvio, "\t%llu inbound packet%s violated process security "
---
> p(in_success, "\t%ju inbound packet%s processed successfully\n");
> p(in_polvio, "\t%ju inbound packet%s violated process security "
228,235c229,236
< p(in_nosa, "\t%llu inbound packet%s with no SA available\n");
< p(in_inval, "\t%llu invalid inbound packet%s\n");
< p(in_nomem, "\t%llu inbound packet%s failed due to insufficient memory\n");
< p(in_badspi, "\t%llu inbound packet%s failed getting SPI\n");
< p(in_ahreplay, "\t%llu inbound packet%s failed on AH replay check\n");
< p(in_espreplay, "\t%llu inbound packet%s failed on ESP replay check\n");
< p(in_ahauthsucc, "\t%llu inbound packet%s considered authentic\n");
< p(in_ahauthfail, "\t%llu inbound packet%s failed on authentication\n");
---
> p(in_nosa, "\t%ju inbound packet%s with no SA available\n");
> p(in_inval, "\t%ju invalid inbound packet%s\n");
> p(in_nomem, "\t%ju inbound packet%s failed due to insufficient memory\n");
> p(in_badspi, "\t%ju inbound packet%s failed getting SPI\n");
> p(in_ahreplay, "\t%ju inbound packet%s failed on AH replay check\n");
> p(in_espreplay, "\t%ju inbound packet%s failed on ESP replay check\n");
> p(in_ahauthsucc, "\t%ju inbound packet%s considered authentic\n");
> p(in_ahauthfail, "\t%ju inbound packet%s failed on authentication\n");
240,241c241,242
< p(out_success, "\t%llu outbound packet%s processed successfully\n");
< p(out_polvio, "\t%llu outbound packet%s violated process security "
---
> p(out_success, "\t%ju outbound packet%s processed successfully\n");
> p(out_polvio, "\t%ju outbound packet%s violated process security "
243,246c244,247
< p(out_nosa, "\t%llu outbound packet%s with no SA available\n");
< p(out_inval, "\t%llu invalid outbound packet%s\n");
< p(out_nomem, "\t%llu outbound packet%s failed due to insufficient memory\n");
< p(out_noroute, "\t%llu outbound packet%s with no route\n");
---
> p(out_nosa, "\t%ju outbound packet%s with no SA available\n");
> p(out_inval, "\t%ju invalid outbound packet%s\n");
> p(out_nomem, "\t%ju outbound packet%s failed due to insufficient memory\n");
> p(out_noroute, "\t%ju outbound packet%s with no route\n");
250,251c251,252
< p(spdcachelookup, "\t%llu SPD cache lookup%s\n");
< pes(spdcachemiss, "\t%llu SPD cache miss%s\n");
---
> p(spdcachelookup, "\t%ju SPD cache lookup%s\n");
> pes(spdcachemiss, "\t%ju SPD cache miss%s\n");
355c356
< printf("\t%llu" m, (unsigned long long)ahstat->f, plural(ahstat->f))
---
> printf("\t%ju" m, (uintmax_t)ahstat->f, plural(ahstat->f))
404c405
< printf("\t%llu" m, (unsigned long long)espstat->f, plural(espstat->f))
---
> printf("\t%ju" m, (uintmax_t)espstat->f, plural(espstat->f))
454c455
< printf("\t%llu" m, (unsigned long long)ipcompstat->f, plural(ipcompstat->f))
---
> printf("\t%ju" m, (uintmax_t)ipcompstat->f, plural(ipcompstat->f))