=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/pftop.c,v retrieving revision 1.41 retrieving revision 1.42 diff -c -r1.41 -r1.42 *** src/usr.bin/systat/pftop.c 2018/02/08 07:00:33 1.41 --- src/usr.bin/systat/pftop.c 2018/09/07 12:43:30 1.42 *************** *** 1,4 **** ! /* $OpenBSD: pftop.c,v 1.41 2018/02/08 07:00:33 martijn Exp $ */ /* * Copyright (c) 2001, 2007 Can Erkin Acar * Copyright (c) 2001 Daniel Hartmeier --- 1,4 ---- ! /* $OpenBSD: pftop.c,v 1.42 2018/09/07 12:43:30 kn Exp $ */ /* * Copyright (c) 2001, 2007 Can Erkin Acar * Copyright (c) 2001 Daniel Hartmeier *************** *** 694,713 **** } int ! unmask(struct pf_addr * m, u_int8_t af) { ! int i = 31, j = 0, b = 0, msize; u_int32_t tmp; ! if (af == AF_INET) ! msize = 1; ! else ! msize = 4; ! while (j < msize && m->addr32[j] == 0xffffffff) { b += 32; j++; } ! if (j < msize) { tmp = ntohl(m->addr32[j]); for (i = 31; tmp & (1 << i); --i) b++; --- 694,709 ---- } int ! unmask(struct pf_addr * m) { ! int i = 31, j = 0, b = 0; u_int32_t tmp; ! while (j < 4 && m->addr32[j] == 0xffffffff) { b += 32; j++; } ! if (j < 4) { tmp = ntohl(m->addr32[j]); for (i = 31; tmp & (1 << i); --i) b++; *************** *** 733,739 **** if (mask != NULL) { if (!PF_AZERO(mask, af)) ! tbprintf("/%u", unmask(mask, af)); } } --- 729,735 ---- if (mask != NULL) { if (!PF_AZERO(mask, af)) ! tbprintf("/%u", unmask(mask)); } }