Up to [local] / src / sbin / pfctl
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.102, Sat Apr 19 14:22:32 2014 UTC (10 years, 1 month ago) by henning
Branch: MAIN
CVS Tags: HEAD
Changes since 1.101: +1 -1 lines
FILE REMOVED
remove altq bits here, too (i was convinced i committed that yesterday already, hrm)
Revision 1.101 / (download) - annotate - [select for diffs], Sun Jan 19 04:14:34 2014 UTC (10 years, 4 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.100: +2 -3 lines
Diff to previous 1.100 (colored)
Fix minor ident issue. OK benno@, pelikan@
Revision 1.100 / (download) - annotate - [select for diffs], Sat Oct 12 12:16:11 2013 UTC (10 years, 7 months ago) by henning
Branch: MAIN
Changes since 1.99: +2 -2 lines
Diff to previous 1.99 (colored)
config bits for the bandwidth shaping part of the new queueing subsystem syntax worked out with many in ljubljana using a whiteboard, testing & looking over by many, ok phessler sthen
Revision 1.99 / (download) - annotate - [select for diffs], Wed Mar 20 00:18:00 2013 UTC (11 years, 2 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4
Changes since 1.98: +3 -3 lines
Diff to previous 1.98 (colored)
MCLBYTES does not belong in here.
Revision 1.98 / (download) - annotate - [select for diffs], Wed May 2 07:45:50 2012 UTC (12 years, 1 month ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE,
OPENBSD_5_3,
OPENBSD_5_2_BASE,
OPENBSD_5_2
Changes since 1.97: +12 -3 lines
Diff to previous 1.97 (colored)
don't call getifmtu in -n mode, assume 1500. calling getifmtu requires the interface in question to be there, breaking ruleset verification From: Silamael <Silamael at coronamundi dot de>
Revision 1.97 / (download) - annotate - [select for diffs], Mon Jul 4 01:07:43 2011 UTC (12 years, 11 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0
Changes since 1.96: +1 -5 lines
Diff to previous 1.96 (colored)
rip out more effectively dead code, ryan ok
Revision 1.96 / (download) - annotate - [select for diffs], Sun Jul 3 23:59:43 2011 UTC (12 years, 11 months ago) by henning
Branch: MAIN
Changes since 1.95: +1 -7 lines
Diff to previous 1.95 (colored)
g/c RIO traces (aka clean up after tedu :))
Revision 1.95 / (download) - annotate - [select for diffs], Sun Jul 3 23:46:23 2011 UTC (12 years, 11 months ago) by henning
Branch: MAIN
Changes since 1.94: +1 -7 lines
Diff to previous 1.94 (colored)
*_CLEARDSCP could never possibly have been set, no point in being able to print that as flag then
Revision 1.94 / (download) - annotate - [select for diffs], Fri Jul 25 17:43:44 2008 UTC (15 years, 10 months ago) by martynas
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8,
OPENBSD_4_7_BASE,
OPENBSD_4_7,
OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4
Changes since 1.93: +1 -2 lines
Diff to previous 1.93 (colored)
don't redefine INFINITY -- math.h defines it now pointed out by, and ok david@, go ahead henning@
Revision 1.93 / (download) - annotate - [select for diffs], Mon Oct 15 02:16:35 2007 UTC (16 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.92: +7 -6 lines
Diff to previous 1.92 (colored)
specifying int instead of just unsigned is better style
Revision 1.92 / (download) - annotate - [select for diffs], Sun May 27 05:15:17 2007 UTC (17 years ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2
Changes since 1.91: +1 -5 lines
Diff to previous 1.91 (colored)
No need to shutdown(2) DGRAM socket before closing it. Found while looking at the code with jdixon@
Revision 1.91 / (download) - annotate - [select for diffs], Tue Nov 28 00:08:50 2006 UTC (17 years, 6 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1
Changes since 1.90: +3 -3 lines
Diff to previous 1.90 (colored)
fix servicecurve check; no point in checking the same sc three times, it was obviously intended to check all three. has been wrong since the beginning, 4 years... noticed by Earl Lapus <earl.lapus@gmail.com>, Vasil Dimov <vd@FreeBSD.org> mailed me then, ok mcbride
Revision 1.90 / (download) - annotate - [select for diffs], Fri Nov 10 06:07:11 2006 UTC (17 years, 6 months ago) by joel
Branch: MAIN
Changes since 1.89: +2 -2 lines
Diff to previous 1.89 (colored)
Print the interface that each queue is bound to in the pfctl -sq output ok henning@
Revision 1.89 / (download) - annotate - [select for diffs], Sun May 14 15:52:11 2006 UTC (18 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE,
OPENBSD_4_0
Changes since 1.88: +3 -3 lines
Diff to previous 1.88 (colored)
better english to describe interfaces without bandwidth info; ok henning
Revision 1.88 / (download) - annotate - [select for diffs], Sat Apr 8 02:04:48 2006 UTC (18 years, 1 month ago) by ray
Branch: MAIN
Changes since 1.87: +2 -5 lines
Diff to previous 1.87 (colored)
Remove a little bit of dead code; minburst is set to 2 earlier, and cannot be 0. From NetBSD from Coverity CID 577. OK henning@
Revision 1.87 / (download) - annotate - [select for diffs], Sat Jan 28 18:54:28 2006 UTC (18 years, 4 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE,
OPENBSD_3_9
Changes since 1.86: +1 -16 lines
Diff to previous 1.86 (colored)
zap unused function From: Andrey Matveev <evol@online.ptt.ru>
Revision 1.86 / (download) - annotate - [select for diffs], Mon Feb 28 14:04:51 2005 UTC (19 years, 3 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7
Changes since 1.85: +5 -5 lines
Diff to previous 1.85 (colored)
use the linkshar keyword when gtalking about the link sharing service curve, inspired by PR4127
Revision 1.85 / (download) - annotate - [select for diffs], Thu May 20 12:18:52 2004 UTC (20 years ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE,
OPENBSD_3_6
Changes since 1.84: +3 -1 lines
Diff to previous 1.84 (colored)
bzero() ifr before use, From: Andrey Matveev <andrushock@korovino.net>
Revision 1.84 / (download) - annotate - [select for diffs], Mon Apr 26 02:50:04 2004 UTC (20 years, 1 month ago) by kjc
Branch: MAIN
Changes since 1.83: +40 -13 lines
Diff to previous 1.83 (colored)
do more careful altq bandwidth checking. - fix a bug in HFSC that does not take the newly added queue into account when computing the bandwidth for admission control. - warn when the sum of the child bandwidth exceeds parent's bandwidth for both CBQ and HFSC. - allow to explicitly specify 0bps to bandwidth. HFSC can have only the real-time sc, and it means a blackhole queue for CBQ. problem reports by "Alexey E. Suslikov" <cruel@texnika.com.ua> ok henning@
Revision 1.83 / (download) - annotate - [select for diffs], Sun Mar 14 21:51:44 2004 UTC (20 years, 2 months ago) by dhartmei
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE,
OPENBSD_3_5
Changes since 1.82: +2 -2 lines
Diff to previous 1.82 (colored)
#include fixes, from Max Laier, ok beck@ henning@
Revision 1.82 / (download) - annotate - [select for diffs], Thu Feb 19 07:44:00 2004 UTC (20 years, 3 months ago) by kjc
Branch: MAIN
Changes since 1.81: +1 -10 lines
Diff to previous 1.81 (colored)
now that qids are managed entirely in the kernel, the qid related code is no longer needed in pfctl. ok, henning@
Revision 1.81 / (download) - annotate - [select for diffs], Tue Feb 10 22:26:56 2004 UTC (20 years, 3 months ago) by dhartmei
Branch: MAIN
Changes since 1.80: +6 -6 lines
Diff to previous 1.80 (colored)
KNF
Revision 1.80 / (download) - annotate - [select for diffs], Tue Feb 10 17:53:37 2004 UTC (20 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.79: +11 -8 lines
Diff to previous 1.79 (colored)
KNF
Revision 1.79 / (download) - annotate - [select for diffs], Wed Jan 14 08:42:23 2004 UTC (20 years, 4 months ago) by kjc
Branch: MAIN
Changes since 1.78: +8 -6 lines
Diff to previous 1.78 (colored)
eliminate the predefined special qids so that qids become simple identifiers without embedded meanings. this also allows us to make the semantics of the qid assignment in line with the tag assignment in the next step. ok, henning@
Revision 1.78 / (download) - annotate - [select for diffs], Tue Oct 21 21:09:13 2003 UTC (20 years, 7 months ago) by itojun
Branch: MAIN
Changes since 1.77: +2 -2 lines
Diff to previous 1.77 (colored)
don't use NULL as (int)0. henning ok
Revision 1.77 / (download) - annotate - [select for diffs], Fri Aug 22 21:50:34 2003 UTC (20 years, 9 months ago) by david
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.76: +2 -2 lines
Diff to previous 1.76 (colored)
pf spelling police ok dhartmei@ jmc@
Revision 1.76 / (download) - annotate - [select for diffs], Wed Aug 20 13:03:35 2003 UTC (20 years, 9 months ago) by henning
Branch: MAIN
Changes since 1.75: +6 -1 lines
Diff to previous 1.75 (colored)
catch invalid CBQ priorities earlier, including a better error message prodded by mpech@
Revision 1.75 / (download) - annotate - [select for diffs], Fri Jun 20 16:53:48 2003 UTC (20 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.74: +6 -6 lines
Diff to previous 1.74 (colored)
some cleanings recommended by lint; dhartmei ok
Revision 1.74 / (download) - annotate - [select for diffs], Fri Jun 6 17:53:05 2003 UTC (21 years ago) by henning
Branch: MAIN
Changes since 1.73: +14 -23 lines
Diff to previous 1.73 (colored)
simplify license. pfctl_altq.c with kenjiro's permission of course.
Revision 1.73 / (download) - annotate - [select for diffs], Thu May 8 22:09:54 2003 UTC (21 years, 1 month ago) by dhartmei
Branch: MAIN
Changes since 1.72: +5 -1 lines
Diff to previous 1.72 (colored)
Close sockets (otherwise the file handle limit can be reached when many queues are defined). Reported by Fernando Braga. ok henning@
Revision 1.72 / (download) - annotate - [select for diffs], Tue Apr 15 11:29:24 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.71: +26 -16 lines
Diff to previous 1.71 (colored)
pass down the unparsed queue opts (struct node_queue_opt) to print_altq/print_hfsc -> print_hfsc_opts and extract struct node_hfsc_sc there for each service curve and pass those down to print_hfsc_sc. now bandwidth specifications in the service curves are printed correct in the case of a queue belonging to more than one interface/parent queue, the parent queues having different bandwidths and the bandwith on teh service curve beeing specified in percent.
Revision 1.71 / (download) - annotate - [select for diffs], Tue Apr 15 11:01:34 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.70: +25 -12 lines
Diff to previous 1.70 (colored)
make print_hfsc_sc() take an extra struct node_hfsc_sc parameter and print relative bandwidth specification if that ws given instead of the calculated absolute ones. to be used soon.
Revision 1.70 / (download) - annotate - [select for diffs], Tue Apr 15 10:56:21 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.69: +2 -2 lines
Diff to previous 1.69 (colored)
don't include the unit "ms" when printing the service curve; parser wants raw number
Revision 1.69 / (download) - annotate - [select for diffs], Tue Apr 15 10:20:19 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.68: +23 -31 lines
Diff to previous 1.68 (colored)
factor out service curve printing to it's own function, print_hfsc_sc().
Revision 1.68 / (download) - annotate - [select for diffs], Mon Apr 14 16:51:36 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.67: +3 -3 lines
Diff to previous 1.67 (colored)
if linkshare service curve m2 == bandwidth, but d given, we do need to print linkshare as it is not exactly the default case then
Revision 1.67 / (download) - annotate - [select for diffs], Mon Apr 14 16:35:13 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.66: +6 -4 lines
Diff to previous 1.66 (colored)
only print hfsc linkshare when it differs from the default
Revision 1.66 / (download) - annotate - [select for diffs], Mon Apr 14 15:50:53 2003 UTC (21 years, 1 month ago) by kjc
Branch: MAIN
Changes since 1.65: +1 -4 lines
Diff to previous 1.65 (colored)
do not add a realtime service curve to the root queue as the realtime service is not hierarchically distributed. ok henning@
Revision 1.65 / (download) - annotate - [select for diffs], Mon Apr 14 14:50:46 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.64: +11 -10 lines
Diff to previous 1.64 (colored)
let print_altq and print_queue take a struct node_queue_bw parameter instead of dintinct bw_percent
Revision 1.64 / (download) - annotate - [select for diffs], Sun Apr 13 23:22:05 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.63: +2 -2 lines
Diff to previous 1.63 (colored)
concistency in the print-funtions, here: HFSC uppercurve and brackets
Revision 1.63 / (download) - annotate - [select for diffs], Sun Apr 13 22:03:18 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.62: +2 -2 lines
Diff to previous 1.62 (colored)
use pa->ifbandwidth instead of rate as reference bandwidth for the root queue
Revision 1.62 / (download) - annotate - [select for diffs], Sun Apr 13 21:44:42 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.61: +31 -1 lines
Diff to previous 1.61 (colored)
process HFSC options for the linkshare, realtime and upperlimit service curves
Revision 1.61 / (download) - annotate - [select for diffs], Sun Apr 13 20:55:50 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.60: +18 -12 lines
Diff to previous 1.60 (colored)
break out bandwidth specification processing code to its own function, will be used in more places soonish
Revision 1.60 / (download) - annotate - [select for diffs], Sun Apr 13 20:16:06 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.59: +38 -3 lines
Diff to previous 1.59 (colored)
pass down the struct node_queue_opts from the altqif/queuespec yacc targets to expand_altq/expand_queue -> eval_pfaltq/eval_pfqueue and further down to the new eval_queue_opts() instead of evaluating them directly in the yacc grammar. this will be needed to process the hfsc options which can contain relative bandwidth specifications, and we can't break them down to an absolute one earlier.
Revision 1.59 / (download) - annotate - [select for diffs], Sun Apr 13 19:36:00 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.58: +13 -14 lines
Diff to previous 1.58 (colored)
move the structs node_queue_bw and node_queue_opt to pfctl_parser.h. let eval_pfqueue() and eval_pfaltq() take a pointer to a struct node_queue_bw instead of two distince bw_absolute and bw_percent parameters.
Revision 1.58 / (download) - annotate - [select for diffs], Sat Apr 12 19:08:40 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.57: +2 -2 lines
Diff to previous 1.57 (colored)
make the first queue id we assign 2 instead of 1, 1 is the default queue for HFSC
Revision 1.57 / (download) - annotate - [select for diffs], Sat Apr 12 19:07:42 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.56: +2 -2 lines
Diff to previous 1.56 (colored)
in check_commit_hfsc, don't check wether the default queue is a leaf queue when we have no default queue. avoids null pointer deref.
Revision 1.56 / (download) - annotate - [select for diffs], Sat Apr 12 19:05:57 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.55: +10 -4 lines
Diff to previous 1.55 (colored)
correctly make up the root queue in eval_pfqueue_hfsc
Revision 1.55 / (download) - annotate - [select for diffs], Sat Apr 12 16:44:19 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.54: +22 -16 lines
Diff to previous 1.54 (colored)
make print_*_opts() int instead of void where the return value indicates wether it printed something or not, and use that to decide wether to print the scheduler name in the altq on .. case instead of checking flags again, which would be a horrible mess for hfsc with its tons of opts (checking flags is not enough there)
Revision 1.54 / (download) - annotate - [select for diffs], Sat Apr 12 16:39:01 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.53: +43 -37 lines
Diff to previous 1.53 (colored)
fix print_hfsc_opts to only print "hfsc( " and " )" when there are opts to print, so it behaves like the print_*_opts for the other schedulers
Revision 1.53 / (download) - annotate - [select for diffs], Sat Apr 12 15:09:57 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.52: +3 -2 lines
Diff to previous 1.52 (colored)
assign queue IDs for HFSC simimar to what we do for PRIQ and CBQ
Revision 1.52 / (download) - annotate - [select for diffs], Fri Apr 11 15:18:33 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.51: +4 -1 lines
Diff to previous 1.51 (colored)
qname_to_qid and qname_to_pfaltq can be private functions now; nothing outside pfctl_altq.c uses them any more, nor should.
Revision 1.51 / (download) - annotate - [select for diffs], Fri Apr 11 15:13:34 2003 UTC (21 years, 1 month ago) by henning
Branch: MAIN
Changes since 1.50: +1 -14 lines
Diff to previous 1.50 (colored)
kill dead code. qid_to_qname is not used anywhere. moreover, I cannot think of any legitimate use; misuse is easy tho.
Revision 1.50 / (download) - annotate - [select for diffs], Sat Apr 5 21:44:46 2003 UTC (21 years, 2 months ago) by henning
Branch: MAIN
Changes since 1.49: +6 -3 lines
Diff to previous 1.49 (colored)
allow queue specs to be limited to certain interfaces. altq on { $if0 $if1 $if2 $if3 } priq bandwidth 10Mb queue { one two } queue one priority 1 priq(default) queue two on $if0 priority 15 queue two on ! $if0 priority 0 ok dhartmei@
Revision 1.49 / (download) - annotate - [select for diffs], Thu Apr 3 14:41:46 2003 UTC (21 years, 2 months ago) by henning
Branch: MAIN
Changes since 1.48: +3 -3 lines
Diff to previous 1.48 (colored)
use a simple linear queue ID assignment algorithm for PRIQ like we do for cbq already. together with the previous change that means it is now possible to have differently named priq queues on different interfaces with the same priorities and packets end up in the right queues. ok dhartmei@ kjc@
Revision 1.48 / (download) - annotate - [select for diffs], Thu Apr 3 05:08:59 2003 UTC (21 years, 2 months ago) by kjc
Branch: MAIN
Changes since 1.47: +2 -1 lines
Diff to previous 1.47 (colored)
explicitly include <sys/limits.h> for INT_MAX.
Revision 1.47 / (download) - annotate - [select for diffs], Fri Mar 28 16:47:39 2003 UTC (21 years, 2 months ago) by henning
Branch: MAIN
Changes since 1.46: +4 -1 lines
Diff to previous 1.46 (colored)
assign qid early for priq too
Revision 1.46 / (download) - annotate - [select for diffs], Tue Mar 11 14:02:12 2003 UTC (21 years, 2 months ago) by henning
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE,
OPENBSD_3_3
Changes since 1.45: +5 -1 lines
Diff to previous 1.45 (colored)
do the queue ID assignment for cbq already in userland. ensure that queues with different names always have different queue IDs, even if they live on different interfaces (that was the goal here). fixes regress pfaltq4 ok cedric@ dhartmei@
Revision 1.45 / (download) - annotate - [select for diffs], Mon Mar 10 14:54:17 2003 UTC (21 years, 2 months ago) by henning
Branch: MAIN
Changes since 1.44: +6 -0 lines
Diff to previous 1.44 (colored)
check for multiple same named queues on one interface. before this was rejected at load time with a rather useless error message, now a nice error message points out the actual error. inspired by an error report from Damien Miller ok dhartmei@ pb@ (monsterdiff complete)
Revision 1.44 / (download) - annotate - [select for diffs], Mon Mar 10 14:48:38 2003 UTC (21 years, 2 months ago) by henning
Branch: MAIN
Changes since 1.43: +23 -14 lines
Diff to previous 1.43 (colored)
rework error handling in eval_pfqueue(). instead of using errx, print the error message and return. This is consistent with what we do everywhere in pfctl. ok dhartmei@ pb@ (as part of a monsterdiff)
Revision 1.43 / (download) - annotate - [select for diffs], Sat Mar 8 14:40:03 2003 UTC (21 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.42: +4 -2 lines
Diff to previous 1.42 (colored)
when complaining about a queue's abndwidth beeing to small (below the resolution we can handle), don't say it must be >6KB, the value actually depends on quite some factors, including interface MTU. Instead, calculate the real minimum value and show that. mpech@ did a good job in bugging me to fix that ;-) ok pb@ dhartmei@ cedric@
Revision 1.42 / (download) - annotate - [select for diffs], Thu Mar 6 12:50:40 2003 UTC (21 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.41: +10 -6 lines
Diff to previous 1.41 (colored)
fix queue assignment on filter rules which are not bound to an interface. when looking up the queue IDs using qname_to_qid, we do not need to limit the matching on the interface in question, as it is guaranteed that same named queues on different interfaces habe the same queue id. moreover, we must not limit the matches to the interface if we do not have an interface given on the filter rule to match on ;-) found after problems reported by Andre Nathan <andre at v2r dot com dot br> ok dhartmei@ pb@ cedric@
Revision 1.41 / (download) - annotate - [select for diffs], Mon Mar 3 14:16:18 2003 UTC (21 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.40: +10 -11 lines
Diff to previous 1.40 (colored)
rate2str() overhaul: -do not print 100.00Kb but 100Kb, but still 1.50Mb. requested by theo. hint by dhartmei lead to a easier algorithm than initially had -while beeing there, use a much nicer, shorter algorithm for determining and printing the unit. a little further easification thanks to a hint by markus@ ok dhartmei@ cedric@
Revision 1.40 / (download) - annotate - [select for diffs], Sun Mar 2 23:37:24 2003 UTC (21 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.39: +16 -7 lines
Diff to previous 1.39 (colored)
when printing queues at load time that have bandwidth specified in percent, print the bandwidth in percent instead of the calculated absolute value. if a queue belongs to more than one interface and they have different bandwidth the calculated absolute is of course different per interface. previously the first calculated absolute value was shown; what of course is incorrect on the second interface. note that only the print was wrong, the correct values were passed to the kernel. ok theo daniel
Revision 1.39 / (download) - annotate - [select for diffs], Sun Mar 2 12:37:49 2003 UTC (21 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.38: +1 -3 lines
Diff to previous 1.38 (colored)
remove the control keyword for cbq queues. the control class was a legacy of the original CBQ design by LBL/Sun to support RSVP. the control class is not used in openbsd, in the sense that we don't automatically set filters for ICMP/IGMP/RSVP for the control class. ok dhartmei@ kjc@ deraadt@
Revision 1.38 / (download) - annotate - [select for diffs], Sun Mar 2 11:24:58 2003 UTC (21 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.37: +4 -2 lines
Diff to previous 1.37 (colored)
add a guarantee that two same named queues on different interfaces have the same queue id. in the usual case this was already true, but not guaranteed. ok dhartmei@ kjc@
Revision 1.37 / (download) - annotate - [select for diffs], Tue Feb 25 12:03:02 2003 UTC (21 years, 3 months ago) by henning
Branch: MAIN
Changes since 1.36: +2 -2 lines
Diff to previous 1.36 (colored)
extend copyright to 2003
Revision 1.36 / (download) - annotate - [select for diffs], Fri Jan 24 11:37:24 2003 UTC (21 years, 4 months ago) by henning
Branch: MAIN
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)
make rate2str include the unit in the ouput even if it is 0b. was irrelevant before as you cannot specify "bandwidth 0b" on a rule; now that rate2str is used for the stats output it does matter.
Revision 1.35 / (download) - annotate - [select for diffs], Fri Jan 24 10:53:32 2003 UTC (21 years, 4 months ago) by henning
Branch: MAIN
Changes since 1.34: +2 -3 lines
Diff to previous 1.34 (colored)
export rate2str
Revision 1.34 / (download) - annotate - [select for diffs], Mon Jan 20 19:07:50 2003 UTC (21 years, 4 months ago) by henning
Branch: MAIN
Changes since 1.33: +2 -3 lines
Diff to previous 1.33 (colored)
unused var; found by dhartmei@ and camield@
Revision 1.33 / (download) - annotate - [select for diffs], Mon Jan 20 19:05:46 2003 UTC (21 years, 4 months ago) by camield
Branch: MAIN
Changes since 1.32: +4 -4 lines
Diff to previous 1.32 (colored)
no named parameters in prototypes ok dhartmei cedric henning
Revision 1.32 / (download) - annotate - [select for diffs], Thu Jan 9 18:55:32 2003 UTC (21 years, 4 months ago) by dhartmei
Branch: MAIN
Changes since 1.31: +7 -3 lines
Diff to previous 1.31 (colored)
strlcpy return checks.
Revision 1.31 / (download) - annotate - [select for diffs], Thu Jan 9 17:33:19 2003 UTC (21 years, 4 months ago) by henning
Branch: MAIN
Changes since 1.30: +1 -99 lines
Diff to previous 1.30 (colored)
first attack at pfctl queue statistics, to be displayed with pfctl -vsq This commit is dedicated to the cute KLM girls who made part of this possible with giving me a seat in the plane where you actually have enough place to hack. Thanks, girls. ok markus@ dhartmei@
Revision 1.30 / (download) - annotate - [select for diffs], Sun Jan 5 02:17:09 2003 UTC (21 years, 5 months ago) by dhartmei
Branch: MAIN
Changes since 1.29: +4 -8 lines
Diff to previous 1.29 (colored)
err()/errx() do not return, errx() -> err() after calloc(), it sets errno. From Andrey Matveev.
Revision 1.29 / (download) - annotate - [select for diffs], Sat Jan 4 00:01:34 2003 UTC (21 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.28: +2 -2 lines
Diff to previous 1.28 (colored)
I do not know where this policy of "one .h file for every .c file" comes from, but whoever thought of it is stupid.
Revision 1.28 / (download) - annotate - [select for diffs], Fri Jan 3 21:48:21 2003 UTC (21 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.27: +3 -3 lines
Diff to previous 1.27 (colored)
KNF
Revision 1.27 / (download) - annotate - [select for diffs], Tue Dec 24 13:29:13 2002 UTC (21 years, 5 months ago) by mcbride
Branch: MAIN
Changes since 1.26: +3 -1 lines
Diff to previous 1.26 (colored)
print_cbq_opts should print "control" if CBQCLF_CTLCLASS is set. ok henning@
Revision 1.26 / (download) - annotate - [select for diffs], Mon Dec 23 15:56:24 2002 UTC (21 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.25: +1 -10 lines
Diff to previous 1.25 (colored)
remove dead code
Revision 1.25 / (download) - annotate - [select for diffs], Tue Dec 17 20:06:05 2002 UTC (21 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.24: +19 -24 lines
Diff to previous 1.24 (colored)
add support for the PRIQ scheduler partitially from kjc@ ok kjc@ dhartmei@
Revision 1.24 / (download) - annotate - [select for diffs], Tue Dec 17 11:29:04 2002 UTC (21 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.23: +544 -10 lines
Diff to previous 1.23 (colored)
PRIQ and HFSC support functions, not yet used. mostly from kjc@ with adjustments by me. ok theo ryan daniel
Revision 1.23 / (download) - annotate - [select for diffs], Tue Dec 17 01:15:59 2002 UTC (21 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.22: +4 -4 lines
Diff to previous 1.22 (colored)
class -> queue
Revision 1.22 / (download) - annotate - [select for diffs], Tue Dec 17 00:00:08 2002 UTC (21 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.21: +3 -3 lines
Diff to previous 1.21 (colored)
duh. two checks in rate2str which decide wether to print Mb or Kb had 1024 instead of 1000 in. cosmetic changes if at all.
Revision 1.21 / (download) - annotate - [select for diffs], Mon Dec 16 23:06:28 2002 UTC (21 years, 5 months ago) by henning
Branch: MAIN
Changes since 1.20: +40 -40 lines
Diff to previous 1.20 (colored)
KNF
Revision 1.20 / (download) - annotate - [select for diffs], Sun Dec 8 00:19:47 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.19: +2 -2 lines
Diff to previous 1.19 (colored)
allow flexible options order like Theo did for rules. idea, lots of input, motivation and ok deraadt@ ATTENTION: this changes the syntax. the "scheduler" keyword is gone now. old: altq on $interface scheduler cbq ... new: altq on $interface cbq ...
Revision 1.19 / (download) - annotate - [select for diffs], Sat Dec 7 19:12:34 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.18: +25 -5 lines
Diff to previous 1.18 (colored)
get the interface's MTU instead of assuming 1500
Revision 1.18 / (download) - annotate - [select for diffs], Fri Dec 6 16:16:15 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.17: +36 -40 lines
Diff to previous 1.17 (colored)
style
Revision 1.17 / (download) - annotate - [select for diffs], Tue Dec 3 10:57:13 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.16: +3 -1 lines
Diff to previous 1.16 (colored)
be nice and shutdown the socket after beeing done; pointed out by kenjiro
Revision 1.16 / (download) - annotate - [select for diffs], Mon Dec 2 22:18:21 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.15: +36 -4 lines
Diff to previous 1.15 (colored)
allow for "altq on $interface" without specifying a bandwidth. The interface's bandwidth is taken then. as a side-effect, "altq on $interface bandwidth xx%" is also possible now, it's relative to the interface's bandwidth then. ok theo
Revision 1.15 / (download) - annotate - [select for diffs], Fri Nov 29 15:52:13 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.14: +8 -5 lines
Diff to previous 1.14 (colored)
in pfctl_find_altq_node also compare the interface. fixes pfctl -sq output in case the queuespec was expanded to >1 queues on different interfaces
Revision 1.14 / (download) - annotate - [select for diffs], Thu Nov 28 14:50:23 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)
qlimit before tbrsize
Revision 1.13 / (download) - annotate - [select for diffs], Thu Nov 28 14:44:57 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.12: +3 -1 lines
Diff to previous 1.12 (colored)
print qlimit on altq if not equal to the default value
Revision 1.12 / (download) - annotate - [select for diffs], Wed Nov 27 16:23:01 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.11: +4 -2 lines
Diff to previous 1.11 (colored)
-use a #define for default qlimit instead of hardcoding it -print qlimit in print_queue if it is not the default one -assign the default qlimit early in the parser instead of using 0
Revision 1.11 / (download) - annotate - [select for diffs], Wed Nov 27 16:06:20 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.10: +11 -9 lines
Diff to previous 1.10 (colored)
next round in print fixes: -only print priority if it is not equal to the default one -space handling overhaul
Revision 1.10 / (download) - annotate - [select for diffs], Wed Nov 27 15:00:41 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.9: +11 -3 lines
Diff to previous 1.9 (colored)
in print_altq() correctly print scheduler type and options
Revision 1.9 / (download) - annotate - [select for diffs], Mon Nov 25 16:30:22 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.8: +8 -8 lines
Diff to previous 1.8 (colored)
1Kb = 1000b, not 1024; as discussed with kjc@ and theo
Revision 1.8 / (download) - annotate - [select for diffs], Fri Nov 22 11:46:02 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.7: +1 -5 lines
Diff to previous 1.7 (colored)
kill dead code
Revision 1.7 / (download) - annotate - [select for diffs], Tue Nov 19 17:49:53 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.6: +5 -4 lines
Diff to previous 1.6 (colored)
pfctl -sq prettier
Revision 1.6 / (download) - annotate - [select for diffs], Tue Nov 19 17:41:19 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.5: +1 -5 lines
Diff to previous 1.5 (colored)
altq ifspec is always level 0
Revision 1.5 / (download) - annotate - [select for diffs], Tue Nov 19 17:37:39 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
Changes since 1.4: +2 -5 lines
Diff to previous 1.4 (colored)
altq interface spec should be printed as altq interface spec, not queue
Revision 1.4 / (download) - annotate - [select for diffs], Mon Nov 18 23:20:43 2002 UTC (21 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +6 -2 lines
Diff to previous 1.3 (colored)
support Gb in print; henning ok
Revision 1.3 / (download) - annotate - [select for diffs], Mon Nov 18 23:13:32 2002 UTC (21 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.2: +5 -5 lines
Diff to previous 1.2 (colored)
KNF
Revision 1.2 / (download) - annotate - [select for diffs], Mon Nov 18 22:55:39 2002 UTC (21 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)
KNF
Revision 1.1 / (download) - annotate - [select for diffs], Mon Nov 18 22:49:15 2002 UTC (21 years, 6 months ago) by henning
Branch: MAIN
altq and pf merged this isn't 100% done yet: the print_ stuff isn't finished, some features will be added later, and there is no documetation yet, but committing now enables a few more people to work on. print_altq_node stuff hacked by Daniel at euroBSDcon; lotsa stuff from kjc, debugging help also pb and camiel. lots of good ideas by theo. "commit now" theo philipp daniel