Deleted Added
full compact
0a1
> /* $FreeBSD: head/contrib/pf/pfctl/pfctl_parser.c 126355 2004-02-28 17:32:53Z mlaier $ */
53a55,61
> #if defined(__FreeBSD__)
> #include <inttypes.h>
> #else
> #define PRIu64 "llu"
> #define PRId64 "lld"
> #endif
>
506c514
< printf(" %-25s %14llu %16llu\n", "Bytes In",
---
> printf(" %-25s %14"PRIu64" %16"PRIu64"\n", "Bytes In",
508c516
< printf(" %-25s %14llu %16llu\n", "Bytes Out",
---
> printf(" %-25s %14"PRIu64" %16"PRIu64"\n", "Bytes Out",
511c519
< printf(" %-23s %14llu %16llu\n", "Passed",
---
> printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Passed",
514c522
< printf(" %-23s %14llu %16llu\n", "Blocked",
---
> printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Blocked",
518c526
< printf(" %-23s %14llu %16llu\n", "Passed",
---
> printf(" %-23s %14"PRIu64" %16"PRIu64"\n", "Passed",
521c529
< printf(" %-23s %14llu %16llu\n\n", "Blocked",
---
> printf(" %-23s %14"PRIu64" %16"PRIu64"\n\n", "Blocked",
528,529c536,537
< printf(" %-25s %14llu", pf_fcounters[i],
< (unsigned long long)s->fcounters[i]);
---
> printf(" %-25s %14"PRIu64" ", pf_fcounters[i],
> s->fcounters[i]);
538,539c546,547
< printf(" %-25s %14llu ", pf_reasons[i],
< (unsigned long long)s->counters[i]);
---
> printf(" %-25s %14"PRIu64" ", pf_reasons[i],
> s->counters[i]);
1126a1135,1140
> #if defined(__FreeBSD__) && (__FreeBSD_version <= 501106)
> /* inet_net_pton acts strange w/ multicast addresses, RFC1112 */
> if (mask == -1 && h->addr.v.a.addr.addr8[0] >= 224 &&
> h->addr.v.a.addr.addr8[0] < 240)
> bits = 32;
> #endif