initial fix for queues; s/pfioc_qstats/pfioc_altqstats

This commit is contained in:
sthen 2013-10-12 13:11:34 +00:00
parent a97e016609
commit 29ff254d98
4 changed files with 24 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2013/03/11 19:50:04 sthen Exp $
# $OpenBSD: Makefile,v 1.30 2013/10/12 13:11:34 sthen Exp $
COMMENT-main= packet filter statistics visualization
COMMENT-daemon= pfstat daemon
@ -7,8 +7,7 @@ DISTNAME= pfstat-2.3
PKGNAME-main= ${DISTNAME}
PKGNAME-daemon= ${DISTNAME:S/-/d-/}
REVISION-main= 2
REVISION-daemon=4
REVISION= 5
CATEGORIES= net
MASTER_SITES= http://www.benzedrine.cx/

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-pf_c,v 1.1 2013/10/12 13:11:34 sthen Exp $
--- pf.c.orig Sat Oct 12 14:10:22 2013
+++ pf.c Sat Oct 12 14:10:25 2013
@@ -74,7 +74,7 @@ query_queues(int fd, void (*cb)(int, const char *, int
/* fetch each of those queues */
for (nr = 0; nr < mnr; ++nr) {
- struct pfioc_qstats pq;
+ struct pfioc_altqstats pq;
union altq_stats s;
u_int64_t c[8];
int i;

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.26 2013/06/19 03:46:55 lteo Exp $
# $OpenBSD: Makefile,v 1.27 2013/10/12 13:12:43 sthen Exp $
#
COMMENT= curses-based real time state and rule display for pf
DISTNAME= pftop-0.7
REVISION= 11
REVISION= 12
CATEGORIES= sysutils
HOMEPAGE= http://www.eee.metu.edu.tr/~canacar/pftop/

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pftop_c,v 1.15 2011/08/23 11:42:11 sthen Exp $
$OpenBSD: patch-pftop_c,v 1.16 2013/10/12 13:12:43 sthen Exp $
--- pftop.c.orig Wed Nov 7 06:36:46 2007
+++ pftop.c Tue Aug 23 12:41:14 2011
+++ pftop.c Sat Oct 12 14:12:12 2013
@@ -127,6 +127,13 @@
#define PT_NOROUTE(x) (0)
#endif
@ -411,7 +411,12 @@ $OpenBSD: patch-pftop_c,v 1.15 2011/08/23 11:42:11 sthen Exp $
}
}
@@ -1747,6 +1940,7 @@ pfctl_update_qstats(struct pf_altq_node **root, int *i
@@ -1743,10 +1936,11 @@ pfctl_update_qstats(struct pf_altq_node **root, int *i
{
struct pf_altq_node *node;
struct pfioc_altq pa;
- struct pfioc_qstats pq;
+ struct pfioc_altqstats pq;
u_int32_t nr;
struct queue_stats qstats;
u_int32_t nr_queues;