head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.90 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.88 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.86 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.84 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.82 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.80 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.78 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.76 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.74 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.72 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.70 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.68 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.66 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.64 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.62 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.60 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.58 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.56 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.54 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.52 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.50 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.48 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.46 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.42 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.22 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.44 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.40 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.38 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.36 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.34 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.32 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.30 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.28 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.26 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.24 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.20 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.18 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.16 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.14 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.12 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.10 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.8 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.6 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.4 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.2 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.3.0.32 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.30 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.28 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.26 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.24 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.22 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.20 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.18 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.16 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.14 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.12 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.10 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.8 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.6 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.4 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.2 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.2.0.4 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.2 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.1.0.22 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.20 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.18 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.16 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.14 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.12 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.10 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.8 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.6 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.4 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.2; locks; strict; comment @# @; 1.4 date 2015.01.14.20.39.42; author rumko; state Exp; branches; next 1.3; commitid wRuoyQBTwzZ0826y; 1.3 date 2011.02.09.22.51.38; author rumko; state Exp; branches; next 1.2; 1.2 date 2010.09.18.20.48.23; author wiz; state Exp; branches; next 1.1; 1.1 date 2008.06.15.14.09.03; author peter; state Exp; branches; next ; desc @@ 1.4 log @sysutils/pftop: fix build on fbsd >= 10 Ok@@ wiz @ text @$NetBSD: patch-ad,v 1.3 2011/02/09 22:51:38 rumko Exp $ $OpenBSD: patch-engine_c,v 1.1 2008/06/13 00:38:12 canacar Exp $ * DragonFly and FreeBSD compatibility * Patches to support PF > 4.1 taken from OpenBSD's ports. --- engine.c.orig 2007-11-07 07:35:44 +0100 +++ engine.c 2009-11-17 00:31:46 +0100 @@@@ -18,11 +18,18 @@@@ #include +#if defined(__DragonFly__) || defined(__FreeBSD__) +#include "queue.h" +#else #include +#endif #include #include +#include +#include #include +#include #include #include #include @@@@ -33,6 +40,10 @@@@ #define MIN(a,b) (((a)<(b))?(a):(b)) #endif +#ifndef CIRCLEQ_END +#define CIRCLEQ_END(head) ((void *)(head)) +#endif + /* circular linked list of views */ CIRCLEQ_HEAD(view_list, view_ent) view_head = CIRCLEQ_HEAD_INITIALIZER(view_head); @@@@ -55,9 +66,6 @@@@ volatile sig_atomic_t gotsig_close = 0; volatile sig_atomic_t gotsig_resize = 0; -volatile sig_atomic_t gotsig_alarm = 0; -int need_update = 0; -int need_sort = 0; SCREEN *screen; @@@@ -105,7 +113,6 @@@@ int tbprintf(char *format, ...) - GCC_PRINTFLIKE(1,2) /* defined in curses.h */ { int len; va_list arg; @@@@ -482,7 +489,6 @@@@ v = ve->view; if ((curr_view != NULL) && (curr_mgr != v->mgr)) { - gotsig_alarm = 1; if (v->mgr != NULL && v->mgr->select_fn != NULL) v->mgr->select_fn(); } @@@@ -491,7 +497,6 @@@@ curr_view = v; curr_mgr = v->mgr; field_setup(); - need_update = 1; } void @@@@ -809,6 +814,9 @@@@ { order_type *o, *oc; + if (curr_view->mgr->order_list == NULL) + return; + oc = curr_view->mgr->order_curr; for (o = curr_view->mgr->order_list; o->name != NULL; o++) { @@@@ -905,12 +913,6 @@@@ } void -sig_alarm(int signal) -{ - gotsig_alarm = 1; -} - -void setup_term(int dmax) { max_disp = dmax; @@@@ -941,8 +943,9 @@@@ keypad(stdscr, TRUE); intrflush(stdscr, FALSE); - halfdelay(10); + cbreak(); noecho(); + timeout(0); } if (dmax == 0) @@@@ -970,7 +973,6 @@@@ } curr_message = NULL; curr_cmd = cmd; - need_update = 1; return prev; } @@@@ -987,7 +989,6 @@@@ int msgprintf(char *format, ...) - GCC_PRINTFLIKE(1,2) /* defined in curses.h */ { static char buf[1024]; int len; @@@@ -1085,28 +1086,21 @@@@ if (curr_message != NULL) { if (ch > 0) { curr_message = NULL; - need_update = 1; } } switch (ch) { - case ' ': - gotsig_alarm = 1; - break; case 'o': next_order(); - need_sort = 1; break; case 'p': paused = !paused; - gotsig_alarm = 1; break; case 'q': gotsig_close = 1; break; case 'r': sortdir *= -1; - need_sort = 1; break; case 'v': /* FALLTHROUGH */ @@@@ -1124,49 +1118,40 @@@@ /* FALLTHROUGH */ case CTRL_N: dispstart++; - need_update = 1; break; case KEY_UP: /* FALLTHROUGH */ case CTRL_P: dispstart--; - need_update = 1; break; case KEY_NPAGE: /* FALLTHROUGH */ case CTRL_V: dispstart += maxprint; - need_update = 1; break; case KEY_PPAGE: /* FALLTHROUGH */ case META_V: dispstart -= maxprint; - need_update = 1; break; case KEY_HOME: /* FALLTHROUGH */ case CTRL_A: dispstart = 0; - need_update = 1; break; case KEY_END: /* FALLTHROUGH */ case CTRL_E: dispstart = num_disp; - need_update = 1; break; case CTRL_L: clear(); - need_update = 1; break; default: break; } - if (set_order_hotkey(ch)) - need_sort = 1; - else + if (!set_order_hotkey(ch)) set_view_hotkey(ch); } @@@@ -1177,43 +1162,15 @@@@ signal(SIGINT, sig_close); signal(SIGQUIT, sig_close); signal(SIGWINCH, sig_resize); - signal(SIGALRM, sig_alarm); } void engine_loop(int countmax) { + struct pollfd set[1]; int count = 0; for (;;) { - if (gotsig_alarm) { - read_view(); - need_sort = 1; - gotsig_alarm = 0; - alarm(delay); - } - - if (need_sort) { - sort_view(); - need_sort = 0; - need_update = 1; - - /* XXX if sort took too long */ - if (gotsig_alarm) { - gotsig_alarm = 0; - alarm(delay); - } - } - - if (need_update) { - erase(); - disp_update(); - end_page(); - need_update = 0; - if (countmax && ++count >= countmax) - break; - } - if (gotsig_close) break; if (gotsig_resize) { @@@@ -1221,13 +1178,31 @@@@ endwin(); setup_term(max_disp); gotsig_resize = 0; - need_update = 1; } - if (interactive && need_update == 0) - keyboard(); - else if (interactive == 0) + read_view(); + sort_view(); + + if (rawmode == 0) + erase(); + disp_update(); + end_page(); + if (countmax && ++count >= countmax) + break; + + if (interactive) { + set[0].fd = STDIN_FILENO; + set[0].events = POLLIN; + if (poll(set, 1, delay * 1000) == -1) { + if (errno == EINTR) + continue; + break; + } + if ((set[0].revents & POLLIN) != 0) + keyboard(); + } else { sleep(delay); + } } if (rawmode == 0) @ 1.3 log @sysutils/pftop: support newer PF and depend on osabi * In order for pftop to be built successfully with newer PF versions (> 4.1), additional patches are necessary which were taken from OpenBSD's ports as seen in PR pkg/44339 * Pftop compiled for another PF version will not work (properly), so to avoid any problems we must depend on the OS version ok@@ wiz @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2010/09/18 20:48:23 wiz Exp $ d4 1 a4 1 * DragonFly compatibility d13 1 a13 1 +#ifdef __DragonFly__ @ 1.2 log @DragonFly fixes from Rumko in PR 42345. @ text @d1 5 a5 1 $NetBSD: patch-ad,v 1.1 2008/06/15 14:09:03 peter Exp $ d73 11 a83 1 @@@@ -905,12 +910,6 @@@@ d96 1 a96 1 @@@@ -941,8 +940,9 @@@@ d107 1 a107 1 @@@@ -970,7 +970,6 @@@@ d115 1 a115 1 @@@@ -987,7 +986,6 @@@@ d123 1 a123 1 @@@@ -1085,28 +1083,21 @@@@ d152 1 a152 1 @@@@ -1124,49 +1115,40 @@@@ d203 1 a203 1 @@@@ -1177,43 +1159,15 @@@@ d248 1 a248 1 @@@@ -1221,13 +1175,31 @@@@ @ 1.1 log @Update pftop to version 0.7. Tested on NetBSD 3.1, 4.0 and yamt-pf42. Changes in version 0.7: This version adds state filtering, which is funded by backcountry.com, many thanks. It is now possible to select which states are displayed using a tcpdump(8) like filtering language. The filter can be specified on the command line, using the '-f' switch. It is also possible to change the filter interactively using the 'f' command key. Some sample, not necessarily practical, filters are given below: - Do not show pfsync or carp traffic: not (pfsync or carp) not pfsync and not carp - DNS traffic not going to or coming from the DNS servers: port 53 and not host (10.0.0.10 or 10.0.0.11) - States with input bytes greater than 1M: inb > 1000000 - Traffic with very small average packet size: ((inb / inp) + (outb / outp))/2 < 100 inb / inp + outb / outp < 200 Changes in version 0.6: No functional changes. It now compiles and runs on OpenBSD 4.1-current after pf interface changes. This version also contains separated pf and display code. This should make adding new views easier. Changes in version 0.5: This version displays all active pf rules by traversing the ruleset tree. In addition HFSC queues are now displayed correctly thanks to Jared Spiegel. This version also incorporates other patches and comments I have received since the previous release. Many thanks to all who have contributed. - New command-line switch 'S' to start the display at a given state. - Display HFCS statistics in the queue page. - Fixed state and rule byte and packet counters - Fixed state sorting by packets and bytes - Fixed some minor display problems - The rule view now traverses all rulesets, and displays all active rules, together with anchor (ruleset) names. - Anchor and Label fields dynamically resize themselves @ text @d1 1 a1 1 $NetBSD$ d3 11 a13 3 --- engine.c.old 2008-06-14 17:38:55.000000000 +0200 +++ engine.c 2008-06-15 12:41:47.000000000 +0200 @@@@ -22,7 +22,10 @@@@ d24 1 a24 1 @@@@ -33,6 +36,10 @@@@ d35 1 a35 1 @@@@ -55,9 +62,6 @@@@ d45 1 a45 1 @@@@ -105,7 +109,6 @@@@ d53 1 a53 1 @@@@ -482,7 +485,6 @@@@ d61 1 a61 1 @@@@ -491,7 +493,6 @@@@ d69 1 a69 1 @@@@ -905,12 +906,6 @@@@ d82 1 a82 1 @@@@ -941,8 +936,9 @@@@ d93 1 a93 1 @@@@ -970,7 +966,6 @@@@ d101 1 a101 1 @@@@ -987,7 +982,6 @@@@ d109 1 a109 1 @@@@ -1085,28 +1079,21 @@@@ d138 1 a138 1 @@@@ -1124,49 +1111,40 @@@@ d189 1 a189 1 @@@@ -1177,43 +1155,15 @@@@ d234 1 a234 1 @@@@ -1221,13 +1171,31 @@@@ @