.clang-format

@@ -1,130 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# clang-format configuration file. Intended for clang-format >= 4.
-#
-# For more information, see:
-#
-#   Documentation/process/clang-format.rst
-#   https://clang.llvm.org/docs/ClangFormat.html
-#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-#
----
-AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-#AlignEscapedNewlines: Left # Unknown to clang-format-4.0
-AlignOperands: true
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterClass: false
-  AfterControlStatement: false
-  AfterEnum: false
-  AfterFunction: true
-  AfterNamespace: true
-  AfterObjCDeclaration: false
-  AfterStruct: false
-  AfterUnion: false
-  #AfterExternBlock: false # Unknown to clang-format-5.0
-  BeforeCatch: false
-  BeforeElse: false
-  IndentBraces: false
-  #SplitEmptyFunction: true # Unknown to clang-format-4.0
-  #SplitEmptyRecord: true # Unknown to clang-format-4.0
-  #SplitEmptyNamespace: true # Unknown to clang-format-4.0
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
-#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: false
-ColumnLimit: 80
-CommentPragmas: '^ IWYU pragma:'
-#CompactNamespaces: false # Unknown to clang-format-4.0
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 8
-ContinuationIndentWidth: 8
-Cpp11BracedListStyle: false
-DerivePointerAlignment: false
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
-#FixNamespaceComments: false # Unknown to clang-format-4.0
-
-# Taken from:
-#   git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \
-#   | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$,  - '\1'," \
-#   | sort | uniq
-ForEachMacros:
-  - 'list_for_each_entry'
-  - 'list_for_each_entry_safe'
-  - 'mnl_attr_for_each_nested'
-  - 'hlist_for_each'
-  - 'hlist_for_each_safe'
-  - 'hlist_for_each_entry'
-
-#IncludeBlocks: Preserve # Unknown to clang-format-5.0
-IncludeCategories:
-  - Regex: '.*'
-    Priority: 1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
-#IndentPPDirectives: None # Unknown to clang-format-5.0
-IndentWidth: 8
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: Inner
-#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
-ObjCBlockIndentWidth: 8
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-
-# Taken from git's rules
-#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
-PenaltyBreakBeforeFirstCallParameter: 30
-PenaltyBreakComment: 10
-PenaltyBreakFirstLessLess: 0
-PenaltyBreakString: 10
-PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
-
-PointerAlignment: Right
-ReflowComments: false
-SortIncludes: false
-#SortUsingDeclarations: false # Unknown to clang-format-4.0
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
-#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
-SpaceBeforeParens: ControlStatements
-#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp03
-TabWidth: 8
-UseTab: Always
-...

.mailmap

@@ -1,22 +0,0 @@
-#
-# This list is used by git-shortlog to fix a few botched name translations
-# in the git archive, either because the author's full name was messed up
-# and/or not always written the same way, making contributions from the
-# same person appearing not to be so or badly displayed.
-#
-# Format
-#  Full name <goodaddress> <badaddress> 
-Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
-Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
-
-Stephen Hemminger <stephen@networkplumber.org> <sthemmin@microsoft.com>
-Stephen Hemminger <stephen@networkplumber.org> <shemming@brocade.com>
-Stephen Hemminger <stephen@networkplumber.org> <stephen.hemminger@vyatta.com>
-Stephen Hemminger <stephen@networkplumber.org> <shemminger@vyatta.com>
-Stephen Hemminger <stephen@networkplumber.org> <shemminger>
-Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
-Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>
-Stephen Hemminger <stephen@networkplumber.org> <osdl.org!shemminger>
-Stephen Hemminger <stephen@networkplumber.org> <osdl.net!shemminger>
-
-David Ahern <dsahern@gmail.com> <dsa@cumulusnetworks.com>

Makefile

@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Top level Makefile for iproute2
 
--include config.mk
-
 ifeq ("$(origin V)", "command line")
 VERBOSE = $(V)
 endif
@@ -15,6 +13,7 @@ MAKEFLAGS += --no-print-directory
 endif
 
 PREFIX?=/usr
+LIBDIR?=$(PREFIX)/lib
 SBINDIR?=/sbin
 CONFDIR?=/etc/iproute2
 NETNS_RUN_DIR?=/var/run/netns
@@ -41,31 +40,28 @@ DEFINES+=-DCONFDIR=\"$(CONFDIR)\" \
          -DNETNS_RUN_DIR=\"$(NETNS_RUN_DIR)\" \
          -DNETNS_ETC_DIR=\"$(NETNS_ETC_DIR)\"
 
-#options for AX.25
+#options for decnet
-ADDLIB+=ax25_ntop.o
+ADDLIB+=dnet_ntop.o dnet_pton.o
 
-#options for AX.25
+#options for ipx
-ADDLIB+=rose_ntop.o
+ADDLIB+=ipx_ntop.o ipx_pton.o
 
 #options for mpls
 ADDLIB+=mpls_ntop.o mpls_pton.o
 
-#options for NETROM
-ADDLIB+=netrom_ntop.o
-
 CC := gcc
 HOSTCC ?= $(CC)
 DEFINES += -D_GNU_SOURCE
 # Turn on transparent support for LFS
 DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CCOPTS = -O2 -pipe
+CCOPTS = -O2
 WFLAGS := -Wall -Wstrict-prototypes  -Wmissing-prototypes
 WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2
 
 CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS)
 YACCFLAGS = -d -t -v
 
-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa
+SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
 
 LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a
 LDLIBS += $(LIBNETLINK)
@@ -73,9 +69,7 @@ LDLIBS += $(LIBNETLINK)
 all: config.mk
 	@set -e; \
 	for i in $(SUBDIRS); \
-	do echo; echo $$i; $(MAKE) -C $$i; done
+	do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done
-
-.PHONY: clean clobber distclean check cscope version
 
 help:
 	@echo "Make Targets:"
@@ -85,52 +79,48 @@ help:
 	@echo " install             - install binaries on local machine"
 	@echo " check               - run tests"
 	@echo " cscope              - build cscope database"
-	@echo " version             - update version"
+	@echo " snapshot            - generate version number header"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]             - set build verbosity level"
 
 config.mk:
-	@if [ ! -f config.mk -o configure -nt config.mk ]; then \
+	sh configure $(KERNEL_INCLUDE)
-		sh configure $(KERNEL_INCLUDE); \
-	fi
 
 install: all
 	install -m 0755 -d $(DESTDIR)$(SBINDIR)
 	install -m 0755 -d $(DESTDIR)$(CONFDIR)
 	install -m 0755 -d $(DESTDIR)$(ARPDDIR)
 	install -m 0755 -d $(DESTDIR)$(HDRDIR)
+	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
+	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
+	install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
+		$(DESTDIR)$(DOCDIR)/examples
+	install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
+		$(DESTDIR)$(DOCDIR)/examples/diffserv
 	@for i in $(SUBDIRS);  do $(MAKE) -C $$i install; done
 	install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
 	install -m 0755 -d $(DESTDIR)$(BASH_COMPDIR)
 	install -m 0644 bash-completion/tc $(DESTDIR)$(BASH_COMPDIR)
-	install -m 0644 bash-completion/devlink $(DESTDIR)$(BASH_COMPDIR)
 	install -m 0644 include/bpf_elf.h $(DESTDIR)$(HDRDIR)
 
-version:
+snapshot:
-	echo "static const char version[] = \""`git describe --tags --long`"\";" \
+	echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
-		> include/version.h
+		> include/SNAPSHOT.h
 
 clean:
 	@for i in $(SUBDIRS) testsuite; \
-	do $(MAKE) -C $$i clean; done
+	do $(MAKE) $(MFLAGS) -C $$i clean; done
 
 clobber:
 	touch config.mk
-	$(MAKE) clean
+	$(MAKE) $(MFLAGS) clean
 	rm -f config.mk cscope.*
 
 distclean: clobber
 
-check: all
+check:
-	$(MAKE) -C testsuite
+	cd testsuite && $(MAKE) && $(MAKE) alltests
-	$(MAKE) -C testsuite alltests
-	@if command -v man >/dev/null 2>&1; then \
-		echo "Checking manpages for syntax errors..."; \
-		$(MAKE) -C man check; \
-	else \
-		echo "man not installed, skipping checks for syntax errors."; \
-	fi
 
 cscope:
 	cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc

README

@@ -28,12 +28,17 @@ The makefile will automatically build a config.mk file which
 contains definitions of libraries that may or may not be available
 on the system such as: ATM, ELF, MNL, and SELINUX.
 
-3. include/uapi
+3. To make documentation, cd to doc/ directory , then
+   look at start of Makefile and set correct values for
+   PAGESIZE=a4		, ie: a4 , letter ...	(string)
+   PAGESPERPAGE=2	, ie: 1 , 2 ...		(numeric)
+   and make there. It assumes, that latex, dvips and psnup
+   are in your path.
 
-This package includes matching sanitized kernel headers because
+4. This package includes matching sanitized kernel headers because
-the build environment may not have up to date versions. See Makefile
+   the build environment may not have up to date versions. See Makefile
-if you have special requirements and need to point at different
+   if you have special requirements and need to point at different
-kernel include files.
+   kernel include files.
 
 Stephen Hemminger
 stephen@networkplumber.org

README.decnet

@@ -0,0 +1,33 @@
+
+Here are a few quick points about DECnet support...
+
+ o iproute2 is the tool of choice for configuring the DECnet support for
+   Linux. For many features, it is the only tool which can be used to
+   configure them.
+
+ o No name resolution is available as yet, all addresses must be
+   entered numerically.
+
+ o Remember to set the hardware address of the interface using: 
+
+   ip link set ethX address xx:xx:xx:xx:xx:xx
+      (where xx:xx:xx:xx:xx:xx is the MAC address for your DECnet node
+       address)
+
+   if your Ethernet card won't listen to more than one unicast
+   mac address at once. If the Linux DECnet stack doesn't talk to
+   any other DECnet nodes, then check this with tcpdump and if its
+   a problem, change the mac address (but do this _before_ starting
+   any other network protocol on the interface)
+
+ o Whilst you can use ip addr add to add more than one DECnet address to an
+   interface, don't expect addresses which are not the same as the
+   kernels node address to work properly with 2.4 kernels. This should
+   be fine with 2.6 kernels as the routing code has been extensively
+   modified and improved.
+
+ o The DECnet support is currently self contained. It does not depend on
+   the libdnet library.
+
+Steve Whitehouse <steve@chygwyn.com>
+

README.distribution

@@ -0,0 +1,95 @@
+I. About the distribution tables
+
+The table used for "synthesizing" the distribution is essentially a scaled,
+translated, inverse to the cumulative distribution function.
+
+Here's how to think about it: Let F() be the cumulative distribution
+function for a probability distribution X.  We'll assume we've scaled
+things so that X has mean 0 and standard deviation 1, though that's not
+so important here.  Then:
+
+	F(x) = P(X <= x) = \int_{-inf}^x f
+
+where f is the probability density function.
+
+F is monotonically increasing, so has an inverse function G, with range
+0 to 1.  Here, G(t) = the x such that P(X <= x) = t.  (In general, G may
+have singularities if X has point masses, i.e., points x such that
+P(X = x) > 0.)
+
+Now we create a tabular representation of G as follows:  Choose some table
+size N, and for the ith entry, put in G(i/N).  Let's call this table T.
+
+The claim now is, I can create a (discrete) random variable Y whose
+distribution has the same approximate "shape" as X, simply by letting
+Y = T(U), where U is a discrete uniform random variable with range 1 to N.
+To see this, it's enough to show that Y's cumulative distribution function,
+(let's call it H), is a discrete approximation to F.  But
+
+	H(x) = P(Y <= x)
+	     = (# of entries in T <= x) / N   -- as Y chosen uniformly from T
+	     = i/N, where i is the largest integer such that G(i/N) <= x
+	     = i/N, where i is the largest integer such that i/N <= F(x)
+	     		-- since G and F are inverse functions (and F is
+	     		   increasing)
+	     = floor(N*F(x))/N
+
+as desired.
+
+II. How to create distribution tables (in theory)
+
+How can we create this table in practice? In some cases, F may have a
+simple expression which allows evaluating its inverse directly.  The
+Pareto distribution is one example of this.  In other cases, and
+especially for matching an experimentally observed distribution, it's
+easiest simply to create a table for F and "invert" it.  Here, we give
+a concrete example, namely how the new "experimental" distribution was
+created.
+
+1. Collect enough data points to characterize the distribution.  Here, I
+collected 25,000 "ping" roundtrip times to a "distant" point (time.nist.gov).
+That's far more data than is really necessary, but it was fairly painless to
+collect it, so...
+
+2. Normalize the data so that it has mean 0 and standard deviation 1.
+
+3. Determine the cumulative distribution.  The code I wrote creates a table
+covering the range -10 to +10, with granularity .00005.  Obviously, this
+is absurdly over-precise, but since it's a one-time only computation, I
+figured it hardly mattered.
+
+4. Invert the table: for each table entry F(x) = y, make the y*TABLESIZE
+(here, 4096) entry be x*TABLEFACTOR (here, 8192).  This creates a table
+for the ("normalized") inverse of size TABLESIZE, covering its domain 0
+to 1 with granularity 1/TABLESIZE.  Note that even with the granularity
+used in creating the table for F, it's possible not all the entries in
+the table for G will be filled in.  So, make a pass through the
+inverse's table, filling in any missing entries by linear interpolation.
+
+III. How to create distribution tables (in practice)
+
+If you want to do all this yourself, I've provided several tools to help:
+
+1. maketable does the steps 2-4 above, and then generates the appropriate
+header file.  So if you have your own time distribution, you can generate
+the header simply by:
+
+	maketable < time.values > header.h
+
+2. As explained in the other README file, the somewhat sleazy way I have
+of generating correlated values needs correction.  You can generate your
+own correction tables by compiling makesigtable and makemutable with
+your header file.  Check the Makefile to see how this is done.
+
+3. Warning: maketable, makesigtable and especially makemutable do
+enormous amounts of floating point arithmetic.  Don't try running
+these on an old 486.  (NIST Net itself will run fine on such a
+system, since in operation, it just needs to do a few simple integral
+calculations.  But getting there takes some work.)
+
+4. The tables produced are all normalized for mean 0 and standard
+deviation 1.  How do you know what values to use for real?  Here, I've
+provided a simple "stats" utility.  Give it a series of floating point
+values, and it will return their mean (mu), standard deviation (sigma),
+and correlation coefficient (rho).  You can then plug these values
+directly into NIST Net.

README.iproute2+tc

@@ -0,0 +1,123 @@
+iproute2+tc*
+
+It's the first release of Linux traffic control engine.
+
+
+NOTES.
+* csz scheduler is inoperational at the moment, and probably
+  never will be repaired but replaced with h-pfq scheduler.
+* To use "fw" classifier you will need ipfwchains patch.
+* No manual available. Ask me, if you have problems (only try to guess
+  answer yourself at first 8)).
+
+
+Micro-manual how to start it the first time
+-------------------------------------------
+
+A. Attach CBQ to eth1:
+
+tc qdisc add dev eth1 root handle 1: cbq bandwidth 10Mbit allot 1514 cell 8 \
+avpkt 1000 mpu 64
+
+B. Add root class:
+
+tc class add dev eth1 parent 1:0 classid 1:1 cbq bandwidth 10Mbit rate 10Mbit \
+allot 1514 cell 8 weight 1Mbit prio 8 maxburst 20 avpkt 1000
+
+C. Add default interactive class:
+
+tc class add dev eth1 parent 1:1 classid 1:2 cbq bandwidth 10Mbit rate 1Mbit \
+allot 1514 cell 8 weight 100Kbit prio 3 maxburst 20 avpkt 1000 split 1:0 \
+defmap c0
+
+D. Add default class:
+
+tc class add dev eth1 parent 1:1 classid 1:3 cbq bandwidth 10Mbit rate 8Mbit \
+allot 1514 cell 8 weight 800Kbit prio 7 maxburst 20 avpkt 1000 split 1:0 \
+defmap 3f
+
+etc. etc. etc. Well, it is enough to start 8) The rest can be guessed 8)
+Look also at more elaborated example, ready to start rsvpd,
+in rsvp/cbqinit.eth1.
+
+
+Terminology and advices about setting CBQ parameters may be found in Sally Floyd
+papers. 
+
+
+Pairs X:Y are class handles, X:0 are qdisc handles.
+weight should be proportional to rate for leaf classes
+(I repeated it ten times less, but it is not necessary)
+
+defmap is bitmap of logical priorities served by this class.
+
+E. Another qdiscs are simpler. F.e. let's join TBF on class 1:2
+
+tc qdisc add dev eth1 parent 1:2 tbf rate 64Kbit buffer 5Kb/8 limit 10Kb
+
+F. Look at all that we created:
+
+tc qdisc ls dev eth1
+tc class ls dev eth1
+
+G. Install "route" classifier on root of cbq and map destination from realm
+1 to class 1:2
+
+tc filter add dev eth1 parent 1:0 protocol ip prio 100 route to 1 classid 1:2
+
+H. Assign routes to 10.11.12.0/24 to realm 1
+
+ip route add 10.11.12.0/24 dev eth1 via whatever realm 1
+
+etc. The same thing can be made with rules.
+I still did not test ipchains, but they should work too.
+
+
+Setup and code example of BPF classifier and action can be found under
+examples/bpf/, which should explain everything for getting started.
+
+
+Setup of rsvp and u32 classifiers is more hairy.
+If you read RSVP specs, you will understand how rsvp classifier
+works easily. What's about u32... That's example:
+
+
+#! /bin/sh
+
+TC=/home/root/tc
+
+# Setup classifier root on eth1 root (it is cbq)
+$TC filter add dev eth1 parent 1:0 prio 5 protocol ip u32
+
+# Create hash table of 256 slots with ID 1:
+$TC filter add dev eth1 parent 1:0 prio 5 handle 1: u32 divisor 256
+
+# Add to 6th slot of hash table rule to select tcp/telnet to 193.233.7.75
+# direct it to class 1:4 and prescribe to fall to best effort,
+# if traffic violate TBF (32kbit,5K)
+$TC filter add dev eth1 parent 1:0 prio 5 u32 ht 1:6: \
+	match ip dst 193.233.7.75 \
+	match tcp dst 0x17 0xffff \
+	flowid 1:4 \
+	police rate 32kbit buffer 5kb/8 mpu 64 mtu 1514 index 1
+
+# Add to 1th slot of hash table rule to select icmp to 193.233.7.75
+# direct it to class 1:4 and prescribe to fall to best effort,
+# if traffic violate TBF (10kbit,5K)
+$TC filter add dev eth1 parent 1:0 prio 5 u32 ht 1:: \
+	sample ip protocol 1 0xff \
+	match ip dst 193.233.7.75 \
+	flowid 1:4 \
+	police rate 10kbit buffer 5kb/8 mpu 64 mtu 1514 index 2
+
+# Lookup hash table, if it is not fragmented frame
+# Use protocol as hash key
+$TC filter add dev eth1 parent 1:0 prio 5 handle ::1 u32 ht 800:: \
+	match ip nofrag \
+	offset mask 0x0F00 shift 6 \
+	hashkey mask 0x00ff0000 at 8 \
+	link 1:
+
+
+Alexey Kuznetsov
+kuznet@ms2.inr.ac.ru

README.lnstat

@@ -0,0 +1,81 @@
+lnstat - linux networking statistics
+(C) 2004 Harald Welte <laforge@gnumonks.org
+======================================================================
+
+This tool is a generalized and more feature-complete replacement for the old
+'rtstat' program.
+
+In addition to routing cache statistics, it supports any kind of statistics
+the linux kernel exports via a file in /proc/net/stat.  In a stock 2.6.9
+kernel, this is 
+	per-protocol neighbour cache statistics 
+		(ipv4, ipv6, atm, decnet)
+	routing cache statistics
+		(ipv4)
+	connection tracking statistics
+		(ipv4)
+
+Please note that lnstat will adopt to any additional statistics that might be
+added to the kernel at some later point
+
+I personally always like examples more than any reference documentation, so I
+list the following examples.  If somebody wants to do a manpage, feel free
+to send me a patch :)
+
+EXAMPLES:
+
+In order to get a list of supported statistics files, you can run
+
+	lnstat -d
+
+It will display something like
+ 
+/proc/net/stat/arp_cache:
+         1: entries
+         2: allocs
+         3: destroys
+[...]
+/proc/net/stat/rt_cache:
+         1: entries
+         2: in_hit
+         3: in_slow_tot
+
+You can now select the files/keys you are interested by something like
+
+	lnstat -k arp_cache:entries,rt_cache:in_hit,arp_cache:destroys
+
+arp_cach|rt_cache|arp_cach|
+ entries|  in_hit|destroys|
+       6|       6|       0|
+       6|       0|       0|
+       6|       2|       0|
+
+
+You can specify the interval (e.g. 10 seconds) by:
+	
+	lnstat -i 10
+
+You can specify to only use one particular statistics file:
+
+	lnstat -f ip_conntrack
+
+You can specify individual field widths 
+
+	lnstat -k arp_cache:entries,rt_cache:entries -w 20,8
+
+You can specify not to print a header at all
+	
+	lnstat -s 0
+
+You can specify to print a header only at start of the program
+
+	lnstat -s 1
+
+You can specify to print a header at start and every 20 lines:
+
+	lnstat -s 20
+
+You can specify the number of samples you want to take (e.g. 5):
+	
+	lnstat -c 5
+

bash-completion/tc

@@ -3,8 +3,8 @@
 # Copyright 2016 Quentin Monnet <quentin.monnet@6wind.com>
 
 QDISC_KIND=' choke codel bfifo pfifo pfifo_head_drop fq fq_codel gred hhf \
-            mqprio multiq netem pfifo_fast pie fq_pie red rr sfb sfq tbf atm \
+            mqprio multiq netem pfifo_fast pie red rr sfb sfq tbf atm cbq drr \
-            cbq drr dsmark hfsc htb prio qfq '
+            dsmark hfsc htb prio qfq '
 FILTER_KIND=' basic bpf cgroup flow flower fw route rsvp tcindex u32 matchall '
 ACTION_KIND=' gact mirred bpf sample '
 
@@ -302,7 +302,7 @@ _tc_qdisc_options()
             ;;
         gred)
             _tc_once_attr 'setup vqs default grio vq prio limit min max avpkt \
-                burst probability bandwidth ecn harddrop'
+                burst probability bandwidth'
             return 0
             ;;
         hhf)
@@ -323,15 +323,6 @@ _tc_qdisc_options()
             _tc_once_attr 'limit target tupdate alpha beta'
             _tc_one_of_list 'bytemode nobytemode'
             _tc_one_of_list 'ecn noecn'
-            _tc_one_of_list 'dq_rate_estimator no_dq_rate_estimator'
-            return 0
-            ;;
-        fq_pie)
-            _tc_once_attr 'limit flows target tupdate \
-                alpha beta quantum memory_limit ecn_prob'
-            _tc_one_of_list 'ecn noecn'
-            _tc_one_of_list 'bytemode nobytemode'
-            _tc_one_of_list 'dq_rate_estimator no_dq_rate_estimator'
             return 0
             ;;
         red)

bridge/br_common.h

@@ -7,14 +7,12 @@
 		((struct rtattr *)(((char *)(r)) + RTA_ALIGN(sizeof(__u32))))
 
 void print_vlan_info(struct rtattr *tb, int ifindex);
-int print_linkinfo(struct nlmsghdr *n, void *arg);
+int print_linkinfo(const struct sockaddr_nl *who,
-int print_mdb_mon(struct nlmsghdr *n, void *arg);
+		   struct nlmsghdr *n, void *arg);
-int print_fdb(struct nlmsghdr *n, void *arg);
+int print_fdb(const struct sockaddr_nl *who,
-void print_stp_state(__u8 state);
+		     struct nlmsghdr *n, void *arg);
-int parse_stp_state(const char *arg);
+int print_mdb(const struct sockaddr_nl *who,
-int print_vlan_rtm(struct nlmsghdr *n, void *arg, bool monitor,
+		     struct nlmsghdr *n, void *arg);
-		   bool global_only);
-void br_print_router_port_stats(struct rtattr *pattr);
 
 int do_fdb(int argc, char **argv);
 int do_mdb(int argc, char **argv);

bridge/bridge.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "version.h"
+#include "SNAPSHOT.h"
 #include "utils.h"
 #include "br_common.h"
 #include "namespace.h"
@@ -23,11 +23,12 @@ int preferred_family = AF_UNSPEC;
 int oneline;
 int show_stats;
 int show_details;
-static int color;
+int show_pretty;
+int color;
 int compress_vlans;
 int json;
 int timestamp;
-static const char *batch_file;
+char *batch_file;
 int force;
 
 static void usage(void) __attribute__((noreturn));
@@ -77,23 +78,45 @@ static int do_cmd(const char *argv0, int argc, char **argv)
 	return -1;
 }
 
-static int br_batch_cmd(int argc, char *argv[], void *data)
-{
-	return do_cmd(argv[0], argc, argv);
-}
-
 static int batch(const char *name)
 {
-	int ret;
+	char *line = NULL;
+	size_t len = 0;
+	int ret = EXIT_SUCCESS;
+
+	if (name && strcmp(name, "-") != 0) {
+		if (freopen(name, "r", stdin) == NULL) {
+			fprintf(stderr,
+				"Cannot open file \"%s\" for reading: %s\n",
+				name, strerror(errno));
+			return EXIT_FAILURE;
+		}
+	}
 
 	if (rtnl_open(&rth, 0) < 0) {
 		fprintf(stderr, "Cannot open rtnetlink\n");
 		return EXIT_FAILURE;
 	}
 
-	rtnl_set_strict_dump(&rth);
+	cmdlineno = 0;
+	while (getcmdline(&line, &len, stdin) != -1) {
+		char *largv[100];
+		int largc;
 
-	ret = do_batch(name, force, br_batch_cmd, NULL);
+		largc = makeargs(line, largv, 100);
+		if (largc == 0)
+			continue;       /* blank line */
+
+		if (do_cmd(largv[0], largc, largv)) {
+			fprintf(stderr, "Command failed %s:%d\n",
+				name, cmdlineno);
+			ret = EXIT_FAILURE;
+			if (!force)
+				break;
+		}
+	}
+	if (line)
+		free(line);
 
 	rtnl_close(&rth);
 	return ret;
@@ -117,7 +140,7 @@ main(int argc, char **argv)
 		if (matches(opt, "-help") == 0) {
 			usage();
 		} else if (matches(opt, "-Version") == 0) {
-			printf("bridge utility, %s\n", version);
+			printf("bridge utility, 0.0\n");
 			exit(0);
 		} else if (matches(opt, "-stats") == 0 ||
 			   matches(opt, "-statistics") == 0) {
@@ -183,8 +206,6 @@ main(int argc, char **argv)
 	if (rtnl_open(&rth, 0) < 0)
 		exit(1);
 
-	rtnl_set_strict_dump(&rth);
-
 	if (argc > 1)
 		return do_cmd(argv[1], argc-1, argv+1);
 

bridge/fdb.c

@@ -30,21 +30,16 @@
 #include "rt_names.h"
 #include "utils.h"
 
-static unsigned int filter_index, filter_dynamic, filter_master,
+static unsigned int filter_index, filter_vlan, filter_state;
-	filter_state, filter_vlan;
 
 static void usage(void)
 {
 	fprintf(stderr,
 		"Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n"
 		"              [ self ] [ master ] [ use ] [ router ] [ extern_learn ]\n"
-		"              [ sticky ] [ local | static | dynamic ] [ vlan VID ]\n"
+		"              [ local | static | dynamic ] [ dst IPADDR ] [ vlan VID ]\n"
-		"              { [ dst IPADDR ] [ port PORT] [ vni VNI ] | [ nhid NHID ] }\n"
+		"              [ port PORT] [ vni VNI ] [ via DEV ]\n"
-		"	       [ via DEV ] [ src_vni VNI ]\n"
+		"       bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ] [ state STATE ] ]\n");
-		"       bridge fdb [ show [ br BRDEV ] [ brport DEV ] [ vlan VID ]\n"
-		"              [ state STATE ] [ dynamic ] ]\n"
-		"       bridge fdb get [ to ] LLADDR [ br BRDEV ] { brport | dev } DEV\n"
-		"              [ vlan VID ] [ vni VNI ] [ self ] [ master ] [ dynamic ]\n");
 	exit(-1);
 }
 
@@ -64,9 +59,6 @@ static const char *state_n2a(unsigned int s)
 	if (s & NUD_REACHABLE)
 		return "";
 
-	if (is_json_context())
-		sprintf(buf, "%#x", s);
-	else
 	sprintf(buf, "state=%#x", s);
 	return buf;
 }
@@ -109,9 +101,6 @@ static void fdb_print_flags(FILE *fp, unsigned int flags)
 	if (flags & NTF_MASTER)
 		print_string(PRINT_ANY, NULL, "%s ", "master");
 
-	if (flags & NTF_STICKY)
-		print_string(PRINT_ANY, NULL, "%s ", "sticky");
-
 	close_json_array(PRINT_JSON, NULL);
 }
 
@@ -134,7 +123,7 @@ static void fdb_print_stats(FILE *fp, const struct nda_cacheinfo *ci)
 	}
 }
 
-int print_fdb(struct nlmsghdr *n, void *arg)
+int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
 	FILE *fp = arg;
 	struct ndmsg *r = NLMSG_DATA(n);
@@ -172,9 +161,6 @@ int print_fdb(struct nlmsghdr *n, void *arg)
 	if (filter_vlan && filter_vlan != vid)
 		return 0;
 
-	if (filter_dynamic && (r->ndm_state & NUD_PERMANENT))
-		return 0;
-
 	open_json_object(NULL);
 	if (n->nlmsg_type == RTM_DELNEIGH)
 		print_bool(PRINT_ANY, "deleted", "Deleted ", true);
@@ -193,10 +179,10 @@ int print_fdb(struct nlmsghdr *n, void *arg)
 	}
 
 	if (!filter_index && r->ndm_ifindex) {
-		print_string(PRINT_FP, NULL, "dev ", NULL);
+		if (!is_json_context())
-
+			fprintf(fp, "dev ");
 		print_color_string(PRINT_ANY, COLOR_IFNAME,
-				   "ifname", "%s ",
+				   "ifname", "dev %s ",
 				   ll_index_to_name(r->ndm_ifindex));
 	}
 
@@ -211,11 +197,9 @@ int print_fdb(struct nlmsghdr *n, void *arg)
 				  RTA_PAYLOAD(tb[NDA_DST]),
 				  RTA_DATA(tb[NDA_DST]));
 
-		print_string(PRINT_FP, NULL, "dst ", NULL);
-
 		print_color_string(PRINT_ANY,
 				   ifa_family_color(family),
-				   "dst", "%s ", dst);
+				    "dst", "dst %s ", dst);
 	}
 
 	if (vid)
@@ -250,10 +234,6 @@ int print_fdb(struct nlmsghdr *n, void *arg)
 					   ll_index_to_name(ifindex));
 	}
 
-	if (tb[NDA_NH_ID])
-		print_uint(PRINT_ANY, "nhid", "nhid %u ",
-			   rta_getattr_u32(tb[NDA_NH_ID]));
-
 	if (tb[NDA_LINK_NETNSID])
 		print_uint(PRINT_ANY,
 				 "linkNetNsId", "link-netnsid %d ",
@@ -276,49 +256,20 @@ int print_fdb(struct nlmsghdr *n, void *arg)
 	return 0;
 }
 
-static int fdb_linkdump_filter(struct nlmsghdr *nlh, int reqlen)
-{
-	int err;
-
-	if (filter_index) {
-		struct ifinfomsg *ifm = NLMSG_DATA(nlh);
-
-		ifm->ifi_index = filter_index;
-	}
-
-	if (filter_master) {
-		err = addattr32(nlh, reqlen, IFLA_MASTER, filter_master);
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
-static int fdb_dump_filter(struct nlmsghdr *nlh, int reqlen)
-{
-	int err;
-
-	if (filter_index) {
-		struct ndmsg *ndm = NLMSG_DATA(nlh);
-
-		ndm->ndm_ifindex = filter_index;
-	}
-
-	if (filter_master) {
-		err = addattr32(nlh, reqlen, NDA_MASTER, filter_master);
-		if (err)
-			return err;
-	}
-
-	return 0;
-}
-
 static int fdb_show(int argc, char **argv)
 {
+	struct {
+		struct nlmsghdr	n;
+		struct ifinfomsg	ifm;
+		char			buf[256];
+	} req = {
+		.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
+		.ifm.ifi_family = PF_BRIDGE,
+	};
+
 	char *filter_dev = NULL;
 	char *br = NULL;
-	int rc;
+	int msg_size = sizeof(struct ifinfomsg);
 
 	while (argc > 0) {
 		if ((strcmp(*argv, "brport") == 0) || strcmp(*argv, "dev") == 0) {
@@ -339,8 +290,6 @@ static int fdb_show(int argc, char **argv)
 			if (state_a2n(&state, *argv))
 				invarg("invalid state", *argv);
 			filter_state |= state;
-		} else if (strcmp(*argv, "dynamic") == 0) {
-			filter_dynamic = 1;
 		} else {
 			if (matches(*argv, "help") == 0)
 				usage();
@@ -355,7 +304,8 @@ static int fdb_show(int argc, char **argv)
 			fprintf(stderr, "Cannot find bridge device \"%s\"\n", br);
 			return -1;
 		}
-		filter_master = br_ifindex;
+		addattr32(&req.n, sizeof(req), IFLA_MASTER, br_ifindex);
+		msg_size += RTA_LENGTH(4);
 	}
 
 	/*we'll keep around filter_dev for older kernels */
@@ -363,13 +313,10 @@ static int fdb_show(int argc, char **argv)
 		filter_index = ll_name_to_index(filter_dev);
 		if (!filter_index)
 			return nodev(filter_dev);
+		req.ifm.ifi_index = filter_index;
 	}
 
-	if (rth.flags & RTNL_HANDLE_F_STRICT_CHK)
+	if (rtnl_dump_request(&rth, RTM_GETNEIGH, &req.ifm, msg_size) < 0) {
-		rc = rtnl_neighdump_req(&rth, PF_BRIDGE, fdb_dump_filter);
-	else
-		rc = rtnl_fdb_linkdump_req_filter_fn(&rth, fdb_linkdump_filter);
-	if (rc < 0) {
 		perror("Cannot send dump request");
 		exit(1);
 	}
@@ -405,11 +352,9 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 	inet_prefix dst;
 	unsigned long port = 0;
 	unsigned long vni = ~0;
-	unsigned long src_vni = ~0;
 	unsigned int via = 0;
 	char *endptr;
 	short vid = -1;
-	__u32 nhid = 0;
 
 	while (argc > 0) {
 		if (strcmp(*argv, "dev") == 0) {
@@ -421,10 +366,6 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 				duparg2("dst", *argv);
 			get_addr(&dst, *argv, preferred_family);
 			dst_ok = 1;
-		} else if (strcmp(*argv, "nhid") == 0) {
-			NEXT_ARG();
-			if (get_u32(&nhid, *argv, 0))
-				invarg("\"id\" value is invalid\n", *argv);
 		} else if (strcmp(*argv, "port") == 0) {
 
 			NEXT_ARG();
@@ -444,12 +385,6 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 			if ((endptr && *endptr) ||
 			    (vni >> 24) || vni == ULONG_MAX)
 				invarg("invalid VNI\n", *argv);
-		} else if (strcmp(*argv, "src_vni") == 0) {
-			NEXT_ARG();
-			src_vni = strtoul(*argv, &endptr, 0);
-			if ((endptr && *endptr) ||
-			    (src_vni >> 24) || src_vni == ULONG_MAX)
-				invarg("invalid src VNI\n", *argv);
 		} else if (strcmp(*argv, "via") == 0) {
 			NEXT_ARG();
 			via = ll_name_to_index(*argv);
@@ -479,8 +414,6 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 			req.ndm.ndm_flags |= NTF_USE;
 		} else if (matches(*argv, "extern_learn") == 0) {
 			req.ndm.ndm_flags |= NTF_EXT_LEARNED;
-		} else if (matches(*argv, "sticky") == 0) {
-			req.ndm.ndm_flags |= NTF_STICKY;
 		} else {
 			if (strcmp(*argv, "to") == 0)
 				NEXT_ARG();
@@ -499,11 +432,6 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 		return -1;
 	}
 
-	if (nhid && (dst_ok || port || vni != ~0)) {
-		fprintf(stderr, "dst, port, vni are mutually exclusive with nhid\n");
-		return -1;
-	}
-
 	/* Assume self */
 	if (!(req.ndm.ndm_flags&(NTF_SELF|NTF_MASTER)))
 		req.ndm.ndm_flags |= NTF_SELF;
@@ -525,8 +453,6 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 
 	if (vid >= 0)
 		addattr16(&req.n, sizeof(req), NDA_VLAN, vid);
-	if (nhid > 0)
-		addattr32(&req.n, sizeof(req), NDA_NH_ID, nhid);
 
 	if (port) {
 		unsigned short dport;
@@ -536,8 +462,6 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 	}
 	if (vni != ~0)
 		addattr32(&req.n, sizeof(req), NDA_VNI, vni);
-	if (src_vni != ~0)
-		addattr32(&req.n, sizeof(req), NDA_SRC_VNI, src_vni);
 	if (via)
 		addattr32(&req.n, sizeof(req), NDA_IFINDEX, via);
 
@@ -551,121 +475,6 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 	return 0;
 }
 
-static int fdb_get(int argc, char **argv)
-{
-	struct {
-		struct nlmsghdr	n;
-		struct ndmsg		ndm;
-		char			buf[1024];
-	} req = {
-		.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)),
-		.n.nlmsg_flags = NLM_F_REQUEST,
-		.n.nlmsg_type = RTM_GETNEIGH,
-		.ndm.ndm_family = AF_BRIDGE,
-	};
-	char  *d = NULL, *br = NULL;
-	struct nlmsghdr *answer;
-	unsigned long vni = ~0;
-	char abuf[ETH_ALEN];
-	int br_ifindex = 0;
-	char *addr = NULL;
-	short vlan = -1;
-	char *endptr;
-
-	while (argc > 0) {
-		if ((strcmp(*argv, "brport") == 0) || strcmp(*argv, "dev") == 0) {
-			NEXT_ARG();
-			d = *argv;
-		} else if (strcmp(*argv, "br") == 0) {
-			NEXT_ARG();
-			br = *argv;
-		} else if (strcmp(*argv, "dev") == 0) {
-			NEXT_ARG();
-			d = *argv;
-		} else if (strcmp(*argv, "vni") == 0) {
-			NEXT_ARG();
-			vni = strtoul(*argv, &endptr, 0);
-			if ((endptr && *endptr) ||
-			    (vni >> 24) || vni == ULONG_MAX)
-				invarg("invalid VNI\n", *argv);
-		} else if (strcmp(*argv, "self") == 0) {
-			req.ndm.ndm_flags |= NTF_SELF;
-		} else if (matches(*argv, "master") == 0) {
-			req.ndm.ndm_flags |= NTF_MASTER;
-		} else if (matches(*argv, "vlan") == 0) {
-			if (vlan >= 0)
-				duparg2("vlan", *argv);
-			NEXT_ARG();
-			vlan = atoi(*argv);
-		} else if (matches(*argv, "dynamic") == 0) {
-			filter_dynamic = 1;
-		} else {
-			if (strcmp(*argv, "to") == 0)
-				NEXT_ARG();
-
-			if (matches(*argv, "help") == 0)
-				usage();
-			if (addr)
-				duparg2("to", *argv);
-			addr = *argv;
-		}
-		argc--; argv++;
-	}
-
-	if ((d == NULL && br == NULL) || addr == NULL) {
-		fprintf(stderr, "Device or master and address are required arguments.\n");
-		return -1;
-	}
-
-	if (sscanf(addr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-		   abuf, abuf+1, abuf+2,
-		   abuf+3, abuf+4, abuf+5) != 6) {
-		fprintf(stderr, "Invalid mac address %s\n", addr);
-		return -1;
-	}
-
-	addattr_l(&req.n, sizeof(req), NDA_LLADDR, abuf, ETH_ALEN);
-
-	if (vlan >= 0)
-		addattr16(&req.n, sizeof(req), NDA_VLAN, vlan);
-
-	if (vni != ~0)
-		addattr32(&req.n, sizeof(req), NDA_VNI, vni);
-
-	if (d) {
-		req.ndm.ndm_ifindex = ll_name_to_index(d);
-		if (!req.ndm.ndm_ifindex) {
-			fprintf(stderr, "Cannot find device \"%s\"\n", d);
-			return -1;
-		}
-	}
-
-	if (br) {
-		br_ifindex = ll_name_to_index(br);
-		if (!br_ifindex) {
-			fprintf(stderr, "Cannot find bridge device \"%s\"\n", br);
-			return -1;
-		}
-		addattr32(&req.n, sizeof(req), NDA_MASTER, br_ifindex);
-	}
-
-	if (rtnl_talk(&rth, &req.n, &answer) < 0)
-		return -2;
-
-	/*
-	 * Initialize a json_writer and open an array object
-	 * if -json was specified.
-	 */
-	new_json_obj(json);
-	if (print_fdb(answer, stdout) < 0) {
-		fprintf(stderr, "An error :-)\n");
-		return -1;
-	}
-	delete_json_obj();
-
-	return 0;
-}
-
 int do_fdb(int argc, char **argv)
 {
 	ll_init_map(&rth);
@@ -679,8 +488,6 @@ int do_fdb(int argc, char **argv)
 			return fdb_modify(RTM_NEWNEIGH, NLM_F_CREATE|NLM_F_REPLACE, argc-1, argv+1);
 		if (matches(*argv, "delete") == 0)
 			return fdb_modify(RTM_DELNEIGH, 0, argc-1, argv+1);
-		if (matches(*argv, "get") == 0)
-			return fdb_get(argc-1, argv+1);
 		if (matches(*argv, "show") == 0 ||
 		    matches(*argv, "lst") == 0 ||
 		    matches(*argv, "list") == 0)

bridge/link.c

@@ -19,7 +19,7 @@
 
 static unsigned int filter_index;
 
-static const char *stp_states[] = {
+static const char *port_states[] = {
 	[BR_STATE_DISABLED] = "disabled",
 	[BR_STATE_LISTENING] = "listening",
 	[BR_STATE_LEARNING] = "learning",
@@ -68,36 +68,29 @@ static void print_link_flags(FILE *fp, unsigned int flags, unsigned int mdown)
 	close_json_array(PRINT_ANY, "> ");
 }
 
-void print_stp_state(__u8 state)
+static void print_portstate(__u8 state)
 {
 	if (state <= BR_STATE_BLOCKING)
 		print_string(PRINT_ANY, "state",
-			     "state %s ", stp_states[state]);
+			     "state %s ", port_states[state]);
 	else
 		print_uint(PRINT_ANY, "state",
 			     "state (%d) ", state);
 }
 
-int parse_stp_state(const char *arg)
+static void print_onoff(FILE *fp, const char *flag, __u8 val)
 {
-	size_t nstates = ARRAY_SIZE(stp_states);
+	if (is_json_context())
-	int state;
+		print_bool(PRINT_JSON, flag, NULL, val);
-
+	else
-	for (state = 0; state < nstates; state++)
+		fprintf(fp, "%s %s ", flag, val ? "on" : "off");
-		if (strcmp(stp_states[state], arg) == 0)
-			break;
-
-	if (state == nstates)
-		state = -1;
-
-	return state;
 }
 
 static void print_hwmode(__u16 mode)
 {
 	if (mode >= ARRAY_SIZE(hw_mode))
 		print_0xhex(PRINT_ANY, "hwmode",
-			    "hwmode %#llx ", mode);
+			    "hwmode %#hx ", mode);
 	else
 		print_string(PRINT_ANY, "hwmode",
 			     "hwmode %s ", hw_mode[mode]);
@@ -111,7 +104,7 @@ static void print_protinfo(FILE *fp, struct rtattr *attr)
 		parse_rtattr_nested(prtb, IFLA_BRPORT_MAX, attr);
 
 		if (prtb[IFLA_BRPORT_STATE])
-			print_stp_state(rta_getattr_u8(prtb[IFLA_BRPORT_STATE]));
+			print_portstate(rta_getattr_u8(prtb[IFLA_BRPORT_STATE]));
 
 		if (prtb[IFLA_BRPORT_PRIORITY])
 			print_uint(PRINT_ANY, "priority",
@@ -130,53 +123,40 @@ static void print_protinfo(FILE *fp, struct rtattr *attr)
 			fprintf(fp, "%s    ", _SL_);
 
 		if (prtb[IFLA_BRPORT_MODE])
-			print_on_off(PRINT_ANY, "hairpin", "hairpin %s ",
+			print_onoff(fp, "hairpin",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_MODE]));
 		if (prtb[IFLA_BRPORT_GUARD])
-			print_on_off(PRINT_ANY, "guard", "guard %s ",
+			print_onoff(fp, "guard",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_GUARD]));
 		if (prtb[IFLA_BRPORT_PROTECT])
-			print_on_off(PRINT_ANY, "root_block", "root_block %s ",
+			print_onoff(fp, "root_block",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_PROTECT]));
 		if (prtb[IFLA_BRPORT_FAST_LEAVE])
-			print_on_off(PRINT_ANY, "fastleave", "fastleave %s ",
+			print_onoff(fp, "fastleave",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_FAST_LEAVE]));
 		if (prtb[IFLA_BRPORT_LEARNING])
-			print_on_off(PRINT_ANY, "learning", "learning %s ",
+			print_onoff(fp, "learning",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_LEARNING]));
 		if (prtb[IFLA_BRPORT_LEARNING_SYNC])
-			print_on_off(PRINT_ANY, "learning_sync", "learning_sync %s ",
+			print_onoff(fp, "learning_sync",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_LEARNING_SYNC]));
 		if (prtb[IFLA_BRPORT_UNICAST_FLOOD])
-			print_on_off(PRINT_ANY, "flood", "flood %s ",
+			print_onoff(fp, "flood",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_UNICAST_FLOOD]));
 		if (prtb[IFLA_BRPORT_MCAST_FLOOD])
-			print_on_off(PRINT_ANY, "mcast_flood", "mcast_flood %s ",
+			print_onoff(fp, "mcast_flood",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_MCAST_FLOOD]));
-		if (prtb[IFLA_BRPORT_MCAST_TO_UCAST])
-			print_on_off(PRINT_ANY, "mcast_to_unicast", "mcast_to_unicast %s ",
-				     rta_getattr_u8(prtb[IFLA_BRPORT_MCAST_TO_UCAST]));
 		if (prtb[IFLA_BRPORT_NEIGH_SUPPRESS])
-			print_on_off(PRINT_ANY, "neigh_suppress", "neigh_suppress %s ",
+			print_onoff(fp, "neigh_suppress",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_NEIGH_SUPPRESS]));
 		if (prtb[IFLA_BRPORT_VLAN_TUNNEL])
-			print_on_off(PRINT_ANY, "vlan_tunnel", "vlan_tunnel %s ",
+			print_onoff(fp, "vlan_tunnel",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_VLAN_TUNNEL]));
-
-		if (prtb[IFLA_BRPORT_BACKUP_PORT]) {
-			int ifidx;
-
-			ifidx = rta_getattr_u32(prtb[IFLA_BRPORT_BACKUP_PORT]);
-			print_string(PRINT_ANY,
-				     "backup_port", "backup_port %s ",
-				     ll_index_to_name(ifidx));
-		}
-
 		if (prtb[IFLA_BRPORT_ISOLATED])
-			print_on_off(PRINT_ANY, "isolated", "isolated %s ",
+			print_onoff(fp, "isolated",
 				    rta_getattr_u8(prtb[IFLA_BRPORT_ISOLATED]));
 	} else
-		print_stp_state(rta_getattr_u8(attr));
+		print_portstate(rta_getattr_u8(attr));
 }
 
 
@@ -200,7 +180,8 @@ static void print_af_spec(struct rtattr *attr, int ifindex)
 		print_vlan_info(aftb[IFLA_BRIDGE_VLAN_INFO], ifindex);
 }
 
-int print_linkinfo(struct nlmsghdr *n, void *arg)
+int print_linkinfo(const struct sockaddr_nl *who,
+		   struct nlmsghdr *n, void *arg)
 {
 	FILE *fp = arg;
 	struct ifinfomsg *ifi = NLMSG_DATA(n);
@@ -261,27 +242,40 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
 
 static void usage(void)
 {
-	fprintf(stderr,
+	fprintf(stderr, "Usage: bridge link set dev DEV [ cost COST ] [ priority PRIO ] [ state STATE ]\n");
-		"Usage: bridge link set dev DEV [ cost COST ] [ priority PRIO ] [ state STATE ]\n"
+	fprintf(stderr, "                               [ guard {on | off} ]\n");
-		"                               [ guard {on | off} ]\n"
+	fprintf(stderr, "                               [ hairpin {on | off} ]\n");
-		"                               [ hairpin {on | off} ]\n"
+	fprintf(stderr, "                               [ fastleave {on | off} ]\n");
-		"                               [ fastleave {on | off} ]\n"
+	fprintf(stderr,	"                               [ root_block {on | off} ]\n");
-		"                               [ root_block {on | off} ]\n"
+	fprintf(stderr,	"                               [ learning {on | off} ]\n");
-		"                               [ learning {on | off} ]\n"
+	fprintf(stderr,	"                               [ learning_sync {on | off} ]\n");
-		"                               [ learning_sync {on | off} ]\n"
+	fprintf(stderr,	"                               [ flood {on | off} ]\n");
-		"                               [ flood {on | off} ]\n"
+	fprintf(stderr,	"                               [ mcast_flood {on | off} ]\n");
-		"                               [ mcast_flood {on | off} ]\n"
+	fprintf(stderr,	"                               [ neigh_suppress {on | off} ]\n");
-		"                               [ mcast_to_unicast {on | off} ]\n"
+	fprintf(stderr,	"                               [ vlan_tunnel {on | off} ]\n");
-		"                               [ neigh_suppress {on | off} ]\n"
+	fprintf(stderr,	"                               [ isolated {on | off} ]\n");
-		"                               [ vlan_tunnel {on | off} ]\n"
+	fprintf(stderr, "                               [ hwmode {vepa | veb} ]\n");
-		"                               [ isolated {on | off} ]\n"
+	fprintf(stderr, "                               [ self ] [ master ]\n");
-		"                               [ hwmode {vepa | veb} ]\n"
+	fprintf(stderr, "       bridge link show [dev DEV]\n");
-		"                               [ backup_port DEVICE ] [ nobackup_port ]\n"
-		"                               [ self ] [ master ]\n"
-		"       bridge link show [dev DEV]\n");
 	exit(-1);
 }
 
+static bool on_off(char *arg, __s8 *attr, char *val)
+{
+	if (strcmp(val, "on") == 0)
+		*attr = 1;
+	else if (strcmp(val, "off") == 0)
+		*attr = 0;
+	else {
+		fprintf(stderr,
+			"Error: argument of \"%s\" must be \"on\" or \"off\"\n",
+			arg);
+		return false;
+	}
+
+	return true;
+}
+
 static int brlink_modify(int argc, char **argv)
 {
 	struct {
@@ -295,14 +289,12 @@ static int brlink_modify(int argc, char **argv)
 		.ifm.ifi_family = PF_BRIDGE,
 	};
 	char *d = NULL;
-	int backup_port_idx = -1;
 	__s8 neigh_suppress = -1;
 	__s8 learning = -1;
 	__s8 learning_sync = -1;
 	__s8 flood = -1;
 	__s8 vlan_tunnel = -1;
 	__s8 mcast_flood = -1;
-	__s8 mcast_to_unicast = -1;
 	__s8 isolated = -1;
 	__s8 hairpin = -1;
 	__s8 bpdu_guard = -1;
@@ -314,7 +306,6 @@ static int brlink_modify(int argc, char **argv)
 	__s16 mode = -1;
 	__u16 flags = 0;
 	struct rtattr *nest;
-	int ret;
 
 	while (argc > 0) {
 		if (strcmp(*argv, "dev") == 0) {
@@ -322,49 +313,36 @@ static int brlink_modify(int argc, char **argv)
 			d = *argv;
 		} else if (strcmp(*argv, "guard") == 0) {
 			NEXT_ARG();
-			bpdu_guard = parse_on_off("guard", *argv, &ret);
+			if (!on_off("guard", &bpdu_guard, *argv))
-			if (ret)
+				return -1;
-				return ret;
 		} else if (strcmp(*argv, "hairpin") == 0) {
 			NEXT_ARG();
-			hairpin = parse_on_off("hairpin", *argv, &ret);
+			if (!on_off("hairpin", &hairpin, *argv))
-			if (ret)
+				return -1;
-				return ret;
 		} else if (strcmp(*argv, "fastleave") == 0) {
 			NEXT_ARG();
-			fast_leave = parse_on_off("fastleave", *argv, &ret);
+			if (!on_off("fastleave", &fast_leave, *argv))
-			if (ret)
+				return -1;
-				return ret;
 		} else if (strcmp(*argv, "root_block") == 0) {
 			NEXT_ARG();
-			root_block = parse_on_off("root_block", *argv, &ret);
+			if (!on_off("root_block", &root_block, *argv))
-			if (ret)
+				return -1;
-				return ret;
 		} else if (strcmp(*argv, "learning") == 0) {
 			NEXT_ARG();
-			learning = parse_on_off("learning", *argv, &ret);
+			if (!on_off("learning", &learning, *argv))
-			if (ret)
+				return -1;
-				return ret;
 		} else if (strcmp(*argv, "learning_sync") == 0) {
 			NEXT_ARG();
-			learning_sync = parse_on_off("learning_sync", *argv, &ret);
+			if (!on_off("learning_sync", &learning_sync, *argv))
-			if (ret)
+				return -1;
-				return ret;
 		} else if (strcmp(*argv, "flood") == 0) {
 			NEXT_ARG();
-			flood = parse_on_off("flood", *argv, &ret);
+			if (!on_off("flood", &flood, *argv))
-			if (ret)
+				return -1;
-				return ret;
 		} else if (strcmp(*argv, "mcast_flood") == 0) {
 			NEXT_ARG();
-			mcast_flood = parse_on_off("mcast_flood", *argv, &ret);
+			if (!on_off("mcast_flood", &mcast_flood, *argv))
-			if (ret)
+				return -1;
-				return ret;
-		} else if (strcmp(*argv, "mcast_to_unicast") == 0) {
-			NEXT_ARG();
-			mcast_to_unicast = parse_on_off("mcast_to_unicast", *argv, &ret);
-			if (ret)
-				return ret;
 		} else if (strcmp(*argv, "cost") == 0) {
 			NEXT_ARG();
 			cost = atoi(*argv);
@@ -374,11 +352,14 @@ static int brlink_modify(int argc, char **argv)
 		} else if (strcmp(*argv, "state") == 0) {
 			NEXT_ARG();
 			char *endptr;
+			size_t nstates = ARRAY_SIZE(port_states);
 
 			state = strtol(*argv, &endptr, 10);
 			if (!(**argv != '\0' && *endptr == '\0')) {
-				state = parse_stp_state(*argv);
+				for (state = 0; state < nstates; state++)
-				if (state == -1) {
+					if (strcmp(port_states[state], *argv) == 0)
+						break;
+				if (state == nstates) {
 					fprintf(stderr,
 						"Error: invalid STP port state\n");
 					return -1;
@@ -402,29 +383,18 @@ static int brlink_modify(int argc, char **argv)
 			flags |= BRIDGE_FLAGS_MASTER;
 		} else if (strcmp(*argv, "neigh_suppress") == 0) {
 			NEXT_ARG();
-			neigh_suppress = parse_on_off("neigh_suppress", *argv, &ret);
+			if (!on_off("neigh_suppress", &neigh_suppress,
-			if (ret)
+				    *argv))
-				return ret;
+				return -1;
 		} else if (strcmp(*argv, "vlan_tunnel") == 0) {
 			NEXT_ARG();
-			vlan_tunnel = parse_on_off("vlan_tunnel", *argv, &ret);
+			if (!on_off("vlan_tunnel", &vlan_tunnel,
-			if (ret)
+				    *argv))
-				return ret;
+				return -1;
 		} else if (strcmp(*argv, "isolated") == 0) {
 			NEXT_ARG();
-			isolated = parse_on_off("isolated", *argv, &ret);
+			if (!on_off("isolated", &isolated, *argv))
-			if (ret)
-				return ret;
-		} else if (strcmp(*argv, "backup_port") == 0) {
-			NEXT_ARG();
-			backup_port_idx = ll_name_to_index(*argv);
-			if (!backup_port_idx) {
-				fprintf(stderr, "Error: device %s does not exist\n",
-					*argv);
 				return -1;
-			}
-		} else if (strcmp(*argv, "nobackup_port") == 0) {
-			backup_port_idx = 0;
 		} else {
 			usage();
 		}
@@ -462,9 +432,6 @@ static int brlink_modify(int argc, char **argv)
 	if (mcast_flood >= 0)
 		addattr8(&req.n, sizeof(req), IFLA_BRPORT_MCAST_FLOOD,
 			 mcast_flood);
-	if (mcast_to_unicast >= 0)
-		addattr8(&req.n, sizeof(req), IFLA_BRPORT_MCAST_TO_UCAST,
-			 mcast_to_unicast);
 	if (learning >= 0)
 		addattr8(&req.n, sizeof(req), IFLA_BRPORT_LEARNING, learning);
 	if (learning_sync >= 0)
@@ -489,10 +456,6 @@ static int brlink_modify(int argc, char **argv)
 	if (isolated != -1)
 		addattr8(&req.n, sizeof(req), IFLA_BRPORT_ISOLATED, isolated);
 
-	if (backup_port_idx != -1)
-		addattr32(&req.n, sizeof(req), IFLA_BRPORT_BACKUP_PORT,
-			  backup_port_idx);
-
 	addattr_nest_end(&req.n, nest);
 
 	/* IFLA_AF_SPEC nested attribute. Contains IFLA_BRIDGE_FLAGS that
@@ -539,7 +502,7 @@ static int brlink_show(int argc, char **argv)
 	}
 
 	if (show_details) {
-		if (rtnl_linkdump_req_filter(&rth, PF_BRIDGE,
+		if (rtnl_wilddump_req_filter(&rth, PF_BRIDGE, RTM_GETLINK,
 					     (compress_vlans ?
 					      RTEXT_FILTER_BRVLAN_COMPRESSED :
 					      RTEXT_FILTER_BRVLAN)) < 0) {
@@ -547,7 +510,7 @@ static int brlink_show(int argc, char **argv)
 			exit(1);
 		}
 	} else {
-		if (rtnl_linkdump_req(&rth, PF_BRIDGE) < 0) {
+		if (rtnl_wilddump_request(&rth, PF_BRIDGE, RTM_GETLINK) < 0) {
 			perror("Cannon send dump request");
 			exit(1);
 		}

bridge/mdb.c

@@ -16,9 +16,9 @@
 #include <arpa/inet.h>
 
 #include "libnetlink.h"
-#include "utils.h"
 #include "br_common.h"
 #include "rt_names.h"
+#include "utils.h"
 #include "json_print.h"
 
 #ifndef MDBA_RTA
@@ -30,9 +30,8 @@ static unsigned int filter_index, filter_vlan;
 
 static void usage(void)
 {
-	fprintf(stderr,
+	fprintf(stderr, "Usage: bridge mdb { add | del } dev DEV port PORT grp GROUP [permanent | temp] [vid VID]\n");
-		"Usage: bridge mdb { add | del } dev DEV port PORT grp GROUP [src SOURCE] [permanent | temp] [vid VID]\n"
+	fprintf(stderr, "       bridge mdb {show} [ dev DEV ] [ vid VID ]\n");
-		"       bridge mdb {show} [ dev DEV ] [ vid VID ]\n");
 	exit(-1);
 }
 
@@ -41,25 +40,20 @@ static bool is_temp_mcast_rtr(__u8 type)
 	return type == MDB_RTR_TYPE_TEMP_QUERY || type == MDB_RTR_TYPE_TEMP;
 }
 
-static const char *format_timer(__u32 ticks, int align)
+static const char *format_timer(__u32 ticks)
 {
 	struct timeval tv;
 	static char tbuf[32];
 
 	__jiffies_to_tv(&tv, ticks);
-	if (align)
 	snprintf(tbuf, sizeof(tbuf), "%4lu.%.2lu",
 		 (unsigned long)tv.tv_sec,
 		 (unsigned long)tv.tv_usec / 10000);
-	else
-		snprintf(tbuf, sizeof(tbuf), "%lu.%.2lu",
-			 (unsigned long)tv.tv_sec,
-			 (unsigned long)tv.tv_usec / 10000);
 
 	return tbuf;
 }
 
-void br_print_router_port_stats(struct rtattr *pattr)
+static void __print_router_port_stats(FILE *f, struct rtattr *pattr)
 {
 	struct rtattr *tb[MDBA_ROUTER_PATTR_MAX + 1];
 
@@ -70,7 +64,7 @@ void br_print_router_port_stats(struct rtattr *pattr)
 		__u32 timer = rta_getattr_u32(tb[MDBA_ROUTER_PATTR_TIMER]);
 
 		print_string(PRINT_ANY, "timer", " %s",
-			     format_timer(timer, 1));
+			     format_timer(timer));
 	}
 
 	if (tb[MDBA_ROUTER_PATTR_TYPE]) {
@@ -101,13 +95,13 @@ static void br_print_router_ports(FILE *f, struct rtattr *attr,
 			print_string(PRINT_JSON, "port", NULL, port_ifname);
 
 			if (show_stats)
-				br_print_router_port_stats(i);
+				__print_router_port_stats(f, i);
 			close_json_object();
 		} else if (show_stats) {
 			fprintf(f, "router ports on %s: %s",
 				brifname, port_ifname);
 
-			br_print_router_port_stats(i);
+			__print_router_port_stats(f, i);
 			fprintf(f, "\n");
 		} else {
 			fprintf(f, "%s ", port_ifname);
@@ -120,120 +114,42 @@ static void br_print_router_ports(FILE *f, struct rtattr *attr,
 	close_json_array(PRINT_JSON, NULL);
 }
 
-static void print_src_entry(struct rtattr *src_attr, int af, const char *sep)
-{
-	struct rtattr *stb[MDBA_MDB_SRCATTR_MAX + 1];
-	SPRINT_BUF(abuf);
-	const char *addr;
-	__u32 timer_val;
-
-	parse_rtattr_nested(stb, MDBA_MDB_SRCATTR_MAX, src_attr);
-	if (!stb[MDBA_MDB_SRCATTR_ADDRESS] || !stb[MDBA_MDB_SRCATTR_TIMER])
-		return;
-
-	addr = inet_ntop(af, RTA_DATA(stb[MDBA_MDB_SRCATTR_ADDRESS]), abuf,
-			 sizeof(abuf));
-	if (!addr)
-		return;
-	timer_val = rta_getattr_u32(stb[MDBA_MDB_SRCATTR_TIMER]);
-
-	open_json_object(NULL);
-	print_string(PRINT_FP, NULL, "%s", sep);
-	print_color_string(PRINT_ANY, ifa_family_color(af),
-			   "address", "%s", addr);
-	print_string(PRINT_ANY, "timer", "/%s", format_timer(timer_val, 0));
-	close_json_object();
-}
-
 static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e,
 			    struct nlmsghdr *n, struct rtattr **tb)
 {
-	const void *grp, *src;
-	const char *addr;
 	SPRINT_BUF(abuf);
 	const char *dev;
+	const void *src;
 	int af;
 
 	if (filter_vlan && e->vid != filter_vlan)
 		return;
 
-	if (!e->addr.proto) {
+	af = e->addr.proto == htons(ETH_P_IP) ? AF_INET : AF_INET6;
-		af = AF_PACKET;
+	src = af == AF_INET ? (const void *)&e->addr.u.ip4 :
-		grp = &e->addr.u.mac_addr;
+			      (const void *)&e->addr.u.ip6;
-	} else if (e->addr.proto == htons(ETH_P_IP)) {
-		af = AF_INET;
-		grp = &e->addr.u.ip4;
-	} else {
-		af = AF_INET6;
-		grp = &e->addr.u.ip6;
-	}
 	dev = ll_index_to_name(ifindex);
 
 	open_json_object(NULL);
 
-	print_int(PRINT_JSON, "index", NULL, ifindex);
+	if (n->nlmsg_type == RTM_DELMDB)
-	print_color_string(PRINT_ANY, COLOR_IFNAME, "dev", "dev %s", dev);
+		print_bool(PRINT_ANY, "deleted", "Deleted ", true);
-	print_string(PRINT_ANY, "port", " port %s",
+
+	print_int(PRINT_ANY, "index", "%u: ", ifindex);
+	print_color_string(PRINT_ANY, COLOR_IFNAME, "dev", "%s ", dev);
+	print_string(PRINT_ANY, "port", " %s ",
 		     ll_index_to_name(e->ifindex));
 
-	/* The ETH_ALEN argument is ignored for all cases but AF_PACKET */
-	addr = rt_addr_n2a_r(af, ETH_ALEN, grp, abuf, sizeof(abuf));
-	if (!addr)
-		return;
-
 	print_color_string(PRINT_ANY, ifa_family_color(af),
-			    "grp", " grp %s", addr);
+			    "grp", " %s ",
-
-	if (tb && tb[MDBA_MDB_EATTR_SOURCE]) {
-		src = (const void *)RTA_DATA(tb[MDBA_MDB_EATTR_SOURCE]);
-		print_color_string(PRINT_ANY, ifa_family_color(af),
-				   "src", " src %s",
 			    inet_ntop(af, src, abuf, sizeof(abuf)));
-	}
+
-	print_string(PRINT_ANY, "state", " %s",
+	print_string(PRINT_ANY, "state", " %s ",
 			   (e->state & MDB_PERMANENT) ? "permanent" : "temp");
-	if (show_details && tb) {
-		if (tb[MDBA_MDB_EATTR_GROUP_MODE]) {
-			__u8 mode = rta_getattr_u8(tb[MDBA_MDB_EATTR_GROUP_MODE]);
-
-			print_string(PRINT_ANY, "filter_mode", " filter_mode %s",
-				     mode == MCAST_INCLUDE ? "include" :
-							     "exclude");
-		}
-		if (tb[MDBA_MDB_EATTR_SRC_LIST]) {
-			struct rtattr *i, *attr = tb[MDBA_MDB_EATTR_SRC_LIST];
-			const char *sep = " ";
-			int rem;
-
-			open_json_array(PRINT_ANY, is_json_context() ?
-								"source_list" :
-								" source_list");
-			rem = RTA_PAYLOAD(attr);
-			for (i = RTA_DATA(attr); RTA_OK(i, rem);
-			     i = RTA_NEXT(i, rem)) {
-				print_src_entry(i, af, sep);
-				sep = ",";
-			}
-			close_json_array(PRINT_JSON, NULL);
-		}
-		if (tb[MDBA_MDB_EATTR_RTPROT]) {
-			__u8 rtprot = rta_getattr_u8(tb[MDBA_MDB_EATTR_RTPROT]);
-			SPRINT_BUF(rtb);
-
-			print_string(PRINT_ANY, "protocol", " proto %s ",
-				     rtnl_rtprot_n2a(rtprot, rtb, sizeof(rtb)));
-		}
-	}
 
 	open_json_array(PRINT_JSON, "flags");
 	if (e->flags & MDB_FLAGS_OFFLOAD)
-		print_string(PRINT_ANY, NULL, " %s", "offload");
+		print_string(PRINT_ANY, NULL, "%s ", "offload");
-	if (e->flags & MDB_FLAGS_FAST_LEAVE)
-		print_string(PRINT_ANY, NULL, " %s", "fast_leave");
-	if (e->flags & MDB_FLAGS_STAR_EXCL)
-		print_string(PRINT_ANY, NULL, " %s", "added_by_star_ex");
-	if (e->flags & MDB_FLAGS_BLOCKED)
-		print_string(PRINT_ANY, NULL, " %s", "blocked");
 	close_json_array(PRINT_JSON, NULL);
 
 	if (e->vid)
@@ -243,7 +159,7 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e,
 		__u32 timer = rta_getattr_u32(tb[MDBA_MDB_EATTR_TIMER]);
 
 		print_string(PRINT_ANY, "timer", " %s",
-			     format_timer(timer, 1));
+			     format_timer(timer));
 	}
 
 	print_nl();
@@ -261,9 +177,8 @@ static void br_print_mdb_entry(FILE *f, int ifindex, struct rtattr *attr,
 	rem = RTA_PAYLOAD(attr);
 	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
 		e = RTA_DATA(i);
-		parse_rtattr_flags(etb, MDBA_MDB_EATTR_MAX, MDB_RTA(RTA_DATA(i)),
+		parse_rtattr(etb, MDBA_MDB_EATTR_MAX, MDB_RTA(RTA_DATA(i)),
-				   RTA_PAYLOAD(i) - RTA_ALIGN(sizeof(*e)),
+			     RTA_PAYLOAD(i) - RTA_ALIGN(sizeof(*e)));
-				   NLA_F_NESTED);
 		print_mdb_entry(f, ifindex, e, n, etb);
 	}
 }
@@ -274,8 +189,10 @@ static void print_mdb_entries(FILE *fp, struct nlmsghdr *n,
 	int rem = RTA_PAYLOAD(mdb);
 	struct rtattr *i;
 
+	open_json_array(PRINT_JSON, "mdb");
 	for (i = RTA_DATA(mdb); RTA_OK(i, rem); i = RTA_NEXT(i, rem))
 		br_print_mdb_entry(fp, ifindex, i, n);
+	close_json_array(PRINT_JSON, NULL);
 }
 
 static void print_router_entries(FILE *fp, struct nlmsghdr *n,
@@ -283,6 +200,7 @@ static void print_router_entries(FILE *fp, struct nlmsghdr *n,
 {
 	const char *brifname = ll_index_to_name(ifindex);
 
+	open_json_array(PRINT_JSON, "router");
 	if (n->nlmsg_type == RTM_GETMDB) {
 		if (show_details)
 			br_print_router_ports(fp, router, brifname);
@@ -304,12 +222,15 @@ static void print_router_entries(FILE *fp, struct nlmsghdr *n,
 				port_name, brifname);
 		}
 	}
+	close_json_array(PRINT_JSON, NULL);
 }
 
-static int __parse_mdb_nlmsg(struct nlmsghdr *n, struct rtattr **tb)
+int print_mdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
+	FILE *fp = arg;
 	struct br_port_msg *r = NLMSG_DATA(n);
 	int len = n->nlmsg_len;
+	struct rtattr *tb[MDBA_MAX+1];
 
 	if (n->nlmsg_type != RTM_GETMDB &&
 	    n->nlmsg_type != RTM_NEWMDB &&
@@ -332,54 +253,6 @@ static int __parse_mdb_nlmsg(struct nlmsghdr *n, struct rtattr **tb)
 
 	parse_rtattr(tb, MDBA_MAX, MDBA_RTA(r), n->nlmsg_len - NLMSG_LENGTH(sizeof(*r)));
 
-	return 1;
-}
-
-static int print_mdbs(struct nlmsghdr *n, void *arg)
-{
-	struct br_port_msg *r = NLMSG_DATA(n);
-	struct rtattr *tb[MDBA_MAX+1];
-	FILE *fp = arg;
-	int ret;
-
-	ret = __parse_mdb_nlmsg(n, tb);
-	if (ret != 1)
-		return ret;
-
-	if (tb[MDBA_MDB])
-		print_mdb_entries(fp, n, r->ifindex, tb[MDBA_MDB]);
-
-	return 0;
-}
-
-static int print_rtrs(struct nlmsghdr *n, void *arg)
-{
-	struct br_port_msg *r = NLMSG_DATA(n);
-	struct rtattr *tb[MDBA_MAX+1];
-	FILE *fp = arg;
-	int ret;
-
-	ret = __parse_mdb_nlmsg(n, tb);
-	if (ret != 1)
-		return ret;
-
-	if (tb[MDBA_ROUTER])
-		print_router_entries(fp, n, r->ifindex, tb[MDBA_ROUTER]);
-
-	return 0;
-}
-
-int print_mdb_mon(struct nlmsghdr *n, void *arg)
-{
-	struct br_port_msg *r = NLMSG_DATA(n);
-	struct rtattr *tb[MDBA_MAX+1];
-	FILE *fp = arg;
-	int ret;
-
-	ret = __parse_mdb_nlmsg(n, tb);
-	if (ret != 1)
-		return ret;
-
 	if (n->nlmsg_type == RTM_DELMDB)
 		print_bool(PRINT_ANY, "deleted", "Deleted ", true);
 
@@ -418,60 +291,24 @@ static int mdb_show(int argc, char **argv)
 	}
 
 	new_json_obj(json);
-	open_json_object(NULL);
 
-	/* get mdb entries */
+	/* get mdb entries*/
-	if (rtnl_mdbdump_req(&rth, PF_BRIDGE) < 0) {
+	if (rtnl_wilddump_request(&rth, PF_BRIDGE, RTM_GETMDB) < 0) {
 		perror("Cannot send dump request");
 		return -1;
 	}
 
-	open_json_array(PRINT_JSON, "mdb");
+	if (rtnl_dump_filter(&rth, print_mdb, stdout) < 0) {
-	if (rtnl_dump_filter(&rth, print_mdbs, stdout) < 0) {
 		fprintf(stderr, "Dump terminated\n");
 		return -1;
 	}
-	close_json_array(PRINT_JSON, NULL);
 
-	/* get router ports */
-	if (rtnl_mdbdump_req(&rth, PF_BRIDGE) < 0) {
-		perror("Cannot send dump request");
-		return -1;
-	}
-
-	open_json_object("router");
-	if (rtnl_dump_filter(&rth, print_rtrs, stdout) < 0) {
-		fprintf(stderr, "Dump terminated\n");
-		return -1;
-	}
-	close_json_object();
-
-	close_json_object();
 	delete_json_obj();
 	fflush(stdout);
 
 	return 0;
 }
 
-static int mdb_parse_grp(const char *grp, struct br_mdb_entry *e)
-{
-	if (inet_pton(AF_INET, grp, &e->addr.u.ip4)) {
-		e->addr.proto = htons(ETH_P_IP);
-		return 0;
-	}
-	if (inet_pton(AF_INET6, grp, &e->addr.u.ip6)) {
-		e->addr.proto = htons(ETH_P_IPV6);
-		return 0;
-	}
-	if (ll_addr_a2n((char *)e->addr.u.mac_addr, sizeof(e->addr.u.mac_addr),
-			grp) == ETH_ALEN) {
-		e->addr.proto = 0;
-		return 0;
-	}
-
-	return -1;
-}
-
 static int mdb_modify(int cmd, int flags, int argc, char **argv)
 {
 	struct {
@@ -484,8 +321,8 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
 		.n.nlmsg_type = cmd,
 		.bpm.family = PF_BRIDGE,
 	};
-	char *d = NULL, *p = NULL, *grp = NULL, *src = NULL;
 	struct br_mdb_entry entry = {};
+	char *d = NULL, *p = NULL, *grp = NULL;
 	short vid = 0;
 
 	while (argc > 0) {
@@ -506,9 +343,6 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
 		} else if (strcmp(*argv, "vid") == 0) {
 			NEXT_ARG();
 			vid = atoi(*argv);
-		} else if (strcmp(*argv, "src") == 0) {
-			NEXT_ARG();
-			src = *argv;
 		} else {
 			if (matches(*argv, "help") == 0)
 				usage();
@@ -529,31 +363,17 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv)
 	if (!entry.ifindex)
 		return nodev(p);
 
-	if (mdb_parse_grp(grp, &entry)) {
+	if (!inet_pton(AF_INET, grp, &entry.addr.u.ip4)) {
+		if (!inet_pton(AF_INET6, grp, &entry.addr.u.ip6)) {
 			fprintf(stderr, "Invalid address \"%s\"\n", grp);
 			return -1;
-	}
+		} else
+			entry.addr.proto = htons(ETH_P_IPV6);
+	} else
+		entry.addr.proto = htons(ETH_P_IP);
 
 	entry.vid = vid;
 	addattr_l(&req.n, sizeof(req), MDBA_SET_ENTRY, &entry, sizeof(entry));
-	if (src) {
-		struct rtattr *nest = addattr_nest(&req.n, sizeof(req),
-						   MDBA_SET_ENTRY_ATTRS);
-		struct in6_addr src_ip6;
-		__be32 src_ip4;
-
-		nest->rta_type |= NLA_F_NESTED;
-		if (!inet_pton(AF_INET, src, &src_ip4)) {
-			if (!inet_pton(AF_INET6, src, &src_ip6)) {
-				fprintf(stderr, "Invalid source address \"%s\"\n", src);
-				return -1;
-			}
-			addattr_l(&req.n, sizeof(req), MDBE_ATTR_SOURCE, &src_ip6, sizeof(src_ip6));
-		} else {
-			addattr32(&req.n, sizeof(req), MDBE_ATTR_SOURCE, src_ip4);
-		}
-		addattr_nest_end(&req.n, nest);
-	}
 
 	if (rtnl_talk(&rth, &req.n, NULL) < 0)
 		return -1;

bridge/monitor.c

@@ -27,15 +27,16 @@
 
 
 static void usage(void) __attribute__((noreturn));
-static int prefix_banner;
+int prefix_banner;
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: bridge monitor [file | link | fdb | mdb | vlan | all]\n");
+	fprintf(stderr, "Usage: bridge monitor [file | link | fdb | mdb | all]\n");
 	exit(-1);
 }
 
-static int accept_msg(struct rtnl_ctrl_data *ctrl,
+static int accept_msg(const struct sockaddr_nl *who,
+		      struct rtnl_ctrl_data *ctrl,
 		      struct nlmsghdr *n, void *arg)
 {
 	FILE *fp = arg;
@@ -49,30 +50,24 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl,
 		if (prefix_banner)
 			fprintf(fp, "[LINK]");
 
-		return print_linkinfo(n, arg);
+		return print_linkinfo(who, n, arg);
 
 	case RTM_NEWNEIGH:
 	case RTM_DELNEIGH:
 		if (prefix_banner)
 			fprintf(fp, "[NEIGH]");
-		return print_fdb(n, arg);
+		return print_fdb(who, n, arg);
 
 	case RTM_NEWMDB:
 	case RTM_DELMDB:
 		if (prefix_banner)
 			fprintf(fp, "[MDB]");
-		return print_mdb_mon(n, arg);
+		return print_mdb(who, n, arg);
 
 	case NLMSG_TSTAMP:
 		print_nlmsg_timestamp(fp, n);
 		return 0;
 
-	case RTM_NEWVLAN:
-	case RTM_DELVLAN:
-		if (prefix_banner)
-			fprintf(fp, "[VLAN]");
-		return print_vlan_rtm(n, arg, true, false);
-
 	default:
 		return 0;
 	}
@@ -85,7 +80,6 @@ int do_monitor(int argc, char **argv)
 	int llink = 0;
 	int lneigh = 0;
 	int lmdb = 0;
-	int lvlan = 0;
 
 	rtnl_close(&rth);
 
@@ -102,12 +96,8 @@ int do_monitor(int argc, char **argv)
 		} else if (matches(*argv, "mdb") == 0) {
 			lmdb = 1;
 			groups = 0;
-		} else if (matches(*argv, "vlan") == 0) {
-			lvlan = 1;
-			groups = 0;
 		} else if (strcmp(*argv, "all") == 0) {
 			groups = ~RTMGRP_TC;
-			lvlan = 1;
 			prefix_banner = 1;
 		} else if (matches(*argv, "help") == 0) {
 			usage();
@@ -145,12 +135,6 @@ int do_monitor(int argc, char **argv)
 
 	if (rtnl_open(&rth, groups) < 0)
 		exit(1);
-
-	if (lvlan && rtnl_add_nl_group(&rth, RTNLGRP_BRVLAN) < 0) {
-		fprintf(stderr, "Failed to add bridge vlan group to list\n");
-		exit(1);
-	}
-
 	ll_init_map(&rth);
 
 	if (rtnl_listen(&rth, accept_msg, stdout) < 0)

configure

@@ -1,10 +1,8 @@
-#!/bin/sh
+#! /bin/bash
 # SPDX-License-Identifier: GPL-2.0
 # This is not an autoconf generated configure
-
+#
-INCLUDE="$PWD/include"
+INCLUDE=${1:-"$PWD/include"}
-PREFIX="/usr"
-LIBDIR="\${prefix}/lib"
 
 # Output file which is input to Makefile
 CONFIG=config.mk
@@ -13,16 +11,20 @@ CONFIG=config.mk
 TMPDIR=$(mktemp -d config.XXXXXX)
 trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM
 
+check_prog()
+{
+    echo -n "$2"
+    command -v $1 >/dev/null 2>&1 && (echo "$3:=y" >> $CONFIG; echo "yes") || (echo "no"; return 1)
+}
+
 check_toolchain()
 {
     : ${PKG_CONFIG:=pkg-config}
     : ${AR=ar}
     : ${CC=gcc}
-    : ${YACC=bison}
     echo "PKG_CONFIG:=${PKG_CONFIG}" >>$CONFIG
     echo "AR:=${AR}" >>$CONFIG
     echo "CC:=${CC}" >>$CONFIG
-    echo "YACC:=${YACC}" >>$CONFIG
 }
 
 check_atm()
@@ -36,7 +38,9 @@ int main(int argc, char **argv) {
 }
 EOF
 
-    if $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1; then
+    $CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1
+    if [ $? -eq 0 ]
+    then
 	echo "TC_CONFIG_ATM:=y" >>$CONFIG
 	echo yes
     else
@@ -47,7 +51,8 @@ EOF
 
 check_xtables()
 {
-	if ! ${PKG_CONFIG} xtables --exists; then
+	if ! ${PKG_CONFIG} xtables --exists
+	then
 		echo "TC_CONFIG_NO_XT:=y" >>$CONFIG
 	fi
 }
@@ -75,7 +80,8 @@ int main(int argc, char **argv)
 EOF
 
     if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \
-	$(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1; then
+	$(${PKG_CONFIG} xtables --cflags --libs) -ldl >/dev/null 2>&1
+    then
 	echo "TC_CONFIG_XT:=y" >>$CONFIG
 	echo "using xtables"
     fi
@@ -85,7 +91,10 @@ EOF
 check_xt_old()
 {
     # bail if previous XT checks has already succeeded.
-    grep -q TC_CONFIG_XT $CONFIG && return
+    if grep -q TC_CONFIG_XT $CONFIG
+    then
+	return
+    fi
 
     #check if we don't need our internal header ..
     cat >$TMPDIR/ipttest.c <<EOF
@@ -109,7 +118,9 @@ int main(int argc, char **argv) {
 
 EOF
 
-    if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1; then
+    $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
+    if [ $? -eq 0 ]
+    then
 	echo "TC_CONFIG_XT_OLD:=y" >>$CONFIG
 	echo "using old xtables (no need for xt-internal.h)"
     fi
@@ -119,7 +130,10 @@ EOF
 check_xt_old_internal_h()
 {
     # bail if previous XT checks has already succeeded.
-    grep -q TC_CONFIG_XT $CONFIG && return
+    if grep -q TC_CONFIG_XT $CONFIG
+    then
+	return
+    fi
 
     #check if we need our own internal.h
     cat >$TMPDIR/ipttest.c <<EOF
@@ -143,25 +157,20 @@ int main(int argc, char **argv) {
 }
 
 EOF
-	if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1; then
+	$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1
+
+	if [ $? -eq 0 ]
+	then
 	    echo "using old xtables with xt-internal.h"
 	    echo "TC_CONFIG_XT_OLD_H:=y" >>$CONFIG
 	fi
 	rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest
 }
 
-check_lib_dir()
-{
-	LIBDIR=$(echo $LIBDIR | sed "s|\${prefix}|$PREFIX|")
-
-	echo -n "lib directory: "
-	echo "$LIBDIR"
-	echo "LIBDIR:=$LIBDIR" >> $CONFIG
-}
-
 check_ipt()
 {
-	if ! grep TC_CONFIG_XT $CONFIG > /dev/null; then
+	if ! grep TC_CONFIG_XT $CONFIG > /dev/null
+	then
 		echo "using iptables"
 	fi
 }
@@ -175,9 +184,9 @@ check_ipt_lib_dir()
 		return
 	fi
 
-	for dir in /lib /usr/lib /usr/local/lib; do
+	for dir in /lib /usr/lib /usr/local/lib
-		for file in "xtables" "iptables"; do
+	do
-			file="$dir/$file/lib*t_*so"
+		for file in $dir/{xtables,iptables}/lib*t_*so ; do
 			if [ -f $file ]; then
 				echo ${file%/*}
 				echo "IPT_LIB_DIR:=${file%/*}" >> $CONFIG
@@ -198,7 +207,9 @@ int main(int argc, char **argv)
 	return 0;
 }
 EOF
-    if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
+    $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1
+    if [ $? -eq 0 ]
+    then
 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
 	echo "yes"
 	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
@@ -208,31 +219,6 @@ EOF
     rm -f $TMPDIR/setnstest.c $TMPDIR/setnstest
 }
 
-check_name_to_handle_at()
-{
-    cat >$TMPDIR/name_to_handle_at_test.c <<EOF
-#define _GNU_SOURCE
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-int main(int argc, char **argv)
-{
-	struct file_handle *fhp;
-	int mount_id, flags, dirfd;
-	char *pathname;
-	name_to_handle_at(dirfd, pathname, fhp, &mount_id, flags);
-	return 0;
-}
-EOF
-    if $CC -I$INCLUDE -o $TMPDIR/name_to_handle_at_test $TMPDIR/name_to_handle_at_test.c >/dev/null 2>&1; then
-        echo "yes"
-        echo "CFLAGS += -DHAVE_HANDLE_AT" >>$CONFIG
-    else
-        echo "no"
-    fi
-    rm -f $TMPDIR/name_to_handle_at_test.c $TMPDIR/name_to_handle_at_test
-}
-
 check_ipset()
 {
     cat >$TMPDIR/ipsettest.c <<EOF
@@ -244,7 +230,7 @@ typedef unsigned short ip_set_id_t;
 #include <linux/netfilter/xt_set.h>
 
 struct xt_set_info info;
-#if IPSET_PROTOCOL == 6 || IPSET_PROTOCOL == 7
+#if IPSET_PROTOCOL == 6
 int main(void)
 {
 	return IPSET_MAXNAMELEN;
@@ -254,7 +240,8 @@ int main(void)
 #endif
 EOF
 
-    if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1; then
+    if $CC -I$INCLUDE -o $TMPDIR/ipsettest $TMPDIR/ipsettest.c >/dev/null 2>&1
+    then
 	echo "TC_CONFIG_IPSET:=y" >>$CONFIG
 	echo "yes"
     else
@@ -265,7 +252,8 @@ EOF
 
 check_elf()
 {
-    if ${PKG_CONFIG} libelf --exists; then
+    if ${PKG_CONFIG} libelf --exists
+    then
 	echo "HAVE_ELF:=y" >>$CONFIG
 	echo "yes"
 
@@ -276,115 +264,11 @@ check_elf()
     fi
 }
 
-have_libbpf_basic()
-{
-    cat >$TMPDIR/libbpf_test.c <<EOF
-#include <bpf/libbpf.h>
-int main(int argc, char **argv) {
-    bpf_program__set_autoload(NULL, false);
-    bpf_map__ifindex(NULL);
-    bpf_map__set_pin_path(NULL, NULL);
-    bpf_object__open_file(NULL, NULL);
-    return 0;
-}
-EOF
-
-    $CC -o $TMPDIR/libbpf_test $TMPDIR/libbpf_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1
-    local ret=$?
-
-    rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
-    return $ret
-}
-
-have_libbpf_sec_name()
-{
-    cat >$TMPDIR/libbpf_sec_test.c <<EOF
-#include <bpf/libbpf.h>
-int main(int argc, char **argv) {
-    void *ptr;
-    bpf_program__section_name(NULL);
-    return 0;
-}
-EOF
-
-    $CC -o $TMPDIR/libbpf_sec_test $TMPDIR/libbpf_sec_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1
-    local ret=$?
-
-    rm -f $TMPDIR/libbpf_sec_test.c $TMPDIR/libbpf_sec_test
-    return $ret
-}
-
-check_force_libbpf_on()
-{
-    # if set LIBBPF_FORCE=on but no libbpf support, just exist the config
-    # process to make sure we don't build without libbpf.
-    if [ "$LIBBPF_FORCE" = on ]; then
-        echo "	LIBBPF_FORCE=on set, but couldn't find a usable libbpf"
-        exit 1
-    fi
-}
-
-check_libbpf()
-{
-    # if set LIBBPF_FORCE=off, disable libbpf entirely
-    if [ "$LIBBPF_FORCE" = off ]; then
-        echo "no"
-        return
-    fi
-
-    if ! ${PKG_CONFIG} libbpf --exists && [ -z "$LIBBPF_DIR" ] ; then
-        echo "no"
-        check_force_libbpf_on
-        return
-    fi
-
-    if [ $(uname -m) = x86_64 ]; then
-        local LIBBPF_LIBDIR="${LIBBPF_DIR}/usr/lib64"
-    else
-        local LIBBPF_LIBDIR="${LIBBPF_DIR}/usr/lib"
-    fi
-
-    if [ -n "$LIBBPF_DIR" ]; then
-        LIBBPF_CFLAGS="-I${LIBBPF_DIR}/usr/include"
-        LIBBPF_LDLIBS="${LIBBPF_LIBDIR}/libbpf.a -lz -lelf"
-        LIBBPF_VERSION=$(PKG_CONFIG_LIBDIR=${LIBBPF_LIBDIR}/pkgconfig ${PKG_CONFIG} libbpf --modversion)
-    else
-        LIBBPF_CFLAGS=$(${PKG_CONFIG} libbpf --cflags)
-        LIBBPF_LDLIBS=$(${PKG_CONFIG} libbpf --libs)
-        LIBBPF_VERSION=$(${PKG_CONFIG} libbpf --modversion)
-    fi
-
-    if ! have_libbpf_basic; then
-        echo "no"
-        echo "	libbpf version $LIBBPF_VERSION is too low, please update it to at least 0.1.0"
-        check_force_libbpf_on
-        return
-    else
-        echo "HAVE_LIBBPF:=y" >> $CONFIG
-        echo 'CFLAGS += -DHAVE_LIBBPF ' $LIBBPF_CFLAGS >> $CONFIG
-        echo "CFLAGS += -DLIBBPF_VERSION=\\\"$LIBBPF_VERSION\\\"" >> $CONFIG
-        echo 'LDLIBS += ' $LIBBPF_LDLIBS >> $CONFIG
-
-        if [ -z "$LIBBPF_DIR" ]; then
-            echo "CFLAGS += -DLIBBPF_DYNAMIC" >> $CONFIG
-        fi
-    fi
-
-    # bpf_program__title() is deprecated since libbpf 0.2.0, use
-    # bpf_program__section_name() instead if we support
-    if have_libbpf_sec_name; then
-        echo "HAVE_LIBBPF_SECTION_NAME:=y" >> $CONFIG
-        echo 'CFLAGS += -DHAVE_LIBBPF_SECTION_NAME ' >> $CONFIG
-    fi
-
-    echo "yes"
-    echo "	libbpf version $LIBBPF_VERSION"
-}
-
 check_selinux()
 # SELinux is a compile time option in the ss utility
 {
-	if ${PKG_CONFIG} libselinux --exists; then
+	if ${PKG_CONFIG} libselinux --exists
+	then
 		echo "HAVE_SELINUX:=y" >>$CONFIG
 		echo "yes"
 
@@ -397,7 +281,8 @@ check_selinux()
 
 check_mnl()
 {
-	if ${PKG_CONFIG} libmnl --exists; then
+	if ${PKG_CONFIG} libmnl --exists
+	then
 		echo "HAVE_MNL:=y" >>$CONFIG
 		echo "yes"
 
@@ -419,7 +304,9 @@ int main(int argc, char **argv) {
 	return 0;
 }
 EOF
-    if $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1; then
+    $CC -I$INCLUDE -o $TMPDIR/dbtest $TMPDIR/dbtest.c -ldb >/dev/null 2>&1
+    if [ $? -eq 0 ]
+    then
 	echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
 	echo "yes"
     else
@@ -438,24 +325,21 @@ int main(int argc, char **argv) {
 	return 0;
 }
 EOF
-    if $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1; then
+    $CC -I$INCLUDE -o $TMPDIR/strtest $TMPDIR/strtest.c >/dev/null 2>&1
-	echo "no"
+    if [ $? -eq 0 ]
-    else
+    then
-	if ${PKG_CONFIG} libbsd --exists; then
-		echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
-		echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
 	echo "no"
     else
 	echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
 	echo "yes"
     fi
-    fi
     rm -f $TMPDIR/strtest.c $TMPDIR/strtest
 }
 
 check_cap()
 {
-	if ${PKG_CONFIG} libcap --exists; then
+	if ${PKG_CONFIG} libcap --exists
+	then
 		echo "HAVE_CAP:=y" >>$CONFIG
 		echo "yes"
 
@@ -492,76 +376,6 @@ endif
 EOF
 }
 
-usage()
-{
-	cat <<EOF
-Usage: $0 [OPTIONS]
-	--include_dir <dir>		Path to iproute2 include dir
-	--libdir <dir>			Path to iproute2 lib dir
-	--libbpf_dir <dir>		Path to libbpf DESTDIR
-	--libbpf_force <on|off>		Enable/disable libbpf by force. Available options:
-					  on: require link against libbpf, quit config if no libbpf support
-					  off: disable libbpf probing
-	--prefix <dir>			Path prefix of the lib files to install
-	-h | --help			Show this usage info
-EOF
-	exit $1
-}
-
-# Compat with the old INCLUDE path setting method.
-if [ $# -eq 1 ] && [ "$(echo $1 | cut -c 1)" != '-' ]; then
-	INCLUDE="$1"
-else
-	while [ "$#" -gt 0 ]; do
-		case "$1" in
-			--include_dir)
-				shift
-				INCLUDE="$1" ;;
-			--include_dir=*)
-				INCLUDE="${1#*=}" ;;
-			--libdir)
-				shift
-				LIBDIR="$1" ;;
-			--libdir=*)
-				LIBDIR="${1#*=}" ;;
-			--libbpf_dir)
-				shift
-				LIBBPF_DIR="$1" ;;
-			--libbpf_dir=*)
-				LIBBPF_DIR="${1#*=}" ;;
-			--libbpf_force)
-				shift
-				LIBBPF_FORCE="$1" ;;
-			--libbpf_force=*)
-				LIBBPF_FORCE="${1#*=}" ;;
-			--prefix)
-				shift
-				PREFIX="$1" ;;
-			--prefix=*)
-				PREFIX="${1#*=}" ;;
-			-h | --help)
-				usage 0 ;;
-			--*)
-				;;
-			*)
-				usage 1 ;;
-		esac
-		[ "$#" -gt 0 ] && shift
-	done
-fi
-
-[ -d "$INCLUDE" ] || usage 1
-if [ "${LIBBPF_DIR-unused}" != "unused" ]; then
-	[ -d "$LIBBPF_DIR" ] || usage 1
-fi
-if [ "${LIBBPF_FORCE-unused}" != "unused" ]; then
-	if [ "$LIBBPF_FORCE" != 'on' ] && [ "$LIBBPF_FORCE" != 'off' ]; then
-		usage 1
-	fi
-fi
-[ -z "$PREFIX" ] && usage 1
-[ -z "$LIBDIR" ] && usage 1
-
 echo "# Generated config based on" $INCLUDE >$CONFIG
 quiet_config >> $CONFIG
 
@@ -573,7 +387,8 @@ echo -n " ATM	"
 check_atm
 
 check_xtables
-if ! grep -q TC_CONFIG_NO_XT $CONFIG; then
+if ! grep -q TC_CONFIG_NO_XT $CONFIG
+then
 	echo -n " IPT	"
 	check_xt
 	check_xt_old
@@ -585,8 +400,8 @@ if ! grep -q TC_CONFIG_NO_XT $CONFIG; then
 fi
 
 echo
-check_lib_dir
+if ! grep -q TC_CONFIG_NO_XT $CONFIG
-if ! grep -q TC_CONFIG_NO_XT $CONFIG; then
+then
 	echo -n "iptables modules directory: "
 	check_ipt_lib_dir
 fi
@@ -594,15 +409,9 @@ fi
 echo -n "libc has setns: "
 check_setns
 
-echo -n "libc has name_to_handle_at: "
-check_name_to_handle_at
-
 echo -n "SELinux support: "
 check_selinux
 
-echo -n "libbpf support: "
-check_libbpf
-
 echo -n "ELF support: "
 check_elf
 
@@ -620,4 +429,4 @@ check_cap
 
 echo >> $CONFIG
 echo "%.o: %.c" >> $CONFIG
-echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
+echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG

dcb/.gitignore

@@ -1 +0,0 @@
-dcb

dcb/Makefile

@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-include ../config.mk
-
-TARGETS :=
-
-ifeq ($(HAVE_MNL),y)
-
-DCBOBJ = dcb.o \
-         dcb_app.o \
-         dcb_buffer.o \
-         dcb_dcbx.o \
-         dcb_ets.o \
-         dcb_maxrate.o \
-         dcb_pfc.o
-TARGETS += dcb
-LDLIBS += -lm
-
-endif
-
-all: $(TARGETS) $(LIBS)
-
-dcb: $(DCBOBJ) $(LIBNETLINK)
-	$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
-
-install: all
-	for i in $(TARGETS); \
-	do install -m 0755 $$i $(DESTDIR)$(SBINDIR); \
-	done
-
-clean:
-	rm -f $(DCBOBJ) $(TARGETS)

dcb/dcb.c

@@ -1,611 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <inttypes.h>
-#include <stdio.h>
-#include <linux/dcbnl.h>
-#include <libmnl/libmnl.h>
-#include <getopt.h>
-
-#include "dcb.h"
-#include "mnl_utils.h"
-#include "namespace.h"
-#include "utils.h"
-#include "version.h"
-
-static int dcb_init(struct dcb *dcb)
-{
-	dcb->buf = malloc(MNL_SOCKET_BUFFER_SIZE);
-	if (dcb->buf == NULL) {
-		perror("Netlink buffer allocation");
-		return -1;
-	}
-
-	dcb->nl = mnlu_socket_open(NETLINK_ROUTE);
-	if (dcb->nl == NULL) {
-		perror("Open netlink socket");
-		goto err_socket_open;
-	}
-
-	new_json_obj_plain(dcb->json_output);
-	return 0;
-
-err_socket_open:
-	free(dcb->buf);
-	return -1;
-}
-
-static void dcb_fini(struct dcb *dcb)
-{
-	delete_json_obj_plain();
-	mnl_socket_close(dcb->nl);
-	free(dcb->buf);
-}
-
-static struct dcb *dcb_alloc(void)
-{
-	struct dcb *dcb;
-
-	dcb = calloc(1, sizeof(*dcb));
-	if (!dcb)
-		return NULL;
-	return dcb;
-}
-
-static void dcb_free(struct dcb *dcb)
-{
-	free(dcb);
-}
-
-struct dcb_get_attribute {
-	struct dcb *dcb;
-	int attr;
-	void *payload;
-	__u16 payload_len;
-};
-
-static int dcb_get_attribute_attr_ieee_cb(const struct nlattr *attr, void *data)
-{
-	struct dcb_get_attribute *ga = data;
-
-	if (mnl_attr_get_type(attr) != ga->attr)
-		return MNL_CB_OK;
-
-	ga->payload = mnl_attr_get_payload(attr);
-	ga->payload_len = mnl_attr_get_payload_len(attr);
-	return MNL_CB_STOP;
-}
-
-static int dcb_get_attribute_attr_cb(const struct nlattr *attr, void *data)
-{
-	if (mnl_attr_get_type(attr) != DCB_ATTR_IEEE)
-		return MNL_CB_OK;
-
-	return mnl_attr_parse_nested(attr, dcb_get_attribute_attr_ieee_cb, data);
-}
-
-static int dcb_get_attribute_cb(const struct nlmsghdr *nlh, void *data)
-{
-	return mnl_attr_parse(nlh, sizeof(struct dcbmsg), dcb_get_attribute_attr_cb, data);
-}
-
-static int dcb_get_attribute_bare_cb(const struct nlmsghdr *nlh, void *data)
-{
-	/* Bare attributes (e.g. DCB_ATTR_DCBX) are not wrapped inside an IEEE
-	 * container, so this does not have to go through unpacking in
-	 * dcb_get_attribute_attr_cb().
-	 */
-	return mnl_attr_parse(nlh, sizeof(struct dcbmsg),
-			      dcb_get_attribute_attr_ieee_cb, data);
-}
-
-struct dcb_set_attribute_response {
-	int response_attr;
-};
-
-static int dcb_set_attribute_attr_cb(const struct nlattr *attr, void *data)
-{
-	struct dcb_set_attribute_response *resp = data;
-	uint16_t len;
-	uint8_t err;
-
-	if (mnl_attr_get_type(attr) != resp->response_attr)
-		return MNL_CB_OK;
-
-	len = mnl_attr_get_payload_len(attr);
-	if (len != 1) {
-		fprintf(stderr, "Response attribute expected to have size 1, not %d\n", len);
-		return MNL_CB_ERROR;
-	}
-
-	err = mnl_attr_get_u8(attr);
-	if (err) {
-		fprintf(stderr, "Error when attempting to set attribute: %s\n",
-			strerror(err));
-		return MNL_CB_ERROR;
-	}
-
-	return MNL_CB_STOP;
-}
-
-static int dcb_set_attribute_cb(const struct nlmsghdr *nlh, void *data)
-{
-	return mnl_attr_parse(nlh, sizeof(struct dcbmsg), dcb_set_attribute_attr_cb, data);
-}
-
-static int dcb_talk(struct dcb *dcb, struct nlmsghdr *nlh, mnl_cb_t cb, void *data)
-{
-	int ret;
-
-	ret = mnl_socket_sendto(dcb->nl, nlh, nlh->nlmsg_len);
-	if (ret < 0) {
-		perror("mnl_socket_sendto");
-		return -1;
-	}
-
-	return mnlu_socket_recv_run(dcb->nl, nlh->nlmsg_seq, dcb->buf, MNL_SOCKET_BUFFER_SIZE,
-				    cb, data);
-}
-
-static struct nlmsghdr *dcb_prepare(struct dcb *dcb, const char *dev,
-				    uint32_t nlmsg_type, uint8_t dcb_cmd)
-{
-	struct dcbmsg dcbm = {
-		.cmd = dcb_cmd,
-	};
-	struct nlmsghdr *nlh;
-
-	nlh = mnlu_msg_prepare(dcb->buf, nlmsg_type, NLM_F_REQUEST, &dcbm, sizeof(dcbm));
-	mnl_attr_put_strz(nlh, DCB_ATTR_IFNAME, dev);
-	return nlh;
-}
-
-static int __dcb_get_attribute(struct dcb *dcb, int command,
-			       const char *dev, int attr,
-			       void **payload_p, __u16 *payload_len_p,
-			       int (*get_attribute_cb)(const struct nlmsghdr *nlh,
-						       void *data))
-{
-	struct dcb_get_attribute ga;
-	struct nlmsghdr *nlh;
-	int ret;
-
-	nlh = dcb_prepare(dcb, dev, RTM_GETDCB, command);
-
-	ga = (struct dcb_get_attribute) {
-		.dcb = dcb,
-		.attr = attr,
-		.payload = NULL,
-	};
-	ret = dcb_talk(dcb, nlh, get_attribute_cb, &ga);
-	if (ret) {
-		perror("Attribute read");
-		return ret;
-	}
-	if (ga.payload == NULL) {
-		perror("Attribute not found");
-		return -ENOENT;
-	}
-
-	*payload_p = ga.payload;
-	*payload_len_p = ga.payload_len;
-	return 0;
-}
-
-int dcb_get_attribute_va(struct dcb *dcb, const char *dev, int attr,
-			 void **payload_p, __u16 *payload_len_p)
-{
-	return __dcb_get_attribute(dcb, DCB_CMD_IEEE_GET, dev, attr,
-				   payload_p, payload_len_p,
-				   dcb_get_attribute_cb);
-}
-
-int dcb_get_attribute_bare(struct dcb *dcb, int cmd, const char *dev, int attr,
-			   void **payload_p, __u16 *payload_len_p)
-{
-	return __dcb_get_attribute(dcb, cmd, dev, attr,
-				   payload_p, payload_len_p,
-				   dcb_get_attribute_bare_cb);
-}
-
-int dcb_get_attribute(struct dcb *dcb, const char *dev, int attr, void *data, size_t data_len)
-{
-	__u16 payload_len;
-	void *payload;
-	int ret;
-
-	ret = dcb_get_attribute_va(dcb, dev, attr, &payload, &payload_len);
-	if (ret)
-		return ret;
-
-	if (payload_len != data_len) {
-		fprintf(stderr, "Wrong len %d, expected %zd\n", payload_len, data_len);
-		return -EINVAL;
-	}
-
-	memcpy(data, payload, data_len);
-	return 0;
-}
-
-static int __dcb_set_attribute(struct dcb *dcb, int command, const char *dev,
-			       int (*cb)(struct dcb *, struct nlmsghdr *, void *),
-			       void *data, int response_attr)
-{
-	struct dcb_set_attribute_response resp = {
-		.response_attr = response_attr,
-	};
-	struct nlmsghdr *nlh;
-	int ret;
-
-	nlh = dcb_prepare(dcb, dev, RTM_SETDCB, command);
-
-	ret = cb(dcb, nlh, data);
-	if (ret)
-		return ret;
-
-	ret = dcb_talk(dcb, nlh, dcb_set_attribute_cb, &resp);
-	if (ret) {
-		perror("Attribute write");
-		return ret;
-	}
-	return 0;
-}
-
-struct dcb_set_attribute_ieee_cb {
-	int (*cb)(struct dcb *dcb, struct nlmsghdr *nlh, void *data);
-	void *data;
-};
-
-static int dcb_set_attribute_ieee_cb(struct dcb *dcb, struct nlmsghdr *nlh, void *data)
-{
-	struct dcb_set_attribute_ieee_cb *ieee_data = data;
-	struct nlattr *nest;
-	int ret;
-
-	nest = mnl_attr_nest_start(nlh, DCB_ATTR_IEEE);
-	ret = ieee_data->cb(dcb, nlh, ieee_data->data);
-	if (ret)
-		return ret;
-	mnl_attr_nest_end(nlh, nest);
-
-	return 0;
-}
-
-int dcb_set_attribute_va(struct dcb *dcb, int command, const char *dev,
-			 int (*cb)(struct dcb *dcb, struct nlmsghdr *nlh, void *data),
-			 void *data)
-{
-	struct dcb_set_attribute_ieee_cb ieee_data = {
-		.cb = cb,
-		.data = data,
-	};
-
-	return __dcb_set_attribute(dcb, command, dev,
-				   &dcb_set_attribute_ieee_cb, &ieee_data,
-				   DCB_ATTR_IEEE);
-}
-
-struct dcb_set_attribute {
-	int attr;
-	const void *data;
-	size_t data_len;
-};
-
-static int dcb_set_attribute_put(struct dcb *dcb, struct nlmsghdr *nlh, void *data)
-{
-	struct dcb_set_attribute *dsa = data;
-
-	mnl_attr_put(nlh, dsa->attr, dsa->data_len, dsa->data);
-	return 0;
-}
-
-int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr, const void *data, size_t data_len)
-{
-	struct dcb_set_attribute dsa = {
-		.attr = attr,
-		.data = data,
-		.data_len = data_len,
-	};
-
-	return dcb_set_attribute_va(dcb, DCB_CMD_IEEE_SET, dev,
-				    &dcb_set_attribute_put, &dsa);
-}
-
-int dcb_set_attribute_bare(struct dcb *dcb, int command, const char *dev,
-			   int attr, const void *data, size_t data_len,
-			   int response_attr)
-{
-	struct dcb_set_attribute dsa = {
-		.attr = attr,
-		.data = data,
-		.data_len = data_len,
-	};
-
-	return __dcb_set_attribute(dcb, command, dev,
-				   &dcb_set_attribute_put, &dsa, response_attr);
-}
-
-void dcb_print_array_u8(const __u8 *array, size_t size)
-{
-	SPRINT_BUF(b);
-	size_t i;
-
-	for (i = 0; i < size; i++) {
-		snprintf(b, sizeof(b), "%zd:%%d ", i);
-		print_uint(PRINT_ANY, NULL, b, array[i]);
-	}
-}
-
-void dcb_print_array_u64(const __u64 *array, size_t size)
-{
-	SPRINT_BUF(b);
-	size_t i;
-
-	for (i = 0; i < size; i++) {
-		snprintf(b, sizeof(b), "%zd:%%" PRIu64 " ", i);
-		print_u64(PRINT_ANY, NULL, b, array[i]);
-	}
-}
-
-void dcb_print_array_on_off(const __u8 *array, size_t size)
-{
-	SPRINT_BUF(b);
-	size_t i;
-
-	for (i = 0; i < size; i++) {
-		snprintf(b, sizeof(b), "%zd:%%s ", i);
-		print_on_off(PRINT_ANY, NULL, b, array[i]);
-	}
-}
-
-void dcb_print_array_kw(const __u8 *array, size_t array_size,
-			const char *const kw[], size_t kw_size)
-{
-	SPRINT_BUF(b);
-	size_t i;
-
-	for (i = 0; i < array_size; i++) {
-		__u8 emt = array[i];
-
-		snprintf(b, sizeof(b), "%zd:%%s ", i);
-		if (emt < kw_size && kw[emt])
-			print_string(PRINT_ANY, NULL, b, kw[emt]);
-		else
-			print_string(PRINT_ANY, NULL, b, "???");
-	}
-}
-
-void dcb_print_named_array(const char *json_name, const char *fp_name,
-			   const __u8 *array, size_t size,
-			   void (*print_array)(const __u8 *, size_t))
-{
-	open_json_array(PRINT_JSON, json_name);
-	print_string(PRINT_FP, NULL, "%s ", fp_name);
-	print_array(array, size);
-	close_json_array(PRINT_JSON, json_name);
-}
-
-int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key,
-		      const char *what_value, __u64 value, __u64 max_value,
-		      void (*set_array)(__u32 index, __u64 value, void *data),
-		      void *set_array_data)
-{
-	bool is_all = key == (__u32) -1;
-
-	if (!is_all && key > max_key) {
-		fprintf(stderr, "In %s:%s mapping, %s is expected to be 0..%d\n",
-			what_key, what_value, what_key, max_key);
-		return -EINVAL;
-	}
-
-	if (value > max_value) {
-		fprintf(stderr, "In %s:%s mapping, %s is expected to be 0..%llu\n",
-			what_key, what_value, what_value, max_value);
-		return -EINVAL;
-	}
-
-	if (is_all) {
-		for (key = 0; key <= max_key; key++)
-			set_array(key, value, set_array_data);
-	} else {
-		set_array(key, value, set_array_data);
-	}
-
-	return 0;
-}
-
-void dcb_set_u8(__u32 key, __u64 value, void *data)
-{
-	__u8 *array = data;
-
-	array[key] = value;
-}
-
-void dcb_set_u32(__u32 key, __u64 value, void *data)
-{
-	__u32 *array = data;
-
-	array[key] = value;
-}
-
-void dcb_set_u64(__u32 key, __u64 value, void *data)
-{
-	__u64 *array = data;
-
-	array[key] = value;
-}
-
-int dcb_cmd_parse_dev(struct dcb *dcb, int argc, char **argv,
-		      int (*and_then)(struct dcb *dcb, const char *dev,
-				      int argc, char **argv),
-		      void (*help)(void))
-{
-	const char *dev;
-
-	if (!argc || matches(*argv, "help") == 0) {
-		help();
-		return 0;
-	} else if (matches(*argv, "dev") == 0) {
-		NEXT_ARG();
-		dev = *argv;
-		if (check_ifname(dev)) {
-			invarg("not a valid ifname", *argv);
-			return -EINVAL;
-		}
-		NEXT_ARG_FWD();
-		return and_then(dcb, dev, argc, argv);
-	} else {
-		fprintf(stderr, "Expected `dev DEV', not `%s'", *argv);
-		help();
-		return -EINVAL;
-	}
-}
-
-static void dcb_help(void)
-{
-	fprintf(stderr,
-		"Usage: dcb [ OPTIONS ] OBJECT { COMMAND | help }\n"
-		"       dcb [ -f | --force ] { -b | --batch } filename [ -n | --netns ] netnsname\n"
-		"where  OBJECT := { app | buffer | dcbx | ets | maxrate | pfc }\n"
-		"       OPTIONS := [ -V | --Version | -i | --iec | -j | --json\n"
-		"                  | -N | --Numeric | -p | --pretty\n"
-		"                  | -s | --statistics | -v | --verbose]\n");
-}
-
-static int dcb_cmd(struct dcb *dcb, int argc, char **argv)
-{
-	if (!argc || matches(*argv, "help") == 0) {
-		dcb_help();
-		return 0;
-	} else if (matches(*argv, "app") == 0) {
-		return dcb_cmd_app(dcb, argc - 1, argv + 1);
-	} else if (matches(*argv, "buffer") == 0) {
-		return dcb_cmd_buffer(dcb, argc - 1, argv + 1);
-	} else if (matches(*argv, "dcbx") == 0) {
-		return dcb_cmd_dcbx(dcb, argc - 1, argv + 1);
-	} else if (matches(*argv, "ets") == 0) {
-		return dcb_cmd_ets(dcb, argc - 1, argv + 1);
-	} else if (matches(*argv, "maxrate") == 0) {
-		return dcb_cmd_maxrate(dcb, argc - 1, argv + 1);
-	} else if (matches(*argv, "pfc") == 0) {
-		return dcb_cmd_pfc(dcb, argc - 1, argv + 1);
-	}
-
-	fprintf(stderr, "Object \"%s\" is unknown\n", *argv);
-	return -ENOENT;
-}
-
-static int dcb_batch_cmd(int argc, char *argv[], void *data)
-{
-	struct dcb *dcb = data;
-
-	return dcb_cmd(dcb, argc, argv);
-}
-
-static int dcb_batch(struct dcb *dcb, const char *name, bool force)
-{
-	return do_batch(name, force, dcb_batch_cmd, dcb);
-}
-
-int main(int argc, char **argv)
-{
-	static const struct option long_options[] = {
-		{ "Version",		no_argument,		NULL, 'V' },
-		{ "force",		no_argument,		NULL, 'f' },
-		{ "batch",		required_argument,	NULL, 'b' },
-		{ "iec",		no_argument,		NULL, 'i' },
-		{ "json",		no_argument,		NULL, 'j' },
-		{ "Numeric",		no_argument,		NULL, 'N' },
-		{ "pretty",		no_argument,		NULL, 'p' },
-		{ "statistics",		no_argument,		NULL, 's' },
-		{ "netns",		required_argument,	NULL, 'n' },
-		{ "help",		no_argument,		NULL, 'h' },
-		{ NULL, 0, NULL, 0 }
-	};
-	const char *batch_file = NULL;
-	bool force = false;
-	struct dcb *dcb;
-	int opt;
-	int err;
-	int ret;
-
-	dcb = dcb_alloc();
-	if (!dcb) {
-		fprintf(stderr, "Failed to allocate memory for dcb\n");
-		return EXIT_FAILURE;
-	}
-
-	while ((opt = getopt_long(argc, argv, "b:fhijn:psvNV",
-				  long_options, NULL)) >= 0) {
-
-		switch (opt) {
-		case 'V':
-			printf("dcb utility, iproute2-%s\n", version);
-			ret = EXIT_SUCCESS;
-			goto dcb_free;
-		case 'f':
-			force = true;
-			break;
-		case 'b':
-			batch_file = optarg;
-			break;
-		case 'j':
-			dcb->json_output = true;
-			break;
-		case 'N':
-			dcb->numeric = true;
-			break;
-		case 'p':
-			pretty = true;
-			break;
-		case 's':
-			dcb->stats = true;
-			break;
-		case 'n':
-			if (netns_switch(optarg)) {
-				ret = EXIT_FAILURE;
-				goto dcb_free;
-			}
-			break;
-		case 'i':
-			dcb->use_iec = true;
-			break;
-		case 'h':
-			dcb_help();
-			ret = EXIT_SUCCESS;
-			goto dcb_free;
-		default:
-			fprintf(stderr, "Unknown option.\n");
-			dcb_help();
-			ret = EXIT_FAILURE;
-			goto dcb_free;
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	err = dcb_init(dcb);
-	if (err) {
-		ret = EXIT_FAILURE;
-		goto dcb_free;
-	}
-
-	if (batch_file)
-		err = dcb_batch(dcb, batch_file, force);
-	else
-		err = dcb_cmd(dcb, argc, argv);
-
-	if (err) {
-		ret = EXIT_FAILURE;
-		goto dcb_fini;
-	}
-
-	ret = EXIT_SUCCESS;
-
-dcb_fini:
-	dcb_fini(dcb);
-dcb_free:
-	dcb_free(dcb);
-
-	return ret;
-}

dcb/dcb.h

@@ -1,81 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __DCB_H__
-#define __DCB_H__ 1
-
-#include <libmnl/libmnl.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-/* dcb.c */
-
-struct dcb {
-	char *buf;
-	struct mnl_socket *nl;
-	bool json_output;
-	bool stats;
-	bool use_iec;
-	bool numeric;
-};
-
-int dcb_parse_mapping(const char *what_key, __u32 key, __u32 max_key,
-		      const char *what_value, __u64 value, __u64 max_value,
-		      void (*set_array)(__u32 index, __u64 value, void *data),
-		      void *set_array_data);
-int dcb_cmd_parse_dev(struct dcb *dcb, int argc, char **argv,
-		      int (*and_then)(struct dcb *dcb, const char *dev,
-				      int argc, char **argv),
-		      void (*help)(void));
-
-void dcb_set_u8(__u32 key, __u64 value, void *data);
-void dcb_set_u32(__u32 key, __u64 value, void *data);
-void dcb_set_u64(__u32 key, __u64 value, void *data);
-
-int dcb_get_attribute(struct dcb *dcb, const char *dev, int attr,
-		      void *data, size_t data_len);
-int dcb_set_attribute(struct dcb *dcb, const char *dev, int attr,
-		      const void *data, size_t data_len);
-int dcb_get_attribute_va(struct dcb *dcb, const char *dev, int attr,
-			 void **payload_p, __u16 *payload_len_p);
-int dcb_set_attribute_va(struct dcb *dcb, int command, const char *dev,
-			 int (*cb)(struct dcb *dcb, struct nlmsghdr *nlh, void *data),
-			 void *data);
-int dcb_get_attribute_bare(struct dcb *dcb, int cmd, const char *dev, int attr,
-			   void **payload_p, __u16 *payload_len_p);
-int dcb_set_attribute_bare(struct dcb *dcb, int command, const char *dev,
-			   int attr, const void *data, size_t data_len,
-			   int response_attr);
-
-void dcb_print_named_array(const char *json_name, const char *fp_name,
-			   const __u8 *array, size_t size,
-			   void (*print_array)(const __u8 *, size_t));
-void dcb_print_array_u8(const __u8 *array, size_t size);
-void dcb_print_array_u64(const __u64 *array, size_t size);
-void dcb_print_array_on_off(const __u8 *array, size_t size);
-void dcb_print_array_kw(const __u8 *array, size_t array_size,
-			const char *const kw[], size_t kw_size);
-
-/* dcb_app.c */
-
-int dcb_cmd_app(struct dcb *dcb, int argc, char **argv);
-
-/* dcb_buffer.c */
-
-int dcb_cmd_buffer(struct dcb *dcb, int argc, char **argv);
-
-/* dcb_dcbx.c */
-
-int dcb_cmd_dcbx(struct dcb *dcb, int argc, char **argv);
-
-/* dcb_ets.c */
-
-int dcb_cmd_ets(struct dcb *dcb, int argc, char **argv);
-
-/* dcb_maxrate.c */
-
-int dcb_cmd_maxrate(struct dcb *dcb, int argc, char **argv);
-
-/* dcb_pfc.c */
-
-int dcb_cmd_pfc(struct dcb *dcb, int argc, char **argv);
-
-#endif /* __DCB_H__ */

dcb/dcb_app.c

@@ -1,795 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <libmnl/libmnl.h>
-#include <linux/dcbnl.h>
-
-#include "dcb.h"
-#include "utils.h"
-#include "rt_names.h"
-
-static void dcb_app_help_add(void)
-{
-	fprintf(stderr,
-		"Usage: dcb app { add | del | replace } dev STRING\n"
-		"           [ default-prio PRIO ]\n"
-		"           [ ethtype-prio ET:PRIO ]\n"
-		"           [ stream-port-prio PORT:PRIO ]\n"
-		"           [ dgram-port-prio PORT:PRIO ]\n"
-		"           [ port-prio PORT:PRIO ]\n"
-		"           [ dscp-prio INTEGER:PRIO ]\n"
-		"\n"
-		" where PRIO := { 0 .. 7 }\n"
-		"       ET := { 0x600 .. 0xffff }\n"
-		"       PORT := { 1 .. 65535 }\n"
-		"       DSCP := { 0 .. 63 }\n"
-		"\n"
-	);
-}
-
-static void dcb_app_help_show_flush(void)
-{
-	fprintf(stderr,
-		"Usage: dcb app { show | flush } dev STRING\n"
-		"           [ default-prio ]\n"
-		"           [ ethtype-prio ]\n"
-		"           [ stream-port-prio ]\n"
-		"           [ dgram-port-prio ]\n"
-		"           [ port-prio ]\n"
-		"           [ dscp-prio ]\n"
-		"\n"
-	);
-}
-
-static void dcb_app_help(void)
-{
-	fprintf(stderr,
-		"Usage: dcb app help\n"
-		"\n"
-	);
-	dcb_app_help_show_flush();
-	dcb_app_help_add();
-}
-
-struct dcb_app_table {
-	struct dcb_app *apps;
-	size_t n_apps;
-};
-
-static void dcb_app_table_fini(struct dcb_app_table *tab)
-{
-	free(tab->apps);
-}
-
-static int dcb_app_table_push(struct dcb_app_table *tab, struct dcb_app *app)
-{
-	struct dcb_app *apps = realloc(tab->apps, (tab->n_apps + 1) * sizeof(*tab->apps));
-
-	if (apps == NULL) {
-		perror("Cannot allocate APP table");
-		return -ENOMEM;
-	}
-
-	tab->apps = apps;
-	tab->apps[tab->n_apps++] = *app;
-	return 0;
-}
-
-static void dcb_app_table_remove_existing(struct dcb_app_table *a,
-					  const struct dcb_app_table *b)
-{
-	size_t ia, ja;
-	size_t ib;
-
-	for (ia = 0, ja = 0; ia < a->n_apps; ia++) {
-		struct dcb_app *aa = &a->apps[ia];
-		bool found = false;
-
-		for (ib = 0; ib < b->n_apps; ib++) {
-			const struct dcb_app *ab = &b->apps[ib];
-
-			if (aa->selector == ab->selector &&
-			    aa->protocol == ab->protocol &&
-			    aa->priority == ab->priority) {
-				found = true;
-				break;
-			}
-		}
-
-		if (!found)
-			a->apps[ja++] = *aa;
-	}
-
-	a->n_apps = ja;
-}
-
-static void dcb_app_table_remove_replaced(struct dcb_app_table *a,
-					  const struct dcb_app_table *b)
-{
-	size_t ia, ja;
-	size_t ib;
-
-	for (ia = 0, ja = 0; ia < a->n_apps; ia++) {
-		struct dcb_app *aa = &a->apps[ia];
-		bool present = false;
-		bool found = false;
-
-		for (ib = 0; ib < b->n_apps; ib++) {
-			const struct dcb_app *ab = &b->apps[ib];
-
-			if (aa->selector == ab->selector &&
-			    aa->protocol == ab->protocol)
-				present = true;
-			else
-				continue;
-
-			if (aa->priority == ab->priority) {
-				found = true;
-				break;
-			}
-		}
-
-		/* Entries that remain in A will be removed, so keep in the
-		 * table only APP entries whose sel/pid is mentioned in B,
-		 * but that do not have the full sel/pid/prio match.
-		 */
-		if (present && !found)
-			a->apps[ja++] = *aa;
-	}
-
-	a->n_apps = ja;
-}
-
-static int dcb_app_table_copy(struct dcb_app_table *a,
-			      const struct dcb_app_table *b)
-{
-	size_t i;
-	int ret;
-
-	for (i = 0; i < b->n_apps; i++) {
-		ret = dcb_app_table_push(a, &b->apps[i]);
-		if (ret != 0)
-			return ret;
-	}
-	return 0;
-}
-
-static int dcb_app_cmp(const struct dcb_app *a, const struct dcb_app *b)
-{
-	if (a->protocol < b->protocol)
-		return -1;
-	if (a->protocol > b->protocol)
-		return 1;
-	return a->priority - b->priority;
-}
-
-static int dcb_app_cmp_cb(const void *a, const void *b)
-{
-	return dcb_app_cmp(a, b);
-}
-
-static void dcb_app_table_sort(struct dcb_app_table *tab)
-{
-	qsort(tab->apps, tab->n_apps, sizeof(*tab->apps), dcb_app_cmp_cb);
-}
-
-struct dcb_app_parse_mapping {
-	__u8 selector;
-	struct dcb_app_table *tab;
-	int err;
-};
-
-static void dcb_app_parse_mapping_cb(__u32 key, __u64 value, void *data)
-{
-	struct dcb_app_parse_mapping *pm = data;
-	struct dcb_app app = {
-		.selector = pm->selector,
-		.priority = value,
-		.protocol = key,
-	};
-
-	if (pm->err)
-		return;
-
-	pm->err = dcb_app_table_push(pm->tab, &app);
-}
-
-static int dcb_app_parse_mapping_ethtype_prio(__u32 key, char *value, void *data)
-{
-	__u8 prio;
-
-	if (key < 0x600) {
-		fprintf(stderr, "Protocol IDs < 0x600 are reserved for EtherType\n");
-		return -EINVAL;
-	}
-
-	if (get_u8(&prio, value, 0))
-		return -EINVAL;
-
-	return dcb_parse_mapping("ETHTYPE", key, 0xffff,
-				 "PRIO", prio, IEEE_8021QAZ_MAX_TCS - 1,
-				 dcb_app_parse_mapping_cb, data);
-}
-
-static int dcb_app_parse_dscp(__u32 *key, const char *arg)
-{
-	if (parse_mapping_num_all(key, arg) == 0)
-		return 0;
-
-	if (rtnl_dsfield_a2n(key, arg) != 0)
-		return -1;
-
-	if (*key & 0x03) {
-		fprintf(stderr, "The values `%s' uses non-DSCP bits.\n", arg);
-		return -1;
-	}
-
-	/* Unshift the value to convert it from dsfield to DSCP. */
-	*key >>= 2;
-	return 0;
-}
-
-static int dcb_app_parse_mapping_dscp_prio(__u32 key, char *value, void *data)
-{
-	__u8 prio;
-
-	if (get_u8(&prio, value, 0))
-		return -EINVAL;
-
-	return dcb_parse_mapping("DSCP", key, 63,
-				 "PRIO", prio, IEEE_8021QAZ_MAX_TCS - 1,
-				 dcb_app_parse_mapping_cb, data);
-}
-
-static int dcb_app_parse_mapping_port_prio(__u32 key, char *value, void *data)
-{
-	__u8 prio;
-
-	if (key == 0) {
-		fprintf(stderr, "Port ID of 0 is invalid\n");
-		return -EINVAL;
-	}
-
-	if (get_u8(&prio, value, 0))
-		return -EINVAL;
-
-	return dcb_parse_mapping("PORT", key, 0xffff,
-				 "PRIO", prio, IEEE_8021QAZ_MAX_TCS - 1,
-				 dcb_app_parse_mapping_cb, data);
-}
-
-static int dcb_app_parse_default_prio(int *argcp, char ***argvp, struct dcb_app_table *tab)
-{
-	int argc = *argcp;
-	char **argv = *argvp;
-	int ret = 0;
-
-	while (argc > 0) {
-		struct dcb_app app;
-		__u8 prio;
-
-		if (get_u8(&prio, *argv, 0)) {
-			ret = 1;
-			break;
-		}
-
-		app = (struct dcb_app){
-			.selector = IEEE_8021QAZ_APP_SEL_ETHERTYPE,
-			.protocol = 0,
-			.priority = prio,
-		};
-		ret = dcb_app_table_push(tab, &app);
-		if (ret != 0)
-			break;
-
-		argc--, argv++;
-	}
-
-	*argcp = argc;
-	*argvp = argv;
-	return ret;
-}
-
-static bool dcb_app_is_ethtype(const struct dcb_app *app)
-{
-	return app->selector == IEEE_8021QAZ_APP_SEL_ETHERTYPE &&
-	       app->protocol != 0;
-}
-
-static bool dcb_app_is_default(const struct dcb_app *app)
-{
-	return app->selector == IEEE_8021QAZ_APP_SEL_ETHERTYPE &&
-	       app->protocol == 0;
-}
-
-static bool dcb_app_is_dscp(const struct dcb_app *app)
-{
-	return app->selector == IEEE_8021QAZ_APP_SEL_DSCP;
-}
-
-static bool dcb_app_is_stream_port(const struct dcb_app *app)
-{
-	return app->selector == IEEE_8021QAZ_APP_SEL_STREAM;
-}
-
-static bool dcb_app_is_dgram_port(const struct dcb_app *app)
-{
-	return app->selector == IEEE_8021QAZ_APP_SEL_DGRAM;
-}
-
-static bool dcb_app_is_port(const struct dcb_app *app)
-{
-	return app->selector == IEEE_8021QAZ_APP_SEL_ANY;
-}
-
-static int dcb_app_print_key_dec(__u16 protocol)
-{
-	return print_uint(PRINT_ANY, NULL, "%d:", protocol);
-}
-
-static int dcb_app_print_key_hex(__u16 protocol)
-{
-	return print_uint(PRINT_ANY, NULL, "%x:", protocol);
-}
-
-static int dcb_app_print_key_dscp(__u16 protocol)
-{
-	const char *name = rtnl_dsfield_get_name(protocol << 2);
-
-
-	if (!is_json_context() && name != NULL)
-		return print_string(PRINT_FP, NULL, "%s:", name);
-	return print_uint(PRINT_ANY, NULL, "%d:", protocol);
-}
-
-static void dcb_app_print_filtered(const struct dcb_app_table *tab,
-				   bool (*filter)(const struct dcb_app *),
-				   int (*print_key)(__u16 protocol),
-				   const char *json_name,
-				   const char *fp_name)
-{
-	bool first = true;
-	size_t i;
-
-	for (i = 0; i < tab->n_apps; i++) {
-		struct dcb_app *app = &tab->apps[i];
-
-		if (!filter(app))
-			continue;
-		if (first) {
-			open_json_array(PRINT_JSON, json_name);
-			print_string(PRINT_FP, NULL, "%s ", fp_name);
-			first = false;
-		}
-
-		open_json_array(PRINT_JSON, NULL);
-		print_key(app->protocol);
-		print_uint(PRINT_ANY, NULL, "%d ", app->priority);
-		close_json_array(PRINT_JSON, NULL);
-	}
-
-	if (!first) {
-		close_json_array(PRINT_JSON, json_name);
-		print_nl();
-	}
-}
-
-static void dcb_app_print_ethtype_prio(const struct dcb_app_table *tab)
-{
-	dcb_app_print_filtered(tab, dcb_app_is_ethtype,  dcb_app_print_key_hex,
-			       "ethtype_prio", "ethtype-prio");
-}
-
-static void dcb_app_print_dscp_prio(const struct dcb *dcb,
-				    const struct dcb_app_table *tab)
-{
-	dcb_app_print_filtered(tab, dcb_app_is_dscp,
-			       dcb->numeric ? dcb_app_print_key_dec
-					    : dcb_app_print_key_dscp,
-			       "dscp_prio", "dscp-prio");
-}
-
-static void dcb_app_print_stream_port_prio(const struct dcb_app_table *tab)
-{
-	dcb_app_print_filtered(tab, dcb_app_is_stream_port, dcb_app_print_key_dec,
-			       "stream_port_prio", "stream-port-prio");
-}
-
-static void dcb_app_print_dgram_port_prio(const struct dcb_app_table *tab)
-{
-	dcb_app_print_filtered(tab, dcb_app_is_dgram_port, dcb_app_print_key_dec,
-			       "dgram_port_prio", "dgram-port-prio");
-}
-
-static void dcb_app_print_port_prio(const struct dcb_app_table *tab)
-{
-	dcb_app_print_filtered(tab, dcb_app_is_port, dcb_app_print_key_dec,
-			       "port_prio", "port-prio");
-}
-
-static void dcb_app_print_default_prio(const struct dcb_app_table *tab)
-{
-	bool first = true;
-	size_t i;
-
-	for (i = 0; i < tab->n_apps; i++) {
-		if (!dcb_app_is_default(&tab->apps[i]))
-			continue;
-		if (first) {
-			open_json_array(PRINT_JSON, "default_prio");
-			print_string(PRINT_FP, NULL, "default-prio ", NULL);
-			first = false;
-		}
-		print_uint(PRINT_ANY, NULL, "%d ", tab->apps[i].priority);
-	}
-
-	if (!first) {
-		close_json_array(PRINT_JSON, "default_prio");
-		print_nl();
-	}
-}
-
-static void dcb_app_print(const struct dcb *dcb, const struct dcb_app_table *tab)
-{
-	dcb_app_print_ethtype_prio(tab);
-	dcb_app_print_default_prio(tab);
-	dcb_app_print_dscp_prio(dcb, tab);
-	dcb_app_print_stream_port_prio(tab);
-	dcb_app_print_dgram_port_prio(tab);
-	dcb_app_print_port_prio(tab);
-}
-
-static int dcb_app_get_table_attr_cb(const struct nlattr *attr, void *data)
-{
-	struct dcb_app_table *tab = data;
-	struct dcb_app *app;
-	int ret;
-
-	if (mnl_attr_get_type(attr) != DCB_ATTR_IEEE_APP) {
-		fprintf(stderr, "Unknown attribute in DCB_ATTR_IEEE_APP_TABLE: %d\n",
-			mnl_attr_get_type(attr));
-		return MNL_CB_OK;
-	}
-	if (mnl_attr_get_payload_len(attr) < sizeof(struct dcb_app)) {
-		fprintf(stderr, "DCB_ATTR_IEEE_APP payload expected to have size %zd, not %d\n",
-			sizeof(struct dcb_app), mnl_attr_get_payload_len(attr));
-		return MNL_CB_OK;
-	}
-
-	app = mnl_attr_get_payload(attr);
-	ret = dcb_app_table_push(tab, app);
-	if (ret != 0)
-		return MNL_CB_ERROR;
-
-	return MNL_CB_OK;
-}
-
-static int dcb_app_get(struct dcb *dcb, const char *dev, struct dcb_app_table *tab)
-{
-	uint16_t payload_len;
-	void *payload;
-	int ret;
-
-	ret = dcb_get_attribute_va(dcb, dev, DCB_ATTR_IEEE_APP_TABLE, &payload, &payload_len);
-	if (ret != 0)
-		return ret;
-
-	ret = mnl_attr_parse_payload(payload, payload_len, dcb_app_get_table_attr_cb, tab);
-	if (ret != MNL_CB_OK)
-		return -EINVAL;
-
-	return 0;
-}
-
-struct dcb_app_add_del {
-	const struct dcb_app_table *tab;
-	bool (*filter)(const struct dcb_app *app);
-};
-
-static int dcb_app_add_del_cb(struct dcb *dcb, struct nlmsghdr *nlh, void *data)
-{
-	struct dcb_app_add_del *add_del = data;
-	struct nlattr *nest;
-	size_t i;
-
-	nest = mnl_attr_nest_start(nlh, DCB_ATTR_IEEE_APP_TABLE);
-
-	for (i = 0; i < add_del->tab->n_apps; i++) {
-		const struct dcb_app *app = &add_del->tab->apps[i];
-
-		if (add_del->filter == NULL || add_del->filter(app))
-			mnl_attr_put(nlh, DCB_ATTR_IEEE_APP, sizeof(*app), app);
-	}
-
-	mnl_attr_nest_end(nlh, nest);
-	return 0;
-}
-
-static int dcb_app_add_del(struct dcb *dcb, const char *dev, int command,
-			   const struct dcb_app_table *tab,
-			   bool (*filter)(const struct dcb_app *))
-{
-	struct dcb_app_add_del add_del = {
-		.tab = tab,
-		.filter = filter,
-	};
-
-	if (tab->n_apps == 0)
-		return 0;
-
-	return dcb_set_attribute_va(dcb, command, dev, dcb_app_add_del_cb, &add_del);
-}
-
-static int dcb_cmd_app_parse_add_del(struct dcb *dcb, const char *dev,
-				     int argc, char **argv, struct dcb_app_table *tab)
-{
-	struct dcb_app_parse_mapping pm = {
-		.tab = tab,
-	};
-	int ret;
-
-	if (!argc) {
-		dcb_app_help_add();
-		return 0;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_app_help_add();
-			return 0;
-		} else if (matches(*argv, "ethtype-prio") == 0) {
-			NEXT_ARG();
-			pm.selector = IEEE_8021QAZ_APP_SEL_ETHERTYPE;
-			ret = parse_mapping(&argc, &argv, false,
-					    &dcb_app_parse_mapping_ethtype_prio,
-					    &pm);
-		} else if (matches(*argv, "default-prio") == 0) {
-			NEXT_ARG();
-			ret = dcb_app_parse_default_prio(&argc, &argv, pm.tab);
-			if (ret != 0) {
-				fprintf(stderr, "Invalid default priority %s\n", *argv);
-				return ret;
-			}
-		} else if (matches(*argv, "dscp-prio") == 0) {
-			NEXT_ARG();
-			pm.selector = IEEE_8021QAZ_APP_SEL_DSCP;
-			ret = parse_mapping_gen(&argc, &argv,
-						&dcb_app_parse_dscp,
-						&dcb_app_parse_mapping_dscp_prio,
-						&pm);
-		} else if (matches(*argv, "stream-port-prio") == 0) {
-			NEXT_ARG();
-			pm.selector = IEEE_8021QAZ_APP_SEL_STREAM;
-			ret = parse_mapping(&argc, &argv, false,
-					    &dcb_app_parse_mapping_port_prio,
-					    &pm);
-		} else if (matches(*argv, "dgram-port-prio") == 0) {
-			NEXT_ARG();
-			pm.selector = IEEE_8021QAZ_APP_SEL_DGRAM;
-			ret = parse_mapping(&argc, &argv, false,
-					    &dcb_app_parse_mapping_port_prio,
-					    &pm);
-		} else if (matches(*argv, "port-prio") == 0) {
-			NEXT_ARG();
-			pm.selector = IEEE_8021QAZ_APP_SEL_ANY;
-			ret = parse_mapping(&argc, &argv, false,
-					    &dcb_app_parse_mapping_port_prio,
-					    &pm);
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_app_help_add();
-			return -EINVAL;
-		}
-
-		if (ret != 0) {
-			fprintf(stderr, "Invalid mapping %s\n", *argv);
-			return ret;
-		}
-		if (pm.err)
-			return pm.err;
-	} while (argc > 0);
-
-	return 0;
-}
-
-static int dcb_cmd_app_add(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct dcb_app_table tab = {};
-	int ret;
-
-	ret = dcb_cmd_app_parse_add_del(dcb, dev, argc, argv, &tab);
-	if (ret != 0)
-		return ret;
-
-	ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_SET, &tab, NULL);
-	dcb_app_table_fini(&tab);
-	return ret;
-}
-
-static int dcb_cmd_app_del(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct dcb_app_table tab = {};
-	int ret;
-
-	ret = dcb_cmd_app_parse_add_del(dcb, dev, argc, argv, &tab);
-	if (ret != 0)
-		return ret;
-
-	ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab, NULL);
-	dcb_app_table_fini(&tab);
-	return ret;
-}
-
-static int dcb_cmd_app_show(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct dcb_app_table tab = {};
-	int ret;
-
-	ret = dcb_app_get(dcb, dev, &tab);
-	if (ret != 0)
-		return ret;
-
-	dcb_app_table_sort(&tab);
-
-	open_json_object(NULL);
-
-	if (!argc) {
-		dcb_app_print(dcb, &tab);
-		goto out;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_app_help_show_flush();
-			goto out;
-		} else if (matches(*argv, "ethtype-prio") == 0) {
-			dcb_app_print_ethtype_prio(&tab);
-		} else if (matches(*argv, "dscp-prio") == 0) {
-			dcb_app_print_dscp_prio(dcb, &tab);
-		} else if (matches(*argv, "stream-port-prio") == 0) {
-			dcb_app_print_stream_port_prio(&tab);
-		} else if (matches(*argv, "dgram-port-prio") == 0) {
-			dcb_app_print_dgram_port_prio(&tab);
-		} else if (matches(*argv, "port-prio") == 0) {
-			dcb_app_print_port_prio(&tab);
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_app_help_show_flush();
-			ret = -EINVAL;
-			goto out;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-out:
-	close_json_object();
-	dcb_app_table_fini(&tab);
-	return ret;
-}
-
-static int dcb_cmd_app_flush(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct dcb_app_table tab = {};
-	int ret;
-
-	ret = dcb_app_get(dcb, dev, &tab);
-	if (ret != 0)
-		return ret;
-
-	if (!argc) {
-		ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab, NULL);
-		goto out;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_app_help_show_flush();
-			goto out;
-		} else if (matches(*argv, "ethtype-prio") == 0) {
-			ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab,
-					      &dcb_app_is_ethtype);
-			if (ret != 0)
-				goto out;
-		} else if (matches(*argv, "default-prio") == 0) {
-			ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab,
-					      &dcb_app_is_default);
-			if (ret != 0)
-				goto out;
-		} else if (matches(*argv, "dscp-prio") == 0) {
-			ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &tab,
-					      &dcb_app_is_dscp);
-			if (ret != 0)
-				goto out;
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_app_help_show_flush();
-			ret = -EINVAL;
-			goto out;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-out:
-	dcb_app_table_fini(&tab);
-	return ret;
-}
-
-static int dcb_cmd_app_replace(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct dcb_app_table orig = {};
-	struct dcb_app_table tab = {};
-	struct dcb_app_table new = {};
-	int ret;
-
-	ret = dcb_app_get(dcb, dev, &orig);
-	if (ret != 0)
-		return ret;
-
-	ret = dcb_cmd_app_parse_add_del(dcb, dev, argc, argv, &tab);
-	if (ret != 0)
-		goto out;
-
-	/* Attempts to add an existing entry would be rejected, so drop
-	 * these entries from tab.
-	 */
-	ret = dcb_app_table_copy(&new, &tab);
-	if (ret != 0)
-		goto out;
-	dcb_app_table_remove_existing(&new, &orig);
-
-	ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_SET, &new, NULL);
-	if (ret != 0) {
-		fprintf(stderr, "Could not add new APP entries\n");
-		goto out;
-	}
-
-	/* Remove the obsolete entries. */
-	dcb_app_table_remove_replaced(&orig, &tab);
-	ret = dcb_app_add_del(dcb, dev, DCB_CMD_IEEE_DEL, &orig, NULL);
-	if (ret != 0) {
-		fprintf(stderr, "Could not remove replaced APP entries\n");
-		goto out;
-	}
-
-out:
-	dcb_app_table_fini(&new);
-	dcb_app_table_fini(&tab);
-	dcb_app_table_fini(&orig);
-	return 0;
-}
-
-int dcb_cmd_app(struct dcb *dcb, int argc, char **argv)
-{
-	if (!argc || matches(*argv, "help") == 0) {
-		dcb_app_help();
-		return 0;
-	} else if (matches(*argv, "show") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_app_show, dcb_app_help_show_flush);
-	} else if (matches(*argv, "flush") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_app_flush, dcb_app_help_show_flush);
-	} else if (matches(*argv, "add") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_app_add, dcb_app_help_add);
-	} else if (matches(*argv, "del") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_app_del, dcb_app_help_add);
-	} else if (matches(*argv, "replace") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_app_replace, dcb_app_help_add);
-	} else {
-		fprintf(stderr, "What is \"%s\"?\n", *argv);
-		dcb_app_help();
-		return -EINVAL;
-	}
-}

dcb/dcb_buffer.c

@@ -1,235 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <linux/dcbnl.h>
-
-#include "dcb.h"
-#include "utils.h"
-
-static void dcb_buffer_help_set(void)
-{
-	fprintf(stderr,
-		"Usage: dcb buffer set dev STRING\n"
-		"           [ prio-buffer PRIO-MAP ]\n"
-		"           [ buffer-size SIZE-MAP ]\n"
-		"\n"
-		" where PRIO-MAP := [ PRIO-MAP ] PRIO-MAPPING\n"
-		"       PRIO-MAPPING := { all | PRIO }:BUFFER\n"
-		"       SIZE-MAP := [ SIZE-MAP ] SIZE-MAPPING\n"
-		"       SIZE-MAPPING := { all | BUFFER }:INTEGER\n"
-		"       PRIO := { 0 .. 7 }\n"
-		"       BUFFER := { 0 .. 7 }\n"
-		"\n"
-	);
-}
-
-static void dcb_buffer_help_show(void)
-{
-	fprintf(stderr,
-		"Usage: dcb buffer show dev STRING\n"
-		"           [ prio-buffer ] [ buffer-size ] [ total-size ]\n"
-		"\n"
-	);
-}
-
-static void dcb_buffer_help(void)
-{
-	fprintf(stderr,
-		"Usage: dcb buffer help\n"
-		"\n"
-	);
-	dcb_buffer_help_show();
-	dcb_buffer_help_set();
-}
-
-static int dcb_buffer_parse_mapping_prio_buffer(__u32 key, char *value, void *data)
-{
-	struct dcbnl_buffer *buffer = data;
-	__u8 buf;
-
-	if (get_u8(&buf, value, 0))
-		return -EINVAL;
-
-	return dcb_parse_mapping("PRIO", key, IEEE_8021Q_MAX_PRIORITIES - 1,
-				 "BUFFER", buf, DCBX_MAX_BUFFERS - 1,
-				 dcb_set_u8, buffer->prio2buffer);
-}
-
-static int dcb_buffer_parse_mapping_buffer_size(__u32 key, char *value, void *data)
-{
-	struct dcbnl_buffer *buffer = data;
-	unsigned int size;
-
-	if (get_size(&size, value)) {
-		fprintf(stderr, "%d:%s: Illegal value for buffer size\n", key, value);
-		return -EINVAL;
-	}
-
-	return dcb_parse_mapping("BUFFER", key, DCBX_MAX_BUFFERS - 1,
-				 "INTEGER", size, -1,
-				 dcb_set_u32, buffer->buffer_size);
-}
-
-static void dcb_buffer_print_total_size(const struct dcbnl_buffer *buffer)
-{
-	print_size(PRINT_ANY, "total_size", "total-size %s ", buffer->total_size);
-}
-
-static void dcb_buffer_print_prio_buffer(const struct dcbnl_buffer *buffer)
-{
-	dcb_print_named_array("prio_buffer", "prio-buffer",
-			      buffer->prio2buffer, ARRAY_SIZE(buffer->prio2buffer),
-			      dcb_print_array_u8);
-}
-
-static void dcb_buffer_print_buffer_size(const struct dcbnl_buffer *buffer)
-{
-	size_t size = ARRAY_SIZE(buffer->buffer_size);
-	SPRINT_BUF(b);
-	size_t i;
-
-	open_json_array(PRINT_JSON, "buffer_size");
-	print_string(PRINT_FP, NULL, "buffer-size ", NULL);
-
-	for (i = 0; i < size; i++) {
-		snprintf(b, sizeof(b), "%zd:%%s ", i);
-		print_size(PRINT_ANY, NULL, b, buffer->buffer_size[i]);
-	}
-
-	close_json_array(PRINT_JSON, "buffer_size");
-}
-
-static void dcb_buffer_print(const struct dcbnl_buffer *buffer)
-{
-	dcb_buffer_print_prio_buffer(buffer);
-	print_nl();
-
-	dcb_buffer_print_buffer_size(buffer);
-	print_nl();
-
-	dcb_buffer_print_total_size(buffer);
-	print_nl();
-}
-
-static int dcb_buffer_get(struct dcb *dcb, const char *dev, struct dcbnl_buffer *buffer)
-{
-	return dcb_get_attribute(dcb, dev, DCB_ATTR_DCB_BUFFER, buffer, sizeof(*buffer));
-}
-
-static int dcb_buffer_set(struct dcb *dcb, const char *dev, const struct dcbnl_buffer *buffer)
-{
-	return dcb_set_attribute(dcb, dev, DCB_ATTR_DCB_BUFFER, buffer, sizeof(*buffer));
-}
-
-static int dcb_cmd_buffer_set(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct dcbnl_buffer buffer;
-	int ret;
-
-	if (!argc) {
-		dcb_buffer_help_set();
-		return 0;
-	}
-
-	ret = dcb_buffer_get(dcb, dev, &buffer);
-	if (ret)
-		return ret;
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_buffer_help_set();
-			return 0;
-		} else if (matches(*argv, "prio-buffer") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true,
-					    &dcb_buffer_parse_mapping_prio_buffer, &buffer);
-			if (ret) {
-				fprintf(stderr, "Invalid priority mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "buffer-size") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true,
-					    &dcb_buffer_parse_mapping_buffer_size, &buffer);
-			if (ret) {
-				fprintf(stderr, "Invalid buffer size mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_buffer_help_set();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-	return dcb_buffer_set(dcb, dev, &buffer);
-}
-
-static int dcb_cmd_buffer_show(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct dcbnl_buffer buffer;
-	int ret;
-
-	ret = dcb_buffer_get(dcb, dev, &buffer);
-	if (ret)
-		return ret;
-
-	open_json_object(NULL);
-
-	if (!argc) {
-		dcb_buffer_print(&buffer);
-		goto out;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_buffer_help_show();
-			return 0;
-		} else if (matches(*argv, "prio-buffer") == 0) {
-			dcb_buffer_print_prio_buffer(&buffer);
-			print_nl();
-		} else if (matches(*argv, "buffer-size") == 0) {
-			dcb_buffer_print_buffer_size(&buffer);
-			print_nl();
-		} else if (matches(*argv, "total-size") == 0) {
-			dcb_buffer_print_total_size(&buffer);
-			print_nl();
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_buffer_help_show();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-out:
-	close_json_object();
-	return 0;
-}
-
-int dcb_cmd_buffer(struct dcb *dcb, int argc, char **argv)
-{
-	if (!argc || matches(*argv, "help") == 0) {
-		dcb_buffer_help();
-		return 0;
-	} else if (matches(*argv, "show") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_buffer_show, dcb_buffer_help_show);
-	} else if (matches(*argv, "set") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_buffer_set, dcb_buffer_help_set);
-	} else {
-		fprintf(stderr, "What is \"%s\"?\n", *argv);
-		dcb_buffer_help();
-		return -EINVAL;
-	}
-}

dcb/dcb_dcbx.c

@@ -1,192 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <linux/dcbnl.h>
-
-#include "dcb.h"
-#include "utils.h"
-
-static void dcb_dcbx_help_set(void)
-{
-	fprintf(stderr,
-		"Usage: dcb dcbx set dev STRING\n"
-		"           [ host | lld-managed ]\n"
-		"           [ cee | ieee ] [ static ]\n"
-		"\n"
-	);
-}
-
-static void dcb_dcbx_help_show(void)
-{
-	fprintf(stderr,
-		"Usage: dcb dcbx show dev STRING\n"
-		"\n"
-	);
-}
-
-static void dcb_dcbx_help(void)
-{
-	fprintf(stderr,
-		"Usage: dcb dcbx help\n"
-		"\n"
-	);
-	dcb_dcbx_help_show();
-	dcb_dcbx_help_set();
-}
-
-struct dcb_dcbx_flag {
-	__u8 value;
-	const char *key_fp;
-	const char *key_json;
-};
-
-static struct dcb_dcbx_flag dcb_dcbx_flags[] = {
-	{DCB_CAP_DCBX_HOST, "host"},
-	{DCB_CAP_DCBX_LLD_MANAGED, "lld-managed", "lld_managed"},
-	{DCB_CAP_DCBX_VER_CEE, "cee"},
-	{DCB_CAP_DCBX_VER_IEEE, "ieee"},
-	{DCB_CAP_DCBX_STATIC, "static"},
-};
-
-static void dcb_dcbx_print(__u8 dcbx)
-{
-	int bit;
-	int i;
-
-	while ((bit = ffs(dcbx))) {
-		bool found = false;
-
-		bit--;
-		for (i = 0; i < ARRAY_SIZE(dcb_dcbx_flags); i++) {
-			struct dcb_dcbx_flag *flag = &dcb_dcbx_flags[i];
-
-			if (flag->value == 1 << bit) {
-				print_bool(PRINT_JSON, flag->key_json ?: flag->key_fp,
-					   NULL, true);
-				print_string(PRINT_FP, NULL, "%s ", flag->key_fp);
-				found = true;
-				break;
-			}
-		}
-
-		if (!found)
-			fprintf(stderr, "Unknown DCBX bit %#x.\n", 1 << bit);
-
-		dcbx &= ~(1 << bit);
-	}
-
-	print_nl();
-}
-
-static int dcb_dcbx_get(struct dcb *dcb, const char *dev, __u8 *dcbx)
-{
-	__u16 payload_len;
-	void *payload;
-	int err;
-
-	err = dcb_get_attribute_bare(dcb, DCB_CMD_IEEE_GET, dev, DCB_ATTR_DCBX,
-				     &payload, &payload_len);
-	if (err != 0)
-		return err;
-
-	if (payload_len != 1) {
-		fprintf(stderr, "DCB_ATTR_DCBX payload has size %d, expected 1.\n",
-			payload_len);
-		return -EINVAL;
-	}
-	*dcbx = *(__u8 *) payload;
-	return 0;
-}
-
-static int dcb_dcbx_set(struct dcb *dcb, const char *dev, __u8 dcbx)
-{
-	return dcb_set_attribute_bare(dcb, DCB_CMD_SDCBX, dev, DCB_ATTR_DCBX,
-				      &dcbx, 1, DCB_ATTR_DCBX);
-}
-
-static int dcb_cmd_dcbx_set(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	__u8 dcbx = 0;
-	__u8 i;
-
-	if (!argc) {
-		dcb_dcbx_help_set();
-		return 0;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_dcbx_help_set();
-			return 0;
-		}
-
-		for (i = 0; i < ARRAY_SIZE(dcb_dcbx_flags); i++) {
-			struct dcb_dcbx_flag *flag = &dcb_dcbx_flags[i];
-
-			if (matches(*argv, flag->key_fp) == 0) {
-				dcbx |= flag->value;
-				NEXT_ARG_FWD();
-				goto next;
-			}
-		}
-
-		fprintf(stderr, "What is \"%s\"?\n", *argv);
-		dcb_dcbx_help_set();
-		return -EINVAL;
-
-next:
-		;
-	} while (argc > 0);
-
-	return dcb_dcbx_set(dcb, dev, dcbx);
-}
-
-static int dcb_cmd_dcbx_show(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	__u8 dcbx;
-	int ret;
-
-	ret = dcb_dcbx_get(dcb, dev, &dcbx);
-	if (ret != 0)
-		return ret;
-
-	while (argc > 0) {
-		if (matches(*argv, "help") == 0) {
-			dcb_dcbx_help_show();
-			return 0;
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_dcbx_help_show();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	}
-
-	open_json_object(NULL);
-	dcb_dcbx_print(dcbx);
-	close_json_object();
-	return 0;
-}
-
-int dcb_cmd_dcbx(struct dcb *dcb, int argc, char **argv)
-{
-	if (!argc || matches(*argv, "help") == 0) {
-		dcb_dcbx_help();
-		return 0;
-	} else if (matches(*argv, "show") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_dcbx_show, dcb_dcbx_help_show);
-	} else if (matches(*argv, "set") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_dcbx_set, dcb_dcbx_help_set);
-	} else {
-		fprintf(stderr, "What is \"%s\"?\n", *argv);
-		dcb_dcbx_help();
-		return -EINVAL;
-	}
-}

dcb/dcb_ets.c

@@ -1,435 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <errno.h>
-#include <stdio.h>
-#include <linux/dcbnl.h>
-
-#include "dcb.h"
-#include "utils.h"
-
-static void dcb_ets_help_set(void)
-{
-	fprintf(stderr,
-		"Usage: dcb ets set dev STRING\n"
-		"           [ willing { on | off } ]\n"
-		"           [ { tc-tsa | reco-tc-tsa } TSA-MAP ]\n"
-		"           [ { pg-bw | tc-bw | reco-tc-bw } BW-MAP ]\n"
-		"           [ { prio-tc | reco-prio-tc } PRIO-MAP ]\n"
-		"\n"
-		" where TSA-MAP := [ TSA-MAP ] TSA-MAPPING\n"
-		"       TSA-MAPPING := { all | TC }:{ strict | cbs | ets | vendor }\n"
-		"       BW-MAP := [ BW-MAP ] BW-MAPPING\n"
-		"       BW-MAPPING := { all | TC }:INTEGER\n"
-		"       PRIO-MAP := [ PRIO-MAP ] PRIO-MAPPING\n"
-		"       PRIO-MAPPING := { all | PRIO }:TC\n"
-		"       TC := { 0 .. 7 }\n"
-		"       PRIO := { 0 .. 7 }\n"
-		"\n"
-	);
-}
-
-static void dcb_ets_help_show(void)
-{
-	fprintf(stderr,
-		"Usage: dcb ets show dev STRING\n"
-		"           [ willing ] [ ets-cap ] [ cbs ] [ tc-tsa ]\n"
-		"           [ reco-tc-tsa ] [ pg-bw ] [ tc-bw ] [ reco-tc-bw ]\n"
-		"           [ prio-tc ] [ reco-prio-tc ]\n"
-		"\n"
-	);
-}
-
-static void dcb_ets_help(void)
-{
-	fprintf(stderr,
-		"Usage: dcb ets help\n"
-		"\n"
-	);
-	dcb_ets_help_show();
-	dcb_ets_help_set();
-}
-
-static const char *const tsa_names[] = {
-	[IEEE_8021QAZ_TSA_STRICT] = "strict",
-	[IEEE_8021QAZ_TSA_CB_SHAPER] = "cbs",
-	[IEEE_8021QAZ_TSA_ETS] = "ets",
-	[IEEE_8021QAZ_TSA_VENDOR] = "vendor",
-};
-
-static int dcb_ets_parse_mapping_tc_tsa(__u32 key, char *value, void *data)
-{
-	__u8 tsa;
-	int ret;
-
-	tsa = parse_one_of("TSA", value, tsa_names, ARRAY_SIZE(tsa_names), &ret);
-	if (ret)
-		return ret;
-
-	return dcb_parse_mapping("TC", key, IEEE_8021QAZ_MAX_TCS - 1,
-				 "TSA", tsa, -1U,
-				 dcb_set_u8, data);
-}
-
-static int dcb_ets_parse_mapping_tc_bw(__u32 key, char *value, void *data)
-{
-	__u8 bw;
-
-	if (get_u8(&bw, value, 0))
-		return -EINVAL;
-
-	return dcb_parse_mapping("TC", key, IEEE_8021QAZ_MAX_TCS - 1,
-				 "BW", bw, 100,
-				 dcb_set_u8, data);
-}
-
-static int dcb_ets_parse_mapping_prio_tc(unsigned int key, char *value, void *data)
-{
-	__u8 tc;
-
-	if (get_u8(&tc, value, 0))
-		return -EINVAL;
-
-	return dcb_parse_mapping("PRIO", key, IEEE_8021QAZ_MAX_TCS - 1,
-				 "TC", tc, IEEE_8021QAZ_MAX_TCS - 1,
-				 dcb_set_u8, data);
-}
-
-static void dcb_print_array_tsa(const __u8 *array, size_t size)
-{
-	dcb_print_array_kw(array, size, tsa_names, ARRAY_SIZE(tsa_names));
-}
-
-static void dcb_ets_print_willing(const struct ieee_ets *ets)
-{
-	print_on_off(PRINT_ANY, "willing", "willing %s ", ets->willing);
-}
-
-static void dcb_ets_print_ets_cap(const struct ieee_ets *ets)
-{
-	print_uint(PRINT_ANY, "ets_cap", "ets-cap %d ", ets->ets_cap);
-}
-
-static void dcb_ets_print_cbs(const struct ieee_ets *ets)
-{
-	print_on_off(PRINT_ANY, "cbs", "cbs %s ", ets->cbs);
-}
-
-static void dcb_ets_print_tc_bw(const struct ieee_ets *ets)
-{
-	dcb_print_named_array("tc_bw", "tc-bw",
-			      ets->tc_tx_bw, ARRAY_SIZE(ets->tc_tx_bw),
-			      dcb_print_array_u8);
-}
-
-static void dcb_ets_print_pg_bw(const struct ieee_ets *ets)
-{
-	dcb_print_named_array("pg_bw", "pg-bw",
-			      ets->tc_rx_bw, ARRAY_SIZE(ets->tc_rx_bw),
-			      dcb_print_array_u8);
-}
-
-static void dcb_ets_print_tc_tsa(const struct ieee_ets *ets)
-{
-	dcb_print_named_array("tc_tsa", "tc-tsa",
-			      ets->tc_tsa, ARRAY_SIZE(ets->tc_tsa),
-			      dcb_print_array_tsa);
-}
-
-static void dcb_ets_print_prio_tc(const struct ieee_ets *ets)
-{
-	dcb_print_named_array("prio_tc", "prio-tc",
-			      ets->prio_tc, ARRAY_SIZE(ets->prio_tc),
-			      dcb_print_array_u8);
-}
-
-static void dcb_ets_print_reco_tc_bw(const struct ieee_ets *ets)
-{
-	dcb_print_named_array("reco_tc_bw", "reco-tc-bw",
-			      ets->tc_reco_bw, ARRAY_SIZE(ets->tc_reco_bw),
-			      dcb_print_array_u8);
-}
-
-static void dcb_ets_print_reco_tc_tsa(const struct ieee_ets *ets)
-{
-	dcb_print_named_array("reco_tc_tsa", "reco-tc-tsa",
-			      ets->tc_reco_tsa, ARRAY_SIZE(ets->tc_reco_tsa),
-			      dcb_print_array_tsa);
-}
-
-static void dcb_ets_print_reco_prio_tc(const struct ieee_ets *ets)
-{
-	dcb_print_named_array("reco_prio_tc", "reco-prio-tc",
-			      ets->reco_prio_tc, ARRAY_SIZE(ets->reco_prio_tc),
-			      dcb_print_array_u8);
-}
-
-static void dcb_ets_print(const struct ieee_ets *ets)
-{
-	dcb_ets_print_willing(ets);
-	dcb_ets_print_ets_cap(ets);
-	dcb_ets_print_cbs(ets);
-	print_nl();
-
-	dcb_ets_print_tc_bw(ets);
-	print_nl();
-
-	dcb_ets_print_pg_bw(ets);
-	print_nl();
-
-	dcb_ets_print_tc_tsa(ets);
-	print_nl();
-
-	dcb_ets_print_prio_tc(ets);
-	print_nl();
-
-	dcb_ets_print_reco_tc_bw(ets);
-	print_nl();
-
-	dcb_ets_print_reco_tc_tsa(ets);
-	print_nl();
-
-	dcb_ets_print_reco_prio_tc(ets);
-	print_nl();
-}
-
-static int dcb_ets_get(struct dcb *dcb, const char *dev, struct ieee_ets *ets)
-{
-	return dcb_get_attribute(dcb, dev, DCB_ATTR_IEEE_ETS, ets, sizeof(*ets));
-}
-
-static int dcb_ets_validate_bw(const __u8 bw[], const __u8 tsa[], const char *what)
-{
-	bool has_ets = false;
-	unsigned int total = 0;
-	unsigned int tc;
-
-	for (tc = 0; tc < IEEE_8021QAZ_MAX_TCS; tc++) {
-		if (tsa[tc] == IEEE_8021QAZ_TSA_ETS) {
-			has_ets = true;
-			break;
-		}
-	}
-
-	/* TC bandwidth is only intended for ETS, but 802.1Q-2018 only requires
-	 * that the sum be 100, and individual entries 0..100. It explicitly
-	 * notes that non-ETS TCs can have non-0 TC bandwidth during
-	 * reconfiguration.
-	 */
-	for (tc = 0; tc < IEEE_8021QAZ_MAX_TCS; tc++) {
-		if (bw[tc] > 100) {
-			fprintf(stderr, "%d%% for TC %d of %s is not a valid bandwidth percentage, expected 0..100%%\n",
-				bw[tc], tc, what);
-			return -EINVAL;
-		}
-		total += bw[tc];
-	}
-
-	/* This is what 802.1Q-2018 requires. */
-	if (total == 100)
-		return 0;
-
-	/* But this requirement does not make sense for all-strict
-	 * configurations. Anything else than 0 does not make sense: either BW
-	 * has not been reconfigured for the all-strict allocation yet, at which
-	 * point we expect sum of 100. Or it has already been reconfigured, at
-	 * which point accept 0.
-	 */
-	if (!has_ets && total == 0)
-		return 0;
-
-	fprintf(stderr, "Bandwidth percentages in %s sum to %d%%, expected %d%%\n",
-		what, total, has_ets ? 100 : 0);
-	return -EINVAL;
-}
-
-static int dcb_ets_set(struct dcb *dcb, const char *dev, const struct ieee_ets *ets)
-{
-	/* Do not validate pg-bw, which is not standard and has unclear
-	 * meaning.
-	 */
-	if (dcb_ets_validate_bw(ets->tc_tx_bw, ets->tc_tsa, "tc-bw") ||
-	    dcb_ets_validate_bw(ets->tc_reco_bw, ets->tc_reco_tsa, "reco-tc-bw"))
-		return -EINVAL;
-
-	return dcb_set_attribute(dcb, dev, DCB_ATTR_IEEE_ETS, ets, sizeof(*ets));
-}
-
-static int dcb_cmd_ets_set(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct ieee_ets ets;
-	int ret;
-
-	if (!argc) {
-		dcb_ets_help_set();
-		return 1;
-	}
-
-	ret = dcb_ets_get(dcb, dev, &ets);
-	if (ret)
-		return ret;
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_ets_help_set();
-			return 0;
-		} else if (matches(*argv, "willing") == 0) {
-			NEXT_ARG();
-			ets.willing = parse_on_off("willing", *argv, &ret);
-			if (ret)
-				return ret;
-		} else if (matches(*argv, "tc-tsa") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true, &dcb_ets_parse_mapping_tc_tsa,
-					    ets.tc_tsa);
-			if (ret) {
-				fprintf(stderr, "Invalid tc-tsa mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "reco-tc-tsa") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true, &dcb_ets_parse_mapping_tc_tsa,
-					    ets.tc_reco_tsa);
-			if (ret) {
-				fprintf(stderr, "Invalid reco-tc-tsa mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "tc-bw") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true, &dcb_ets_parse_mapping_tc_bw,
-					    ets.tc_tx_bw);
-			if (ret) {
-				fprintf(stderr, "Invalid tc-bw mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "pg-bw") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true, &dcb_ets_parse_mapping_tc_bw,
-					    ets.tc_rx_bw);
-			if (ret) {
-				fprintf(stderr, "Invalid pg-bw mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "reco-tc-bw") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true, &dcb_ets_parse_mapping_tc_bw,
-					    ets.tc_reco_bw);
-			if (ret) {
-				fprintf(stderr, "Invalid reco-tc-bw mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "prio-tc") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true, &dcb_ets_parse_mapping_prio_tc,
-					    ets.prio_tc);
-			if (ret) {
-				fprintf(stderr, "Invalid prio-tc mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "reco-prio-tc") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true, &dcb_ets_parse_mapping_prio_tc,
-					    ets.reco_prio_tc);
-			if (ret) {
-				fprintf(stderr, "Invalid reco-prio-tc mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_ets_help_set();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-	return dcb_ets_set(dcb, dev, &ets);
-}
-
-static int dcb_cmd_ets_show(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct ieee_ets ets;
-	int ret;
-
-	ret = dcb_ets_get(dcb, dev, &ets);
-	if (ret)
-		return ret;
-
-	open_json_object(NULL);
-
-	if (!argc) {
-		dcb_ets_print(&ets);
-		goto out;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_ets_help_show();
-			return 0;
-		} else if (matches(*argv, "willing") == 0) {
-			dcb_ets_print_willing(&ets);
-			print_nl();
-		} else if (matches(*argv, "ets-cap") == 0) {
-			dcb_ets_print_ets_cap(&ets);
-			print_nl();
-		} else if (matches(*argv, "cbs") == 0) {
-			dcb_ets_print_cbs(&ets);
-			print_nl();
-		} else if (matches(*argv, "tc-tsa") == 0) {
-			dcb_ets_print_tc_tsa(&ets);
-			print_nl();
-		} else if (matches(*argv, "reco-tc-tsa") == 0) {
-			dcb_ets_print_reco_tc_tsa(&ets);
-			print_nl();
-		} else if (matches(*argv, "tc-bw") == 0) {
-			dcb_ets_print_tc_bw(&ets);
-			print_nl();
-		} else if (matches(*argv, "pg-bw") == 0) {
-			dcb_ets_print_pg_bw(&ets);
-			print_nl();
-		} else if (matches(*argv, "reco-tc-bw") == 0) {
-			dcb_ets_print_reco_tc_bw(&ets);
-			print_nl();
-		} else if (matches(*argv, "prio-tc") == 0) {
-			dcb_ets_print_prio_tc(&ets);
-			print_nl();
-		} else if (matches(*argv, "reco-prio-tc") == 0) {
-			dcb_ets_print_reco_prio_tc(&ets);
-			print_nl();
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_ets_help_show();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-out:
-	close_json_object();
-	return 0;
-}
-
-int dcb_cmd_ets(struct dcb *dcb, int argc, char **argv)
-{
-	if (!argc || matches(*argv, "help") == 0) {
-		dcb_ets_help();
-		return 0;
-	} else if (matches(*argv, "show") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv, dcb_cmd_ets_show, dcb_ets_help_show);
-	} else if (matches(*argv, "set") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv, dcb_cmd_ets_set, dcb_ets_help_set);
-	} else {
-		fprintf(stderr, "What is \"%s\"?\n", *argv);
-		dcb_ets_help();
-		return -EINVAL;
-	}
-}

dcb/dcb_maxrate.c

@@ -1,182 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <linux/dcbnl.h>
-
-#include "dcb.h"
-#include "utils.h"
-
-static void dcb_maxrate_help_set(void)
-{
-	fprintf(stderr,
-		"Usage: dcb maxrate set dev STRING\n"
-		"           [ tc-maxrate RATE-MAP ]\n"
-		"\n"
-		" where RATE-MAP := [ RATE-MAP ] RATE-MAPPING\n"
-		"       RATE-MAPPING := { all | TC }:RATE\n"
-		"       TC := { 0 .. 7 }\n"
-		"\n"
-	);
-}
-
-static void dcb_maxrate_help_show(void)
-{
-	fprintf(stderr,
-		"Usage: dcb [ -i ] maxrate show dev STRING\n"
-		"           [ tc-maxrate ]\n"
-		"\n"
-	);
-}
-
-static void dcb_maxrate_help(void)
-{
-	fprintf(stderr,
-		"Usage: dcb maxrate help\n"
-		"\n"
-	);
-	dcb_maxrate_help_show();
-	dcb_maxrate_help_set();
-}
-
-static int dcb_maxrate_parse_mapping_tc_maxrate(__u32 key, char *value, void *data)
-{
-	__u64 rate;
-
-	if (get_rate64(&rate, value))
-		return -EINVAL;
-
-	return dcb_parse_mapping("TC", key, IEEE_8021QAZ_MAX_TCS - 1,
-				 "RATE", rate, -1,
-				 dcb_set_u64, data);
-}
-
-static void dcb_maxrate_print_tc_maxrate(struct dcb *dcb, const struct ieee_maxrate *maxrate)
-{
-	size_t size = ARRAY_SIZE(maxrate->tc_maxrate);
-	SPRINT_BUF(b);
-	size_t i;
-
-	open_json_array(PRINT_JSON, "tc_maxrate");
-	print_string(PRINT_FP, NULL, "tc-maxrate ", NULL);
-
-	for (i = 0; i < size; i++) {
-		snprintf(b, sizeof(b), "%zd:%%s ", i);
-		print_rate(dcb->use_iec, PRINT_ANY, NULL, b, maxrate->tc_maxrate[i]);
-	}
-
-	close_json_array(PRINT_JSON, "tc_maxrate");
-}
-
-static void dcb_maxrate_print(struct dcb *dcb, const struct ieee_maxrate *maxrate)
-{
-	dcb_maxrate_print_tc_maxrate(dcb, maxrate);
-	print_nl();
-}
-
-static int dcb_maxrate_get(struct dcb *dcb, const char *dev, struct ieee_maxrate *maxrate)
-{
-	return dcb_get_attribute(dcb, dev, DCB_ATTR_IEEE_MAXRATE, maxrate, sizeof(*maxrate));
-}
-
-static int dcb_maxrate_set(struct dcb *dcb, const char *dev, const struct ieee_maxrate *maxrate)
-{
-	return dcb_set_attribute(dcb, dev, DCB_ATTR_IEEE_MAXRATE, maxrate, sizeof(*maxrate));
-}
-
-static int dcb_cmd_maxrate_set(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct ieee_maxrate maxrate;
-	int ret;
-
-	if (!argc) {
-		dcb_maxrate_help_set();
-		return 0;
-	}
-
-	ret = dcb_maxrate_get(dcb, dev, &maxrate);
-	if (ret)
-		return ret;
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_maxrate_help_set();
-			return 0;
-		} else if (matches(*argv, "tc-maxrate") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true,
-					    &dcb_maxrate_parse_mapping_tc_maxrate, &maxrate);
-			if (ret) {
-				fprintf(stderr, "Invalid mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_maxrate_help_set();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-	return dcb_maxrate_set(dcb, dev, &maxrate);
-}
-
-static int dcb_cmd_maxrate_show(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct ieee_maxrate maxrate;
-	int ret;
-
-	ret = dcb_maxrate_get(dcb, dev, &maxrate);
-	if (ret)
-		return ret;
-
-	open_json_object(NULL);
-
-	if (!argc) {
-		dcb_maxrate_print(dcb, &maxrate);
-		goto out;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_maxrate_help_show();
-			return 0;
-		} else if (matches(*argv, "tc-maxrate") == 0) {
-			dcb_maxrate_print_tc_maxrate(dcb, &maxrate);
-			print_nl();
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_maxrate_help_show();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-out:
-	close_json_object();
-	return 0;
-}
-
-int dcb_cmd_maxrate(struct dcb *dcb, int argc, char **argv)
-{
-	if (!argc || matches(*argv, "help") == 0) {
-		dcb_maxrate_help();
-		return 0;
-	} else if (matches(*argv, "show") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_maxrate_show, dcb_maxrate_help_show);
-	} else if (matches(*argv, "set") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_maxrate_set, dcb_maxrate_help_set);
-	} else {
-		fprintf(stderr, "What is \"%s\"?\n", *argv);
-		dcb_maxrate_help();
-		return -EINVAL;
-	}
-}

dcb/dcb_pfc.c

@@ -1,286 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <errno.h>
-#include <stdio.h>
-#include <linux/dcbnl.h>
-
-#include "dcb.h"
-#include "utils.h"
-
-static void dcb_pfc_help_set(void)
-{
-	fprintf(stderr,
-		"Usage: dcb pfc set dev STRING\n"
-		"           [ prio-pfc PFC-MAP ]\n"
-		"           [ macsec-bypass { on | off } ]\n"
-		"           [ delay INTEGER ]\n"
-		"\n"
-		" where PFC-MAP := [ PFC-MAP ] PFC-MAPPING\n"
-		"       PFC-MAPPING := { all | TC }:PFC\n"
-		"       TC := { 0 .. 7 }\n"
-		"       PFC := { on | off }\n"
-		"\n"
-	);
-}
-
-static void dcb_pfc_help_show(void)
-{
-	fprintf(stderr,
-		"Usage: dcb [ -s ] pfc show dev STRING\n"
-		"           [ pfc-cap ] [ prio-pfc ] [ macsec-bypass ]\n"
-		"           [ delay ] [ requests ] [ indications ]\n"
-		"\n"
-	);
-}
-
-static void dcb_pfc_help(void)
-{
-	fprintf(stderr,
-		"Usage: dcb pfc help\n"
-		"\n"
-	);
-	dcb_pfc_help_show();
-	dcb_pfc_help_set();
-}
-
-static void dcb_pfc_to_array(__u8 array[IEEE_8021QAZ_MAX_TCS], __u8 pfc_en)
-{
-	int i;
-
-	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++)
-		array[i] = !!(pfc_en & (1 << i));
-}
-
-static void dcb_pfc_from_array(__u8 array[IEEE_8021QAZ_MAX_TCS], __u8 *pfc_en_p)
-{
-	__u8 pfc_en = 0;
-	int i;
-
-	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
-		if (array[i])
-			pfc_en |= 1 << i;
-	}
-
-	*pfc_en_p = pfc_en;
-}
-
-static int dcb_pfc_parse_mapping_prio_pfc(__u32 key, char *value, void *data)
-{
-	struct ieee_pfc *pfc = data;
-	__u8 pfc_en[IEEE_8021QAZ_MAX_TCS];
-	bool enabled;
-	int ret;
-
-	dcb_pfc_to_array(pfc_en, pfc->pfc_en);
-
-	enabled = parse_on_off("PFC", value, &ret);
-	if (ret)
-		return ret;
-
-	ret = dcb_parse_mapping("PRIO", key, IEEE_8021QAZ_MAX_TCS - 1,
-				"PFC", enabled, -1,
-				dcb_set_u8, pfc_en);
-	if (ret)
-		return ret;
-
-	dcb_pfc_from_array(pfc_en, &pfc->pfc_en);
-	return 0;
-}
-
-static void dcb_pfc_print_pfc_cap(const struct ieee_pfc *pfc)
-{
-	print_uint(PRINT_ANY, "pfc_cap", "pfc-cap %d ", pfc->pfc_cap);
-}
-
-static void dcb_pfc_print_macsec_bypass(const struct ieee_pfc *pfc)
-{
-	print_on_off(PRINT_ANY, "macsec_bypass", "macsec-bypass %s ", pfc->mbc);
-}
-
-static void dcb_pfc_print_delay(const struct ieee_pfc *pfc)
-{
-	print_uint(PRINT_ANY, "delay", "delay %d ", pfc->delay);
-}
-
-static void dcb_pfc_print_prio_pfc(const struct ieee_pfc *pfc)
-{
-	__u8 pfc_en[IEEE_8021QAZ_MAX_TCS];
-
-	dcb_pfc_to_array(pfc_en, pfc->pfc_en);
-	dcb_print_named_array("prio_pfc", "prio-pfc",
-			      pfc_en, ARRAY_SIZE(pfc_en), &dcb_print_array_on_off);
-}
-
-static void dcb_pfc_print_requests(const struct ieee_pfc *pfc)
-{
-	open_json_array(PRINT_JSON, "requests");
-	print_string(PRINT_FP, NULL, "requests ", NULL);
-	dcb_print_array_u64(pfc->requests, ARRAY_SIZE(pfc->requests));
-	close_json_array(PRINT_JSON, "requests");
-}
-
-static void dcb_pfc_print_indications(const struct ieee_pfc *pfc)
-{
-	open_json_array(PRINT_JSON, "indications");
-	print_string(PRINT_FP, NULL, "indications ", NULL);
-	dcb_print_array_u64(pfc->indications, ARRAY_SIZE(pfc->indications));
-	close_json_array(PRINT_JSON, "indications");
-}
-
-static void dcb_pfc_print(const struct dcb *dcb, const struct ieee_pfc *pfc)
-{
-	dcb_pfc_print_pfc_cap(pfc);
-	dcb_pfc_print_macsec_bypass(pfc);
-	dcb_pfc_print_delay(pfc);
-	print_nl();
-
-	dcb_pfc_print_prio_pfc(pfc);
-	print_nl();
-
-	if (dcb->stats) {
-		dcb_pfc_print_requests(pfc);
-		print_nl();
-
-		dcb_pfc_print_indications(pfc);
-		print_nl();
-	}
-}
-
-static int dcb_pfc_get(struct dcb *dcb, const char *dev, struct ieee_pfc *pfc)
-{
-	return dcb_get_attribute(dcb, dev, DCB_ATTR_IEEE_PFC, pfc, sizeof(*pfc));
-}
-
-static int dcb_pfc_set(struct dcb *dcb, const char *dev, const struct ieee_pfc *pfc)
-{
-	return dcb_set_attribute(dcb, dev, DCB_ATTR_IEEE_PFC, pfc, sizeof(*pfc));
-}
-
-static int dcb_cmd_pfc_set(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct ieee_pfc pfc;
-	int ret;
-
-	if (!argc) {
-		dcb_pfc_help_set();
-		return 0;
-	}
-
-	ret = dcb_pfc_get(dcb, dev, &pfc);
-	if (ret)
-		return ret;
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_pfc_help_set();
-			return 0;
-		} else if (matches(*argv, "prio-pfc") == 0) {
-			NEXT_ARG();
-			ret = parse_mapping(&argc, &argv, true,
-					    &dcb_pfc_parse_mapping_prio_pfc, &pfc);
-			if (ret) {
-				fprintf(stderr, "Invalid pfc mapping %s\n", *argv);
-				return ret;
-			}
-			continue;
-		} else if (matches(*argv, "macsec-bypass") == 0) {
-			NEXT_ARG();
-			pfc.mbc = parse_on_off("macsec-bypass", *argv, &ret);
-			if (ret)
-				return ret;
-		} else if (matches(*argv, "delay") == 0) {
-			NEXT_ARG();
-			/* Do not support the size notations for delay.
-			 * Delay is specified in "bit times", not bits, so
-			 * it is not applicable. At the same time it would
-			 * be confusing that 10Kbit does not mean 10240,
-			 * but 1280.
-			 */
-			if (get_u16(&pfc.delay, *argv, 0)) {
-				fprintf(stderr, "Invalid delay `%s', expected an integer 0..65535\n",
-					*argv);
-				return -EINVAL;
-			}
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_pfc_help_set();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-	return dcb_pfc_set(dcb, dev, &pfc);
-}
-
-static int dcb_cmd_pfc_show(struct dcb *dcb, const char *dev, int argc, char **argv)
-{
-	struct ieee_pfc pfc;
-	int ret;
-
-	ret = dcb_pfc_get(dcb, dev, &pfc);
-	if (ret)
-		return ret;
-
-	open_json_object(NULL);
-
-	if (!argc) {
-		dcb_pfc_print(dcb, &pfc);
-		goto out;
-	}
-
-	do {
-		if (matches(*argv, "help") == 0) {
-			dcb_pfc_help_show();
-			return 0;
-		} else if (matches(*argv, "prio-pfc") == 0) {
-			dcb_pfc_print_prio_pfc(&pfc);
-			print_nl();
-		} else if (matches(*argv, "pfc-cap") == 0) {
-			dcb_pfc_print_pfc_cap(&pfc);
-			print_nl();
-		} else if (matches(*argv, "macsec-bypass") == 0) {
-			dcb_pfc_print_macsec_bypass(&pfc);
-			print_nl();
-		} else if (matches(*argv, "delay") == 0) {
-			dcb_pfc_print_delay(&pfc);
-			print_nl();
-		} else if (matches(*argv, "requests") == 0) {
-			dcb_pfc_print_requests(&pfc);
-			print_nl();
-		} else if (matches(*argv, "indications") == 0) {
-			dcb_pfc_print_indications(&pfc);
-			print_nl();
-		} else {
-			fprintf(stderr, "What is \"%s\"?\n", *argv);
-			dcb_pfc_help_show();
-			return -EINVAL;
-		}
-
-		NEXT_ARG_FWD();
-	} while (argc > 0);
-
-out:
-	close_json_object();
-	return 0;
-}
-
-int dcb_cmd_pfc(struct dcb *dcb, int argc, char **argv)
-{
-	if (!argc || matches(*argv, "help") == 0) {
-		dcb_pfc_help();
-		return 0;
-	} else if (matches(*argv, "show") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_pfc_show, dcb_pfc_help_show);
-	} else if (matches(*argv, "set") == 0) {
-		NEXT_ARG_FWD();
-		return dcb_cmd_parse_dev(dcb, argc, argv,
-					 dcb_cmd_pfc_set, dcb_pfc_help_set);
-	} else {
-		fprintf(stderr, "What is \"%s\"?\n", *argv);
-		dcb_pfc_help();
-		return -EINVAL;
-	}
-}

devlink/Makefile

@@ -7,19 +7,19 @@ ifeq ($(HAVE_MNL),y)
 
 DEVLINKOBJ = devlink.o mnlg.o
 TARGETS += devlink
-LDLIBS += -lm
+
+CFLAGS += $(shell $(PKG_CONFIG) libmnl --cflags)
+LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
 
 endif
 
 all: $(TARGETS) $(LIBS)
 
-devlink: $(DEVLINKOBJ) $(LIBNETLINK)
+devlink: $(DEVLINKOBJ)
 	$(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@
 
 install: all
-	for i in $(TARGETS); \
+	install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR)
-	do install -m 0755 $$i $(DESTDIR)$(SBINDIR); \
-	done
 
 clean:
 	rm -f $(DEVLINKOBJ) $(TARGETS)

devlink/mnlg.c

@@ -14,11 +14,11 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <time.h>
 #include <libmnl/libmnl.h>
 #include <linux/genetlink.h>
 
 #include "libnetlink.h"
-#include "mnl_utils.h"
 #include "utils.h"
 #include "mnlg.h"
 
@@ -28,13 +28,90 @@ struct mnlg_socket {
 	uint32_t id;
 	uint8_t version;
 	unsigned int seq;
+	unsigned int portid;
 };
 
-int mnlg_socket_send(struct mnlu_gen_socket *nlg, const struct nlmsghdr *nlh)
+static struct nlmsghdr *__mnlg_msg_prepare(struct mnlg_socket *nlg, uint8_t cmd,
+					   uint16_t flags, uint32_t id,
+					   uint8_t version)
+{
+	struct nlmsghdr *nlh;
+	struct genlmsghdr *genl;
+
+	nlh = mnl_nlmsg_put_header(nlg->buf);
+	nlh->nlmsg_type	= id;
+	nlh->nlmsg_flags = flags;
+	nlg->seq = time(NULL);
+	nlh->nlmsg_seq = nlg->seq;
+
+	genl = mnl_nlmsg_put_extra_header(nlh, sizeof(struct genlmsghdr));
+	genl->cmd = cmd;
+	genl->version = version;
+
+	return nlh;
+}
+
+struct nlmsghdr *mnlg_msg_prepare(struct mnlg_socket *nlg, uint8_t cmd,
+				  uint16_t flags)
+{
+	return __mnlg_msg_prepare(nlg, cmd, flags, nlg->id, nlg->version);
+}
+
+int mnlg_socket_send(struct mnlg_socket *nlg, const struct nlmsghdr *nlh)
 {
 	return mnl_socket_sendto(nlg->nl, nlh, nlh->nlmsg_len);
 }
 
+static int mnlg_cb_noop(const struct nlmsghdr *nlh, void *data)
+{
+	return MNL_CB_OK;
+}
+
+static int mnlg_cb_error(const struct nlmsghdr *nlh, void *data)
+{
+	const struct nlmsgerr *err = mnl_nlmsg_get_payload(nlh);
+
+	/* Netlink subsystems returns the errno value with different signess */
+	if (err->error < 0)
+		errno = -err->error;
+	else
+		errno = err->error;
+
+	if (nl_dump_ext_ack(nlh, NULL))
+		return MNL_CB_ERROR;
+
+	return err->error == 0 ? MNL_CB_STOP : MNL_CB_ERROR;
+}
+
+static int mnlg_cb_stop(const struct nlmsghdr *nlh, void *data)
+{
+	return MNL_CB_STOP;
+}
+
+static mnl_cb_t mnlg_cb_array[NLMSG_MIN_TYPE] = {
+	[NLMSG_NOOP]	= mnlg_cb_noop,
+	[NLMSG_ERROR]	= mnlg_cb_error,
+	[NLMSG_DONE]	= mnlg_cb_stop,
+	[NLMSG_OVERRUN]	= mnlg_cb_noop,
+};
+
+int mnlg_socket_recv_run(struct mnlg_socket *nlg, mnl_cb_t data_cb, void *data)
+{
+	int err;
+
+	do {
+		err = mnl_socket_recvfrom(nlg->nl, nlg->buf,
+					  MNL_SOCKET_BUFFER_SIZE);
+		if (err <= 0)
+			break;
+		err = mnl_cb_run2(nlg->buf, err, nlg->seq, nlg->portid,
+				  data_cb, data, mnlg_cb_array,
+				  ARRAY_SIZE(mnlg_cb_array));
+	} while (err > 0);
+
+	return err;
+}
+
 struct group_info {
 	bool found;
 	uint32_t id;
@@ -114,17 +191,15 @@ static int get_group_id_cb(const struct nlmsghdr *nlh, void *data)
 	return MNL_CB_OK;
 }
 
-int mnlg_socket_group_add(struct mnlu_gen_socket *nlg, const char *group_name)
+int mnlg_socket_group_add(struct mnlg_socket *nlg, const char *group_name)
 {
 	struct nlmsghdr *nlh;
 	struct group_info group_info;
 	int err;
 
-	nlh = _mnlu_gen_socket_cmd_prepare(nlg, CTRL_CMD_GETFAMILY,
+	nlh = __mnlg_msg_prepare(nlg, CTRL_CMD_GETFAMILY,
-					   NLM_F_REQUEST | NLM_F_ACK,
+				 NLM_F_REQUEST | NLM_F_ACK, GENL_ID_CTRL, 1);
-					   GENL_ID_CTRL, 1);
+	mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, nlg->id);
-
-	mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, nlg->family);
 
 	err = mnlg_socket_send(nlg, nlh);
 	if (err < 0)
@@ -132,7 +207,7 @@ int mnlg_socket_group_add(struct mnlu_gen_socket *nlg, const char *group_name)
 
 	group_info.found = false;
 	group_info.name = group_name;
-	err = mnlu_gen_socket_recv_run(nlg, get_group_id_cb, &group_info);
+	err = mnlg_socket_recv_run(nlg, get_group_id_cb, &group_info);
 	if (err < 0)
 		return err;
 
@@ -149,7 +224,92 @@ int mnlg_socket_group_add(struct mnlu_gen_socket *nlg, const char *group_name)
 	return 0;
 }
 
-int mnlg_socket_get_fd(struct mnlu_gen_socket *nlg)
+static int get_family_id_attr_cb(const struct nlattr *attr, void *data)
 {
-	return mnl_socket_get_fd(nlg->nl);
+	const struct nlattr **tb = data;
+	int type = mnl_attr_get_type(attr);
+
+	if (mnl_attr_type_valid(attr, CTRL_ATTR_MAX) < 0)
+		return MNL_CB_ERROR;
+
+	if (type == CTRL_ATTR_FAMILY_ID &&
+	    mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+		return MNL_CB_ERROR;
+	tb[type] = attr;
+	return MNL_CB_OK;
+}
+
+static int get_family_id_cb(const struct nlmsghdr *nlh, void *data)
+{
+	uint32_t *p_id = data;
+	struct nlattr *tb[CTRL_ATTR_MAX + 1] = {};
+	struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+	mnl_attr_parse(nlh, sizeof(*genl), get_family_id_attr_cb, tb);
+	if (!tb[CTRL_ATTR_FAMILY_ID])
+		return MNL_CB_ERROR;
+	*p_id = mnl_attr_get_u16(tb[CTRL_ATTR_FAMILY_ID]);
+	return MNL_CB_OK;
+}
+
+struct mnlg_socket *mnlg_socket_open(const char *family_name, uint8_t version)
+{
+	struct mnlg_socket *nlg;
+	struct nlmsghdr *nlh;
+	int one = 1;
+	int err;
+
+	nlg = malloc(sizeof(*nlg));
+	if (!nlg)
+		return NULL;
+
+	nlg->buf = malloc(MNL_SOCKET_BUFFER_SIZE);
+	if (!nlg->buf)
+		goto err_buf_alloc;
+
+	nlg->nl = mnl_socket_open(NETLINK_GENERIC);
+	if (!nlg->nl)
+		goto err_mnl_socket_open;
+
+	/* Older kernels may no support capped/extended ACK reporting */
+	mnl_socket_setsockopt(nlg->nl, NETLINK_CAP_ACK, &one, sizeof(one));
+	mnl_socket_setsockopt(nlg->nl, NETLINK_EXT_ACK, &one, sizeof(one));
+
+	err = mnl_socket_bind(nlg->nl, 0, MNL_SOCKET_AUTOPID);
+	if (err < 0)
+		goto err_mnl_socket_bind;
+
+	nlg->portid = mnl_socket_get_portid(nlg->nl);
+
+	nlh = __mnlg_msg_prepare(nlg, CTRL_CMD_GETFAMILY,
+				 NLM_F_REQUEST | NLM_F_ACK, GENL_ID_CTRL, 1);
+	mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, family_name);
+
+	err = mnlg_socket_send(nlg, nlh);
+	if (err < 0)
+		goto err_mnlg_socket_send;
+
+	err = mnlg_socket_recv_run(nlg, get_family_id_cb, &nlg->id);
+	if (err < 0)
+		goto err_mnlg_socket_recv_run;
+
+	nlg->version = version;
+	return nlg;
+
+err_mnlg_socket_recv_run:
+err_mnlg_socket_send:
+err_mnl_socket_bind:
+	mnl_socket_close(nlg->nl);
+err_mnl_socket_open:
+	free(nlg->buf);
+err_buf_alloc:
+	free(nlg);
+	return NULL;
+}
+
+void mnlg_socket_close(struct mnlg_socket *nlg)
+{
+	mnl_socket_close(nlg->nl);
+	free(nlg->buf);
+	free(nlg);
 }

devlink/mnlg.h

@@ -14,10 +14,14 @@
 
 #include <libmnl/libmnl.h>
 
-struct mnlu_gen_socket;
+struct mnlg_socket;
 
-int mnlg_socket_send(struct mnlu_gen_socket *nlg, const struct nlmsghdr *nlh);
+struct nlmsghdr *mnlg_msg_prepare(struct mnlg_socket *nlg, uint8_t cmd,
-int mnlg_socket_group_add(struct mnlu_gen_socket *nlg, const char *group_name);
+				  uint16_t flags);
-int mnlg_socket_get_fd(struct mnlu_gen_socket *nlg);
+int mnlg_socket_send(struct mnlg_socket *nlg, const struct nlmsghdr *nlh);
+int mnlg_socket_recv_run(struct mnlg_socket *nlg, mnl_cb_t data_cb, void *data);
+int mnlg_socket_group_add(struct mnlg_socket *nlg, const char *group_name);
+struct mnlg_socket *mnlg_socket_open(const char *family_name, uint8_t version);
+void mnlg_socket_close(struct mnlg_socket *nlg);
 
 #endif /* _MNLG_H_ */

doc/actions/actions-general

@@ -254,3 +254,4 @@ At the moment the focus has been on getting the architecture in place.
 Expect new things in the spurious time i have to work on this
 (particularly around end of year when i have typically get time off
 from work).
+

doc/actions/gact-usage

@@ -10,7 +10,7 @@ Where:
       
 ACTION semantics
 - pass and ok are equivalent to accept
-- continue allows one to restart classification lookup
+- continue allows to restart classification lookup
 - drop drops packets
 - reclassify implies continue classification where we left off
 
@@ -76,3 +76,4 @@ filter protocol ip pref 6 u32 filter protocol ip pref 6 u32 fh 800: ht divisor 1
          index 4 ref 1 bind 1 installed 118 sec used 82 sec
          Sent 1680 bytes 20 pkts (dropped 10, overlimits 0 )
 -----
+

etc/iproute2/rt_protos

@@ -15,9 +15,7 @@
 14	xorp
 15	ntk
 16      dhcp
-18	keepalived
 42	babel
-99	openr
 186	bgp
 187	isis
 188	ospf

examples/README.cbq

@@ -0,0 +1,122 @@
+# CHANGES
+# -------
+# v0.3a2- fixed bug in "if" operator. Thanks kad@dgtu.donetsk.ua.
+# v0.3a-  added TIME parameter. Example:
+#         TIME=00:00-19:00;64Kbit/6Kbit
+#         So, between 00:00 and 19:00 RATE will be 64Kbit.
+#         Just start "cbq.init timecheck" periodically from cron (every 10
+#         minutes for example).
+#         !!! Anyway you MUST start "cbq.init start" for CBQ initialize.
+# v0.2 -  Some cosmetique changes. Now it more compatible with
+#         old bash version. Thanks to Stanislav V. Voronyi
+#         <stas@cnti.uanet.kharkov.ua>.
+# v0.1 -  First public release
+# 
+# README
+# ------
+# 
+# First of all - this is just a SIMPLE EXAMPLE of CBQ power.
+# Don't ask me "why" and "how" :)
+# 
+# This is an example of using CBQ (Class Based Queueing) and policy-based
+# filter for building smart ethernet shapers. All CBQ parameters are
+# correct only for ETHERNET (eth0,1,2..) linux interfaces. It works for
+# ARCNET too (just set bandwidth parameter to 2Mbit). It was tested
+# on 2.1.125-2.1.129 linux kernels (KSI linux, Nostromo version) and 
+# ip-route utility by A.Kuznetsov (iproute2-ss981101 version). 
+# You can download ip-route from ftp://ftp.inr.ac.ru/ip-routing or
+# get iproute2*.rpm (compiled with glibc) from ftp.ksi-linux.com.
+# 
+# 
+# HOW IT WORKS
+# 
+# Each shaper must be described by config file in $CBQ_PATH
+# (/etc/sysconfig/cbq/) directory - one config file for each CBQ shaper.
+# 
+# Some words about config file name:
+# Each shaper has its personal ID - two byte HEX number. Really ID is 
+# CBQ class.
+# So, filename looks like:
+# 
+# cbq-1280.My_first_shaper
+# ^^^ ^^^  ^^^^^^^^^^^^^
+#  |  |            |______ Shaper name - any word
+#  |  |___________________ ID (0000-FFFF), let ID looks like shaper's rate
+#  |______________________ Filename must begin from "cbq-" 
+# 
+# 
+# Config file describes shaper parameters and source[destination] 
+# address[port].
+# For example let's prepare /etc/sysconfig/cbq/cbq-1280.My_first_shaper:
+# 
+# ----------8<---------------------
+# DEVICE=eth0,10Mbit,1Mbit
+# RATE=128Kbit
+# WEIGHT=10Kbit
+# PRIO=5
+# RULE=192.168.1.0/24
+# ----------8<---------------------
+# 
+# This is minimal configuration, where:
+# DEVICE:  eth0   - device where we do control our traffic
+#          10Mbit - REAL ethernet card bandwidth
+#          1Mbit  - "weight" of :1 class (parent for all shapers for eth0),
+#                   as a rule of thumb weight=batdwidth/10.
+#          100Mbit adapter's example: DEVICE=eth0,100Mbit,10Mbit
+#          *** If you want to build more than one shaper per device it's
+#              enough to describe bandwidth and weight once  - cbq.init
+#              is smart :) You can put only 'DEVICE=eth0' into cbq-* 
+#              config file for eth0.
+# 
+# RATE:    Shaper's speed - Kbit,Mbit or bps (bytes per second)
+# 
+# WEIGHT:  "weight" of shaper (CBQ class). Like for DEVICE - approx. RATE/10
+# 
+# PRIO:    shaper's priority from 1 to 8 where 1 is the highest one.
+#          I do always use "5" for all my shapers.
+# 
+# RULE:    [source addr][:source port],[dest addr][:dest port]
+#          Some examples:
+# RULE=10.1.1.0/24:80         - all traffic for network 10.1.1.0 to port 80
+#                               will be shaped.
+# RULE=10.2.2.5               - shaper works only for IP address 10.2.2.5   
+# RULE=:25,10.2.2.128/25:5000 - all traffic from any address and port 25 to
+#                               address 10.2.2.128 - 10.2.2.255 and port 5000
+#                               will be shaped.
+# RULE=10.5.5.5:80,           - shaper active only for traffic from port 80 of
+#                               address 10.5.5.5
+# Multiple RULE fields per one config file are allowed. For example:
+# RULE=10.1.1.2:80
+# RULE=10.1.1.2:25
+# RULE=10.1.1.2:110
+# 
+# *** ATTENTION!!!
+# All shapers do work only for outgoing traffic!
+# So, if you want to build bidirectional shaper you must set it up for
+# both ethernet card. For example let's build shaper for our linux box like:
+# 
+#                     ---------             192.168.1.1
+# BACKBONE -----eth0-|  linux  |-eth1------*[our client]
+#                     ---------
+# 
+# Let all traffic from backbone to client will be shaped at 28Kbit and
+# traffic from client to backbone - at 128Kbit. We need two config files:
+# 
+# ---8<-----/etc/sysconfig/cbq/cbq-28.client-out----
+# DEVICE=eth1,10Mbit,1Mbit
+# RATE=28Kbit
+# WEIGHT=2Kbit
+# PRIO=5
+# RULE=192.168.1.1
+# ---8<---------------------------------------------
+# 
+# ---8<-----/etc/sysconfig/cbq/cbq-128.client-in----
+# DEVICE=eth0,10Mbit,1Mbit
+# RATE=128Kbit
+# WEIGHT=10Kbit
+# PRIO=5
+# RULE=192.168.1.1,
+# ---8<---------------------------------------------
+#                 ^pay attention to "," - this is source address!
+# 
+# Enjoy.

examples/SYN-DoS.rate.limit

@@ -0,0 +1,49 @@
+#! /bin/sh -x
+#
+# sample script on using the ingress capabilities
+# this script shows how one can rate limit incoming SYNs
+# Useful for TCP-SYN attack protection. You can use
+# IPchains to have more powerful additions to the SYN (eg 
+# in addition the subnet)
+#
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/root/DS-6-beta/iproute2-990530-dsing
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+IPCHAINS=/root/DS-6-beta/ipchains-1.3.9/ipchains
+INDEV=eth2
+#
+# tag all incoming SYN packets through $INDEV as mark value 1
+############################################################ 
+$IPCHAINS -A input -i $INDEV -y -m 1
+############################################################ 
+#
+# install the ingress qdisc on the ingress interface
+############################################################ 
+$TC qdisc add dev $INDEV handle ffff: ingress
+############################################################ 
+
+#
+# 
+# SYN packets are 40 bytes (320 bits) so three SYNs equals
+# 960 bits (approximately 1kbit); so we rate limit below
+# the incoming SYNs to 3/sec (not very sueful really; but
+#serves to show the point - JHS
+############################################################ 
+$TC filter add dev $INDEV parent ffff: protocol ip prio 50 handle 1 fw \
+police rate 1kbit burst 40 mtu 9k drop flowid :1
+############################################################ 
+
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent ffff:
+
+#deleting the ingress qdisc
+#$TC qdisc del $INDEV ingress

examples/bpf/README

@@ -1,18 +1,8 @@
 eBPF toy code examples (running in kernel) to familiarize yourself
 with syntax and features:
 
-- BTF defined map examples
- - bpf_graft.c		-> Demo on altering runtime behaviour
  - bpf_shared.c		-> Ingress/egress map sharing example
+ - bpf_tailcall.c	-> Using tail call chains
+ - bpf_cyclic.c		-> Simple cycle as tail calls
+ - bpf_graft.c		-> Demo on altering runtime behaviour
  - bpf_map_in_map.c     -> Using map in map example
-
-- legacy struct bpf_elf_map defined map examples
- - legacy/bpf_shared.c		-> Ingress/egress map sharing example
- - legacy/bpf_tailcall.c	-> Using tail call chains
- - legacy/bpf_cyclic.c		-> Simple cycle as tail calls
- - legacy/bpf_graft.c		-> Demo on altering runtime behaviour
- - legacy/bpf_map_in_map.c	-> Using map in map example
-
-Note: Users should use new BTF way to defined the maps, the examples
-in legacy folder which is using struct bpf_elf_map defined maps is not
-recommanded.

examples/bpf/bpf_cyclic.c

@@ -1,4 +1,4 @@
-#include "../../../include/bpf_api.h"
+#include "../../include/bpf_api.h"
 
 /* Cyclic dependency example to test the kernel's runtime upper
  * bound on loops. Also demonstrates on how to use direct-actions,

examples/bpf/bpf_graft.c

@@ -33,13 +33,13 @@
  *   [...]
  */
 
-struct {
+struct bpf_elf_map __section_maps jmp_tc = {
-	__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
+	.type		= BPF_MAP_TYPE_PROG_ARRAY,
-	__uint(key_size, sizeof(uint32_t));
+	.size_key	= sizeof(uint32_t),
-	__uint(value_size, sizeof(uint32_t));
+	.size_value	= sizeof(uint32_t),
-	__uint(max_entries, 1);
+	.pinning	= PIN_GLOBAL_NS,
-	__uint(pinning, LIBBPF_PIN_BY_NAME);
+	.max_elem	= 1,
-} jmp_tc __section(".maps");
+};
 
 __section("aaa")
 int cls_aaa(struct __sk_buff *skb)

examples/bpf/bpf_map_in_map.c

@@ -1,23 +1,24 @@
 #include "../../include/bpf_api.h"
 
-struct inner_map {
+#define MAP_INNER_ID	42
-	__uint(type, BPF_MAP_TYPE_ARRAY);
-	__uint(key_size, sizeof(uint32_t));
-	__uint(value_size, sizeof(uint32_t));
-	__uint(max_entries, 1);
-} map_inner __section(".maps");
 
-struct {
+struct bpf_elf_map __section_maps map_inner = {
-	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
+	.type		= BPF_MAP_TYPE_ARRAY,
-	__uint(key_size, sizeof(uint32_t));
+	.size_key	= sizeof(uint32_t),
-	__uint(value_size, sizeof(uint32_t));
+	.size_value	= sizeof(uint32_t),
-	__uint(max_entries, 1);
+	.id		= MAP_INNER_ID,
-	__uint(pinning, LIBBPF_PIN_BY_NAME);
+	.inner_idx	= 0,
-	__array(values, struct inner_map);
+	.pinning	= PIN_GLOBAL_NS,
-} map_outer __section(".maps") = {
+	.max_elem	= 1,
-	.values = {
+};
-		[0] = &map_inner,
+
-	},
+struct bpf_elf_map __section_maps map_outer = {
+	.type		= BPF_MAP_TYPE_ARRAY_OF_MAPS,
+	.size_key	= sizeof(uint32_t),
+	.size_value	= sizeof(uint32_t),
+	.inner_id	= MAP_INNER_ID,
+	.pinning	= PIN_GLOBAL_NS,
+	.max_elem	= 1,
 };
 
 __section("egress")

examples/bpf/bpf_shared.c

@@ -18,13 +18,13 @@
  * instance is being created.
  */
 
-struct {
+struct bpf_elf_map __section_maps map_sh = {
-	__uint(type, BPF_MAP_TYPE_ARRAY);
+	.type		= BPF_MAP_TYPE_ARRAY,
-	__uint(key_size, sizeof(uint32_t));
+	.size_key	= sizeof(uint32_t),
-	__uint(value_size, sizeof(uint32_t));
+	.size_value	= sizeof(uint32_t),
-	__uint(max_entries, 1);
+	.pinning	= PIN_OBJECT_NS, /* or PIN_GLOBAL_NS, or PIN_NONE */
-	__uint(pinning, LIBBPF_PIN_BY_NAME);	/* or LIBBPF_PIN_NONE */
+	.max_elem	= 1,
-} map_sh __section(".maps");
+};
 
 __section("egress")
 int emain(struct __sk_buff *skb)

examples/bpf/bpf_tailcall.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#include "../../../include/bpf_api.h"
+#include "../../include/bpf_api.h"
 
 #define ENTRY_INIT	3
 #define ENTRY_0		0

examples/bpf/legacy/bpf_graft.c

@@ -1,66 +0,0 @@
-#include "../../../include/bpf_api.h"
-
-/* This example demonstrates how classifier run-time behaviour
- * can be altered with tail calls. We start out with an empty
- * jmp_tc array, then add section aaa to the array slot 0, and
- * later on atomically replace it with section bbb. Note that
- * as shown in other examples, the tc loader can prepopulate
- * tail called sections, here we start out with an empty one
- * on purpose to show it can also be done this way.
- *
- * tc filter add dev foo parent ffff: bpf obj graft.o
- * tc exec bpf dbg
- *   [...]
- *   Socket Thread-20229 [001] ..s. 138993.003923: : fallthrough
- *   <idle>-0            [001] ..s. 138993.202265: : fallthrough
- *   Socket Thread-20229 [001] ..s. 138994.004149: : fallthrough
- *   [...]
- *
- * tc exec bpf graft m:globals/jmp_tc key 0 obj graft.o sec aaa
- * tc exec bpf dbg
- *   [...]
- *   Socket Thread-19818 [002] ..s. 139012.053587: : aaa
- *   <idle>-0            [002] ..s. 139012.172359: : aaa
- *   Socket Thread-19818 [001] ..s. 139012.173556: : aaa
- *   [...]
- *
- * tc exec bpf graft m:globals/jmp_tc key 0 obj graft.o sec bbb
- * tc exec bpf dbg
- *   [...]
- *   Socket Thread-19818 [002] ..s. 139022.102967: : bbb
- *   <idle>-0            [002] ..s. 139022.155640: : bbb
- *   Socket Thread-19818 [001] ..s. 139022.156730: : bbb
- *   [...]
- */
-
-struct bpf_elf_map __section_maps jmp_tc = {
-	.type		= BPF_MAP_TYPE_PROG_ARRAY,
-	.size_key	= sizeof(uint32_t),
-	.size_value	= sizeof(uint32_t),
-	.pinning	= PIN_GLOBAL_NS,
-	.max_elem	= 1,
-};
-
-__section("aaa")
-int cls_aaa(struct __sk_buff *skb)
-{
-	printt("aaa\n");
-	return TC_H_MAKE(1, 42);
-}
-
-__section("bbb")
-int cls_bbb(struct __sk_buff *skb)
-{
-	printt("bbb\n");
-	return TC_H_MAKE(1, 43);
-}
-
-__section_cls_entry
-int cls_entry(struct __sk_buff *skb)
-{
-	tail_call(skb, &jmp_tc, 0);
-	printt("fallthrough\n");
-	return BPF_H_DEFAULT;
-}
-
-BPF_LICENSE("GPL");

examples/bpf/legacy/bpf_map_in_map.c

@@ -1,56 +0,0 @@
-#include "../../../include/bpf_api.h"
-
-#define MAP_INNER_ID	42
-
-struct bpf_elf_map __section_maps map_inner = {
-	.type		= BPF_MAP_TYPE_ARRAY,
-	.size_key	= sizeof(uint32_t),
-	.size_value	= sizeof(uint32_t),
-	.id		= MAP_INNER_ID,
-	.inner_idx	= 0,
-	.pinning	= PIN_GLOBAL_NS,
-	.max_elem	= 1,
-};
-
-struct bpf_elf_map __section_maps map_outer = {
-	.type		= BPF_MAP_TYPE_ARRAY_OF_MAPS,
-	.size_key	= sizeof(uint32_t),
-	.size_value	= sizeof(uint32_t),
-	.inner_id	= MAP_INNER_ID,
-	.pinning	= PIN_GLOBAL_NS,
-	.max_elem	= 1,
-};
-
-__section("egress")
-int emain(struct __sk_buff *skb)
-{
-	struct bpf_elf_map *map_inner;
-	int key = 0, *val;
-
-	map_inner = map_lookup_elem(&map_outer, &key);
-	if (map_inner) {
-		val = map_lookup_elem(map_inner, &key);
-		if (val)
-			lock_xadd(val, 1);
-	}
-
-	return BPF_H_DEFAULT;
-}
-
-__section("ingress")
-int imain(struct __sk_buff *skb)
-{
-	struct bpf_elf_map *map_inner;
-	int key = 0, *val;
-
-	map_inner = map_lookup_elem(&map_outer, &key);
-	if (map_inner) {
-		val = map_lookup_elem(map_inner, &key);
-		if (val)
-			printt("map val: %d\n", *val);
-	}
-
-	return BPF_H_DEFAULT;
-}
-
-BPF_LICENSE("GPL");

examples/bpf/legacy/bpf_shared.c

@@ -1,53 +0,0 @@
-#include "../../../include/bpf_api.h"
-
-/* Minimal, stand-alone toy map pinning example:
- *
- * clang -target bpf -O2 [...] -o bpf_shared.o -c bpf_shared.c
- * tc filter add dev foo parent 1: bpf obj bpf_shared.o sec egress
- * tc filter add dev foo parent ffff: bpf obj bpf_shared.o sec ingress
- *
- * Both classifier will share the very same map instance in this example,
- * so map content can be accessed from ingress *and* egress side!
- *
- * This example has a pinning of PIN_OBJECT_NS, so it's private and
- * thus shared among various program sections within the object.
- *
- * A setting of PIN_GLOBAL_NS would place it into a global namespace,
- * so that it can be shared among different object files. A setting
- * of PIN_NONE (= 0) means no sharing, so each tc invocation a new map
- * instance is being created.
- */
-
-struct bpf_elf_map __section_maps map_sh = {
-	.type		= BPF_MAP_TYPE_ARRAY,
-	.size_key	= sizeof(uint32_t),
-	.size_value	= sizeof(uint32_t),
-	.pinning	= PIN_OBJECT_NS, /* or PIN_GLOBAL_NS, or PIN_NONE */
-	.max_elem	= 1,
-};
-
-__section("egress")
-int emain(struct __sk_buff *skb)
-{
-	int key = 0, *val;
-
-	val = map_lookup_elem(&map_sh, &key);
-	if (val)
-		lock_xadd(val, 1);
-
-	return BPF_H_DEFAULT;
-}
-
-__section("ingress")
-int imain(struct __sk_buff *skb)
-{
-	int key = 0, *val;
-
-	val = map_lookup_elem(&map_sh, &key);
-	if (val)
-		printt("map val: %d\n", *val);
-
-	return BPF_H_DEFAULT;
-}
-
-BPF_LICENSE("GPL");

examples/cbq.init-v0.7.3

@@ -0,0 +1,983 @@
+#!/bin/bash
+#
+#    cbq.init v0.7.3
+#    Copyright (C) 1999  Pavel Golubev <pg@ksi-linux.com>
+#    Copyright (C) 2001-2004  Lubomir Bulej <pallas@kadan.cz>
+#
+#    chkconfig:   2345 11 89
+#    description: sets up CBQ-based traffic control
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+#    To get the latest version, check on Freshmeat for actual location:
+#
+#		http://freshmeat.net/projects/cbq.init
+#
+#
+# VERSION HISTORY
+# ---------------
+# v0.7.3- Deepak Singhal <singhal at users.sourceforge.net>
+#	  - fix timecheck to not ignore regular TIME rules after
+#	    encountering a TIME rule that spans over midnight
+#	- Nathan Shafer <nicodemus at users.sourceforge.net>
+#	  - allow symlinks to class files
+#	- Seth J. Blank <antifreeze at users.sourceforge.net>
+#	  - replace hardcoded ip/tc location with variables
+#	- Mark Davis <mark.davis at gmx.de>
+#	  - allow setting of PRIO_{MARK,RULE,REALM} in class file
+#	- Fernando Sanch <toptnc at users.sourceforge.net>
+#	  - allow underscores in interface names
+# v0.7.2- Paulo Sedrez
+#	  - fix time2abs to allow hours with leading zero in TIME rules
+#	- Svetlin Simeonov <zvero at yahoo.com>
+#	  - fix cbq_device_list to allow VLAN interfaces
+#	- Mark Davis <mark.davis at gmx.de>
+#	  - ignore *~ backup files when looking for classes
+#	- Mike Boyer <boyer at administrative.com>
+#	  - fix to allow arguments to be passed to "restart" command
+# v0.7.1- Lubomir Bulej <pallas at kadan.cz>
+#	  - default value for PERTURB
+#	  - fixed small bug in RULE parser to correctly parse rules with
+#	    identical source and destination fields
+#	  - faster initial scanning of DEVICE fields
+# v0.7	- Lubomir Bulej <pallas at kadan.cz>
+#	  - lots of various cleanups and reorganizations; the parsing is now
+#	    some 40% faster, but the class ID must be in range 0x0002-0xffff
+#	    (again). Because of the number of internal changes and the above
+#	    class ID restriction, I bumped the version to 0.7 to indicate
+#	    something might have got broken :)
+#	  - changed PRIO_{U32,FW,ROUTE} to PRIO_{RULE,MARK,REALM}
+#	    for consistency with filter keywords
+#	  - exposed "compile" command
+#	- Catalin Petrescu <taz at dntis.ro>
+#	  - support for port masks in RULE (u32) filter
+#	- Jordan Vrtanoski <obeliks at mt.net.mk>
+#	  - support for week days in TIME rules
+# v0.6.4- Lubomir Bulej <pallas at kadan.cz>
+#	  - added PRIO_* variables to allow easy control of filter priorities
+#	  - added caching to speed up CBQ start, the cache is invalidated
+#	    whenever any of the configuration files changes
+#	  - updated the readme section + some cosmetic fixes
+# v0.6.3- Lubomir Bulej <pallas at kadan.cz>
+#	  - removed setup of (unnecessary) class 1:1 - all classes
+#	    now use qdisc's default class 1:0 as their parent
+#	  - minor fix in the timecheck branch - classes
+#	    without leaf qdisc were not updated
+#	  - minor fix to avoid timecheck failure when run
+#	    at time with minutes equal to 08 or 09
+#	  - respect CBQ_PATH setting in environment
+#	  - made PRIO=5 default, rendering it optional in configs
+#	  - added support for route filter, see notes about REALM keyword
+#	  - added support for fw filter, see notes about MARK keyword
+#	  - added filter display to "list" and "stats" commands
+#	  - readme section update + various cosmetic fixes
+# v0.6.2- Catalin Petrescu <taz at dntis.ro>
+#	  - added tunnels interface handling
+# v0.6.1- Pavel Golubev <pg at ksi-linux.com>
+#	  - added sch_prio module loading
+#	    (thanks johan at iglo.virtual.or.id for reminding)
+#	  - resolved errors resulting from stricter syntax checking in bash2
+#	- Lubomir Bulej <pallas at kadan.cz>
+#	  - various cosmetic fixes
+# v0.6	- Lubomir Bulej <pallas at kadan.cz>
+#	  - attempt to limit number of spawned processes by utilizing
+#	    more of sed power (use sed instead of grep+cut)
+#	  - simplified TIME parser, using bash builtins
+#	  - added initial support for SFQ as leaf qdisc
+#	  - reworked the documentation part a little
+#	  - incorporated pending patches and ideas submitted by
+#	    following people for versions 0.3 into version 0.6
+#	- Miguel Freitas <miguel at cetuc.puc-rio.br>
+#	  - in case of overlapping TIME parameters, the last match is taken
+#	- Juanjo Ciarlante <jjo at mendoza.gov.ar>
+#	  - chkconfig tags, list + stats startup parameters
+#	  - optional tc & ip command logging (into /var/run/cbq-*)
+#	- Rafal Maszkowski <rzm at icm.edu.pl>
+#	  - PEAK parameter for setting TBF's burst peak rate
+#	  - fix for many config files (use find instead of ls)
+# v0.5.1- Lubomir Bulej <pallas at kadan.cz>
+#	  - fixed little but serious bug in RULE parser
+# v0.5	- Lubomir Bulej <pallas at kadan.cz>
+#	  - added options PARENT, LEAF, ISOLATED and BOUNDED. This allows
+#	    (with some attention to config file ordering) for creating
+#	    hierarchical structures of shapers with classes able (or unable)
+#	    to borrow bandwidth from their parents.
+#	  - class ID check allows hexadecimal numbers
+#	  - rewritten & simplified RULE parser
+#	  - cosmetic changes to improve readability
+#	  - reorganization to avoid duplicate code (timecheck etc.)
+#	  - timecheck doesn't check classes without TIME fields anymore
+# v0.4  - Lubomir Bulej <pallas at kadan.cz>
+#	  - small bugfix in RULE parsing code
+#	  - simplified configuration parsing code
+#	  - several small cosmetic changes
+#	  - TIME parameter can be now specified more than once allowing you to
+#	    differentiate RATE throughout the whole day. Time overlapping is
+#	    not checked, first match is taken. Midnight wrap (eg. 20:00-6:00)
+#	    is allowed and taken care of.
+# v0.3a4- fixed small bug in IF operator. Thanks to
+#	  Rafal Maszkowski <rzm at icm.edu.pl>
+# v0.3a3- fixed grep bug when using more than 10 eth devices. Thanks to David
+#	  Trcka <trcka at poda.cz>.
+# v0.3a2- fixed bug in "if" operator. Thanks kad at dgtu.donetsk.ua.
+# v0.3a - added TIME parameter. Example: TIME=00:00-19:00;64Kbit/6Kbit
+#	  So, between 00:00 and 19:00 the RATE will be 64Kbit.
+#	  Just start "cbq.init timecheck" periodically from cron
+#	  (every 10 minutes for example). DON'T FORGET though, to run
+#	  "cbq.init start" for CBQ to initialize.
+# v0.2  - Some cosmetic changes. Now it is more compatible with old bash
+#	  version. Thanks to Stanislav V. Voronyi <stas at cnti.uanet.kharkov.ua>.
+# v0.1  - First public release
+#
+#
+# README
+# ------
+#
+# First of all - this is just a SIMPLE EXAMPLE of CBQ power.
+# Don't ask me "why" and "how" :)
+#
+# This script is meant to simplify setup and management of relatively simple
+# CBQ-based traffic control on Linux. Access to advanced networking features
+# of Linux kernel is provided by "ip" and "tc" utilities from A. Kuznetsov's
+# iproute2 package, available at ftp://ftp.inr.ac.ru/ip-routing. Because the
+# utilities serve primarily to translate user wishes to RTNETLINK commands,
+# their interface is rather spartan, intolerant and requires quite a lot of
+# typing. And typing is what this script attempts to reduce :)
+#
+# The advanced networking stuff in Linux is pretty flexible and this script
+# aims to bring some of its features to the not-so-hard-core Linux users. Of
+# course, there is a tradeoff between simplicity and flexibility and you may
+# realize that the flexibility suffered too much for your needs -- time to
+# face "ip" and "tc" interface.
+#
+# To speed up the "start" command, simple caching was introduced in version
+# 0.6.4. The caching works so that the sequence of "tc" commands for given
+# configuration is stored in a file (/var/cache/cbq.init by default) which
+# is used next time the "start" command is run to avoid repeated parsing of
+# configuration files. This cache is invalidated whenever any of the CBQ
+# configuration files changes. If you want to run "cbq.init start" without
+# caching, run it as "cbq.init start nocache". If you want to force cache
+# invalidation, run it as "cbq.init start invalidate". Caching is disabled
+# if you have logging enabled (ie. CBQ_DEBUG is not empty).
+#
+# If you only want cqb.init to translate your configuration to "tc" commands,
+# use "compile" command which will output "tc" commands required to build
+# your configuration. Bear in mind that "compile" does not check if the "tc"
+# commands were successful - this is done (in certain places) only when the
+# "start nocache" command is used, which is also useful when creating the
+# configuration to check whether it is completely valid.
+#
+# All CBQ parameters are valid for Ethernet interfaces only, The script was
+# tested on various Linux kernel versions from series 2.1 to 2.4 and several
+# distributions with KSI Linux (Nostromo version) as the premier one.
+#
+#
+# HOW DOES IT WORK?
+# -----------------
+#
+# Every traffic class must be described by a file in the $CBQ_PATH directory
+# (/etc/sysconfig/cbq by default) - one file per class.
+#
+# The config file names must obey mandatory format: cbq-<clsid>.<name> where
+# <clsid> is two-byte hexadecimal number in range <0002-FFFF> (which in fact
+# is a CBQ class ID) and <name> is the name of the class -- anything to help
+# you distinguish the configuration files. For small amount of classes it is
+# often possible (and convenient) to let <clsid> resemble bandwidth of the
+# class.
+#
+# Example of valid config name:
+#	cbq-1280.My_first_shaper
+#
+#
+# The configuration file may contain the following parameters:
+#
+### Device parameters
+#
+# DEVICE=<ifname>,<bandwidth>[,<weight>]	mandatory
+# DEVICE=eth0,10Mbit,1Mbit
+#
+#	<ifname> is the name of the interface you want to control
+#		traffic on, e.g. eth0
+#	<bandwidth> is the physical bandwidth of the device, e.g. for
+#		ethernet 10Mbit or 100Mbit, for arcnet 2Mbit
+#	<weight> is tuning parameter that should be proportional to
+#		<bandwidth>. As a rule of thumb: <weight> = <bandwidth> / 10
+#
+# When you have more classes on one interface, it is enough to specify
+# <bandwidth> [and <weight>] only once, therefore in other files you only
+# need to set DEVICE=<ifname>.
+#
+### Class parameters
+#
+# RATE=<speed>					mandatory
+# RATE=5Mbit
+#
+#	Bandwidth allocated to the class. Traffic going through the class is
+#	shaped to conform to specified rate. You can use Kbit, Mbit or bps,
+#	Kbps and Mbps as suffices. If you don't specify any unit, bits/sec
+#	are used. Also note that "bps" means "bytes per second", not bits.
+#
+# WEIGHT=<speed> 				mandatory
+# WEIGHT=500Kbit
+#
+#	Tuning parameter that should be proportional to RATE. As a rule
+#	of thumb, use WEIGHT ~= RATE / 10.
+#
+# PRIO=<1-8>					optional, default 5
+# PRIO=5
+#
+#	Priority of class traffic. The higher the number, the lesser
+#	the priority. Priority of 5 is just fine.
+#
+# PARENT=<clsid>				optional, default not set
+# PARENT=1280
+#
+#	Specifies ID of the parent class to which you want this class be
+#	attached. You might want to use LEAF=none for the parent class as
+#	mentioned below. By using this parameter and carefully ordering the
+#	configuration files, it is possible to create simple hierarchical
+#	structures of CBQ classes. The ordering is important so that parent
+#	classes are constructed prior to their children.
+#
+# LEAF=none|tbf|sfq				optional, default "tbf"
+#
+#	Tells the script to attach specified leaf queueing discipline to CBQ
+#	class. By default, TBF is used. Note that attaching TBF to CBQ class
+#	shapes the traffic to conform to TBF parameters and prevents the class
+#	from borrowing bandwidth from its parent even if you have BOUNDED set
+#	to "no". To allow the class to borrow bandwidth (provided it is not
+#	bounded), you must set LEAF to "none" or "sfq".
+#
+#	If you want to ensure (approximately) fair sharing of bandwidth among
+#	several hosts in the same class, you might want to specify LEAF=sfq to
+#	attach SFQ as leaf queueing discipline to that class.
+#
+# BOUNDED=yes|no				optional, default "yes"
+#
+#	If set to "yes", the class is not allowed to borrow bandwidth from
+#	its parent class in overlimit situation. If set to "no", the class
+#	will be allowed to borrow bandwidth from its parent.
+#
+# Note:	Don't forget to set LEAF to "none" or "sfq", otherwise the class will
+#	have TBF attached to itself and will not be able to borrow unused
+#	bandwidth from its parent.
+#
+# ISOLATED=yes|no				optional, default "no"
+#
+#	If set to "yes", the class will not lend unused bandwidth to
+#	its children.
+#
+### TBF qdisc parameters
+#
+# BUFFER=<bytes>[/<bytes>]			optional, default "10Kb/8"
+#
+#	This parameter controls the depth of the token bucket. In other
+#	words it represents the maximal burst size the class can send.
+#	The optional part of parameter is used to determine the length
+#	of intervals in packet sizes, for which the transmission times
+#	are kept.
+#
+# LIMIT=<bytes>					optional, default "15Kb"
+#
+#	This parameter determines the maximal length of backlog. If
+#	the queue contains more data than specified by LIMIT, the
+#	newly arriving packets are dropped. The length of backlog
+#	determines queue latency in case of congestion.
+#
+# PEAK=<speed>					optional, default not set
+#
+#	Maximal peak rate for short-term burst traffic. This allows you
+#	to control the absolute peak rate the class can send at, because
+#	single TBF that allows 256Kbit/s would of course allow rate of
+#	512Kbit for half a second or 1Mbit for a quarter of second.
+#
+# MTU=<bytes>  					optional, default "1500"
+#
+#	Maximum number of bytes that can be sent at once over the
+#	physical medium. This parameter is required when you specify
+#	PEAK parameter. It defaults to MTU of ethernet - for other
+#	media types you might want to change it.
+#
+# Note: Setting TBF as leaf qdisc will effectively prevent the class from
+#	borrowing bandwidth from the ancestor class, because even if the
+#	class allows more traffic to pass through, it is then shaped to
+#	conform to TBF.
+#
+### SFQ qdisc parameters
+#
+# The SFQ queueing discipline is a cheap way for sharing class bandwidth
+# among several hosts. As it is stochastic, the fairness is approximate but
+# it will do the job in most cases. If you want real fairness, you should
+# probably use WRR (weighted round robin) or WFQ queueing disciplines. Note
+# that SFQ does not do any traffic shaping - the shaping is done by the CBQ
+# class the SFQ is attached to.
+#
+# QUANTUM=<bytes>				optional, default not set
+#
+#	This parameter should not be set lower than link MTU, for ethernet
+#	it is 1500b, or (with MAC header) 1514b which is the value used
+#	in Alexey Kuznetsov's examples.
+#
+# PERTURB=<seconds>				optional, default "10"
+#
+#	Period of hash function perturbation. If unset, hash reconfiguration
+#	will never take place which is what you probably don't want. The
+#	default value of 10 seconds is probably a good one.
+#
+### Filter parameters
+#
+# RULE=[[saddr[/prefix]][:port[/mask]],][daddr[/prefix]][:port[/mask]]
+#
+#	These parameters make up "u32" filter rules that select traffic for
+#	each of the classes. You can use multiple RULE fields per config.
+#
+#	The optional port mask should only be used by advanced users who
+#	understand how the u32 filter works.
+#
+# Some examples:
+#
+#	RULE=10.1.1.0/24:80
+#		selects traffic going to port 80 in network 10.1.1.0
+#
+#	RULE=10.2.2.5
+#		selects traffic going to any port on single host 10.2.2.5
+#
+#	RULE=10.2.2.5:20/0xfffe
+#		selects traffic going to ports 20 and 21 on host 10.2.2.5
+#
+#	RULE=:25,10.2.2.128/26:5000
+#		selects traffic going from anywhere on port 50 to
+#		port 5000 in network 10.2.2.128
+#
+#	RULE=10.5.5.5:80,
+#		selects traffic going from port 80 of single host 10.5.5.5
+#
+#
+#
+# REALM=[srealm,][drealm]
+#
+#	These parameters make up "route" filter rules that classify traffic
+#	according to packet source/destination realms. For information about
+#	realms, see Alexey Kuznetsov's IP Command Reference. This script
+#	does not define any realms, it justs builds "tc filter" commands
+#	for you if you need to classify traffic this way.
+#
+#	Realm is either a decimal number or a string referencing entry in
+#	/etc/iproute2/rt_realms (usually).
+#
+# Some examples:
+#
+#	REALM=russia,internet
+#		selects traffic going from realm "russia" to realm "internet"
+#
+#	REALM=freenet,
+#		selects traffic going from realm "freenet"
+#
+#	REALM=10
+#		selects traffic going to realm 10
+#
+#
+#
+# MARK=<mark>
+#
+#	These parameters make up "fw" filter rules that select traffic for
+#	each of the classes according to firewall "mark". Mark is a decimal
+#	number packets are tagged with if firewall rules say so. You can
+#	use multiple MARK fields per config.
+#
+#
+# Note: Rules for different filter types can be combined. Attention must be
+#	paid to the priority of filter rules, which can be set below using
+#	PRIO_{RULE,MARK,REALM} variables.
+#
+### Time ranging parameters
+#
+# TIME=[<dow>,<dow>, ...,<dow>/]<from>-<till>;<rate>/<weight>[/<peak>]
+# TIME=0,1,2,5/18:00-06:00;256Kbit/25Kbit
+# TIME=60123/18:00-06:00;256Kbit/25Kbit
+# TIME=18:00-06:00;256Kbit/25Kbit
+#
+#	This parameter allows you to differentiate the class bandwidth
+#	throughout the day. You can specify multiple TIME parameters, if
+#	the times overlap, last match is taken. The fields <rate>, <weight>
+#	and <peak> correspond to parameters RATE, WEIGHT and PEAK (which
+#	is optional and applies to TBF leaf qdisc only).
+#
+#	You can also specify days of week when the TIME rule applies. <dow>
+#	is numeric, 0 corresponds to sunday, 1 corresponds to monday, etc.
+#
+###
+#
+# Sample configuration file: cbq-1280.My_first_shaper
+#
+# --------------------------------------------------------------------------
+# DEVICE=eth0,10Mbit,1Mbit
+# RATE=128Kbit
+# WEIGHT=10Kbit
+# PRIO=5
+# RULE=192.128.1.0/24
+# --------------------------------------------------------------------------
+#
+# The configuration says that we will control traffic on 10Mbit ethernet
+# device eth0 and the traffic going to network 192.168.1.0 will be
+# processed with priority 5 and shaped to rate of 128Kbit.
+#
+# Note that you can control outgoing traffic only. If you want to control
+# traffic in both directions, you must set up CBQ for both interfaces.
+#
+# Consider the following example:
+#
+#                    +---------+      192.168.1.1
+# BACKBONE -----eth0-|  linux  |-eth1------*-[client]
+#                    +---------+
+#
+# Imagine you want to shape traffic from backbone to the client to 28Kbit
+# and traffic in the opposite direction to 128Kbit. You need to setup CBQ
+# on both eth0 and eth1 interfaces, thus you need two config files:
+#
+# cbq-028.backbone-client
+# --------------------------------------------------------------------------
+# DEVICE=eth1,10Mbit,1Mbit
+# RATE=28Kbit
+# WEIGHT=2Kbit
+# PRIO=5
+# RULE=192.168.1.1
+# --------------------------------------------------------------------------
+#
+# cbq-128.client-backbone
+# --------------------------------------------------------------------------
+# DEVICE=eth0,10Mbit,1Mbit
+# RATE=128Kbit
+# WEIGHT=10Kbit
+# PRIO=5
+# RULE=192.168.1.1,
+# --------------------------------------------------------------------------
+#
+# Pay attention to comma "," in the RULE field - it denotes source address!
+#
+# Enjoy.
+#
+#############################################################################
+
+export LC_ALL=C
+
+### Command locations
+TC=/sbin/tc
+IP=/sbin/ip
+MP=/sbin/modprobe
+
+### Default filter priorities (must be different)
+PRIO_RULE_DEFAULT=${PRIO_RULE:-100}
+PRIO_MARK_DEFAULT=${PRIO_MARK:-200}
+PRIO_REALM_DEFAULT=${PRIO_REALM:-300}
+
+### Default CBQ_PATH & CBQ_CACHE settings
+CBQ_PATH=${CBQ_PATH:-/etc/sysconfig/cbq}
+CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}
+
+### Uncomment to enable logfile for debugging
+#CBQ_DEBUG="/var/run/cbq-$1"
+
+### Modules to probe for. Uncomment the last CBQ_PROBE
+### line if you have QoS support compiled into kernel
+CBQ_PROBE="sch_cbq sch_tbf sch_sfq sch_prio"
+CBQ_PROBE="$CBQ_PROBE cls_fw cls_u32 cls_route"
+#CBQ_PROBE=""
+
+### Keywords required for qdisc & class configuration
+CBQ_WORDS="DEVICE|RATE|WEIGHT|PRIO|PARENT|LEAF|BOUNDED|ISOLATED"
+CBQ_WORDS="$CBQ_WORDS|PRIO_MARK|PRIO_RULE|PRIO_REALM|BUFFER"
+CBQ_WORDS="$CBQ_WORDS|LIMIT|PEAK|MTU|QUANTUM|PERTURB"
+
+### Source AVPKT if it exists
+[ -r /etc/sysconfig/cbq/avpkt ] && . /etc/sysconfig/cbq/avpkt
+AVPKT=${AVPKT:-3000}
+
+
+#############################################################################
+############################# SUPPORT FUNCTIONS #############################
+#############################################################################
+
+### Get list of network devices
+cbq_device_list () {
+	ip link show| sed -n "/^[0-9]/ \
+		{ s/^[0-9]\+: \([a-z0-9._]\+\)[:@].*/\1/; p; }"
+} # cbq_device_list
+
+
+### Remove root class from device $1
+cbq_device_off () {
+	tc qdisc del dev $1 root 2> /dev/null
+} # cbq_device_off
+
+
+### Remove CBQ from all devices
+cbq_off () {
+	for dev in `cbq_device_list`; do
+		cbq_device_off $dev
+	done
+} # cbq_off
+
+
+### Prefixed message
+cbq_message () {
+	echo -e "**CBQ: $*"
+} # cbq_message
+
+### Failure message
+cbq_failure () {
+	cbq_message "$@"
+	exit 1
+} # cbq_failure
+
+### Failure w/ cbq-off
+cbq_fail_off () {
+	cbq_message "$@"
+	cbq_off
+	exit 1
+} # cbq_fail_off
+
+
+### Convert time to absolute value
+cbq_time2abs () {
+	local min=${1##*:}; min=${min##0}
+	local hrs=${1%%:*}; hrs=${hrs##0}
+	echo $[hrs*60 + min]
+} # cbq_time2abs
+
+
+### Display CBQ setup
+cbq_show () {
+	for dev in `cbq_device_list`; do
+		[ "`tc qdisc show dev $dev| wc -l`" -eq 0 ] && continue
+		echo -e "### $dev: queueing disciplines\n"
+		tc $1 qdisc show dev $dev; echo
+
+		[ "`tc class show dev $dev| wc -l`" -eq 0 ] && continue
+		echo -e "### $dev: traffic classes\n"
+		tc $1 class show dev $dev; echo
+
+		[ "`tc filter show dev $dev| wc -l`" -eq 0 ] && continue
+		echo -e "### $dev: filtering rules\n"
+		tc $1 filter show dev $dev; echo
+	done
+} # cbq_show
+
+
+### Check configuration and load DEVICES, DEVFIELDS and CLASSLIST from $1
+cbq_init () {
+	### Get a list of configured classes
+	CLASSLIST=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \
+		-not -name '*~' -printf "%f\n"| sort`
+	[ -z "$CLASSLIST" ] &&
+		cbq_failure "no configuration files found in $1!"
+
+	### Gather all DEVICE fields from $1/cbq-*
+	DEVFIELDS=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \
+		  -not -name '*~' -print0 | xargs -0 sed -n 's/#.*//; \
+		  s/[[:space:]]//g; /^DEVICE=[^,]*,[^,]*\(,[^,]*\)\?/ \
+		  { s/.*=//; p; }'| sort -u`
+	[ -z "$DEVFIELDS" ] &&
+		cbq_failure "no DEVICE field found in $1/cbq-*!"
+
+	### Check for different DEVICE fields for the same device
+	DEVICES=`echo "$DEVFIELDS"| sed 's/,.*//'| sort -u`
+	[ "`echo "$DEVICES"| wc -l`" -ne "`echo "$DEVFIELDS"| wc -l`" ] &&
+		cbq_failure "different DEVICE fields for single device!\n$DEVFIELDS"
+} # cbq_init
+
+
+### Load class configuration from $1/$2
+cbq_load_class () {
+	CLASS=`echo $2| sed 's/^cbq-0*//; s/^\([0-9a-fA-F]\+\).*/\1/'`
+	CFILE=`sed -n 's/#.*//; s/[[:space:]]//g; /^[[:alnum:]_]\+=[[:alnum:].,:;/*@-_]\+$/ p' $1/$2`
+
+	### Check class number
+	IDVAL=`/usr/bin/printf "%d" 0x$CLASS 2> /dev/null`
+	[ $? -ne 0 -o $IDVAL -lt 2 -o $IDVAL -gt 65535 ] &&
+		cbq_fail_off "class ID of $2 must be in range <0002-FFFF>!"
+
+	### Set defaults & load class
+	RATE=""; WEIGHT=""; PARENT=""; PRIO=5
+	LEAF=tbf; BOUNDED=yes; ISOLATED=no
+	BUFFER=10Kb/8; LIMIT=15Kb; MTU=1500
+	PEAK=""; PERTURB=10; QUANTUM=""
+
+	PRIO_RULE=$PRIO_RULE_DEFAULT
+	PRIO_MARK=$PRIO_MARK_DEFAULT
+	PRIO_REALM=$PRIO_REALM_DEFAULT
+
+	eval "`echo "$CFILE"| grep -E "^($CBQ_WORDS)="`"
+
+	### Require RATE/WEIGHT
+	[ -z "$RATE" -o -z "$WEIGHT" ] &&
+		cbq_fail_off "missing RATE or WEIGHT in $2!"
+
+	### Class device
+	DEVICE=${DEVICE%%,*}
+	[ -z "$DEVICE" ] && cbq_fail_off "missing DEVICE field in $2!"
+
+	BANDWIDTH=`echo "$DEVFIELDS"| sed -n "/^$DEVICE,/ \
+		  { s/[^,]*,\([^,]*\).*/\1/; p; q; }"`
+
+	### Convert to "tc" options
+	PEAK=${PEAK:+peakrate $PEAK}
+	PERTURB=${PERTURB:+perturb $PERTURB}
+	QUANTUM=${QUANTUM:+quantum $QUANTUM}
+
+	[ "$BOUNDED" = "no" ] && BOUNDED="" || BOUNDED="bounded"
+	[ "$ISOLATED" = "yes" ] && ISOLATED="isolated" || ISOLATED=""
+} # cbq_load_class
+
+
+#############################################################################
+#################################### INIT ###################################
+#############################################################################
+
+### Check for presence of ip-route2 in usual place
+[ -x $TC -a -x $IP ] ||
+	cbq_failure "ip-route2 utilities not installed or executable!"
+
+
+### ip/tc wrappers
+if [ "$1" = "compile" ]; then
+	### no module probing
+	CBQ_PROBE=""
+
+	ip () {
+		$IP "$@"
+	} # ip
+
+	### echo-only version of "tc" command
+	tc () {
+		echo "$TC $*"
+	} # tc
+
+elif [ -n "$CBQ_DEBUG" ]; then
+	echo -e "# `date`" > $CBQ_DEBUG
+
+	### Logging version of "ip" command
+	ip () {
+		echo -e "\n# ip $*" >> $CBQ_DEBUG
+		$IP "$@" 2>&1 | tee -a $CBQ_DEBUG
+	} # ip
+
+	### Logging version of "tc" command
+	tc () {
+		echo -e "\n# tc $*" >> $CBQ_DEBUG
+		$TC "$@" 2>&1 | tee -a $CBQ_DEBUG
+	} # tc
+else
+	### Default wrappers
+	
+	ip () {
+		$IP "$@"
+	} # ip
+	
+	tc () {
+		$TC "$@"
+	} # tc
+fi # ip/tc wrappers
+
+
+case "$1" in
+
+#############################################################################
+############################### START/COMPILE ###############################
+#############################################################################
+
+start|compile)
+
+### Probe QoS modules (start only)
+for module in $CBQ_PROBE; do
+	$MP $module || cbq_failure "failed to load module $module"
+done
+
+### If we are in compile/nocache/logging mode, don't bother with cache
+if [ "$1" != "compile" -a "$2" != "nocache" -a -z "$CBQ_DEBUG" ]; then
+	VALID=1
+
+	### validate the cache
+	[ "$2" = "invalidate" -o ! -f $CBQ_CACHE ] && VALID=0
+	if [ $VALID -eq 1 ]; then
+		[ "`find $CBQ_PATH -maxdepth 1 -newer $CBQ_CACHE| \
+		  wc -l`" -gt 0 ] && VALID=0
+	fi
+
+	### compile the config if the cache is invalid
+	if [ $VALID -ne 1 ]; then
+		$0 compile > $CBQ_CACHE ||
+			cbq_fail_off "failed to compile CBQ configuration!"
+	fi
+
+	### run the cached commands
+	exec /bin/sh $CBQ_CACHE 2> /dev/null
+fi
+
+### Load DEVICES, DEVFIELDS and CLASSLIST
+cbq_init $CBQ_PATH
+
+
+### Setup root qdisc on all configured devices
+for dev in $DEVICES; do
+	### Retrieve device bandwidth and, optionally, weight
+	DEVTEMP=`echo "$DEVFIELDS"| sed -n "/^$dev,/ { s/$dev,//; p; q; }"`
+	DEVBWDT=${DEVTEMP%%,*};	DEVWGHT=${DEVTEMP##*,}
+	[ "$DEVBWDT" = "$DEVWGHT" ] && DEVWGHT=""
+
+	### Device bandwidth is required
+	if [ -z "$DEVBWDT" ]; then
+		cbq_message "could not determine bandwidth for device $dev!"
+		cbq_failure "please set up the DEVICE fields properly!"
+	fi
+
+	### Check if the device is there
+	ip link show $dev &> /dev/null ||
+		cbq_fail_off "device $dev not found!"
+
+	### Remove old root qdisc from device
+	cbq_device_off $dev
+
+
+	### Setup root qdisc + class for device
+	tc qdisc add dev $dev root handle 1 cbq \
+	bandwidth $DEVBWDT avpkt $AVPKT cell 8
+
+	### Set weight of the root class if set
+	[ -n "$DEVWGHT" ] &&
+		tc class change dev $dev root cbq weight $DEVWGHT allot 1514
+
+	[ "$1" = "compile" ] && echo
+done # dev
+
+
+### Setup traffic classes
+for classfile in $CLASSLIST; do
+	cbq_load_class $CBQ_PATH $classfile
+
+	### Create the class
+	tc class add dev $DEVICE parent 1:$PARENT classid 1:$CLASS cbq \
+	bandwidth $BANDWIDTH rate $RATE weight $WEIGHT prio $PRIO \
+	allot 1514 cell 8 maxburst 20 avpkt $AVPKT $BOUNDED $ISOLATED ||
+		cbq_fail_off "failed to add class $CLASS with parent $PARENT on $DEVICE!"
+
+	### Create leaf qdisc if set
+	if [ "$LEAF" = "tbf" ]; then
+		tc qdisc add dev $DEVICE parent 1:$CLASS handle $CLASS tbf \
+		rate $RATE buffer $BUFFER limit $LIMIT mtu $MTU $PEAK
+	elif [ "$LEAF" = "sfq" ]; then
+		tc qdisc add dev $DEVICE parent 1:$CLASS handle $CLASS sfq \
+		$PERTURB $QUANTUM
+	fi
+
+
+	### Create fw filter for MARK fields
+	for mark in `echo "$CFILE"| sed -n '/^MARK/ { s/.*=//; p; }'`; do
+		### Attach fw filter to root class
+		tc filter add dev $DEVICE parent 1:0 protocol ip \
+		prio $PRIO_MARK handle $mark fw classid 1:$CLASS
+	done ### mark
+
+	### Create route filter for REALM fields
+	for realm in `echo "$CFILE"| sed -n '/^REALM/ { s/.*=//; p; }'`; do
+		### Split realm into source & destination realms
+		SREALM=${realm%%,*}; DREALM=${realm##*,}
+		[ "$SREALM" = "$DREALM" ] && SREALM=""
+
+		### Convert asterisks to empty strings
+		SREALM=${SREALM#\*}; DREALM=${DREALM#\*}
+
+		### Attach route filter to the root class
+		tc filter add dev $DEVICE parent 1:0 protocol ip \
+		prio $PRIO_REALM route ${SREALM:+from $SREALM} \
+		${DREALM:+to $DREALM} classid 1:$CLASS
+	done ### realm
+
+	### Create u32 filter for RULE fields
+	for rule in `echo "$CFILE"| sed -n '/^RULE/ { s/.*=//; p; }'`; do
+		### Split rule into source & destination
+		SRC=${rule%%,*}; DST=${rule##*,}
+		[ "$SRC" = "$rule" ] && SRC=""
+
+
+		### Split destination into address, port & mask fields
+		DADDR=${DST%%:*}; DTEMP=${DST##*:}
+		[ "$DADDR" = "$DST" ] && DTEMP=""
+
+		DPORT=${DTEMP%%/*}; DMASK=${DTEMP##*/}
+		[ "$DPORT" = "$DTEMP" ] && DMASK="0xffff"
+
+
+		### Split up source (if specified)
+		SADDR=""; SPORT=""
+		if [ -n "$SRC" ]; then
+			SADDR=${SRC%%:*}; STEMP=${SRC##*:}
+			[ "$SADDR" = "$SRC" ] && STEMP=""
+
+			SPORT=${STEMP%%/*}; SMASK=${STEMP##*/}
+			[ "$SPORT" = "$STEMP" ] && SMASK="0xffff"
+		fi
+
+
+		### Convert asterisks to empty strings
+		SADDR=${SADDR#\*}; DADDR=${DADDR#\*}
+
+		### Compose u32 filter rules
+		u32_s="${SPORT:+match ip sport $SPORT $SMASK}"
+		u32_s="${SADDR:+match ip src $SADDR} $u32_s"
+		u32_d="${DPORT:+match ip dport $DPORT $DMASK}"
+		u32_d="${DADDR:+match ip dst $DADDR} $u32_d"
+
+		### Uncomment the following if you want to see parsed rules
+		#echo "$rule: $u32_s $u32_d"
+
+		### Attach u32 filter to the appropriate class
+		tc filter add dev $DEVICE parent 1:0 protocol ip \
+		prio $PRIO_RULE u32 $u32_s $u32_d classid 1:$CLASS
+	done ### rule
+
+	[ "$1" = "compile" ] && echo
+done ### classfile
+;;
+
+
+#############################################################################
+################################# TIME CHECK ################################
+#############################################################################
+
+timecheck)
+
+### Get time + weekday
+TIME_TMP=`date +%w/%k:%M`
+TIME_DOW=${TIME_TMP%%/*}
+TIME_NOW=${TIME_TMP##*/}
+
+### Load DEVICES, DEVFIELDS and CLASSLIST
+cbq_init $CBQ_PATH
+
+### Run through all classes
+for classfile in $CLASSLIST; do
+	### Gather all TIME rules from class config
+	TIMESET=`sed -n 's/#.*//; s/[[:space:]]//g; /^TIME/ { s/.*=//; p; }' \
+		$CBQ_PATH/$classfile`
+	[ -z "$TIMESET" ] && continue
+
+	MATCH=0; CHANGE=0
+	for timerule in $TIMESET; do
+		TIME_ABS=`cbq_time2abs $TIME_NOW`
+		
+		### Split TIME rule to pieces
+		TIMESPEC=${timerule%%;*}; PARAMS=${timerule##*;}
+		WEEKDAYS=${TIMESPEC%%/*}; INTERVAL=${TIMESPEC##*/}
+		BEG_TIME=${INTERVAL%%-*}; END_TIME=${INTERVAL##*-}
+
+		### Check the day-of-week (if present)
+		[ "$WEEKDAYS" != "$INTERVAL" -a \
+		  -n "${WEEKDAYS##*$TIME_DOW*}" ] && continue
+
+		### Compute interval boundaries
+		BEG_ABS=`cbq_time2abs $BEG_TIME`
+		END_ABS=`cbq_time2abs $END_TIME`
+
+		### Midnight wrap fixup
+		if [ $BEG_ABS -gt $END_ABS ]; then
+			[ $TIME_ABS -le $END_ABS ] &&
+				TIME_ABS=$[TIME_ABS + 24*60]
+
+			END_ABS=$[END_ABS + 24*60]
+		fi
+
+		### If the time matches, remember params and set MATCH flag
+		if [ $TIME_ABS -ge $BEG_ABS -a $TIME_ABS -lt $END_ABS ]; then
+			TMP_RATE=${PARAMS%%/*}; PARAMS=${PARAMS#*/}
+			TMP_WGHT=${PARAMS%%/*}; TMP_PEAK=${PARAMS##*/}
+
+			[ "$TMP_PEAK" = "$TMP_WGHT" ] && TMP_PEAK=""
+			TMP_PEAK=${TMP_PEAK:+peakrate $TMP_PEAK}
+
+			MATCH=1
+		fi
+	done ### timerule
+
+
+	cbq_load_class $CBQ_PATH $classfile
+
+	### Get current RATE of CBQ class
+	RATE_NOW=`tc class show dev $DEVICE| sed -n \
+		 "/cbq 1:$CLASS / { s/.*rate //; s/ .*//; p; q; }"`
+	[ -z "$RATE_NOW" ] && continue
+
+	### Time interval matched
+	if [ $MATCH -ne 0 ]; then
+
+		### Check if there is any change in class RATE
+		if [ "$RATE_NOW" != "$TMP_RATE" ]; then
+			NEW_RATE="$TMP_RATE"
+			NEW_WGHT="$TMP_WGHT"
+			NEW_PEAK="$TMP_PEAK"
+			CHANGE=1
+		fi
+
+	### Match not found, reset to default RATE if necessary
+	elif [ "$RATE_NOW" != "$RATE" ]; then
+		NEW_WGHT="$WEIGHT"
+		NEW_RATE="$RATE"
+		NEW_PEAK="$PEAK"
+		CHANGE=1
+	fi
+
+	### If there are no changes, go for next class
+	[ $CHANGE -eq 0 ] && continue
+
+	### Replace CBQ class
+	tc class replace dev $DEVICE classid 1:$CLASS cbq \
+	bandwidth $BANDWIDTH rate $NEW_RATE weight $NEW_WGHT prio $PRIO \
+	allot 1514 cell 8 maxburst 20 avpkt $AVPKT $BOUNDED $ISOLATED
+
+	### Replace leaf qdisc (if any)
+	if [ "$LEAF" = "tbf" ]; then
+		tc qdisc replace dev $DEVICE handle $CLASS tbf \
+		rate $NEW_RATE buffer $BUFFER limit $LIMIT mtu $MTU $NEW_PEAK
+	fi
+
+	cbq_message "$TIME_NOW: class $CLASS on $DEVICE changed rate ($RATE_NOW -> $NEW_RATE)"
+done ### class file
+;;
+
+
+#############################################################################
+################################## THE REST #################################
+#############################################################################
+
+stop)
+	cbq_off
+	;;
+
+list)
+	cbq_show
+	;;
+
+stats)
+	cbq_show -s
+	;;
+
+restart)
+	shift
+	$0 stop
+	$0 start "$@"
+	;;
+
+*)
+	echo "Usage: `basename $0` {start|compile|stop|restart|timecheck|list|stats}"
+esac

examples/cbqinit.eth1

@@ -0,0 +1,76 @@
+#! /bin/sh
+
+TC=/home/root/tc
+IP=/home/root/ip
+DEVICE=eth1
+BANDWIDTH="bandwidth 10Mbit"
+
+# Attach CBQ on $DEVICE. It will have handle 1:.
+#   $BANDWIDTH is real $DEVICE bandwidth (10Mbit).
+#   avpkt is average packet size.
+#   mpu is minimal packet size.
+
+$TC qdisc add dev $DEVICE  root  handle 1:  cbq \
+$BANDWIDTH avpkt 1000 mpu 64
+
+# Create root class with classid 1:1. This step is not necessary.
+#   bandwidth is the same as on CBQ itself.
+#   rate == all the bandwidth
+#   allot is MTU + MAC header
+#   maxburst measure allowed class burstiness (please,read S.Floyd and VJ papers)
+#   est 1sec 8sec means, that kernel will evaluate average rate
+#                 on this class with period 1sec and time constant 8sec.
+#                 This rate is viewed with "tc -s class ls dev $DEVICE"
+
+$TC class add dev $DEVICE parent 1:0 classid :1 est 1sec 8sec cbq \
+$BANDWIDTH rate 10Mbit allot 1514 maxburst 50 avpkt 1000
+
+# Bulk.
+#    New parameters are: 
+#    weight, which is set to be proportional to
+#            "rate". It is not necessary, weight=1 will work as well.
+#    defmap and split say that best effort ttraffic, not classfied
+#            by another means will fall to this class.
+
+$TC class add dev $DEVICE parent 1:1 classid :2 est 1sec 8sec cbq \
+$BANDWIDTH rate 4Mbit allot 1514 weight 500Kbit \
+prio 6 maxburst 50 avpkt 1000 split 1:0 defmap ff3d
+
+# OPTIONAL.
+# Attach "sfq" qdisc to this class, quantum is MTU, perturb
+# gives period of hash function perturbation in seconds.
+#
+$TC qdisc add dev $DEVICE parent 1:2 sfq quantum 1514b perturb 15
+
+# Interactive-burst class
+
+$TC class add dev $DEVICE parent 1:1 classid :3 est 2sec 16sec cbq \
+$BANDWIDTH rate 1Mbit allot 1514 weight 100Kbit \
+prio 2 maxburst 100 avpkt 1000 split 1:0 defmap c0
+
+$TC qdisc add dev $DEVICE parent 1:3 sfq quantum 1514b perturb 15
+
+# Background.
+
+$TC class add dev $DEVICE parent 1:1 classid :4 est 1sec 8sec cbq \
+  $BANDWIDTH rate 100Kbit allot 1514 weight 10Mbit \
+  prio 7 maxburst 10 avpkt 1000 split 1:0 defmap 2
+
+$TC qdisc add dev $DEVICE parent 1:4 sfq quantum 1514b perturb 15
+
+# Realtime class for RSVP
+
+$TC class add dev $DEVICE parent 1:1 classid 1:7FFE cbq \
+rate 5Mbit $BANDWIDTH allot 1514b avpkt 1000 \
+maxburst 20
+
+# Reclassified realtime traffic
+#
+# New element: split is not 1:0, but 1:7FFE. It means,
+#     that only real-time packets, which violated policing filters
+#     or exceeded reshaping buffers will fall to it.
+
+$TC class add dev $DEVICE parent 1:7FFE classid 1:7FFF  est 4sec 32sec cbq \
+rate 1Mbit $BANDWIDTH allot 1514b avpkt 1000 weight 10Kbit \
+prio 6 maxburst 10 split 1:7FFE defmap ffff
+

examples/dhcp-client-script

@@ -0,0 +1,446 @@
+#!/bin/bash
+#
+# dhclient-script for Linux.
+#
+#		This program is free software; you can redistribute it and/or
+#		modify it under the terms of the GNU General Public License
+#		as published by the Free Software Foundation; either version
+#		2 of the License, or (at your option) any later version.
+#
+# Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+#
+# Probably, I did not understand, what this funny feature as "alias"
+# means exactly. For now I suppose, that it is a static address, which
+# we should install and preserve.
+#
+
+exec >> /var/log/DHS.log 2>&1
+
+echo dhc-script $* reason=$reason
+set | grep "^\(old_\|new_\|check_\)"
+
+LOG () {
+    echo LOG $* ;
+}
+
+# convert 8bit mask to length
+# arg: $1 = mask
+#
+Mask8ToLen() {
+	local l=0;
+
+	while [ $l -le 7 ]; do
+		if [ $[ ( 1 << $l ) + $1 ] -eq 256 ]; then
+			return	$[ 8 - $l ]
+		fi
+		l=$[ $l + 1 ]
+	done
+	return 0;
+}
+
+# convert inet dotted quad mask to length
+# arg: $1 = dotquad mask
+#
+MaskToLen() {
+ local masklen=0
+ local mask8=$1
+
+ case $1 in
+ 0.0.0.0)
+	return 0;
+	;;
+ 255.*.0.0)
+	masklen=8
+	mask8=${mask8#255.}
+	mask8=${mask8%.0.0}
+	;;
+ 255.255.*.0)
+	masklen=16
+	mask8=${mask8#255.255.}
+	mask8=${mask8%.0}
+	;;
+ 255.255.255.*)
+	masklen=24
+	mask8=${mask8#255.255.255.}
+	;;
+ *)
+	return 255
+	;;
+ esac
+ Mask8ToLen $mask8
+ return $[ $? + $masklen ]
+}
+
+# calculate ABC "natural" mask
+# arg: $1 = dotquad address
+#
+ABCMask () {
+ local class;
+
+ class=${1%%.*}
+
+ if [ "$1" = "255.255.255.255" ]; then
+    echo $1
+ elif [ "$1" = "0.0.0.0" ]; then
+    echo $1
+ elif [ $class -ge 224 ]; then
+    echo 240.0.0.0
+ elif [ $class -ge 192 ]; then
+    echo 255.255.255.0
+ elif [ $class -ge 128 ]; then
+    echo 255.255.0.0
+ else
+    echo 255.0.0.0
+ fi
+}
+
+# calculate ABC "natural" mask length
+# arg: $1 = dotquad address
+#
+ABCMaskLen () {
+ local class;
+
+ class=${1%%.*}
+
+ if [ "$1" = "255.255.255.255" ]; then
+    return 32
+ elif [ "$1" = "0.0.0.0" ]; then
+    return 0
+ elif [ $class -ge 224 ]; then
+    return 4;
+ elif [ $class -ge 192 ]; then
+    return 24;
+ elif [ $class -ge 128 ]; then
+    return 16;
+ else
+    return 8;
+ fi
+}
+
+# Delete IP address
+# args: $1 = interface
+#       $2 = address
+#       $3 = mask
+#       $4 = broadcast
+#       $5 = label
+#
+DelINETAddr () {
+  local masklen=32
+  local addrid=$1
+
+  LOG DelINETAddr $*
+
+  if [ "$5" ]; then
+    addrid=$addrid:$5
+  fi
+  LOG ifconfig $addrid down
+  ifconfig $addrid down
+}
+
+# Add IP address
+# args: $1 = interface
+#       $2 = address
+#       $3 = mask
+#       $4 = broadcast
+#       $5 = label
+#
+AddINETAddr () {
+  local mask_arg
+  local brd_arg
+  local addrid=$1
+
+  LOG AddINETAddr $*
+
+  if [ "$5" ]; then
+    addrid=$addrid:$5
+  fi
+  if [ "$3" ]; then
+    mask_arg="netmask $3"
+  fi
+  if [ "$4" ]; then
+    brd_arg="broadcast $4"
+  fi
+
+  LOG ifconfig $addrid $2 $mask_arg $brd_arg up
+  ifconfig $addrid $2 $mask_arg $brd_arg up
+}
+
+# Add default routes
+# args: $1 = routers list
+#
+AddDefaultRoutes() {
+    local router
+
+    if [ "$1" ]; then
+      LOG AddDefaultRoutes $*
+      for router in $1; do
+        LOG route add default gw $router
+        route add default gw $router
+      done ;
+    fi
+}
+
+# Delete default routes
+# args: $1 = routers list
+#
+DelDefaultRoutes() {
+    local router
+
+    if [ "$1" ]; then
+      LOG DelDefaultRoutes $*
+
+      for router in $1; do
+        LOG route del default gw $router
+        route del default gw $router
+      done
+    fi
+}
+
+# ping a host
+# args: $1 = dotquad address of the host
+#
+PingNode() {
+    LOG PingNode $*
+    if ping -q -c 1 -w 2 $1 ; then
+	return 0;
+    fi
+    return 1;
+}
+
+# Check (and add route, if alive) default routers
+# args: $1 = routers list
+# returns: 0 if at least one router is alive.
+#
+CheckRouterList() {
+    local router
+    local succeed=1
+
+    LOG CheckRouterList $*
+
+    for router in $1; do
+      if PingNode $router ; then
+	succeed=0
+        route add default gw $router
+      fi
+    done
+    return $succeed
+}
+
+# Delete/create static routes.
+# args: $1 = operation (del/add)
+#       $2 = routes list in format "dst1 nexthop1 dst2 ..."
+#
+# BEWARE: this feature of DHCP is obsolete, because does not
+#         support subnetting.
+#
+X-StaticRouteList() {
+    local op=$1
+    local lst="$2"
+    local masklen
+
+    LOG X-StaticRouteList $*
+
+    if [ "$lst" ]; then
+      set $lst
+      while [ $# -gt 1 ]; do
+	route $op -net $1 netmask `ABCMask "$1"` gw $2
+	shift; shift;
+      done
+   fi
+}
+
+# Create static routes.
+# arg: $1 = routes list in format "dst1 nexthop1 dst2 ..."
+#
+AddStaticRouteList() {
+    LOG AddStaticRouteList $*
+    X-StaticRouteList add "$1"
+}
+
+# Delete static routes.
+# arg: $1 = routes list in format "dst1 nexthop1 dst2 ..."
+#
+DelStaticRouteList() {
+    LOG DelStaticRouteList $*
+    X-StaticRouteList del "$1"
+}
+
+# Broadcast unsolicited ARP to update neighbours' caches.
+# args: $1 = interface
+#       $2 = address
+#
+UnsolicitedARP() {
+    if [ -f /sbin/arping ]; then
+	/sbin/arping -A -c 1 -I "$1" "$2" &
+	(sleep 2 ; /sbin/arping -U -c 1 -I "$1" "$2" ) &
+    fi
+}
+
+# Duplicate address detection.
+# args: $1 = interface
+#       $2 = test address
+# returns: 0, if DAD succeeded.
+DAD() {
+  if [ -f /sbin/arping ]; then
+	/sbin/arping -c 2 -w 3 -D -I "$1" "$2"
+	return $?
+  fi
+  return 0
+}
+
+
+# Setup resolver.
+# args: NO
+#       domain and nameserver list are passed in global variables.
+#
+# NOTE: we try to be careful and not to break user supplied resolv.conf.
+#       The script mangles it, only if it has dhcp magic signature.
+#
+UpdateDNS() {
+    local nameserver
+    local idstring="#### Generated by DHCPCD"
+
+    LOG UpdateDNS $*
+
+    if [ "$new_domain_name" = "" -a "$new_domain_name_servers" = "" ]; then
+	return 0;
+    fi
+
+    echo $idstring > /etc/resolv.conf.dhcp
+    if [ "$new_domain_name" ]; then
+	echo search $new_domain_name >> /etc/resolv.conf.dhcp
+    fi
+    echo options ndots:1 >> /etc/resolv.conf.dhcp
+
+    if [ "$new_domain_name_servers" ]; then
+	for nameserver in $new_domain_name_servers; do
+	    echo nameserver $nameserver >> /etc/resolv.conf.dhcp
+	done
+    else
+	echo nameserver 127.0.0.1 >> /etc/resolv.conf.dhcp
+    fi
+
+    if [ -f /etc/resolv.conf ]; then
+	if [ "`head -1 /etc/resolv.conf`" != "$idstring" ]; then
+	    return 0
+	fi
+	if [ "$old_domain_name" = "$new_domain_name" -a
+	     "$new_domain_name_servers" = "$old_domain_name_servers" ]; then
+	     return 0
+	fi
+    fi
+    mv /etc/resolv.conf.dhcp /etc/resolv.conf
+}
+
+case $reason in
+NBI)
+  exit 1
+  ;;
+
+MEDIUM)
+  exit 0
+  ;;
+
+PREINIT)
+  ifconfig $interface:dhcp down
+  ifconfig $interface:dhcp1 down
+  if [ -d /proc/sys/net/ipv4/conf/$interface ]; then
+    ifconfig $interface:dhcp 10.10.10.10 netmask 255.255.255.255
+    ifconfig $interface:dhcp down
+    if [ -d /proc/sys/net/ipv4/conf/$interface ]; then
+	LOG The interface $interface already configured.
+    fi
+  fi
+  ifconfig $interface:dhcp up
+  exit 0
+  ;;
+
+ARPSEND)
+  exit 0
+  ;;
+
+ARPCHECK)
+  if DAD "$interface" "$check_ip_address" ; then
+    exit 0
+  fi
+  exit 1
+  ;;
+
+BOUND|RENEW|REBIND|REBOOT)
+  if [ "$old_ip_address" -a "$alias_ip_address" -a \
+	"$alias_ip_address" != "$old_ip_address" ]; then
+    DelINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+  fi
+  if [ "$old_ip_address" -a "$old_ip_address" != "$new_ip_address" ]; then
+    DelINETAddr "$interface" "$old_ip_address" "$old_subnet_mask" "$old_broadcast_address" dhcp
+    DelDefaultRoutes "$old_routers"
+    DelStaticRouteList "$old_static_routes"
+  fi
+  if [ "$old_ip_address" = "" -o "$old_ip_address" != "$new_ip_address" -o \
+       "$reason" = "BOUND" -o "$reason" = "REBOOT" ]; then
+    AddINETAddr "$interface" "$new_ip_address" "$new_subnet_mask" "$new_broadcast_address" dhcp
+    AddStaticRouteList "$new_static_routes"
+    AddDefaultRoutes "$new_routers"
+    UnsolicitedARP "$interface" "$new_ip_address"
+  fi
+  if [ "$new_ip_address" != "$alias_ip_address" -a "$alias_ip_address" ]; then
+    AddINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+  fi
+  UpdateDNS
+  exit 0
+  ;;
+
+EXPIRE|FAIL)
+  if [ "$alias_ip_address" ]; then
+    DelINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+  fi
+  if [ "$old_ip_address" ]; then
+    DelINETAddr "$interface" "$old_ip_address" "$old_subnet_mask" "$old_broadcast_address" dhcp
+    DelDefaultRoutes "$old_routers"
+    DelStaticRouteList "$old_static_routes"
+  fi
+  if [ "$alias_ip_address" ]; then
+    AddINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+  fi
+  exit 0
+  ;;
+
+TIMEOUT)
+  if [ "$alias_ip_address" ]; then
+    DelINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+  fi
+# Seems, <null address> means, that no more old leases found.
+# Or does it mean bug in dhcpcd? 8) Fail for now.
+  if [ "$new_ip_address" = "<null address>" ]; then
+    if [ "$old_ip_address" ]; then
+	DelINETAddr "$interface" "$old_ip_address" "$old_subnet_mask" "$old_broadcast_address" dhcp
+    fi
+    if [ "$alias_ip_address" ]; then
+        AddINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+    fi
+    exit 1
+  fi
+  if DAD "$interface" "$new_ip_address" ; then
+    AddINETAddr "$interface" "$new_ip_address" "$new_subnet_mask" "$new_broadcast_address" dhcp
+    UnsolicitedARP "$interface" "$new_ip_address"
+    if [ "$alias_ip_address" -a "$alias_ip_address" != "$new_ip_address" ]; then
+      AddINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+      UnsolicitedARP "$interface" "$alias_ip_address"
+    fi
+    if CheckRouterList "$new_routers" ; then
+	AddStaticRouteList "$new_static_routes"
+	UpdateDNS
+	exit 0
+    fi
+  fi
+  DelINETAddr "$interface" "$new_ip_address" "$new_subnet_mask" "$new_broadcast_address" dhcp
+  DelDefaultRoutes "$old_routers"
+  DelStaticRouteList "$old_static_routes"
+  if [ "$alias_ip_address" ]; then
+    AddINETAddr "$interface" "$alias_ip_address" "$alias_subnet_mask" "$alias_broadcast_address" dhcp1
+  fi
+  exit 1
+  ;;
+esac
+
+exit 0

examples/diffserv/Edge1

@@ -0,0 +1,68 @@
+#! /bin/sh -x
+#
+# sample script on using the ingress capabilities
+# This script just tags on the ingress interfac using Ipchains
+# the result is used for fast classification and re-marking
+# on the egress interface
+#
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/root/DS-6-beta/iproute2-990530-dsing
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+IPCHAINS=/root/DS-6-beta/ipchains-1.3.9/ipchains
+INDEV=eth2
+EGDEV="dev eth1"
+#
+# tag all incoming packets from host 10.2.0.24 to value 1
+# tag all incoming packets from host 10.2.0.3 to value 2
+# tag the rest of incoming packets from subnet 10.2.0.0/24 to value 3
+#These values are used in the egress
+#
+############################################################ 
+$IPCHAINS -A input -s 10.2.0.4/24 -m 3
+$IPCHAINS -A input -i $INDEV -s 10.2.0.24 -m 1
+$IPCHAINS -A input -i $INDEV -s 10.2.0.3 -m 2
+
+######################## Egress side ########################
+
+
+# attach a dsmarker
+#
+$TC qdisc add $EGDEV handle 1:0 root dsmark indices 64 set_tc_index
+#
+# values of the DSCP to change depending on the class
+#
+#becomes EF
+$TC class change $EGDEV classid 1:1 dsmark mask 0x3 \
+       value 0xb8
+#becomes AF11
+$TC class change $EGDEV classid 1:2 dsmark mask 0x3 \
+       value 0x28
+#becomes AF21
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x48
+#
+#
+# The class mapping
+#
+$TC filter add $EGDEV parent 1:0 protocol ip prio 4 handle 1 fw classid 1:1
+$TC filter add $EGDEV parent 1:0 protocol ip prio 4 handle 2 fw classid 1:2
+$TC filter add $EGDEV parent 1:0 protocol ip prio 4 handle 3 fw classid 1:3
+#
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent 1:0
+
+echo "---- qdisc parameters Egress  ----------"
+$TC qdisc ls $EGDEV
+echo "---- Class parameters Egress  ----------"
+$TC class ls $EGDEV
+echo "---- filter parameters Egress ----------"
+$TC filter ls $EGDEV parent 1:0

examples/diffserv/Edge2

@@ -0,0 +1,87 @@
+#! /bin/sh -x
+#
+# sample script on using the ingress capabilities
+# This script tags the fwmark on the ingress interface using IPchains
+# the result is used first for policing on the Ingress interface then
+# for fast classification and re-marking
+# on the egress interface
+#
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/root/DS-6-beta/iproute2-990530-dsing
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+IPCHAINS=/root/DS-6-beta/ipchains-1.3.9/ipchains
+INDEV=eth2
+EGDEV="dev eth1"
+#
+# tag all incoming packets from host 10.2.0.24 to value 1
+# tag all incoming packets from host 10.2.0.3 to value 2
+# tag the rest of incoming packets from subnet 10.2.0.0/24 to value 3
+#These values are used in the egress
+############################################################ 
+$IPCHAINS -A input -s 10.2.0.0/24 -m 3
+$IPCHAINS -A input -i $INDEV -s 10.2.0.24 -m 1
+$IPCHAINS -A input -i $INDEV -s 10.2.0.3 -m 2
+############################################################ 
+#
+# install the ingress qdisc on the ingress interface
+############################################################ 
+$TC qdisc add dev $INDEV handle ffff: ingress
+############################################################ 
+
+#
+# attach a fw classifier to the ingress which polices anything marked
+# by ipchains to tag value 3 (The rest of the subnet packets -- not
+# tag 1 or 2) to not go beyond 1.5Mbps
+# Allow up to at least 60 packets to burst (assuming maximum packet 
+# size of # 1.5 KB) in the long run and up to about 6 packets in the
+# shot run
+
+############################################################ 
+$TC filter add dev $INDEV parent ffff: protocol ip prio 50 handle 3 fw \
+police rate 1500kbit burst 90k mtu 9k drop flowid :1
+############################################################ 
+
+######################## Egress side ########################
+
+
+# attach a dsmarker
+#
+$TC qdisc add $EGDEV handle 1:0 root dsmark indices 64
+#
+# values of the DSCP to change depending on the class
+#
+$TC class change $EGDEV classid 1:1 dsmark mask 0x3 \
+       value 0xb8
+$TC class change $EGDEV classid 1:2 dsmark mask 0x3 \
+       value 0x28
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x48
+#
+#
+# The class mapping
+#
+$TC filter add $EGDEV parent 1:0 protocol ip prio 4 handle 1 fw classid 1:1
+$TC filter add $EGDEV parent 1:0 protocol ip prio 4 handle 2 fw classid 1:2
+$TC filter add $EGDEV parent 1:0 protocol ip prio 4 handle 3 fw classid 1:3
+#
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent ffff:
+
+echo "---- qdisc parameters Egress  ----------"
+$TC qdisc ls $EGDEV
+echo "---- Class parameters Egress  ----------"
+$TC class ls $EGDEV
+echo "---- filter parameters Egress ----------"
+$TC filter ls $EGDEV parent 1:0
+#
+#deleting the ingress qdisc
+#$TC qdisc del $DEV ingress

examples/diffserv/Edge31-ca-u32

@@ -0,0 +1,170 @@
+#! /bin/sh -x
+#
+# sample script on using the ingress capabilities using u32 classifier
+# This script tags tcindex based on metering on the ingress 
+# interface the result is used for fast classification and re-marking
+# on the egress interface
+# This is an example of a color aware mode marker with PIR configured
+# based on draft-wahjak-mcm-00.txt (section 3.1)
+#
+# The colors are defined using the Diffserv Fields
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/usr/src/iproute2-current
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+INDEV=eth0
+EGDEV="dev eth1"
+CIR1=1500kbit
+CIR2=1000kbit
+
+#The CBS is about 60 MTU sized packets
+CBS1=90k
+CBS2=90k
+
+############################################################ 
+#
+# install the ingress qdisc on the ingress interface
+$TC qdisc add dev $INDEV handle ffff: ingress
+############################################################ 
+#
+# Create u32 filters 
+$TC filter add dev $INDEV parent ffff: protocol ip prio 4 handle 1: u32 \
+divisor 1
+############################################################ 
+
+# The meters: Note that we have shared meters in this case as identified
+# by the index parameter
+meter1=" police index 1 rate $CIR1 burst $CBS1 "
+meter2=" police index 2 rate $CIR2 burst $CBS1 "
+meter3=" police index 3 rate $CIR2 burst $CBS2 "
+meter4=" police index 4 rate $CIR1 burst $CBS2 "
+meter5=" police index 5 rate $CIR1 burst $CBS2 "
+
+# All packets are marked with a tcindex value which is used on the egress
+# tcindex 1 maps to AF41, 2->AF42, 3->AF43, 4->BE
+
+# *********************** AF41 *************************** 
+#AF41 (DSCP 0x22) is passed on with a tcindex value 1
+#if it doesn't exceed its CIR/CBS 
+#policer 1  is used.
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 4 u32 \
+match ip tos 0x88 0xfc \
+$meter1 \
+continue flowid :1
+#
+# if it exceeds the above but not the extra rate/burst below, it gets a 
+# tcindex value  of 2
+# policer 2 is used
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 5 u32 \
+match ip tos 0x88 0xfc \
+$meter2 \
+continue flowid :2
+#
+# if it exceeds the above but not the rule below, it gets a tcindex value
+# of 3 (policer 3)
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 u32 \
+match ip tos 0x88 0xfc \
+$meter3 \
+drop flowid :3
+#
+
+# *********************** AF42 *************************** 
+#AF42 (DSCP 0x24) from is passed on with a tcindex value 2
+#if it doesn't exceed its CIR/CBS 
+#policer 2 is used. Note that this is shared with the AF41
+#
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 5 u32 \
+match ip tos 0x90 0xfc \
+$meter2 \
+continue flowid :2
+#
+# if it exceeds the above but not the rule below, it gets a tcindex value
+# of 3 (policer 3)
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 u32 \
+match ip tos 0x90 0xfc \
+$meter3 \
+drop flowid :3
+#
+# *********************** AF43 *************************** 
+#
+#AF43 (DSCP 0x26) from is passed on with a tcindex value 3
+#if it doesn't exceed its CIR/CBS
+#policer 3 is used. Note that this is shared with the AF41 and AF42
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 u32 \
+match ip tos 0x98 0xfc \
+$meter3 \
+drop flowid :3
+#
+# *********************** BE *************************** 
+#
+# Anything else (not from the AF4*) gets discarded if it 
+# exceeds 1Mbps and by default goes to BE if it doesn't
+# Note that the BE class is also used by the AF4* in the worst
+# case
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 7 u32 \
+match ip src 0/0\
+$meter4 \
+drop flowid :4
+
+######################## Egress side ########################
+
+# attach a dsmarker
+#
+$TC qdisc add $EGDEV handle 1:0 root dsmark indices 64
+#
+# values of the DSCP to change depending on the class
+#note that the ECN bits are masked out
+#
+#AF41 (0x88 is 0x22 shifted to the right by two bits)
+#
+$TC class change $EGDEV classid 1:1 dsmark mask 0x3 \
+       value 0x88
+#AF42
+$TC class change $EGDEV classid 1:2 dsmark mask 0x3 \
+       value 0x90
+#AF43
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x98
+#BE
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x0
+#
+#
+# The class mapping
+#
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 1 tcindex classid 1:1
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 2 tcindex  classid 1:2
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 3 tcindex  classid 1:3
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 4 tcindex  classid 1:4
+#
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent ffff:
+
+echo "---- qdisc parameters Egress  ----------"
+$TC qdisc ls $EGDEV
+echo "---- Class parameters Egress  ----------"
+$TC class ls $EGDEV
+echo "---- filter parameters Egress ----------"
+$TC filter ls $EGDEV parent 1:0
+#
+#deleting the ingress qdisc
+#$TC qdisc del $INDEV ingress

examples/diffserv/Edge31-cb-chains

@@ -0,0 +1,132 @@
+#! /bin/sh -x
+#
+# sample script on using the ingress capabilities
+# This script fwmark tags(IPchains) based on metering on the ingress 
+# interface the result is used for fast classification and re-marking
+# on the egress interface
+# This is an example of a color blind mode marker with no PIR configured
+# based on draft-wahjak-mcm-00.txt (section 3.1)
+#
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/root/DS-6-beta/iproute2-990530-dsing
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+IPCHAINS=/root/DS-6-beta/ipchains-1.3.9/ipchains
+INDEV=eth2
+EGDEV="dev eth1"
+CIR1=1500kbit
+CIR2=1000kbit
+
+#The CBS is about 60 MTU sized packets
+CBS1=90k
+CBS2=90k
+
+meter1="police rate $CIR1 burst $CBS1 "
+meter2="police rate $CIR1 burst $CBS2 "
+meter3="police rate $CIR2 burst $CBS1 "
+meter4="police rate $CIR2 burst $CBS2 "
+meter5="police rate $CIR2 burst $CBS2 "
+#
+# tag the rest of incoming packets from subnet 10.2.0.0/24 to fw value 1
+# tag all incoming packets from any other subnet to fw tag 2
+############################################################ 
+$IPCHAINS -A input -i $INDEV -s 0/0 -m 2
+$IPCHAINS -A input -i $INDEV -s 10.2.0.0/24 -m 1
+#
+############################################################ 
+# install the ingress qdisc on the ingress interface
+$TC qdisc add dev $INDEV handle ffff: ingress
+#
+############################################################ 
+
+# All packets are marked with a tcindex value which is used on the egress
+# tcindex 1 maps to AF41, 2->AF42, 3->AF43, 4->BE
+#
+############################################################ 
+# 
+# anything with fw tag of 1 is passed on with a tcindex value 1
+#if it doesn't exceed its allocated rate (CIR/CBS)
+# 
+$TC filter add dev $INDEV parent ffff: protocol ip prio 4 handle 1 fw \
+$meter1 \
+continue flowid 4:1
+#
+# if it exceeds the above but not the extra rate/burst below, it gets a 
+#tcindex value  of 2
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 5 handle 1 fw \
+$meter2 \
+continue flowid 4:2
+#
+# if it exceeds the above but not the rule below, it gets a tcindex value
+# of 3
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 handle 1 fw \
+$meter3 \
+drop flowid 4:3
+#
+# Anything else (not from the subnet 10.2.0.24/24) gets discarded if it 
+# exceeds 1Mbps and by default goes to BE if it doesn't
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 handle 2 fw \
+$meter5 \
+drop flowid 4:4
+
+
+######################## Egress side ########################
+
+
+# attach a dsmarker
+#
+$TC qdisc add $EGDEV handle 1:0 root dsmark indices 64
+#
+# values of the DSCP to change depending on the class
+#note that the ECN bits are masked out
+#
+#AF41 (0x88 is 0x22 shifted to the right by two bits)
+#
+$TC class change $EGDEV classid 1:1 dsmark mask 0x3 \
+       value 0x88
+#AF42
+$TC class change $EGDEV classid 1:2 dsmark mask 0x3 \
+       value 0x90
+#AF43
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x98
+#BE
+$TC class change $EGDEV classid 1:4 dsmark mask 0x3 \
+       value 0x0
+#
+#
+# The class mapping (using tcindex; could easily have
+# replaced it with the fw classifier instead)
+#
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 1 tcindex classid 1:1
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 2 tcindex  classid 1:2
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 3 tcindex  classid 1:3
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 4 tcindex  classid 1:4
+#
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent ffff:
+
+echo "---- qdisc parameters Egress  ----------"
+$TC qdisc ls $EGDEV
+echo "---- Class parameters Egress  ----------"
+$TC class ls $EGDEV
+echo "---- filter parameters Egress ----------"
+$TC filter ls $EGDEV parent 1:0
+#
+#deleting the ingress qdisc
+#$TC qdisc del $INDEV ingress

examples/diffserv/Edge32-ca-u32

@@ -0,0 +1,198 @@
+#! /bin/sh -x
+#
+# sample script on using the ingress capabilities using u32 classifier
+# This script tags tcindex based on metering on the ingress 
+# interface the result is used for fast classification and re-marking
+# on the egress interface
+# This is an example of a color aware mode marker with PIR configured
+# based on draft-wahjak-mcm-00.txt (section 3.2)
+#
+# The colors are defined using the Diffserv Fields
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/root/DS-6-beta/iproute2-990530-dsing
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+IPCHAINS=/root/DS-6-beta/ipchains-1.3.9/ipchains
+INDEV=eth2
+EGDEV="dev eth1"
+CIR1=1000kbit
+CIR2=500kbit
+# the PIR is what is in excess of the CIR
+PIR1=1000kbit
+PIR2=500kbit
+
+#The CBS is about 60 MTU sized packets
+CBS1=90k
+CBS2=90k
+#the EBS is about 20 max sized packets
+EBS1=30k
+EBS2=30k
+
+# The meters: Note that we have shared meters in this case as identified
+# by the index parameter
+meter1=" police index 1 rate $CIR1 burst $CBS1 "
+meter1a=" police index 2 rate $PIR1 burst $EBS1 "
+meter2=" police index 3 rate $CIR2 burst $CBS1 "
+meter2a=" police index 4 rate $PIR2 burst $EBS1 "
+meter3=" police index 5 rate $CIR2 burst $CBS2 "
+meter3a=" police index 6 rate $PIR2 burst $EBS2 "
+meter4=" police index 7 rate $CIR1 burst $CBS2 "
+
+############################################################ 
+#
+# install the ingress qdisc on the ingress interface
+$TC qdisc add dev $INDEV handle ffff: ingress
+############################################################ 
+#
+# All packets are marked with a tcindex value which is used on the egress
+# tcindex 1 maps to AF41, 2->AF42, 3->AF43, 4->BE
+#
+# *********************** AF41 *************************** 
+#AF41 (DSCP 0x22) from is passed on with a tcindex value 1
+#if it doesn't exceed its CIR/CBS + PIR/EBS
+#policer 1  is used.
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 1 u32 \
+match ip tos 0x88 0xfc \
+$meter1 \
+continue flowid :1
+$TC filter add dev $INDEV parent ffff: protocol ip prio 2 u32 \
+match ip tos 0x88 0xfc \
+$meter1a \
+continue flowid :1
+#
+# if it exceeds the above but not the extra rate/burst below, it gets a 
+# tcindex value  of 2
+# policer 2 is used
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 3 u32 \
+match ip tos 0x88 0xfc \
+$meter2 \
+continue flowid :2
+$TC filter add dev $INDEV parent ffff: protocol ip prio 4 u32 \
+match ip tos 0x88 0xfc \
+$meter2a \
+continue flowid :2
+#
+# if it exceeds the above but not the rule below, it gets a tcindex value
+# of 3 (policer 3)
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 5 u32 \
+match ip tos 0x88 0xfc \
+$meter3 \
+continue flowid :3
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 u32 \
+match ip tos 0x88 0xfc \
+$meter3a \
+drop flowid :3
+#
+# *********************** AF42 *************************** 
+#AF42 (DSCP 0x24) from is passed on with a tcindex value 2
+#if it doesn't exceed its CIR/CBS + PIR/EBS
+#policer 2 is used. Note that this is shared with the AF41
+#
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 8 u32 \
+match ip tos 0x90 0xfc \
+$meter2 \
+continue flowid :2
+$TC filter add dev $INDEV parent ffff: protocol ip prio 9 u32 \
+match ip tos 0x90 0xfc \
+$meter2a \
+continue flowid :2
+#
+# if it exceeds the above but not the rule below, it gets a tcindex value
+# of 3 (policer 3)
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 10 u32 \
+match ip tos 0x90 0xfc \
+$meter3 \
+continue flowid :3
+$TC filter add dev $INDEV parent ffff: protocol ip prio 11 u32 \
+match ip tos 0x90 0xfc \
+$meter3a \
+drop flowid :3
+
+#
+# *********************** AF43 *************************** 
+#
+#AF43 (DSCP 0x26) from is passed on with a tcindex value 3
+#if it doesn't exceed its CIR/CBS + PIR/EBS
+#policer 3 is used. Note that this is shared with the AF41 and AF42
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 13 u32 \
+match ip tos 0x98 0xfc \
+$meter3 \
+continue flowid :3
+$TC filter add dev $INDEV parent ffff: protocol ip prio 14 u32 \
+match ip tos 0x98 0xfc \
+$meter3a \
+drop flowid :3
+#
+## *********************** BE *************************** 
+##
+## Anything else (not from the AF4*) gets discarded if it 
+## exceeds 1Mbps and by default goes to BE if it doesn't
+## Note that the BE class is also used by the AF4* in the worst
+## case
+##
+$TC filter add dev $INDEV parent ffff: protocol ip prio 16 u32 \
+match ip src 0/0\
+$meter4 \
+drop flowid :4
+
+######################## Egress side ########################
+
+# attach a dsmarker
+#
+$TC qdisc add $EGDEV handle 1:0 root dsmark indices 64
+#
+# values of the DSCP to change depending on the class
+#note that the ECN bits are masked out
+#
+#AF41 (0x88 is 0x22 shifted to the right by two bits)
+#
+$TC class change $EGDEV classid 1:1 dsmark mask 0x3 \
+       value 0x88
+#AF42
+$TC class change $EGDEV classid 1:2 dsmark mask 0x3 \
+       value 0x90
+#AF43
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x98
+#BE
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x0
+#
+#
+# The class mapping
+#
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 1 tcindex classid 1:1
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 2 tcindex  classid 1:2
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 3 tcindex  classid 1:3
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 4 tcindex  classid 1:4
+#
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent ffff:
+
+echo "---- qdisc parameters Egress  ----------"
+$TC qdisc ls $EGDEV
+echo "---- Class parameters Egress  ----------"
+$TC class ls $EGDEV
+echo "---- filter parameters Egress ----------"
+$TC filter ls $EGDEV parent 1:0
+#
+#deleting the ingress qdisc
+#$TC qdisc del $INDEV ingress

examples/diffserv/Edge32-cb-chains

@@ -0,0 +1,144 @@
+#! /bin/sh -x
+#
+# sample script on using the ingress capabilities
+# This script fwmark tags(IPchains) based on metering on the ingress 
+# interface the result is used for fast classification and re-marking
+# on the egress interface
+# This is an example of a color blind mode marker with no PIR configured
+# based on draft-wahjak-mcm-00.txt (section 3.1)
+#
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/root/DS-6-beta/iproute2-990530-dsing
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+IPCHAINS=/root/DS-6-beta/ipchains-1.3.9/ipchains
+INDEV=eth2
+EGDEV="dev eth1"
+CIR1=1500kbit
+CIR2=500kbit
+
+#The CBS is about 60 MTU sized packets
+CBS1=90k
+CBS2=90k
+
+meter1="police rate $CIR1 burst $CBS1 "
+meter1a="police rate $CIR2 burst $CBS1 "
+meter2="police rate $CIR1 burst $CBS2 "
+meter2a="police rate $CIR2 burst $CBS2 "
+meter3="police rate $CIR2 burst $CBS1 "
+meter3a="police rate $CIR2 burst $CBS1 "
+meter4="police rate $CIR2 burst $CBS2 "
+meter5="police rate $CIR1 burst $CBS2 "
+#
+# tag the rest of incoming packets from subnet 10.2.0.0/24 to fw value 1
+# tag all incoming packets from any other subnet to fw tag 2
+############################################################ 
+$IPCHAINS -A input -i $INDEV -s 0/0 -m 2
+$IPCHAINS -A input -i $INDEV -s 10.2.0.0/24 -m 1
+#
+############################################################ 
+# install the ingress qdisc on the ingress interface
+$TC qdisc add dev $INDEV handle ffff: ingress
+#
+############################################################ 
+
+# All packets are marked with a tcindex value which is used on the egress
+# tcindex 1 maps to AF41, 2->AF42, 3->AF43, 4->BE
+#
+############################################################ 
+# 
+# anything with fw tag of 1 is passed on with a tcindex value 1
+#if it doesn't exceed its allocated rate (CIR/CBS)
+# 
+$TC filter add dev $INDEV parent ffff: protocol ip prio 1 handle 1 fw \
+$meter1 \
+continue flowid 4:1
+$TC filter add dev $INDEV parent ffff: protocol ip prio 2 handle 1 fw \
+$meter1a \
+continue flowid 4:1
+#
+# if it exceeds the above but not the extra rate/burst below, it gets a 
+#tcindex value  of 2
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 3 handle 1 fw \
+$meter2 \
+continue flowid 4:2
+$TC filter add dev $INDEV parent ffff: protocol ip prio 4 handle 1 fw \
+$meter2a \
+continue flowid 4:2
+#
+# if it exceeds the above but not the rule below, it gets a tcindex value
+# of 3
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 5 handle 1 fw \
+$meter3 \
+continue flowid 4:3
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 handle 1 fw \
+$meter3a \
+drop flowid 4:3
+#
+# Anything else (not from the subnet 10.2.0.24/24) gets discarded if it 
+# exceeds 1Mbps and by default goes to BE if it doesn't
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 7 handle 2 fw \
+$meter5 \
+drop flowid 4:4
+
+
+######################## Egress side ########################
+
+
+# attach a dsmarker
+#
+$TC qdisc add $EGDEV handle 1:0 root dsmark indices 64
+#
+# values of the DSCP to change depending on the class
+#note that the ECN bits are masked out
+#
+#AF41 (0x88 is 0x22 shifted to the right by two bits)
+#
+$TC class change $EGDEV classid 1:1 dsmark mask 0x3 \
+       value 0x88
+#AF42
+$TC class change $EGDEV classid 1:2 dsmark mask 0x3 \
+       value 0x90
+#AF43
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x98
+#BE
+$TC class change $EGDEV classid 1:4 dsmark mask 0x3 \
+       value 0x0
+#
+#
+# The class mapping (using tcindex; could easily have
+# replaced it with the fw classifier instead)
+#
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 1 tcindex classid 1:1
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 2 tcindex  classid 1:2
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 3 tcindex  classid 1:3
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 4 tcindex  classid 1:4
+#
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent ffff:
+
+echo "---- qdisc parameters Egress  ----------"
+$TC qdisc ls $EGDEV
+echo "---- Class parameters Egress  ----------"
+$TC class ls $EGDEV
+echo "---- filter parameters Egress ----------"
+$TC filter ls $EGDEV parent 1:0
+#
+#deleting the ingress qdisc
+#$TC qdisc del $INDEV ingress

examples/diffserv/Edge32-cb-u32

@@ -0,0 +1,145 @@
+#! /bin/sh 
+#
+# sample script on using the ingress capabilities using u32 classifier
+# This script tags tcindex based on metering on the ingress 
+# interface the result is used for fast classification and re-marking
+# on the egress interface
+# This is an example of a color blind mode marker with PIR configured
+# based on draft-wahjak-mcm-00.txt (section 3.2)
+#
+#path to various utilities;
+#change to reflect yours.
+#
+IPROUTE=/root/DS-6-beta/iproute2-990530-dsing
+TC=$IPROUTE/tc/tc
+IP=$IPROUTE/ip/ip
+INDEV=eth2
+EGDEV="dev eth1"
+CIR1=1000kbit
+CIR2=1000kbit
+# The PIR is the excess (in addition to the CIR i.e if always
+# going to the PIR --> average rate is CIR+PIR)
+PIR1=1000kbit
+PIR2=500kbit
+
+#The CBS is about 60 MTU sized packets
+CBS1=90k
+CBS2=90k
+#the EBS is about 10 max sized packets
+EBS1=15k
+EBS2=15k
+# The meters
+meter1=" police rate $CIR1 burst $CBS1 "
+meter1a=" police rate $PIR1 burst $EBS1 "
+meter2=" police rate $CIR2 burst $CBS1 "
+meter2a="police rate $PIR2 burst $CBS1 "
+meter3=" police rate $CIR2 burst $CBS2 "
+meter3a=" police rate $PIR2 burst $EBS2 "
+meter4=" police rate $CIR1 burst $CBS2 "
+meter5=" police rate $CIR1 burst $CBS2 "
+
+
+# install the ingress qdisc on the ingress interface
+############################################################ 
+$TC qdisc add dev $INDEV handle ffff: ingress
+############################################################ 
+#
+############################################################ 
+
+# All packets are marked with a tcindex value which is used on the egress
+# NOTE: tcindex 1 maps to AF41, 2->AF42, 3->AF43, 4->BE
+# 
+#anything from subnet 10.2.0.2/24 is passed on with a tcindex value 1
+#if it doesn't exceed its CIR/CBS + PIR/EBS
+# 
+$TC filter add dev $INDEV parent ffff: protocol ip prio 1 u32 \
+match ip src 10.2.0.0/24 $meter1 \
+continue flowid :1
+$TC filter add dev $INDEV parent ffff: protocol ip prio 2 u32 \
+match ip src 10.2.0.0/24 $meter1a \
+continue flowid :1
+
+#
+# if it exceeds the above but not the extra rate/burst below, it gets a 
+#tcindex value  of 2
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 3 u32 \
+match ip src 10.2.0.0/24 $meter2 \
+continue flowid :2
+$TC filter add dev $INDEV parent ffff: protocol ip prio 4 u32 \
+match ip src 10.2.0.0/24 $meter2a \
+continue flowid :2
+#
+# if it exceeds the above but not the rule below, it gets a tcindex value
+# of 3
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 5 u32 \
+match ip src 10.2.0.0/24 $meter3 \
+continue flowid :3
+$TC filter add dev $INDEV parent ffff: protocol ip prio 6 u32 \
+match ip src 10.2.0.0/24 $meter3a \
+drop flowid :3
+#
+#
+# Anything else (not from the subnet 10.2.0.24/24) gets discarded if it 
+# exceeds 1Mbps and by default goes to BE if it doesn't
+#
+$TC filter add dev $INDEV parent ffff: protocol ip prio 7 u32 \
+match ip src 0/0 $meter5 \
+drop flowid :4
+
+
+######################## Egress side ########################
+
+
+# attach a dsmarker
+#
+$TC qdisc add $EGDEV handle 1:0 root dsmark indices 64
+#
+# values of the DSCP to change depending on the class
+#note that the ECN bits are masked out
+#
+#AF41 (0x88 is 0x22 shifted to the right by two bits)
+#
+$TC class change $EGDEV classid 1:1 dsmark mask 0x3 \
+       value 0x88
+#AF42
+$TC class change $EGDEV classid 1:2 dsmark mask 0x3 \
+       value 0x90
+#AF43
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x98
+#BE
+$TC class change $EGDEV classid 1:3 dsmark mask 0x3 \
+       value 0x0
+#
+#
+# The class mapping
+#
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 1 tcindex classid 1:1
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 2 tcindex  classid 1:2
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 3 tcindex  classid 1:3
+$TC filter add $EGDEV parent 1:0 protocol ip prio 1 \
+          handle 4 tcindex  classid 1:4
+#
+
+#
+echo "---- qdisc parameters Ingress  ----------"
+$TC qdisc ls dev $INDEV
+echo "---- Class parameters Ingress  ----------"
+$TC class ls dev $INDEV
+echo "---- filter parameters Ingress ----------"
+$TC filter ls dev $INDEV parent ffff:
+
+echo "---- qdisc parameters Egress  ----------"
+$TC qdisc ls $EGDEV
+echo "---- Class parameters Egress  ----------"
+$TC class ls $EGDEV
+echo "---- filter parameters Egress ----------"
+$TC filter ls $EGDEV parent 1:0
+#
+#deleting the ingress qdisc
+#$TC qdisc del $INDEV ingress

examples/diffserv/README

@@ -0,0 +1,98 @@
+
+Note all these are mere examples which can be customized to your needs
+
+AFCBQ
+-----
+AF PHB built using CBQ, DSMARK,GRED (default in GRIO mode) ,RED for BE 
+and the tcindex classifier with some algorithmic mapping
+
+EFCBQ
+-----
+EF PHB built using CBQ (for rate control and prioritization), 
+DSMARK( to remark DSCPs), tcindex  classifier and  RED for the BE
+traffic.
+
+EFPRIO
+------
+EF PHB using the PRIO scheduler, Token Bucket to rate control EF,
+tcindex classifier, DSMARK to remark, and RED for the BE traffic
+
+EDGE scripts
+==============
+
+CB-3(1|2)-(u32/chains)
+======================
+
+
+The major differences are that the classifier is u32 on -u32 extension
+and IPchains on the chains extension. CB stands for color Blind
+and 31 is for the mode where only a CIR and CBS are defined whereas
+32 stands for a mode where a CIR/CBS + PIR/EBS are defined.
+
+Color Blind (CB)
+==========-----=
+We look at one special subnet that we are interested in for simplicty
+reasons to demonstrate the capability. We send the packets from that
+subnet to AF4*, BE or end up dropping depending on the metering results. 
+
+
+The algorithm overview is as follows:
+
+*classify:
+
+**case: subnet X
+----------------
+  if !exceed meter1 tag as AF41
+	else
+	    if !exceed meter2  tag as AF42
+	        else
+		  if !exceed meter 3 tag as AF43
+		      else 
+			 drop 
+
+default case: Any other subnet
+-------------------------------
+  if !exceed meter 5 tag as AF43
+      else
+	 drop 
+
+
+One Egress side change the DSCPs of the packets to reflect AF4* and BE
+based on the tags from the ingress.
+
+-------------------------------------------------------------
+
+Color Aware
+===========
+
+Define some meters with + policing and give them IDs eg
+
+meter1=police index 1 rate $CIR1 burst $CBS1  
+meter2=police index 2 rate $CIR2 burst $CBS2   etc 
+
+General overview:
+classify based on the DSCPs and use the policer ids to decide tagging
+
+
+*classify on ingress:
+
+switch (dscp) {
+    case AF41: /* tos&0xfc == 0x88 */
+	if (!exceed meter1) break;
+    case AF42: /* tos&0xfc == 0x90 */
+	if (!exceed meter2) {
+	    tag as AF42;
+	    break;
+	}
+    case AF43: /* tos&0xfc == 0x98 */
+	if (!exceed meter3) {
+	    tag as AF43;
+	    break;
+	} else
+	  drop;
+    default:
+	if (!exceed meter4) tag as BE;
+	else drop;
+}
+
+On the Egress side mark the proper AF tags

examples/diffserv/afcbq

@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+#
+#
+# AF using CBQ for a single interface eth0 
+# 4 AF classes using GRED and one BE using RED
+# Things you might want to change:
+#	- the device bandwidth (set at 10Mbits)
+#	- the bandwidth allocated for each AF class and the BE class	
+#	- the drop probability associated with each AF virtual queue
+#
+# AF DSCP values used (based on AF draft 04)
+# -----------------------------------------
+# AF DSCP values
+# AF1 1. 0x0a 2. 0x0c 3. 0x0e
+# AF2 1. 0x12 2. 0x14 3. 0x16
+# AF3 1. 0x1a 2. 0x1c 3. 0x1e
+# AF4 1. 0x22 2. 0x24 3. 0x26
+
+#
+# 
+# A simple DSCP-class relationship formula used to generate
+# values in the for loop of this script; $drop stands for the
+# DP
+#	$dscp = ($class*8+$drop*2)
+#
+#  if you use GRIO buffer sharing, then GRED priority is set as follows:
+#  $gprio=$drop+1; 
+#
+
+$TC = "/usr/src/iproute2-current/tc/tc";
+$DEV = "dev lo";
+$DEV = "dev eth1";
+$DEV = "dev eth0";
+# the BE-class number
+$beclass = "5";  
+
+#GRIO buffer sharing on or off?
+$GRIO = "";
+$GRIO = "grio";
+# The bandwidth of your device
+$linerate="10Mbit";
+# The BE and AF rates
+%rate_table=();
+$berate="1500Kbit";
+$rate_table{"AF1rate"}="1500Kbit";
+$rate_table{"AF2rate"}="1500Kbit";
+$rate_table{"AF3rate"}="1500Kbit";
+$rate_table{"AF4rate"}="1500Kbit";
+#
+#
+#
+print "\n# --- General setup  ---\n";
+print "$TC qdisc add $DEV handle 1:0 root dsmark indices 64 set_tc_index\n";
+print "$TC filter add $DEV parent 1:0 protocol ip prio 1 tcindex mask 0xfc " .
+   "shift 2 pass_on\n";
+   #"shift 2\n";
+print "$TC qdisc add $DEV parent 1:0 handle 2:0 cbq bandwidth $linerate ".
+  "cell 8 avpkt 1000 mpu 64\n";
+print "$TC filter add $DEV parent 2:0 protocol ip prio 1 tcindex ".
+  "mask 0xf0 shift 4 pass_on\n";
+for $class (1..4) {
+    print "\n# --- AF Class $class specific setup---\n";
+    $AFrate=sprintf("AF%drate",$class);
+    print "$TC class add $DEV parent 2:0 classid 2:$class cbq ".
+      "bandwidth $linerate rate $rate_table{$AFrate} avpkt 1000 prio ".
+      (6-$class)." bounded allot 1514 weight 1 maxburst 21\n";
+    print "$TC filter add $DEV parent 2:0 protocol ip prio 1 handle $class ".
+      "tcindex classid 2:$class\n";
+    print "$TC qdisc add $DEV parent 2:$class gred setup DPs 3 default 2 ".
+      "$GRIO\n";
+# 
+# per DP setup
+#
+    for $drop (1..3) {
+    print "\n# --- AF Class $class DP $drop---\n";
+	$dscp = $class*8+$drop*2;
+	$tcindex = sprintf("1%x%x",$class,$drop);
+	print "$TC filter add $DEV parent 1:0 protocol ip prio 1 ".
+	  "handle $dscp tcindex classid 1:$tcindex\n";
+	$prob = $drop*0.02;
+        if ($GRIO) {
+	$gprio = $drop+1;
+	print "$TC qdisc change $DEV parent 2:$class gred limit 60KB min 15KB ".
+	  "max 45KB burst 20 avpkt 1000 bandwidth $linerate DP $drop ".
+	  "probability $prob ".
+          "prio $gprio\n";
+        } else {
+	print "$TC qdisc change $DEV parent 2:$class gred limit 60KB min 15KB ".
+	  "max 45KB burst 20 avpkt 1000 bandwidth $linerate DP $drop ".
+	  "probability $prob \n";
+	}
+    }
+}
+#
+#
+print "\n#------BE Queue setup------\n";
+print "$TC filter add $DEV parent 1:0 protocol ip prio 2 ".
+          "handle 0 tcindex mask 0 classid 1:1\n";
+print "$TC class add $DEV parent 2:0 classid 2:$beclass cbq ".
+      "bandwidth $linerate rate $berate avpkt 1000 prio 6 " .
+      "bounded allot 1514 weight 1 maxburst 21 \n";
+print "$TC filter add $DEV parent 2:0 protocol ip prio 1 handle 0 tcindex ".
+  "classid 2:5\n";
+print "$TC qdisc add $DEV parent 2:5 red limit 60KB min 15KB max 45KB ".
+  "burst 20 avpkt 1000 bandwidth $linerate probability 0.4\n";

examples/diffserv/ef-prio

@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+$TC = "/root/DS-6-beta/iproute2-990530-dsing/tc/tc";
+$DEV = "dev eth1";
+$efrate="1.5Mbit";
+$MTU="1.5kB";
+print "$TC qdisc add $DEV handle 1:0 root dsmark indices 64 set_tc_index\n";
+print "$TC filter add $DEV parent 1:0 protocol ip prio 1 tcindex ".
+  "mask 0xfc shift 2\n";
+print "$TC qdisc add $DEV parent 1:0 handle 2:0 prio\n";
+#
+# EF class: Maximum about one MTU sized packet allowed on the queue
+#
+print "$TC qdisc add $DEV parent 2:1 tbf rate $efrate burst $MTU limit 1.6kB\n";
+print "$TC filter add $DEV parent 2:0 protocol ip prio 1 ".
+	  "handle 0x2e tcindex classid 2:1 pass_on\n";
+#
+# BE class
+#
+print "#BE class(2:2) \n";
+print "$TC qdisc add $DEV parent 2:2 red limit 60KB ".
+	  "min 15KB max 45KB burst 20 avpkt 1000 bandwidth 10Mbit ".
+	  "probability 0.4\n";
+#
+print "$TC filter add $DEV parent 2:0 protocol ip prio 2 ".
+	  "handle 0 tcindex mask 0 classid 2:2 pass_on\n";

examples/diffserv/efcbq

@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+#
+$TC = "/root/DS-6-beta/iproute2-990530-dsing/tc/tc";
+$DEV = "dev eth1";
+print "$TC qdisc add $DEV handle 1:0 root dsmark indices 64 set_tc_index\n";
+print "$TC filter add $DEV parent 1:0 protocol ip prio 1 tcindex ".
+  "mask 0xfc shift 2\n";
+print "$TC qdisc add $DEV parent 1:0 handle 2:0 cbq bandwidth ".
+	"10Mbit cell 8 avpkt 1000 mpu 64\n";
+#
+# EF class
+#
+print "$TC class add $DEV parent 2:0 classid 2:1 cbq bandwidth ". 
+	"10Mbit rate 1500Kbit avpkt 1000 prio 1 bounded isolated ".
+	"allot 1514 weight 1 maxburst 10 \n";
+# packet fifo for EF?
+print "$TC qdisc add $DEV parent 2:1 pfifo limit 5\n";
+print "$TC filter add $DEV parent 2:0 protocol ip prio 1 ".
+	  "handle 0x2e tcindex classid 2:1 pass_on\n";
+#
+# BE class
+#
+print "#BE class(2:2) \n";
+print "$TC class add $DEV parent 2:0 classid 2:2 cbq bandwidth ". 
+	"10Mbit rate 5Mbit avpkt 1000 prio 7 allot 1514 weight 1 ".
+	"maxburst 21 borrow split 2:0 defmap 0xffff \n";
+print "$TC qdisc add $DEV parent 2:2 red limit 60KB ".
+	  "min 15KB max 45KB burst 20 avpkt 1000 bandwidth 10Mbit ".
+	  "probability 0.4\n";
+print "$TC filter add $DEV parent 2:0 protocol ip prio 2 ".
+	  "handle 0 tcindex mask 0 classid 2:2 pass_on\n";

examples/diffserv/regression-testing

@@ -0,0 +1,125 @@
+
+These were the tests done to validate the Diffserv scripts.
+This document will be updated continuously. If you do more
+thorough validation testing please post the details to the
+diffserv mailing list. 
+Nevertheless, these tests should serve for basic validation.
+
+AFCBQ, EFCBQ, EFPRIO
+----------------------
+
+generate all possible DSCPs and observe that they 
+get sent to the proper classes. In the case of AF also
+to the correct Virtual Queues.
+
+Edge1
+-----
+generate TOS values 0x0,0x10,0xbb each with IP addresses
+10.2.0.24 (mark 1), 10.2.0.3 (mark2) and 10.2.0.30 (mark 3)
+and observe that they get marked as expected.
+
+Edge2
+-----
+
+-Repeat the tests in Edge1
+-ftp with data direction from 10.2.0.2
+	*observe that the metering/policing works correctly (and the marking
+	as well). In this case the mark used will be 3
+
+Edge31-cb-chains
+----------------
+
+-ftp with data direction from 10.2.0.2
+
+	*observe that the metering/policing works correctly (and the marking
+	as well). In this case the mark used will be 1. 
+
+	Metering: The data throughput should not exceed 2*CIR1 + 2*CIR2
+	which is roughly: 5mbps
+
+	Marking: the should be a variation of marked packets:
+	AF41(TOS=0x88) AF42(0x90) AF43(0x98) and BE (0x0)
+
+More tests required to see the interaction of several sources (other
+than subnet 10.2.0.0/24).
+
+Edge31-ca-u32
+--------------
+
+Generate data using modified tcpblast from 10.2.0.2 (behind eth2) to the 
+discard port of 10.1.0.2 (behind eth1)
+
+1) generate with src tos = 0x88
+	Metering: Allocated throughput should not exceed 2*CIR1 + 2*CIR2
+	approximately 5mbps
+	Marking: Should vary between 0x88,0x90,0x98 and 0x0
+
+2) generate with src tos = 0x90
+	Metering: Allocated throughput should not exceed CIR1 + 2*CIR2
+	approximately 3.5mbps
+	Marking: Should vary between 0x90,0x98 and 0x0
+
+3) generate with src tos = 0x98
+	Metering: Allocated throughput should not exceed CIR1 + CIR2
+	approximately 2.5mbps
+	Marking: Should vary between 0x98 and 0x0
+
+4) generate with src tos any other than the above
+	Metering: Allocated throughput should not exceed CIR1 
+	approximately 1.5mbps
+	Marking: Should be consistent at 0x0
+
+TODO: Testing on how each color shares when all 4 types of packets
+are going through the edge device
+
+Edge32-cb-u32, Edge32-cb-chains
+-------------------------------
+
+-ftp with data direction from 10.2.0.2
+
+	*observe that the metering/policing works correctly (and the marking
+	as well). 
+
+	Metering: 
+        The data throughput should not exceed 2*CIR1 + 2*CIR2
+	+ 2*PIR2 + PIR1 for u32 which is roughly: 6mbps
+        The data throughput should not exceed 2*CIR1 + 5*CIR2
+	for chains which is roughly: 6mbps
+
+	Marking: the should be a variation of marked packets:
+	AF41(TOS=0x88) AF42(0x90) AF43(0x98) and BE (0x0)
+
+TODO:
+-More tests required to see the interaction of several sources (other
+than subnet 10.2.0.0/24).
+-More tests needed to capture stats on how many times the CIR was exceeded
+but the data was not remarked etc.
+
+Edge32-ca-u32
+--------------
+
+Generate data using modified tcpblast from 10.2.0.2 (behind eth2) to the 
+discard port of 10.1.0.2 (behind eth1)
+
+1) generate with src tos = 0x88
+	Metering: Allocated throughput should not exceed 2*CIR1 + 2*CIR2
+	+PIR1 -- approximately 4mbps
+	Marking: Should vary between 0x88,0x90,0x98 and 0x0
+
+2) generate with src tos = 0x90
+	Metering: Allocated throughput should not exceed CIR1 + 2*CIR2
+	+ 2* PIR2 approximately 3mbps
+	Marking: Should vary between 0x90,0x98 and 0x0
+
+3) generate with src tos = 0x98
+	Metering: Allocated throughput should not exceed PIR1+ CIR1 + CIR2
+	approximately 2.5mbps
+	Marking: Should vary between 0x98 and 0x0
+
+4) generate with src tos any other than the above
+	Metering: Allocated throughput should not exceed CIR1 
+	approximately 1mbps
+	Marking: Should be consistent at 0x0
+
+TODO: Testing on how each color shares when all 4 types of packets
+are going through the edge device

examples/gaiconf

@@ -0,0 +1,134 @@
+#!/bin/sh
+
+#
+# Setup address label from /etc/gai.conf
+#
+# Written by YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>, 2010.
+#
+
+IP=ip
+DEFAULT_GAICONF=/etc/gai.conf
+verbose=
+debug=
+
+function run ()
+{
+	if [ x"$verbose" != x"" ]; then
+		echo "$@"
+	fi
+	if [ x"$debug" = x"" ]; then
+		"$@"
+	fi
+}
+
+function do_load_config ()
+{
+	file=$1; shift
+	flush=1
+	cat $file | while read command prefix label; do
+		if [ x"$command" = x"#label" ]; then
+			if [ ${flush} = 1 ]; then
+				run ${IP} -6 addrlabel flush
+				flush=0
+			fi
+			run ${IP} -6 addrlabel add prefix $prefix label $label
+		fi
+	done
+}
+
+function do_list_config ()
+{
+	${IP} -6 addrlabel list | while read p pfx l lbl; do
+		echo label ${pfx} ${lbl}
+	done
+}
+
+function help ()
+{
+	echo "Usage: $0 [-v] {--list | --config [ ${DEFAULT_GAICONF} ] | --default}"
+	exit 1
+}
+
+TEMP=`getopt -o c::dlv -l config::,default,list,verbose -n gaiconf -- "$@"`
+
+if [ $? != 0 ]; then
+	echo "Terminating..." >&2
+	exit 1
+fi
+
+TEMPFILE=`mktemp`
+
+eval set -- "$TEMP"
+
+while true ; do
+	case "$1" in
+		-c|--config)
+			if [ x"$cmd" != x"" ]; then
+				help
+			fi
+			case "$2" in
+			"")	gai_conf="${DEFAULT_GAICONF}"
+				shift 2
+				;;
+			*)	gai_conf="$2"
+				shift 2
+			esac
+			cmd=config
+			;;
+		-d|--default)
+			if [ x"$cmd" != x"" ]; then
+				help
+			fi
+			gai_conf=${TEMPFILE}
+			cmd=config
+			;;
+		-l|--list)
+			if [ x"$cmd" != x"" ]; then
+				help
+			fi
+			cmd=list
+			shift
+			;;
+		-v)
+			verbose=1
+			shift
+			;;
+		--)
+			shift;
+			break
+			;;
+		*)
+			echo "Internal error!" >&2
+			exit 1
+			;;
+	esac
+done
+
+case "$cmd" in
+	config)
+		if [ x"$gai_conf" = x"${TEMPFILE}" ]; then
+			sed -e 's/^[[:space:]]*//' <<END_OF_DEFAULT >${TEMPFILE}
+				label ::1/128       0
+				label ::/0          1
+				label 2002::/16     2
+				label ::/96         3
+				label ::ffff:0:0/96 4
+				label fec0::/10     5
+				label fc00::/7      6
+				label 2001:0::/32   7
+END_OF_DEFAULT
+		fi
+		do_load_config "$gai_conf"
+		;;
+	list)
+		do_list_config
+		;;
+	*)
+		help
+		;;
+esac
+
+rm -f "${TEMPFILE}"
+
+exit 0
+

genl/ctrl.c

@@ -28,18 +28,87 @@
 static int usage(void)
 {
 	fprintf(stderr,"Usage: ctrl <CMD>\n" \
-		       "CMD   := get <PARMS> | list | monitor | policy <PARMS>\n" \
+		       "CMD   := get <PARMS> | list | monitor\n" \
 		       "PARMS := name <name> | id <id>\n" \
 		       "Examples:\n" \
 		       "\tctrl ls\n" \
 		       "\tctrl monitor\n" \
 		       "\tctrl get name foobar\n" \
-		       "\tctrl get id 0xF\n"
+		       "\tctrl get id 0xF\n");
-		       "\tctrl policy name foobar\n"
-		       "\tctrl policy id 0xF\n");
 	return -1;
 }
 
+int genl_ctrl_resolve_family(const char *family)
+{
+	struct rtnl_handle rth;
+	int ret = 0;
+	struct {
+		struct nlmsghdr         n;
+		struct genlmsghdr	g;
+		char                    buf[4096];
+	} req = {
+		.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN),
+		.n.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK,
+		.n.nlmsg_type = GENL_ID_CTRL,
+		.g.cmd = CTRL_CMD_GETFAMILY,
+	};
+	struct nlmsghdr *nlh = &req.n;
+	struct genlmsghdr *ghdr = &req.g;
+	struct nlmsghdr *answer = NULL;
+
+	if (rtnl_open_byproto(&rth, 0, NETLINK_GENERIC) < 0) {
+		fprintf(stderr, "Cannot open generic netlink socket\n");
+		exit(1);
+	}
+
+	addattr_l(nlh, 128, CTRL_ATTR_FAMILY_NAME, family, strlen(family) + 1);
+
+	if (rtnl_talk(&rth, nlh, &answer) < 0) {
+		fprintf(stderr, "Error talking to the kernel\n");
+		goto errout;
+	}
+
+	{
+		struct rtattr *tb[CTRL_ATTR_MAX + 1];
+		int len = answer->nlmsg_len;
+		struct rtattr *attrs;
+
+		if (answer->nlmsg_type !=  GENL_ID_CTRL) {
+			fprintf(stderr, "Not a controller message, nlmsg_len=%d "
+				"nlmsg_type=0x%x\n", answer->nlmsg_len, answer->nlmsg_type);
+			goto errout;
+		}
+
+		if (ghdr->cmd != CTRL_CMD_NEWFAMILY) {
+			fprintf(stderr, "Unknown controller command %d\n", ghdr->cmd);
+			goto errout;
+		}
+
+		len -= NLMSG_LENGTH(GENL_HDRLEN);
+
+		if (len < 0) {
+			fprintf(stderr, "wrong controller message len %d\n", len);
+			free(answer);
+			return -1;
+		}
+
+		attrs = (struct rtattr *) ((char *) answer + NLMSG_LENGTH(GENL_HDRLEN));
+		parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len);
+
+		if (tb[CTRL_ATTR_FAMILY_ID] == NULL) {
+			fprintf(stderr, "Missing family id TLV\n");
+			goto errout;
+		}
+
+		ret = rta_getattr_u16(tb[CTRL_ATTR_FAMILY_ID]);
+	}
+
+errout:
+	free(answer);
+	rtnl_close(&rth);
+	return ret;
+}
+
 static void print_ctrl_cmd_flags(FILE *fp, __u32 fl)
 {
 	fprintf(fp, "\n\t\tCapabilities (0x%x):\n ", fl);
@@ -105,7 +174,8 @@ static int print_ctrl_grp(FILE *fp, struct rtattr *arg, __u32 ctrl_ver)
 /*
  * The controller sends one nlmsg per family
 */
-static int print_ctrl(struct rtnl_ctrl_data *ctrl,
+static int print_ctrl(const struct sockaddr_nl *who,
+		      struct rtnl_ctrl_data *ctrl,
 		      struct nlmsghdr *n, void *arg)
 {
 	struct rtattr *tb[CTRL_ATTR_MAX + 1];
@@ -125,8 +195,7 @@ static int print_ctrl(struct rtnl_ctrl_data *ctrl,
 	    ghdr->cmd != CTRL_CMD_DELFAMILY &&
 	    ghdr->cmd != CTRL_CMD_NEWFAMILY &&
 	    ghdr->cmd != CTRL_CMD_NEWMCAST_GRP &&
-	    ghdr->cmd != CTRL_CMD_DELMCAST_GRP &&
+	    ghdr->cmd != CTRL_CMD_DELMCAST_GRP) {
-	    ghdr->cmd != CTRL_CMD_GETPOLICY) {
 		fprintf(stderr, "Unknown controller command %d\n", ghdr->cmd);
 		return 0;
 	}
@@ -139,7 +208,7 @@ static int print_ctrl(struct rtnl_ctrl_data *ctrl,
 	}
 
 	attrs = (struct rtattr *) ((char *) ghdr + GENL_HDRLEN);
-	parse_rtattr_flags(tb, CTRL_ATTR_MAX, attrs, len, NLA_F_NESTED);
+	parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len);
 
 	if (tb[CTRL_ATTR_FAMILY_NAME]) {
 		char *name = RTA_DATA(tb[CTRL_ATTR_FAMILY_NAME]);
@@ -162,36 +231,6 @@ static int print_ctrl(struct rtnl_ctrl_data *ctrl,
 		__u32 *ma = RTA_DATA(tb[CTRL_ATTR_MAXATTR]);
 		fprintf(fp, " max attribs: %d ",*ma);
 	}
-	if (tb[CTRL_ATTR_OP_POLICY]) {
-		const struct rtattr *pos;
-
-		rtattr_for_each_nested(pos, tb[CTRL_ATTR_OP_POLICY]) {
-			struct rtattr *ptb[CTRL_ATTR_POLICY_DUMP_MAX + 1];
-			struct rtattr *pattrs = RTA_DATA(pos);
-			int plen = RTA_PAYLOAD(pos);
-
-			parse_rtattr_flags(ptb, CTRL_ATTR_POLICY_DUMP_MAX,
-					   pattrs, plen, NLA_F_NESTED);
-
-			fprintf(fp, " op %d policies:",
-				pos->rta_type & ~NLA_F_NESTED);
-
-			if (ptb[CTRL_ATTR_POLICY_DO]) {
-				__u32 *v = RTA_DATA(ptb[CTRL_ATTR_POLICY_DO]);
-
-				fprintf(fp, " do=%d", *v);
-			}
-
-			if (ptb[CTRL_ATTR_POLICY_DUMP]) {
-				__u32 *v = RTA_DATA(ptb[CTRL_ATTR_POLICY_DUMP]);
-
-				fprintf(fp, " dump=%d", *v);
-			}
-		}
-	}
-	if (tb[CTRL_ATTR_POLICY])
-		nl_print_policy(tb[CTRL_ATTR_POLICY], fp);
-
 	/* end of family definitions .. */
 	fprintf(fp,"\n");
 	if (tb[CTRL_ATTR_OPS]) {
@@ -240,9 +279,10 @@ static int print_ctrl(struct rtnl_ctrl_data *ctrl,
 	return 0;
 }
 
-static int print_ctrl2(struct nlmsghdr *n, void *arg)
+static int print_ctrl2(const struct sockaddr_nl *who,
+		      struct nlmsghdr *n, void *arg)
 {
-	return print_ctrl(NULL, n, arg);
+	return print_ctrl(who, NULL, n, arg);
 }
 
 static int ctrl_list(int cmd, int argc, char **argv)
@@ -268,9 +308,7 @@ static int ctrl_list(int cmd, int argc, char **argv)
 		exit(1);
 	}
 
-	if (cmd == CTRL_CMD_GETFAMILY || cmd == CTRL_CMD_GETPOLICY) {
+	if (cmd == CTRL_CMD_GETFAMILY) {
-		req.g.cmd = cmd;
-
 		if (argc != 2) {
 			fprintf(stderr, "Wrong number of params\n");
 			return -1;
@@ -295,22 +333,20 @@ static int ctrl_list(int cmd, int argc, char **argv)
 			fprintf(stderr, "Wrong params\n");
 			goto ctrl_done;
 		}
-	}
 
-	if (cmd == CTRL_CMD_GETFAMILY) {
 		if (rtnl_talk(&rth, nlh, &answer) < 0) {
 			fprintf(stderr, "Error talking to the kernel\n");
 			goto ctrl_done;
 		}
 
-		if (print_ctrl2(answer, (void *) stdout) < 0) {
+		if (print_ctrl2(NULL, answer, (void *) stdout) < 0) {
 			fprintf(stderr, "Dump terminated\n");
 			goto ctrl_done;
 		}
 
 	}
 
-	if (cmd == CTRL_CMD_UNSPEC || cmd == CTRL_CMD_GETPOLICY) {
+	if (cmd == CTRL_CMD_UNSPEC) {
 		nlh->nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
 		nlh->nlmsg_seq = rth.dump = ++rth.seq;
 
@@ -361,8 +397,6 @@ static int parse_ctrl(struct genl_util *a, int argc, char **argv)
 	    matches(*argv, "show") == 0 ||
 	    matches(*argv, "lst") == 0)
 		return ctrl_list(CTRL_CMD_UNSPEC, argc-1, argv+1);
-	if (matches(*argv, "policy") == 0)
-		return ctrl_list(CTRL_CMD_GETPOLICY, argc-1, argv+1);
 	if (matches(*argv, "help") == 0)
 		return usage();
 

genl/genl.c

@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h> /* until we put our own header */
-#include "version.h"
+#include "SNAPSHOT.h"
 #include "utils.h"
 #include "genl_utils.h"
 
@@ -34,7 +34,8 @@ static void *BODY;
 static struct genl_util *genl_list;
 
 
-static int print_nofopt(struct nlmsghdr *n, void *arg)
+static int print_nofopt(const struct sockaddr_nl *who, struct nlmsghdr *n,
+			void *arg)
 {
 	fprintf((FILE *) arg, "unknown genl type ..\n");
 	return 0;
@@ -118,7 +119,7 @@ int main(int argc, char **argv)
 		} else if (matches(argv[1], "-raw") == 0) {
 			++show_raw;
 		} else if (matches(argv[1], "-Version") == 0) {
-			printf("genl utility, iproute2-%s\n", version);
+			printf("genl utility, iproute2-ss%s\n", SNAPSHOT);
 			exit(0);
 		} else if (matches(argv[1], "-help") == 0) {
 			usage();

genl/genl_utils.h

@@ -2,14 +2,18 @@
 #ifndef _TC_UTIL_H_
 #define _TC_UTIL_H_ 1
 
-#include <linux/genetlink.h>
 #include "utils.h"
+#include "linux/genetlink.h"
 
-struct genl_util {
+struct genl_util
+{
 	struct  genl_util *next;
 	char	name[16];
 	int	(*parse_genlopt)(struct genl_util *fu, int argc, char **argv);
-	int	(*print_genlopt)(struct nlmsghdr *n, void *arg);
+	int	(*print_genlopt)(const struct sockaddr_nl *who,
+				 struct nlmsghdr *n, void *arg);
 };
 
+int genl_ctrl_resolve_family(const char *family);
+
 #endif

include/SNAPSHOT.h

@@ -0,0 +1 @@
+static const char SNAPSHOT[] = "181023";

include/bpf_api.h

@@ -19,19 +19,6 @@
 
 #include "bpf_elf.h"
 
-/** libbpf pin type. */
-enum libbpf_pin_type {
-	LIBBPF_PIN_NONE,
-	/* PIN_BY_NAME: pin maps by name (in /sys/fs/bpf by default) */
-	LIBBPF_PIN_BY_NAME,
-};
-
-/** Type helper macros. */
-
-#define __uint(name, val) int (*name)[val]
-#define __type(name, val) typeof(val) *name
-#define __array(name, val) typeof(val) *name[]
-
 /** Misc macros. */
 
 #ifndef __stringify

include/bpf_util.h

@@ -272,18 +272,14 @@ const char *bpf_prog_to_default_section(enum bpf_prog_type type);
 int bpf_graft_map(const char *map_path, uint32_t *key, int argc, char **argv);
 int bpf_trace_pipe(void);
 
-void bpf_print_ops(struct rtattr *bpf_ops, __u16 len);
+void bpf_print_ops(FILE *f, struct rtattr *bpf_ops, __u16 len);
 
-int bpf_prog_load_dev(enum bpf_prog_type type, const struct bpf_insn *insns,
+int bpf_prog_load(enum bpf_prog_type type, const struct bpf_insn *insns,
-		      size_t size_insns, const char *license, __u32 ifindex,
-		      char *log, size_t size_log);
-int bpf_program_load(enum bpf_prog_type type, const struct bpf_insn *insns,
 		  size_t size_insns, const char *license, char *log,
 		  size_t size_log);
 
 int bpf_prog_attach_fd(int prog_fd, int target_fd, enum bpf_attach_type type);
 int bpf_prog_detach_fd(int target_fd, enum bpf_attach_type type);
-int bpf_program_attach(int prog_fd, int target_fd, enum bpf_attach_type type);
 
 int bpf_dump_prog_info(FILE *f, uint32_t id);
 
@@ -291,16 +287,6 @@ int bpf_dump_prog_info(FILE *f, uint32_t id);
 int bpf_send_map_fds(const char *path, const char *obj);
 int bpf_recv_map_fds(const char *path, int *fds, struct bpf_map_aux *aux,
 		     unsigned int entries);
-#ifdef HAVE_LIBBPF
-int iproute2_bpf_elf_ctx_init(struct bpf_cfg_in *cfg);
-int iproute2_bpf_fetch_ancillary(void);
-int iproute2_get_root_path(char *root_path, size_t len);
-bool iproute2_is_pin_map(const char *libbpf_map_name, char *pathname);
-bool iproute2_is_map_in_map(const char *libbpf_map_name, struct bpf_elf_map *imap,
-			    struct bpf_elf_map *omap, char *omap_name);
-int iproute2_find_map_name_by_id(unsigned int map_id, char *name);
-int iproute2_load_libbpf(struct bpf_cfg_in *cfg);
-#endif /* HAVE_LIBBPF */
 #else
 static inline int bpf_send_map_fds(const char *path, const char *obj)
 {
@@ -313,15 +299,5 @@ static inline int bpf_recv_map_fds(const char *path, int *fds,
 {
 	return -1;
 }
-#ifdef HAVE_LIBBPF
-static inline int iproute2_load_libbpf(struct bpf_cfg_in *cfg)
-{
-	fprintf(stderr, "No ELF library support compiled in.\n");
-	return -1;
-}
-#endif /* HAVE_LIBBPF */
 #endif /* HAVE_ELF */
-
-const char *get_libbpf_version(void);
-
 #endif /* __BPF_UTIL__ */

include/cg_map.h

@@ -1,6 +0,0 @@
-#ifndef __CG_MAP_H__
-#define __CG_MAP_H__
-
-const char *cg_id_to_path(__u64 id);
-
-#endif /* __CG_MAP_H__ */

include/color.h

@@ -20,8 +20,10 @@ enum color_opt {
 	COLOR_OPT_ALWAYS = 2
 };
 
+void enable_color(void);
 bool check_enable_color(int color, int json);
 bool matches_color(const char *arg, int *val);
+void set_color_palette(void);
 int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...);
 enum color_attr ifa_family_color(__u8 ifa_family);
 enum color_attr oper_state_color(__u8 state);

include/json_print.h

@@ -15,9 +15,6 @@
 #include "json_writer.h"
 #include "color.h"
 
-#define _IS_JSON_CONTEXT(type) (is_json_context() && (type & PRINT_JSON || type & PRINT_ANY))
-#define _IS_FP_CONTEXT(type)   (!is_json_context() && (type & PRINT_FP || type & PRINT_ANY))
-
 json_writer_t *get_json_writer(void);
 
 /*
@@ -34,11 +31,11 @@ enum output_type {
 
 void new_json_obj(int json);
 void delete_json_obj(void);
-void new_json_obj_plain(int json);
-void delete_json_obj_plain(void);
 
 bool is_json_context(void);
 
+void fflush_fp(void);
+
 void open_json_object(const char *str);
 void close_json_object(void);
 void open_json_array(enum output_type type, const char *delim);
@@ -47,61 +44,32 @@ void close_json_array(enum output_type type, const char *delim);
 void print_nl(void);
 
 #define _PRINT_FUNC(type_name, type)					\
-	int print_color_##type_name(enum output_type t,			\
+	void print_color_##type_name(enum output_type t,		\
 				     enum color_attr color,		\
 				     const char *key,			\
 				     const char *fmt,			\
 				     type value);			\
 									\
-	static inline int print_##type_name(enum output_type t,		\
+	static inline void print_##type_name(enum output_type t,	\
 					     const char *key,		\
 					     const char *fmt,		\
 					     type value)		\
 	{								\
-		return print_color_##type_name(t, COLOR_NONE, key, fmt,	\
+		print_color_##type_name(t, COLOR_NONE, key, fmt, value);	\
-					       value);			\
 	}
-
+_PRINT_FUNC(int, int);
-/* These functions return 0 if printing to a JSON context, number of
+_PRINT_FUNC(s64, int64_t);
- * characters printed otherwise (as calculated by printf(3)).
+_PRINT_FUNC(bool, bool);
- */
+_PRINT_FUNC(null, const char*);
-_PRINT_FUNC(int, int)
+_PRINT_FUNC(string, const char*);
-_PRINT_FUNC(s64, int64_t)
+_PRINT_FUNC(uint, unsigned int);
-_PRINT_FUNC(bool, bool)
+_PRINT_FUNC(u64, uint64_t);
-_PRINT_FUNC(on_off, bool)
+_PRINT_FUNC(hu, unsigned short);
-_PRINT_FUNC(null, const char*)
+_PRINT_FUNC(hex, unsigned int);
-_PRINT_FUNC(string, const char*)
+_PRINT_FUNC(0xhex, unsigned long long int);
-_PRINT_FUNC(uint, unsigned int)
+_PRINT_FUNC(luint, unsigned long int);
-_PRINT_FUNC(size, __u32)
+_PRINT_FUNC(lluint, unsigned long long int);
-_PRINT_FUNC(u64, uint64_t)
+_PRINT_FUNC(float, double);
-_PRINT_FUNC(hhu, unsigned char)
-_PRINT_FUNC(hu, unsigned short)
-_PRINT_FUNC(hex, unsigned int)
-_PRINT_FUNC(0xhex, unsigned long long)
-_PRINT_FUNC(luint, unsigned long)
-_PRINT_FUNC(lluint, unsigned long long)
-_PRINT_FUNC(float, double)
-_PRINT_FUNC(tv, const struct timeval *)
 #undef _PRINT_FUNC
 
-#define _PRINT_NAME_VALUE_FUNC(type_name, type, format_char)		  \
-	void print_##type_name##_name_value(const char *name, type value) \
-
-_PRINT_NAME_VALUE_FUNC(uint, unsigned int, u);
-_PRINT_NAME_VALUE_FUNC(string, const char*, s);
-#undef _PRINT_NAME_VALUE_FUNC
-
-int print_color_rate(bool use_iec, enum output_type t, enum color_attr color,
-		     const char *key, const char *fmt, unsigned long long rate);
-
-static inline int print_rate(bool use_iec, enum output_type t,
-			     const char *key, const char *fmt,
-			     unsigned long long rate)
-{
-	return print_color_rate(use_iec, t, COLOR_NONE, key, fmt, rate);
-}
-
-/* A backdoor to the size formatter. Please use print_size() instead. */
-char *sprint_size(__u32 sz, char *buf);
-
 #endif /* _JSON_PRINT_H_ */

include/json_writer.h

@@ -38,13 +38,12 @@ void jsonw_float_fmt(json_writer_t *self, const char *fmt, double num);
 void jsonw_uint(json_writer_t *self, unsigned int number);
 void jsonw_u64(json_writer_t *self, uint64_t number);
 void jsonw_xint(json_writer_t *self, uint64_t number);
-void jsonw_hhu(json_writer_t *self, unsigned char num);
 void jsonw_hu(json_writer_t *self, unsigned short number);
 void jsonw_int(json_writer_t *self, int number);
 void jsonw_s64(json_writer_t *self, int64_t number);
 void jsonw_null(json_writer_t *self);
-void jsonw_luint(json_writer_t *self, unsigned long num);
+void jsonw_luint(json_writer_t *self, unsigned long int num);
-void jsonw_lluint(json_writer_t *self, unsigned long long num);
+void jsonw_lluint(json_writer_t *self, unsigned long long int num);
 
 /* Useful Combinations of name and value */
 void jsonw_string_field(json_writer_t *self, const char *prop, const char *val);
@@ -53,15 +52,14 @@ void jsonw_float_field(json_writer_t *self, const char *prop, double num);
 void jsonw_uint_field(json_writer_t *self, const char *prop, unsigned int num);
 void jsonw_u64_field(json_writer_t *self, const char *prop, uint64_t num);
 void jsonw_xint_field(json_writer_t *self, const char *prop, uint64_t num);
-void jsonw_hhu_field(json_writer_t *self, const char *prop, unsigned char num);
 void jsonw_hu_field(json_writer_t *self, const char *prop, unsigned short num);
 void jsonw_int_field(json_writer_t *self, const char *prop, int num);
 void jsonw_s64_field(json_writer_t *self, const char *prop, int64_t num);
 void jsonw_null_field(json_writer_t *self, const char *prop);
 void jsonw_luint_field(json_writer_t *self, const char *prop,
-			unsigned long num);
+			unsigned long int num);
 void jsonw_lluint_field(json_writer_t *self, const char *prop,
-			unsigned long long num);
+			unsigned long long int num);
 
 /* Collections */
 void jsonw_start_object(json_writer_t *self);

include/libgenl.h

@@ -21,7 +21,6 @@ struct {								\
 	},								\
 }
 
-int genl_add_mcast_grp(struct rtnl_handle *grth, __u16 genl_family, const char *group);
 int genl_resolve_family(struct rtnl_handle *grth, const char *family);
 int genl_init_handle(struct rtnl_handle *grth, const char *family,
 		     int *genl_family);

include/libnetlink.h

@@ -23,7 +23,6 @@ struct rtnl_handle {
 	FILE		       *dump_fp;
 #define RTNL_HANDLE_F_LISTEN_ALL_NSID		0x01
 #define RTNL_HANDLE_F_SUPPRESS_NLERR		0x02
-#define RTNL_HANDLE_F_STRICT_CHK		0x04
 	int			flags;
 };
 
@@ -45,50 +44,21 @@ int rtnl_open(struct rtnl_handle *rth, unsigned int subscriptions)
 int rtnl_open_byproto(struct rtnl_handle *rth, unsigned int subscriptions,
 			     int protocol)
 	__attribute__((warn_unused_result));
-int rtnl_add_nl_group(struct rtnl_handle *rth, unsigned int group)
+
-	__attribute__((warn_unused_result));
 void rtnl_close(struct rtnl_handle *rth);
-void rtnl_set_strict_dump(struct rtnl_handle *rth);
+int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type)
+	__attribute__((warn_unused_result));
+int rtnl_wilddump_req_filter(struct rtnl_handle *rth, int fam, int type,
+				    __u32 filt_mask)
+	__attribute__((warn_unused_result));
 
 typedef int (*req_filter_fn_t)(struct nlmsghdr *nlh, int reqlen);
 
-int rtnl_addrdump_req(struct rtnl_handle *rth, int family,
+int rtnl_wilddump_req_filter_fn(struct rtnl_handle *rth, int fam, int type,
-		      req_filter_fn_t filter_fn)
-	__attribute__((warn_unused_result));
-int rtnl_addrlbldump_req(struct rtnl_handle *rth, int family)
-	__attribute__((warn_unused_result));
-int rtnl_routedump_req(struct rtnl_handle *rth, int family,
-		       req_filter_fn_t filter_fn)
-	__attribute__((warn_unused_result));
-int rtnl_ruledump_req(struct rtnl_handle *rth, int family)
-	__attribute__((warn_unused_result));
-int rtnl_neighdump_req(struct rtnl_handle *rth, int family,
-		       req_filter_fn_t filter_fn)
-	__attribute__((warn_unused_result));
-int rtnl_neightbldump_req(struct rtnl_handle *rth, int family)
-	__attribute__((warn_unused_result));
-int rtnl_mdbdump_req(struct rtnl_handle *rth, int family)
-	__attribute__((warn_unused_result));
-int rtnl_brvlandump_req(struct rtnl_handle *rth, int family, __u32 dump_flags)
-	__attribute__((warn_unused_result));
-int rtnl_netconfdump_req(struct rtnl_handle *rth, int family)
-	__attribute__((warn_unused_result));
-
-int rtnl_linkdump_req(struct rtnl_handle *rth, int fam)
-	__attribute__((warn_unused_result));
-int rtnl_linkdump_req_filter(struct rtnl_handle *rth, int fam, __u32 filt_mask)
-	__attribute__((warn_unused_result));
-
-int rtnl_linkdump_req_filter_fn(struct rtnl_handle *rth, int fam,
 				req_filter_fn_t fn)
 	__attribute__((warn_unused_result));
-int rtnl_fdb_linkdump_req_filter_fn(struct rtnl_handle *rth,
+int rtnl_wilddump_stats_req_filter(struct rtnl_handle *rth, int fam, int type,
-				    req_filter_fn_t filter_fn)
+				   __u32 filt_mask)
-	__attribute__((warn_unused_result));
-int rtnl_nsiddump_req_filter_fn(struct rtnl_handle *rth, int family,
-				req_filter_fn_t filter_fn)
-	__attribute__((warn_unused_result));
-int rtnl_statsdump_req_filter(struct rtnl_handle *rth, int fam, __u32 filt_mask)
 	__attribute__((warn_unused_result));
 int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req,
 			     int len)
@@ -96,41 +66,15 @@ int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req,
 int rtnl_dump_request_n(struct rtnl_handle *rth, struct nlmsghdr *n)
 	__attribute__((warn_unused_result));
 
-int rtnl_nexthopdump_req(struct rtnl_handle *rth, int family,
-			 req_filter_fn_t filter_fn)
-	__attribute__((warn_unused_result));
-int rtnl_nexthop_bucket_dump_req(struct rtnl_handle *rth, int family,
-				 req_filter_fn_t filter_fn)
-	__attribute__((warn_unused_result));
-
 struct rtnl_ctrl_data {
 	int	nsid;
 };
 
-typedef int (*rtnl_filter_t)(struct nlmsghdr *n, void *);
+typedef int (*rtnl_filter_t)(const struct sockaddr_nl *,
+			     struct nlmsghdr *n, void *);
 
-/**
+typedef int (*rtnl_listen_filter_t)(const struct sockaddr_nl *,
- * rtnl error handler called from
+				    struct rtnl_ctrl_data *,
- *      rtnl_dump_done()
- *      rtnl_dump_error()
- *
- * Return value is a bitmask of the following values:
- * RTNL_LET_NLERR
- *      error handled as usual
- * RTNL_SUPPRESS_NLMSG_DONE_NLERR
- *      error in nlmsg_type == NLMSG_DONE will be suppressed
- * RTNL_SUPPRESS_NLMSG_ERROR_NLERR
- *      error in nlmsg_type == NLMSG_ERROR will be suppressed
- *      and nlmsg will be skipped
- * RTNL_SUPPRESS_NLERR - suppress error in both previous cases
- */
-#define RTNL_LET_NLERR				0x01
-#define RTNL_SUPPRESS_NLMSG_DONE_NLERR		0x02
-#define RTNL_SUPPRESS_NLMSG_ERROR_NLERR		0x04
-#define RTNL_SUPPRESS_NLERR			0x06
-typedef int (*rtnl_err_hndlr_t)(struct nlmsghdr *n, void *);
-
-typedef int (*rtnl_listen_filter_t)(struct rtnl_ctrl_data *,
 				    struct nlmsghdr *n, void *);
 
 typedef int (*nl_ext_ack_fn_t)(const char *errmsg, uint32_t off,
@@ -139,31 +83,25 @@ typedef int (*nl_ext_ack_fn_t)(const char *errmsg, uint32_t off,
 struct rtnl_dump_filter_arg {
 	rtnl_filter_t filter;
 	void *arg1;
-	rtnl_err_hndlr_t errhndlr;
-	void *arg2;
 	__u16 nc_flags;
 };
 
+int rtnl_dump_filter_l(struct rtnl_handle *rth,
+			      const struct rtnl_dump_filter_arg *arg);
 int rtnl_dump_filter_nc(struct rtnl_handle *rth,
 			rtnl_filter_t filter,
 			void *arg, __u16 nc_flags);
 #define rtnl_dump_filter(rth, filter, arg) \
 	rtnl_dump_filter_nc(rth, filter, arg, 0)
-int rtnl_dump_filter_errhndlr_nc(struct rtnl_handle *rth,
-				 rtnl_filter_t filter,
-				 void *arg1,
-				 rtnl_err_hndlr_t errhndlr,
-				 void *arg2,
-				 __u16 nc_flags);
-#define rtnl_dump_filter_errhndlr(rth, filter, farg, errhndlr, earg) \
-	rtnl_dump_filter_errhndlr_nc(rth, filter, farg, errhndlr, earg, 0)
-
 int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
 	      struct nlmsghdr **answer)
 	__attribute__((warn_unused_result));
 int rtnl_talk_iov(struct rtnl_handle *rtnl, struct iovec *iovec, size_t iovlen,
 		  struct nlmsghdr **answer)
 	__attribute__((warn_unused_result));
+int rtnl_talk_extack(struct rtnl_handle *rtnl, struct nlmsghdr *n,
+	      struct nlmsghdr **answer, nl_ext_ack_fn_t errfn)
+	__attribute__((warn_unused_result));
 int rtnl_talk_suppress_rtnl_errmsg(struct rtnl_handle *rtnl, struct nlmsghdr *n,
 				   struct nlmsghdr **answer)
 	__attribute__((warn_unused_result));
@@ -172,7 +110,6 @@ int rtnl_send(struct rtnl_handle *rth, const void *buf, int)
 int rtnl_send_check(struct rtnl_handle *rth, const void *buf, int)
 	__attribute__((warn_unused_result));
 int nl_dump_ext_ack(const struct nlmsghdr *nlh, nl_ext_ack_fn_t errfn);
-int nl_dump_ext_ack_done(const struct nlmsghdr *nlh, int error);
 
 int addattr(struct nlmsghdr *n, int maxlen, int type);
 int addattr8(struct nlmsghdr *n, int maxlen, int type, __u8 data);
@@ -199,6 +136,8 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
 int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
 int parse_rtattr_flags(struct rtattr *tb[], int max, struct rtattr *rta,
 			      int len, unsigned short flags);
+int parse_rtattr_byindex(struct rtattr *tb[], int max,
+			 struct rtattr *rta, int len);
 struct rtattr *parse_rtattr_one(int type, struct rtattr *rta, int len);
 int __parse_rtattr_nested_compat(struct rtattr *tb[], int max, struct rtattr *rta, int len);
 
@@ -210,8 +149,7 @@ int rta_nest_end(struct rtattr *rta, struct rtattr *nest);
 				    RTA_ALIGN((rta)->rta_len)))
 
 #define parse_rtattr_nested(tb, max, rta) \
-	(parse_rtattr_flags((tb), (max), RTA_DATA(rta), RTA_PAYLOAD(rta), \
+	(parse_rtattr((tb), (max), RTA_DATA(rta), RTA_PAYLOAD(rta)))
-			    NLA_F_NESTED))
 
 #define parse_rtattr_one_nested(type, rta) \
 	(parse_rtattr_one(type, RTA_DATA(rta), RTA_PAYLOAD(rta)))
@@ -247,17 +185,6 @@ static inline __u64 rta_getattr_u64(const struct rtattr *rta)
 	memcpy(&tmp, RTA_DATA(rta), sizeof(__u64));
 	return tmp;
 }
-static inline __s32 rta_getattr_s32(const struct rtattr *rta)
-{
-	return *(__s32 *)RTA_DATA(rta);
-}
-static inline __s64 rta_getattr_s64(const struct rtattr *rta)
-{
-	__s64 tmp;
-
-	memcpy(&tmp, RTA_DATA(rta), sizeof(tmp));
-	return tmp;
-}
 static inline const char *rta_getattr_str(const struct rtattr *rta)
 {
 	return (const char *)RTA_DATA(rta);
@@ -317,20 +244,8 @@ int rtnl_from_file(FILE *, rtnl_listen_filter_t handler,
 	((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct if_stats_msg))))
 #endif
 
-#ifndef BRVLAN_RTA
-#define BRVLAN_RTA(r) \
-	((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct br_vlan_msg))))
-#endif
-
 /* User defined nlmsg_type which is used mostly for logging netlink
  * messages from dump file */
 #define NLMSG_TSTAMP	15
 
-#define rtattr_for_each_nested(attr, nest) \
-	for ((attr) = (void *)RTA_DATA(nest); \
-	     RTA_OK(attr, RTA_PAYLOAD(nest) - ((char *)(attr) - (char *)RTA_DATA((nest)))); \
-	     (attr) = RTA_TAIL((attr)))
-
-void nl_print_policy(const struct rtattr *attr, FILE *fp);
-
 #endif /* __LIBNETLINK_H__ */

include/ll_map.h

@@ -2,16 +2,17 @@
 #ifndef __LL_MAP_H__
 #define __LL_MAP_H__ 1
 
-int ll_remember_index(struct nlmsghdr *n, void *arg);
+int ll_remember_index(const struct sockaddr_nl *who,
+		      struct nlmsghdr *n, void *arg);
 
 void ll_init_map(struct rtnl_handle *rth);
 unsigned ll_name_to_index(const char *name);
 const char *ll_index_to_name(unsigned idx);
 int ll_index_to_type(unsigned idx);
 int ll_index_to_flags(unsigned idx);
-void ll_drop_by_index(unsigned index);
 unsigned namehash(const char *str);
 
 const char *ll_idx_n2a(unsigned int idx);
+unsigned int ll_idx_a2n(const char *name);
 
 #endif /* __LL_MAP_H__ */

include/mnl_utils.h

@@ -1,33 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __MNL_UTILS_H__
-#define __MNL_UTILS_H__ 1
-
-struct mnlu_gen_socket {
-	struct mnl_socket *nl;
-	char *buf;
-	uint32_t family;
-	unsigned int seq;
-	uint8_t version;
-};
-
-int mnlu_gen_socket_open(struct mnlu_gen_socket *nlg, const char *family_name,
-			 uint8_t version);
-void mnlu_gen_socket_close(struct mnlu_gen_socket *nlg);
-struct nlmsghdr *
-_mnlu_gen_socket_cmd_prepare(struct mnlu_gen_socket *nlg,
-			     uint8_t cmd, uint16_t flags,
-			     uint32_t id, uint8_t version);
-struct nlmsghdr *mnlu_gen_socket_cmd_prepare(struct mnlu_gen_socket *nlg,
-					     uint8_t cmd, uint16_t flags);
-int mnlu_gen_socket_sndrcv(struct mnlu_gen_socket *nlg, const struct nlmsghdr *nlh,
-			   mnl_cb_t data_cb, void *data);
-
-struct mnl_socket *mnlu_socket_open(int bus);
-struct nlmsghdr *mnlu_msg_prepare(void *buf, uint32_t nlmsg_type, uint16_t flags,
-				  void *extra_header, size_t extra_header_size);
-int mnlu_socket_recv_run(struct mnl_socket *nl, unsigned int seq, void *buf, size_t buf_size,
-			 mnl_cb_t cb, void *data);
-int mnlu_gen_socket_recv_run(struct mnlu_gen_socket *nlg, mnl_cb_t cb,
-			     void *data);
-
-#endif /* __MNL_UTILS_H__ */

include/names.h

@@ -22,5 +22,6 @@ int db_names_load(struct db_names *db, const char *path);
 void db_names_free(struct db_names *db);
 
 char *id_to_name(struct db_names *db, int id, char *name);
+int name_to_id(struct db_names *db, int *id, const char *name);
 
 #endif

include/rt_names.h

@@ -9,7 +9,6 @@ const char *rtnl_rtscope_n2a(int id, char *buf, int len);
 const char *rtnl_rttable_n2a(__u32 id, char *buf, int len);
 const char *rtnl_rtrealm_n2a(int id, char *buf, int len);
 const char *rtnl_dsfield_n2a(int id, char *buf, int len);
-const char *rtnl_dsfield_get_name(int id);
 const char *rtnl_group_n2a(int id, char *buf, int len);
 
 int rtnl_rtprot_a2n(__u32 *id, const char *arg);
@@ -34,9 +33,4 @@ int ll_proto_a2n(unsigned short *id, const char *buf);
 const char *nl_proto_n2a(int id, char *buf, int len);
 int nl_proto_a2n(__u32 *id, const char *arg);
 
-int protodown_reason_a2n(__u32 *id, const char *arg);
-int protodown_reason_n2a(int id, char *buf, int len);
-
-extern int numeric;
-
 #endif

include/uapi/asm-generic/sockios.h

@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef __ASM_GENERIC_SOCKIOS_H
-#define __ASM_GENERIC_SOCKIOS_H
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN	0x8901
-#define SIOCSPGRP	0x8902
-#define FIOGETOWN	0x8903
-#define SIOCGPGRP	0x8904
-#define SIOCATMARK	0x8905
-#define SIOCGSTAMP_OLD	0x8906		/* Get stamp (timeval) */
-#define SIOCGSTAMPNS_OLD 0x8907		/* Get stamp (timespec) */
-
-#endif /* __ASM_GENERIC_SOCKIOS_H */

include/uapi/linux/amt.h

@@ -1,62 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
-/*
- * Copyright (c) 2021 Taehee Yoo <ap420073@gmail.com>
- */
-#ifndef _AMT_H_
-#define _AMT_H_
-
-enum ifla_amt_mode {
-	/* AMT interface works as Gateway mode.
-	 * The Gateway mode encapsulates IGMP/MLD traffic and decapsulates
-	 * multicast traffic.
-	 */
-	AMT_MODE_GATEWAY = 0,
-	/* AMT interface works as Relay mode.
-	 * The Relay mode encapsulates multicast traffic and decapsulates
-	 * IGMP/MLD traffic.
-	 */
-	AMT_MODE_RELAY,
-	__AMT_MODE_MAX,
-};
-
-#define AMT_MODE_MAX (__AMT_MODE_MAX - 1)
-
-enum {
-	IFLA_AMT_UNSPEC,
-	/* This attribute specify mode etier Gateway or Relay. */
-	IFLA_AMT_MODE,
-	/* This attribute specify Relay port.
-	 * AMT interface is created as Gateway mode, this attribute is used
-	 * to specify relay(remote) port.
-	 * AMT interface is created as Relay mode, this attribute is used
-	 * as local port.
-	 */
-	IFLA_AMT_RELAY_PORT,
-	/* This attribute specify Gateway port.
-	 * AMT interface is created as Gateway mode, this attribute is used
-	 * as local port.
-	 * AMT interface is created as Relay mode, this attribute is not used.
-	 */
-	IFLA_AMT_GATEWAY_PORT,
-	/* This attribute specify physical device */
-	IFLA_AMT_LINK,
-	/* This attribute specify local ip address */
-	IFLA_AMT_LOCAL_IP,
-	/* This attribute specify Relay ip address.
-	 * So, this is not used by Relay.
-	 */
-	IFLA_AMT_REMOTE_IP,
-	/* This attribute specify Discovery ip address.
-	 * When Gateway get started, it send discovery message to find the
-	 * Relay's ip address.
-	 * So, this is not used by Relay.
-	 */
-	IFLA_AMT_DISCOVERY_IP,
-	/* This attribute specify number of maximum tunnel. */
-	IFLA_AMT_MAX_TUNNELS,
-	__IFLA_AMT_MAX,
-};
-
-#define IFLA_AMT_MAX (__IFLA_AMT_MAX - 1)
-
-#endif /* _AMT_H_ */

include/uapi/linux/atmioc.h

@@ -5,7 +5,7 @@
 
 
 /*
- * See https://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
+ * See http://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
  * "magic" ioctl numbers.
  */
 

include/uapi/linux/btf.h

@@ -22,9 +22,9 @@ struct btf_header {
 };
 
 /* Max # of type identifier */
-#define BTF_MAX_TYPE	0x000fffff
+#define BTF_MAX_TYPE	0x0000ffff
 /* Max offset into the string section */
-#define BTF_MAX_NAME_OFFSET	0x00ffffff
+#define BTF_MAX_NAME_OFFSET	0x0000ffff
 /* Max # of struct/union/enum members or func args */
 #define BTF_MAX_VLEN	0xffff
 
@@ -34,16 +34,13 @@ struct btf_type {
 	 * bits  0-15: vlen (e.g. # of struct's members)
 	 * bits 16-23: unused
 	 * bits 24-27: kind (e.g. int, ptr, array...etc)
-	 * bits 28-30: unused
+	 * bits 28-31: unused
-	 * bit     31: kind_flag, currently used by
-	 *             struct, union and fwd
 	 */
 	__u32 info;
-	/* "size" is used by INT, ENUM, STRUCT, UNION and DATASEC.
+	/* "size" is used by INT, ENUM, STRUCT and UNION.
 	 * "size" tells the size of the type it is describing.
 	 *
-	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT,
+	 * "type" is used by PTR, TYPEDEF, VOLATILE, CONST and RESTRICT.
-	 * FUNC, FUNC_PROTO, VAR and DECL_TAG.
 	 * "type" is a type_id referring to another type.
 	 */
 	union {
@@ -52,33 +49,23 @@ struct btf_type {
 	};
 };
 
-#define BTF_INFO_KIND(info)	(((info) >> 24) & 0x1f)
+#define BTF_INFO_KIND(info)	(((info) >> 24) & 0x0f)
 #define BTF_INFO_VLEN(info)	((info) & 0xffff)
-#define BTF_INFO_KFLAG(info)	((info) >> 31)
 
-enum {
+#define BTF_KIND_UNKN		0	/* Unknown	*/
-	BTF_KIND_UNKN		= 0,	/* Unknown	*/
+#define BTF_KIND_INT		1	/* Integer	*/
-	BTF_KIND_INT		= 1,	/* Integer	*/
+#define BTF_KIND_PTR		2	/* Pointer	*/
-	BTF_KIND_PTR		= 2,	/* Pointer	*/
+#define BTF_KIND_ARRAY		3	/* Array	*/
-	BTF_KIND_ARRAY		= 3,	/* Array	*/
+#define BTF_KIND_STRUCT		4	/* Struct	*/
-	BTF_KIND_STRUCT		= 4,	/* Struct	*/
+#define BTF_KIND_UNION		5	/* Union	*/
-	BTF_KIND_UNION		= 5,	/* Union	*/
+#define BTF_KIND_ENUM		6	/* Enumeration	*/
-	BTF_KIND_ENUM		= 6,	/* Enumeration	*/
+#define BTF_KIND_FWD		7	/* Forward	*/
-	BTF_KIND_FWD		= 7,	/* Forward	*/
+#define BTF_KIND_TYPEDEF	8	/* Typedef	*/
-	BTF_KIND_TYPEDEF	= 8,	/* Typedef	*/
+#define BTF_KIND_VOLATILE	9	/* Volatile	*/
-	BTF_KIND_VOLATILE	= 9,	/* Volatile	*/
+#define BTF_KIND_CONST		10	/* Const	*/
-	BTF_KIND_CONST		= 10,	/* Const	*/
+#define BTF_KIND_RESTRICT	11	/* Restrict	*/
-	BTF_KIND_RESTRICT	= 11,	/* Restrict	*/
+#define BTF_KIND_MAX		11
-	BTF_KIND_FUNC		= 12,	/* Function	*/
+#define NR_BTF_KINDS		12
-	BTF_KIND_FUNC_PROTO	= 13,	/* Function Proto	*/
-	BTF_KIND_VAR		= 14,	/* Variable	*/
-	BTF_KIND_DATASEC	= 15,	/* Section	*/
-	BTF_KIND_FLOAT		= 16,	/* Floating point	*/
-	BTF_KIND_DECL_TAG	= 17,	/* Decl Tag */
-
-	NR_BTF_KINDS,
-	BTF_KIND_MAX		= NR_BTF_KINDS - 1,
-};
 
 /* For some specific BTF_KIND, "struct btf_type" is immediately
  * followed by extra data.
@@ -88,7 +75,7 @@ enum {
  * is the 32 bits arrangement:
  */
 #define BTF_INT_ENCODING(VAL)	(((VAL) & 0x0f000000) >> 24)
-#define BTF_INT_OFFSET(VAL)	(((VAL) & 0x00ff0000) >> 16)
+#define BTF_INT_OFFSET(VAL)	(((VAL  & 0x00ff0000)) >> 16)
 #define BTF_INT_BITS(VAL)	((VAL)  & 0x000000ff)
 
 /* Attributes stored in the BTF_INT_ENCODING */
@@ -120,69 +107,7 @@ struct btf_array {
 struct btf_member {
 	__u32	name_off;
 	__u32	type;
-	/* If the type info kind_flag is set, the btf_member offset
+	__u32	offset;	/* offset in bits */
-	 * contains both member bitfield size and bit offset. The
-	 * bitfield size is set for bitfield members. If the type
-	 * info kind_flag is not set, the offset contains only bit
-	 * offset.
-	 */
-	__u32	offset;
-};
-
-/* If the struct/union type info kind_flag is set, the
- * following two macros are used to access bitfield_size
- * and bit_offset from btf_member.offset.
- */
-#define BTF_MEMBER_BITFIELD_SIZE(val)	((val) >> 24)
-#define BTF_MEMBER_BIT_OFFSET(val)	((val) & 0xffffff)
-
-/* BTF_KIND_FUNC_PROTO is followed by multiple "struct btf_param".
- * The exact number of btf_param is stored in the vlen (of the
- * info in "struct btf_type").
- */
-struct btf_param {
-	__u32	name_off;
-	__u32	type;
-};
-
-enum {
-	BTF_VAR_STATIC = 0,
-	BTF_VAR_GLOBAL_ALLOCATED = 1,
-	BTF_VAR_GLOBAL_EXTERN = 2,
-};
-
-enum btf_func_linkage {
-	BTF_FUNC_STATIC = 0,
-	BTF_FUNC_GLOBAL = 1,
-	BTF_FUNC_EXTERN = 2,
-};
-
-/* BTF_KIND_VAR is followed by a single "struct btf_var" to describe
- * additional information related to the variable such as its linkage.
- */
-struct btf_var {
-	__u32	linkage;
-};
-
-/* BTF_KIND_DATASEC is followed by multiple "struct btf_var_secinfo"
- * to describe all BTF_KIND_VAR types it contains along with it's
- * in-section offset as well as size.
- */
-struct btf_var_secinfo {
-	__u32	type;
-	__u32	offset;
-	__u32	size;
-};
-
-/* BTF_KIND_DECL_TAG is followed by a single "struct btf_decl_tag" to describe
- * additional information related to the tag applied location.
- * If component_idx == -1, the tag is applied to a struct, union,
- * variable or function. Otherwise, it is applied to a struct/union
- * member or a func argument, and component_idx indicates which member
- * or argument (0 ... vlen-1).
- */
-struct btf_decl_tag {
-       __s32   component_idx;
 };
 
 #endif /* __LINUX_BTF_H__ */

include/uapi/linux/can.h

@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * linux/can.h
  *
@@ -84,7 +84,6 @@ typedef __u32 can_err_mask_t;
 
 /* CAN payload length and DLC definitions according to ISO 11898-1 */
 #define CAN_MAX_DLC 8
-#define CAN_MAX_RAW_DLC 15
 #define CAN_MAX_DLEN 8
 
 /* CAN FD payload length and DLC definitions according to ISO 11898-7 */
@@ -92,39 +91,30 @@ typedef __u32 can_err_mask_t;
 #define CANFD_MAX_DLEN 64
 
 /**
- * struct can_frame - Classical CAN frame structure (aka CAN 2.0B)
+ * struct can_frame - basic CAN frame structure
  * @can_id:  CAN ID of the frame and CAN_*_FLAG flags, see canid_t definition
- * @len:      CAN frame payload length in byte (0 .. 8)
+ * @can_dlc: frame payload length in byte (0 .. 8) aka data length code
- * @can_dlc:  deprecated name for CAN frame payload length in byte (0 .. 8)
+ *           N.B. the DLC field from ISO 11898-1 Chapter 8.4.2.3 has a 1:1
+ *           mapping of the 'data length code' to the real payload length
  * @__pad:   padding
  * @__res0:  reserved / padding
- * @len8_dlc: optional DLC value (9 .. 15) at 8 byte payload length
+ * @__res1:  reserved / padding
- *            len8_dlc contains values from 9 .. 15 when the payload length is
- *            8 bytes but the DLC value (see ISO 11898-1) is greater then 8.
- *            CAN_CTRLMODE_CC_LEN8_DLC flag has to be enabled in CAN driver.
  * @data:    CAN frame payload (up to 8 byte)
  */
 struct can_frame {
 	canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
-	union {
+	__u8    can_dlc; /* frame payload length in byte (0 .. CAN_MAX_DLEN) */
-		/* CAN frame payload length in byte (0 .. CAN_MAX_DLEN)
-		 * was previously named can_dlc so we need to carry that
-		 * name for legacy support
-		 */
-		__u8 len;
-		__u8 can_dlc; /* deprecated */
-	} __attribute__((packed)); /* disable padding added in some ABIs */
 	__u8    __pad;   /* padding */
 	__u8    __res0;  /* reserved / padding */
-	__u8 len8_dlc; /* optional DLC for 8 byte payload length (9 .. 15) */
+	__u8    __res1;  /* reserved / padding */
 	__u8    data[CAN_MAX_DLEN] __attribute__((aligned(8)));
 };
 
 /*
  * defined bits for canfd_frame.flags
  *
- * The use of struct canfd_frame implies the FD Frame (FDF) bit to
+ * The use of struct canfd_frame implies the Extended Data Length (EDL) bit to
- * be set in the CAN frame bitstream on the wire. The FDF bit switch turns
+ * be set in the CAN frame bitstream on the wire. The EDL bit switch turns
  * the CAN controllers bitstream processor into the CAN FD mode which creates
  * two new options within the CAN FD frame specification:
  *
@@ -135,18 +125,9 @@ struct can_frame {
  * controller only the CANFD_BRS bit is relevant for real CAN controllers when
  * building a CAN FD frame for transmission. Setting the CANFD_ESI bit can make
  * sense for virtual CAN interfaces to test applications with echoed frames.
- *
- * The struct can_frame and struct canfd_frame intentionally share the same
- * layout to be able to write CAN frame content into a CAN FD frame structure.
- * When this is done the former differentiation via CAN_MTU / CANFD_MTU gets
- * lost. CANFD_FDF allows programmers to mark CAN FD frames in the case of
- * using struct canfd_frame for mixed CAN / CAN FD content (dual use).
- * N.B. the Kernel APIs do NOT provide mixed CAN / CAN FD content inside of
- * struct canfd_frame therefore the CANFD_FDF flag is disregarded by Linux.
  */
 #define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */
 #define CANFD_ESI 0x02 /* error state indicator of the transmitting node */
-#define CANFD_FDF 0x04 /* mark CAN FD for dual use of struct canfd_frame */
 
 /**
  * struct canfd_frame - CAN flexible data rate frame structure
@@ -176,8 +157,7 @@ struct canfd_frame {
 #define CAN_TP20	4 /* VAG Transport Protocol v2.0 */
 #define CAN_MCNET	5 /* Bosch MCNet */
 #define CAN_ISOTP	6 /* ISO 15765-2 Transport Protocol */
-#define CAN_J1939	7 /* SAE J1939 */
+#define CAN_NPROTO	7
-#define CAN_NPROTO	8
 
 #define SOL_CAN_BASE 100
 
@@ -194,23 +174,6 @@ struct sockaddr_can {
 		/* transport protocol class address information (e.g. ISOTP) */
 		struct { canid_t rx_id, tx_id; } tp;
 
-		/* J1939 address information */
-		struct {
-			/* 8 byte name when using dynamic addressing */
-			__u64 name;
-
-			/* pgn:
-			 * 8 bit: PS in PDU2 case, else 0
-			 * 8 bit: PF
-			 * 1 bit: DP
-			 * 1 bit: reserved
-			 */
-			__u32 pgn;
-
-			/* 1 byte address */
-			__u8 addr;
-		} j1939;
-
 		/* reserved for future CAN protocols address information */
 	} can_addr;
 };

include/uapi/linux/can/netlink.h

@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/can/netlink.h
  *
@@ -40,15 +40,15 @@ struct can_bittiming {
 };
 
 /*
- * CAN hardware-dependent bit-timing constant
+ * CAN harware-dependent bit-timing constant
  *
  * Used for calculating and checking bit-timing parameters
  */
 struct can_bittiming_const {
 	char name[16];		/* Name of the CAN controller hardware */
-	__u32 tseg1_min;	/* Time segment 1 = prop_seg + phase_seg1 */
+	__u32 tseg1_min;	/* Time segement 1 = prop_seg + phase_seg1 */
 	__u32 tseg1_max;
-	__u32 tseg2_min;	/* Time segment 2 = phase_seg2 */
+	__u32 tseg2_min;	/* Time segement 2 = phase_seg2 */
 	__u32 tseg2_max;
 	__u32 sjw_max;		/* Synchronisation jump width */
 	__u32 brp_min;		/* Bit-rate prescaler */
@@ -100,9 +100,6 @@ struct can_ctrlmode {
 #define CAN_CTRLMODE_FD			0x20	/* CAN FD mode */
 #define CAN_CTRLMODE_PRESUME_ACK	0x40	/* Ignore missing CAN ACKs */
 #define CAN_CTRLMODE_FD_NON_ISO		0x80	/* CAN FD in non-ISO mode */
-#define CAN_CTRLMODE_CC_LEN8_DLC	0x100	/* Classic CAN DLC option */
-#define CAN_CTRLMODE_TDC_AUTO		0x200	/* CAN transiver automatically calculates TDCV */
-#define CAN_CTRLMODE_TDC_MANUAL		0x400	/* TDCV is manually set up by user */
 
 /*
  * CAN device statistics
@@ -136,35 +133,10 @@ enum {
 	IFLA_CAN_BITRATE_CONST,
 	IFLA_CAN_DATA_BITRATE_CONST,
 	IFLA_CAN_BITRATE_MAX,
-	IFLA_CAN_TDC,
+	__IFLA_CAN_MAX
-
-	/* add new constants above here */
-	__IFLA_CAN_MAX,
-	IFLA_CAN_MAX = __IFLA_CAN_MAX - 1
 };
 
-/*
+#define IFLA_CAN_MAX	(__IFLA_CAN_MAX - 1)
- * CAN FD Transmitter Delay Compensation (TDC)
- *
- * Please refer to struct can_tdc_const and can_tdc in
- * include/linux/can/bittiming.h for further details.
- */
-enum {
-	IFLA_CAN_TDC_UNSPEC,
-	IFLA_CAN_TDC_TDCV_MIN,	/* u32 */
-	IFLA_CAN_TDC_TDCV_MAX,	/* u32 */
-	IFLA_CAN_TDC_TDCO_MIN,	/* u32 */
-	IFLA_CAN_TDC_TDCO_MAX,	/* u32 */
-	IFLA_CAN_TDC_TDCF_MIN,	/* u32 */
-	IFLA_CAN_TDC_TDCF_MAX,	/* u32 */
-	IFLA_CAN_TDC_TDCV,	/* u32 */
-	IFLA_CAN_TDC_TDCO,	/* u32 */
-	IFLA_CAN_TDC_TDCF,	/* u32 */
-
-	/* add new constants above here */
-	__IFLA_CAN_TDC,
-	IFLA_CAN_TDC_MAX = __IFLA_CAN_TDC - 1
-};
 
 /* u16 termination range: 1..65535 Ohms */
 #define CAN_TERMINATION_DISABLED 0

include/uapi/linux/can/vxcan.h

@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _CAN_VXCAN_H
 #define _CAN_VXCAN_H
 

include/uapi/linux/const.h

@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* const.h: Macros for dealing with constants.  */
-
-#ifndef _LINUX_CONST_H
-#define _LINUX_CONST_H
-
-/* Some constant macros are used in both assembler and
- * C code.  Therefore we cannot annotate them always with
- * 'UL' and other type specifiers unilaterally.  We
- * use the following macros to deal with this.
- *
- * Similarly, _AT() will cast an expression with a type in C, but
- * leave it unchanged in asm.
- */
-
-#ifdef __ASSEMBLY__
-#define _AC(X,Y)	X
-#define _AT(T,X)	X
-#else
-#define __AC(X,Y)	(X##Y)
-#define _AC(X,Y)	__AC(X,Y)
-#define _AT(T,X)	((T)(X))
-#endif
-
-#define _UL(x)		(_AC(x, UL))
-#define _ULL(x)		(_AC(x, ULL))
-
-#define _BITUL(x)	(_UL(1) << (x))
-#define _BITULL(x)	(_ULL(1) << (x))
-
-#define __ALIGN_KERNEL(x, a)		__ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
-#define __ALIGN_KERNEL_MASK(x, mask)	(((x) + (mask)) & ~(mask))
-
-#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
-
-#endif /* _LINUX_CONST_H */

include/uapi/linux/dcbnl.h

@@ -1,769 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * Copyright (c) 2008-2011, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Author: Lucy Liu <lucy.liu@intel.com>
- */
-
-#ifndef __LINUX_DCBNL_H__
-#define __LINUX_DCBNL_H__
-
-#include <linux/types.h>
-
-/* IEEE 802.1Qaz std supported values */
-#define IEEE_8021QAZ_MAX_TCS	8
-
-#define IEEE_8021QAZ_TSA_STRICT		0
-#define IEEE_8021QAZ_TSA_CB_SHAPER	1
-#define IEEE_8021QAZ_TSA_ETS		2
-#define IEEE_8021QAZ_TSA_VENDOR		255
-
-/* This structure contains the IEEE 802.1Qaz ETS managed object
- *
- * @willing: willing bit in ETS configuration TLV
- * @ets_cap: indicates supported capacity of ets feature
- * @cbs: credit based shaper ets algorithm supported
- * @tc_tx_bw: tc tx bandwidth indexed by traffic class
- * @tc_rx_bw: tc rx bandwidth indexed by traffic class
- * @tc_tsa: TSA Assignment table, indexed by traffic class
- * @prio_tc: priority assignment table mapping 8021Qp to traffic class
- * @tc_reco_bw: recommended tc bandwidth indexed by traffic class for TLV
- * @tc_reco_tsa: recommended tc bandwidth indexed by traffic class for TLV
- * @reco_prio_tc: recommended tc tx bandwidth indexed by traffic class for TLV
- *
- * Recommended values are used to set fields in the ETS recommendation TLV
- * with hardware offloaded LLDP.
- *
- * ----
- *  TSA Assignment 8 bit identifiers
- *	0	strict priority
- *	1	credit-based shaper
- *	2	enhanced transmission selection
- *	3-254	reserved
- *	255	vendor specific
- */
-struct ieee_ets {
-	__u8	willing;
-	__u8	ets_cap;
-	__u8	cbs;
-	__u8	tc_tx_bw[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_rx_bw[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_tsa[IEEE_8021QAZ_MAX_TCS];
-	__u8	prio_tc[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_reco_bw[IEEE_8021QAZ_MAX_TCS];
-	__u8	tc_reco_tsa[IEEE_8021QAZ_MAX_TCS];
-	__u8	reco_prio_tc[IEEE_8021QAZ_MAX_TCS];
-};
-
-/* This structure contains rate limit extension to the IEEE 802.1Qaz ETS
- * managed object.
- * Values are 64 bits long and specified in Kbps to enable usage over both
- * slow and very fast networks.
- *
- * @tc_maxrate: maximal tc tx bandwidth indexed by traffic class
- */
-struct ieee_maxrate {
-	__u64	tc_maxrate[IEEE_8021QAZ_MAX_TCS];
-};
-
-enum dcbnl_cndd_states {
-	DCB_CNDD_RESET = 0,
-	DCB_CNDD_EDGE,
-	DCB_CNDD_INTERIOR,
-	DCB_CNDD_INTERIOR_READY,
-};
-
-/* This structure contains the IEEE 802.1Qau QCN managed object.
- *
- *@rpg_enable: enable QCN RP
- *@rppp_max_rps: maximum number of RPs allowed for this CNPV on this port
- *@rpg_time_reset: time between rate increases if no CNMs received.
- *		   given in u-seconds
- *@rpg_byte_reset: transmitted data between rate increases if no CNMs received.
- *		   given in Bytes
- *@rpg_threshold: The number of times rpByteStage or rpTimeStage can count
- *		   before RP rate control state machine advances states
- *@rpg_max_rate: the maxinun rate, in Mbits per second,
- *		 at which an RP can transmit
- *@rpg_ai_rate: The rate, in Mbits per second,
- *		used to increase rpTargetRate in the RPR_ACTIVE_INCREASE
- *@rpg_hai_rate: The rate, in Mbits per second,
- *		 used to increase rpTargetRate in the RPR_HYPER_INCREASE state
- *@rpg_gd: Upon CNM receive, flow rate is limited to (Fb/Gd)*CurrentRate.
- *	   rpgGd is given as log2(Gd), where Gd may only be powers of 2
- *@rpg_min_dec_fac: The minimum factor by which the current transmit rate
- *		    can be changed by reception of a CNM.
- *		    value is given as percentage (1-100)
- *@rpg_min_rate: The minimum value, in bits per second, for rate to limit
- *@cndd_state_machine: The state of the congestion notification domain
- *		       defense state machine, as defined by IEEE 802.3Qau
- *		       section 32.1.1. In the interior ready state,
- *		       the QCN capable hardware may add CN-TAG TLV to the
- *		       outgoing traffic, to specifically identify outgoing
- *		       flows.
- */
-
-struct ieee_qcn {
-	__u8 rpg_enable[IEEE_8021QAZ_MAX_TCS];
-	__u32 rppp_max_rps[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_time_reset[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_byte_reset[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_threshold[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_max_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_ai_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_hai_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_gd[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_min_dec_fac[IEEE_8021QAZ_MAX_TCS];
-	__u32 rpg_min_rate[IEEE_8021QAZ_MAX_TCS];
-	__u32 cndd_state_machine[IEEE_8021QAZ_MAX_TCS];
-};
-
-/* This structure contains the IEEE 802.1Qau QCN statistics.
- *
- *@rppp_rp_centiseconds: the number of RP-centiseconds accumulated
- *			 by RPs at this priority level on this Port
- *@rppp_created_rps: number of active RPs(flows) that react to CNMs
- */
-
-struct ieee_qcn_stats {
-	__u64 rppp_rp_centiseconds[IEEE_8021QAZ_MAX_TCS];
-	__u32 rppp_created_rps[IEEE_8021QAZ_MAX_TCS];
-};
-
-/* This structure contains the IEEE 802.1Qaz PFC managed object
- *
- * @pfc_cap: Indicates the number of traffic classes on the local device
- *	     that may simultaneously have PFC enabled.
- * @pfc_en: bitmap indicating pfc enabled traffic classes
- * @mbc: enable macsec bypass capability
- * @delay: the allowance made for a round-trip propagation delay of the
- *	   link in bits.
- * @requests: count of the sent pfc frames
- * @indications: count of the received pfc frames
- */
-struct ieee_pfc {
-	__u8	pfc_cap;
-	__u8	pfc_en;
-	__u8	mbc;
-	__u16	delay;
-	__u64	requests[IEEE_8021QAZ_MAX_TCS];
-	__u64	indications[IEEE_8021QAZ_MAX_TCS];
-};
-
-#define IEEE_8021Q_MAX_PRIORITIES 8
-#define DCBX_MAX_BUFFERS  8
-struct dcbnl_buffer {
-	/* priority to buffer mapping */
-	__u8    prio2buffer[IEEE_8021Q_MAX_PRIORITIES];
-	/* buffer size in Bytes */
-	__u32   buffer_size[DCBX_MAX_BUFFERS];
-	__u32   total_size;
-};
-
-/* CEE DCBX std supported values */
-#define CEE_DCBX_MAX_PGS	8
-#define CEE_DCBX_MAX_PRIO	8
-
-/**
- * struct cee_pg - CEE Priority-Group managed object
- *
- * @willing: willing bit in the PG tlv
- * @error: error bit in the PG tlv
- * @pg_en: enable bit of the PG feature
- * @tcs_supported: number of traffic classes supported
- * @pg_bw: bandwidth percentage for each priority group
- * @prio_pg: priority to PG mapping indexed by priority
- */
-struct cee_pg {
-	__u8    willing;
-	__u8    error;
-	__u8    pg_en;
-	__u8    tcs_supported;
-	__u8    pg_bw[CEE_DCBX_MAX_PGS];
-	__u8    prio_pg[CEE_DCBX_MAX_PGS];
-};
-
-/**
- * struct cee_pfc - CEE PFC managed object
- *
- * @willing: willing bit in the PFC tlv
- * @error: error bit in the PFC tlv
- * @pfc_en: bitmap indicating pfc enabled traffic classes
- * @tcs_supported: number of traffic classes supported
- */
-struct cee_pfc {
-	__u8    willing;
-	__u8    error;
-	__u8    pfc_en;
-	__u8    tcs_supported;
-};
-
-/* IEEE 802.1Qaz std supported values */
-#define IEEE_8021QAZ_APP_SEL_ETHERTYPE	1
-#define IEEE_8021QAZ_APP_SEL_STREAM	2
-#define IEEE_8021QAZ_APP_SEL_DGRAM	3
-#define IEEE_8021QAZ_APP_SEL_ANY	4
-#define IEEE_8021QAZ_APP_SEL_DSCP       5
-
-/* This structure contains the IEEE 802.1Qaz APP managed object. This
- * object is also used for the CEE std as well.
- *
- * @selector: protocol identifier type
- * @protocol: protocol of type indicated
- * @priority: 3-bit unsigned integer indicating priority for IEEE
- *            8-bit 802.1p user priority bitmap for CEE
- *
- * ----
- *  Selector field values for IEEE 802.1Qaz
- *	0	Reserved
- *	1	Ethertype
- *	2	Well known port number over TCP or SCTP
- *	3	Well known port number over UDP or DCCP
- *	4	Well known port number over TCP, SCTP, UDP, or DCCP
- *	5	Differentiated Services Code Point (DSCP) value
- *	6-7	Reserved
- *
- *  Selector field values for CEE
- *	0	Ethertype
- *	1	Well known port number over TCP or UDP
- *	2-3	Reserved
- */
-struct dcb_app {
-	__u8	selector;
-	__u8	priority;
-	__u16	protocol;
-};
-
-/**
- * struct dcb_peer_app_info - APP feature information sent by the peer
- *
- * @willing: willing bit in the peer APP tlv
- * @error: error bit in the peer APP tlv
- *
- * In addition to this information the full peer APP tlv also contains
- * a table of 'app_count' APP objects defined above.
- */
-struct dcb_peer_app_info {
-	__u8	willing;
-	__u8	error;
-};
-
-struct dcbmsg {
-	__u8               dcb_family;
-	__u8               cmd;
-	__u16              dcb_pad;
-};
-
-/**
- * enum dcbnl_commands - supported DCB commands
- *
- * @DCB_CMD_UNDEFINED: unspecified command to catch errors
- * @DCB_CMD_GSTATE: request the state of DCB in the device
- * @DCB_CMD_SSTATE: set the state of DCB in the device
- * @DCB_CMD_PGTX_GCFG: request the priority group configuration for Tx
- * @DCB_CMD_PGTX_SCFG: set the priority group configuration for Tx
- * @DCB_CMD_PGRX_GCFG: request the priority group configuration for Rx
- * @DCB_CMD_PGRX_SCFG: set the priority group configuration for Rx
- * @DCB_CMD_PFC_GCFG: request the priority flow control configuration
- * @DCB_CMD_PFC_SCFG: set the priority flow control configuration
- * @DCB_CMD_SET_ALL: apply all changes to the underlying device
- * @DCB_CMD_GPERM_HWADDR: get the permanent MAC address of the underlying
- *                        device.  Only useful when using bonding.
- * @DCB_CMD_GCAP: request the DCB capabilities of the device
- * @DCB_CMD_GNUMTCS: get the number of traffic classes currently supported
- * @DCB_CMD_SNUMTCS: set the number of traffic classes
- * @DCB_CMD_GBCN: set backward congestion notification configuration
- * @DCB_CMD_SBCN: get backward congestion notification configuration.
- * @DCB_CMD_GAPP: get application protocol configuration
- * @DCB_CMD_SAPP: set application protocol configuration
- * @DCB_CMD_IEEE_SET: set IEEE 802.1Qaz configuration
- * @DCB_CMD_IEEE_GET: get IEEE 802.1Qaz configuration
- * @DCB_CMD_GDCBX: get DCBX engine configuration
- * @DCB_CMD_SDCBX: set DCBX engine configuration
- * @DCB_CMD_GFEATCFG: get DCBX features flags
- * @DCB_CMD_SFEATCFG: set DCBX features negotiation flags
- * @DCB_CMD_CEE_GET: get CEE aggregated configuration
- * @DCB_CMD_IEEE_DEL: delete IEEE 802.1Qaz configuration
- */
-enum dcbnl_commands {
-	DCB_CMD_UNDEFINED,
-
-	DCB_CMD_GSTATE,
-	DCB_CMD_SSTATE,
-
-	DCB_CMD_PGTX_GCFG,
-	DCB_CMD_PGTX_SCFG,
-	DCB_CMD_PGRX_GCFG,
-	DCB_CMD_PGRX_SCFG,
-
-	DCB_CMD_PFC_GCFG,
-	DCB_CMD_PFC_SCFG,
-
-	DCB_CMD_SET_ALL,
-
-	DCB_CMD_GPERM_HWADDR,
-
-	DCB_CMD_GCAP,
-
-	DCB_CMD_GNUMTCS,
-	DCB_CMD_SNUMTCS,
-
-	DCB_CMD_PFC_GSTATE,
-	DCB_CMD_PFC_SSTATE,
-
-	DCB_CMD_BCN_GCFG,
-	DCB_CMD_BCN_SCFG,
-
-	DCB_CMD_GAPP,
-	DCB_CMD_SAPP,
-
-	DCB_CMD_IEEE_SET,
-	DCB_CMD_IEEE_GET,
-
-	DCB_CMD_GDCBX,
-	DCB_CMD_SDCBX,
-
-	DCB_CMD_GFEATCFG,
-	DCB_CMD_SFEATCFG,
-
-	DCB_CMD_CEE_GET,
-	DCB_CMD_IEEE_DEL,
-
-	__DCB_CMD_ENUM_MAX,
-	DCB_CMD_MAX = __DCB_CMD_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_attrs - DCB top-level netlink attributes
- *
- * @DCB_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_ATTR_IFNAME: interface name of the underlying device (NLA_STRING)
- * @DCB_ATTR_STATE: enable state of DCB in the device (NLA_U8)
- * @DCB_ATTR_PFC_STATE: enable state of PFC in the device (NLA_U8)
- * @DCB_ATTR_PFC_CFG: priority flow control configuration (NLA_NESTED)
- * @DCB_ATTR_NUM_TC: number of traffic classes supported in the device (NLA_U8)
- * @DCB_ATTR_PG_CFG: priority group configuration (NLA_NESTED)
- * @DCB_ATTR_SET_ALL: bool to commit changes to hardware or not (NLA_U8)
- * @DCB_ATTR_PERM_HWADDR: MAC address of the physical device (NLA_NESTED)
- * @DCB_ATTR_CAP: DCB capabilities of the device (NLA_NESTED)
- * @DCB_ATTR_NUMTCS: number of traffic classes supported (NLA_NESTED)
- * @DCB_ATTR_BCN: backward congestion notification configuration (NLA_NESTED)
- * @DCB_ATTR_IEEE: IEEE 802.1Qaz supported attributes (NLA_NESTED)
- * @DCB_ATTR_DCBX: DCBX engine configuration in the device (NLA_U8)
- * @DCB_ATTR_FEATCFG: DCBX features flags (NLA_NESTED)
- * @DCB_ATTR_CEE: CEE std supported attributes (NLA_NESTED)
- */
-enum dcbnl_attrs {
-	DCB_ATTR_UNDEFINED,
-
-	DCB_ATTR_IFNAME,
-	DCB_ATTR_STATE,
-	DCB_ATTR_PFC_STATE,
-	DCB_ATTR_PFC_CFG,
-	DCB_ATTR_NUM_TC,
-	DCB_ATTR_PG_CFG,
-	DCB_ATTR_SET_ALL,
-	DCB_ATTR_PERM_HWADDR,
-	DCB_ATTR_CAP,
-	DCB_ATTR_NUMTCS,
-	DCB_ATTR_BCN,
-	DCB_ATTR_APP,
-
-	/* IEEE std attributes */
-	DCB_ATTR_IEEE,
-
-	DCB_ATTR_DCBX,
-	DCB_ATTR_FEATCFG,
-
-	/* CEE nested attributes */
-	DCB_ATTR_CEE,
-
-	__DCB_ATTR_ENUM_MAX,
-	DCB_ATTR_MAX = __DCB_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum ieee_attrs - IEEE 802.1Qaz get/set attributes
- *
- * @DCB_ATTR_IEEE_UNSPEC: unspecified
- * @DCB_ATTR_IEEE_ETS: negotiated ETS configuration
- * @DCB_ATTR_IEEE_PFC: negotiated PFC configuration
- * @DCB_ATTR_IEEE_APP_TABLE: negotiated APP configuration
- * @DCB_ATTR_IEEE_PEER_ETS: peer ETS configuration - get only
- * @DCB_ATTR_IEEE_PEER_PFC: peer PFC configuration - get only
- * @DCB_ATTR_IEEE_PEER_APP: peer APP tlv - get only
- */
-enum ieee_attrs {
-	DCB_ATTR_IEEE_UNSPEC,
-	DCB_ATTR_IEEE_ETS,
-	DCB_ATTR_IEEE_PFC,
-	DCB_ATTR_IEEE_APP_TABLE,
-	DCB_ATTR_IEEE_PEER_ETS,
-	DCB_ATTR_IEEE_PEER_PFC,
-	DCB_ATTR_IEEE_PEER_APP,
-	DCB_ATTR_IEEE_MAXRATE,
-	DCB_ATTR_IEEE_QCN,
-	DCB_ATTR_IEEE_QCN_STATS,
-	DCB_ATTR_DCB_BUFFER,
-	__DCB_ATTR_IEEE_MAX
-};
-#define DCB_ATTR_IEEE_MAX (__DCB_ATTR_IEEE_MAX - 1)
-
-enum ieee_attrs_app {
-	DCB_ATTR_IEEE_APP_UNSPEC,
-	DCB_ATTR_IEEE_APP,
-	__DCB_ATTR_IEEE_APP_MAX
-};
-#define DCB_ATTR_IEEE_APP_MAX (__DCB_ATTR_IEEE_APP_MAX - 1)
-
-/**
- * enum cee_attrs - CEE DCBX get attributes.
- *
- * @DCB_ATTR_CEE_UNSPEC: unspecified
- * @DCB_ATTR_CEE_PEER_PG: peer PG configuration - get only
- * @DCB_ATTR_CEE_PEER_PFC: peer PFC configuration - get only
- * @DCB_ATTR_CEE_PEER_APP_TABLE: peer APP tlv - get only
- * @DCB_ATTR_CEE_TX_PG: TX PG configuration (DCB_CMD_PGTX_GCFG)
- * @DCB_ATTR_CEE_RX_PG: RX PG configuration (DCB_CMD_PGRX_GCFG)
- * @DCB_ATTR_CEE_PFC: PFC configuration (DCB_CMD_PFC_GCFG)
- * @DCB_ATTR_CEE_APP_TABLE: APP configuration (multi DCB_CMD_GAPP)
- * @DCB_ATTR_CEE_FEAT: DCBX features flags (DCB_CMD_GFEATCFG)
- *
- * An aggregated collection of the cee std negotiated parameters.
- */
-enum cee_attrs {
-	DCB_ATTR_CEE_UNSPEC,
-	DCB_ATTR_CEE_PEER_PG,
-	DCB_ATTR_CEE_PEER_PFC,
-	DCB_ATTR_CEE_PEER_APP_TABLE,
-	DCB_ATTR_CEE_TX_PG,
-	DCB_ATTR_CEE_RX_PG,
-	DCB_ATTR_CEE_PFC,
-	DCB_ATTR_CEE_APP_TABLE,
-	DCB_ATTR_CEE_FEAT,
-	__DCB_ATTR_CEE_MAX
-};
-#define DCB_ATTR_CEE_MAX (__DCB_ATTR_CEE_MAX - 1)
-
-enum peer_app_attr {
-	DCB_ATTR_CEE_PEER_APP_UNSPEC,
-	DCB_ATTR_CEE_PEER_APP_INFO,
-	DCB_ATTR_CEE_PEER_APP,
-	__DCB_ATTR_CEE_PEER_APP_MAX
-};
-#define DCB_ATTR_CEE_PEER_APP_MAX (__DCB_ATTR_CEE_PEER_APP_MAX - 1)
-
-enum cee_attrs_app {
-	DCB_ATTR_CEE_APP_UNSPEC,
-	DCB_ATTR_CEE_APP,
-	__DCB_ATTR_CEE_APP_MAX
-};
-#define DCB_ATTR_CEE_APP_MAX (__DCB_ATTR_CEE_APP_MAX - 1)
-
-/**
- * enum dcbnl_pfc_attrs - DCB Priority Flow Control user priority nested attrs
- *
- * @DCB_PFC_UP_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_PFC_UP_ATTR_0: Priority Flow Control value for User Priority 0 (NLA_U8)
- * @DCB_PFC_UP_ATTR_1: Priority Flow Control value for User Priority 1 (NLA_U8)
- * @DCB_PFC_UP_ATTR_2: Priority Flow Control value for User Priority 2 (NLA_U8)
- * @DCB_PFC_UP_ATTR_3: Priority Flow Control value for User Priority 3 (NLA_U8)
- * @DCB_PFC_UP_ATTR_4: Priority Flow Control value for User Priority 4 (NLA_U8)
- * @DCB_PFC_UP_ATTR_5: Priority Flow Control value for User Priority 5 (NLA_U8)
- * @DCB_PFC_UP_ATTR_6: Priority Flow Control value for User Priority 6 (NLA_U8)
- * @DCB_PFC_UP_ATTR_7: Priority Flow Control value for User Priority 7 (NLA_U8)
- * @DCB_PFC_UP_ATTR_MAX: highest attribute number currently defined
- * @DCB_PFC_UP_ATTR_ALL: apply to all priority flow control attrs (NLA_FLAG)
- *
- */
-enum dcbnl_pfc_up_attrs {
-	DCB_PFC_UP_ATTR_UNDEFINED,
-
-	DCB_PFC_UP_ATTR_0,
-	DCB_PFC_UP_ATTR_1,
-	DCB_PFC_UP_ATTR_2,
-	DCB_PFC_UP_ATTR_3,
-	DCB_PFC_UP_ATTR_4,
-	DCB_PFC_UP_ATTR_5,
-	DCB_PFC_UP_ATTR_6,
-	DCB_PFC_UP_ATTR_7,
-	DCB_PFC_UP_ATTR_ALL,
-
-	__DCB_PFC_UP_ATTR_ENUM_MAX,
-	DCB_PFC_UP_ATTR_MAX = __DCB_PFC_UP_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_pg_attrs - DCB Priority Group attributes
- *
- * @DCB_PG_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_PG_ATTR_TC_0: Priority Group Traffic Class 0 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_1: Priority Group Traffic Class 1 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_2: Priority Group Traffic Class 2 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_3: Priority Group Traffic Class 3 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_4: Priority Group Traffic Class 4 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_5: Priority Group Traffic Class 5 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_6: Priority Group Traffic Class 6 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_7: Priority Group Traffic Class 7 configuration (NLA_NESTED)
- * @DCB_PG_ATTR_TC_MAX: highest attribute number currently defined
- * @DCB_PG_ATTR_TC_ALL: apply to all traffic classes (NLA_NESTED)
- * @DCB_PG_ATTR_BW_ID_0: Percent of link bandwidth for Priority Group 0 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_1: Percent of link bandwidth for Priority Group 1 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_2: Percent of link bandwidth for Priority Group 2 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_3: Percent of link bandwidth for Priority Group 3 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_4: Percent of link bandwidth for Priority Group 4 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_5: Percent of link bandwidth for Priority Group 5 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_6: Percent of link bandwidth for Priority Group 6 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_7: Percent of link bandwidth for Priority Group 7 (NLA_U8)
- * @DCB_PG_ATTR_BW_ID_MAX: highest attribute number currently defined
- * @DCB_PG_ATTR_BW_ID_ALL: apply to all priority groups (NLA_FLAG)
- *
- */
-enum dcbnl_pg_attrs {
-	DCB_PG_ATTR_UNDEFINED,
-
-	DCB_PG_ATTR_TC_0,
-	DCB_PG_ATTR_TC_1,
-	DCB_PG_ATTR_TC_2,
-	DCB_PG_ATTR_TC_3,
-	DCB_PG_ATTR_TC_4,
-	DCB_PG_ATTR_TC_5,
-	DCB_PG_ATTR_TC_6,
-	DCB_PG_ATTR_TC_7,
-	DCB_PG_ATTR_TC_MAX,
-	DCB_PG_ATTR_TC_ALL,
-
-	DCB_PG_ATTR_BW_ID_0,
-	DCB_PG_ATTR_BW_ID_1,
-	DCB_PG_ATTR_BW_ID_2,
-	DCB_PG_ATTR_BW_ID_3,
-	DCB_PG_ATTR_BW_ID_4,
-	DCB_PG_ATTR_BW_ID_5,
-	DCB_PG_ATTR_BW_ID_6,
-	DCB_PG_ATTR_BW_ID_7,
-	DCB_PG_ATTR_BW_ID_MAX,
-	DCB_PG_ATTR_BW_ID_ALL,
-
-	__DCB_PG_ATTR_ENUM_MAX,
-	DCB_PG_ATTR_MAX = __DCB_PG_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_tc_attrs - DCB Traffic Class attributes
- *
- * @DCB_TC_ATTR_PARAM_UNDEFINED: unspecified attribute to catch errors
- * @DCB_TC_ATTR_PARAM_PGID: (NLA_U8) Priority group the traffic class belongs to
- *                          Valid values are:  0-7
- * @DCB_TC_ATTR_PARAM_UP_MAPPING: (NLA_U8) Traffic class to user priority map
- *                                Some devices may not support changing the
- *                                user priority map of a TC.
- * @DCB_TC_ATTR_PARAM_STRICT_PRIO: (NLA_U8) Strict priority setting
- *                                 0 - none
- *                                 1 - group strict
- *                                 2 - link strict
- * @DCB_TC_ATTR_PARAM_BW_PCT: optional - (NLA_U8) If supported by the device and
- *                            not configured to use link strict priority,
- *                            this is the percentage of bandwidth of the
- *                            priority group this traffic class belongs to
- * @DCB_TC_ATTR_PARAM_ALL: (NLA_FLAG) all traffic class parameters
- *
- */
-enum dcbnl_tc_attrs {
-	DCB_TC_ATTR_PARAM_UNDEFINED,
-
-	DCB_TC_ATTR_PARAM_PGID,
-	DCB_TC_ATTR_PARAM_UP_MAPPING,
-	DCB_TC_ATTR_PARAM_STRICT_PRIO,
-	DCB_TC_ATTR_PARAM_BW_PCT,
-	DCB_TC_ATTR_PARAM_ALL,
-
-	__DCB_TC_ATTR_PARAM_ENUM_MAX,
-	DCB_TC_ATTR_PARAM_MAX = __DCB_TC_ATTR_PARAM_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_cap_attrs - DCB Capability attributes
- *
- * @DCB_CAP_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_CAP_ATTR_ALL: (NLA_FLAG) all capability parameters
- * @DCB_CAP_ATTR_PG: (NLA_U8) device supports Priority Groups
- * @DCB_CAP_ATTR_PFC: (NLA_U8) device supports Priority Flow Control
- * @DCB_CAP_ATTR_UP2TC: (NLA_U8) device supports user priority to
- *                               traffic class mapping
- * @DCB_CAP_ATTR_PG_TCS: (NLA_U8) bitmap where each bit represents a
- *                                number of traffic classes the device
- *                                can be configured to use for Priority Groups
- * @DCB_CAP_ATTR_PFC_TCS: (NLA_U8) bitmap where each bit represents a
- *                                 number of traffic classes the device can be
- *                                 configured to use for Priority Flow Control
- * @DCB_CAP_ATTR_GSP: (NLA_U8) device supports group strict priority
- * @DCB_CAP_ATTR_BCN: (NLA_U8) device supports Backwards Congestion
- *                             Notification
- * @DCB_CAP_ATTR_DCBX: (NLA_U8) device supports DCBX engine
- *
- */
-enum dcbnl_cap_attrs {
-	DCB_CAP_ATTR_UNDEFINED,
-	DCB_CAP_ATTR_ALL,
-	DCB_CAP_ATTR_PG,
-	DCB_CAP_ATTR_PFC,
-	DCB_CAP_ATTR_UP2TC,
-	DCB_CAP_ATTR_PG_TCS,
-	DCB_CAP_ATTR_PFC_TCS,
-	DCB_CAP_ATTR_GSP,
-	DCB_CAP_ATTR_BCN,
-	DCB_CAP_ATTR_DCBX,
-
-	__DCB_CAP_ATTR_ENUM_MAX,
-	DCB_CAP_ATTR_MAX = __DCB_CAP_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * DCBX capability flags
- *
- * @DCB_CAP_DCBX_HOST: DCBX negotiation is performed by the host LLDP agent.
- *                     'set' routines are used to configure the device with
- *                     the negotiated parameters
- *
- * @DCB_CAP_DCBX_LLD_MANAGED: DCBX negotiation is not performed in the host but
- *                            by another entity
- *                            'get' routines are used to retrieve the
- *                            negotiated parameters
- *                            'set' routines can be used to set the initial
- *                            negotiation configuration
- *
- * @DCB_CAP_DCBX_VER_CEE: for a non-host DCBX engine, indicates the engine
- *                        supports the CEE protocol flavor
- *
- * @DCB_CAP_DCBX_VER_IEEE: for a non-host DCBX engine, indicates the engine
- *                         supports the IEEE protocol flavor
- *
- * @DCB_CAP_DCBX_STATIC: for a non-host DCBX engine, indicates the engine
- *                       supports static configuration (i.e no actual
- *                       negotiation is performed negotiated parameters equal
- *                       the initial configuration)
- *
- */
-#define DCB_CAP_DCBX_HOST		0x01
-#define DCB_CAP_DCBX_LLD_MANAGED	0x02
-#define DCB_CAP_DCBX_VER_CEE		0x04
-#define DCB_CAP_DCBX_VER_IEEE		0x08
-#define DCB_CAP_DCBX_STATIC		0x10
-
-/**
- * enum dcbnl_numtcs_attrs - number of traffic classes
- *
- * @DCB_NUMTCS_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_NUMTCS_ATTR_ALL: (NLA_FLAG) all traffic class attributes
- * @DCB_NUMTCS_ATTR_PG: (NLA_U8) number of traffic classes used for
- *                               priority groups
- * @DCB_NUMTCS_ATTR_PFC: (NLA_U8) number of traffic classes which can
- *                                support priority flow control
- */
-enum dcbnl_numtcs_attrs {
-	DCB_NUMTCS_ATTR_UNDEFINED,
-	DCB_NUMTCS_ATTR_ALL,
-	DCB_NUMTCS_ATTR_PG,
-	DCB_NUMTCS_ATTR_PFC,
-
-	__DCB_NUMTCS_ATTR_ENUM_MAX,
-	DCB_NUMTCS_ATTR_MAX = __DCB_NUMTCS_ATTR_ENUM_MAX - 1,
-};
-
-enum dcbnl_bcn_attrs{
-	DCB_BCN_ATTR_UNDEFINED = 0,
-
-	DCB_BCN_ATTR_RP_0,
-	DCB_BCN_ATTR_RP_1,
-	DCB_BCN_ATTR_RP_2,
-	DCB_BCN_ATTR_RP_3,
-	DCB_BCN_ATTR_RP_4,
-	DCB_BCN_ATTR_RP_5,
-	DCB_BCN_ATTR_RP_6,
-	DCB_BCN_ATTR_RP_7,
-	DCB_BCN_ATTR_RP_ALL,
-
-	DCB_BCN_ATTR_BCNA_0,
-	DCB_BCN_ATTR_BCNA_1,
-	DCB_BCN_ATTR_ALPHA,
-	DCB_BCN_ATTR_BETA,
-	DCB_BCN_ATTR_GD,
-	DCB_BCN_ATTR_GI,
-	DCB_BCN_ATTR_TMAX,
-	DCB_BCN_ATTR_TD,
-	DCB_BCN_ATTR_RMIN,
-	DCB_BCN_ATTR_W,
-	DCB_BCN_ATTR_RD,
-	DCB_BCN_ATTR_RU,
-	DCB_BCN_ATTR_WRTT,
-	DCB_BCN_ATTR_RI,
-	DCB_BCN_ATTR_C,
-	DCB_BCN_ATTR_ALL,
-
-	__DCB_BCN_ATTR_ENUM_MAX,
-	DCB_BCN_ATTR_MAX = __DCB_BCN_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcb_general_attr_values - general DCB attribute values
- *
- * @DCB_ATTR_UNDEFINED: value used to indicate an attribute is not supported
- *
- */
-enum dcb_general_attr_values {
-	DCB_ATTR_VALUE_UNDEFINED = 0xff
-};
-
-#define DCB_APP_IDTYPE_ETHTYPE	0x00
-#define DCB_APP_IDTYPE_PORTNUM	0x01
-enum dcbnl_app_attrs {
-	DCB_APP_ATTR_UNDEFINED,
-
-	DCB_APP_ATTR_IDTYPE,
-	DCB_APP_ATTR_ID,
-	DCB_APP_ATTR_PRIORITY,
-
-	__DCB_APP_ATTR_ENUM_MAX,
-	DCB_APP_ATTR_MAX = __DCB_APP_ATTR_ENUM_MAX - 1,
-};
-
-/**
- * enum dcbnl_featcfg_attrs - features conifiguration flags
- *
- * @DCB_FEATCFG_ATTR_UNDEFINED: unspecified attribute to catch errors
- * @DCB_FEATCFG_ATTR_ALL: (NLA_FLAG) all features configuration attributes
- * @DCB_FEATCFG_ATTR_PG: (NLA_U8) configuration flags for priority groups
- * @DCB_FEATCFG_ATTR_PFC: (NLA_U8) configuration flags for priority
- *                                 flow control
- * @DCB_FEATCFG_ATTR_APP: (NLA_U8) configuration flags for application TLV
- *
- */
-#define DCB_FEATCFG_ERROR	0x01	/* error in feature resolution */
-#define DCB_FEATCFG_ENABLE	0x02	/* enable feature */
-#define DCB_FEATCFG_WILLING	0x04	/* feature is willing */
-#define DCB_FEATCFG_ADVERTISE	0x08	/* advertise feature */
-enum dcbnl_featcfg_attrs {
-	DCB_FEATCFG_ATTR_UNDEFINED,
-	DCB_FEATCFG_ATTR_ALL,
-	DCB_FEATCFG_ATTR_PG,
-	DCB_FEATCFG_ATTR_PFC,
-	DCB_FEATCFG_ATTR_APP,
-
-	__DCB_FEATCFG_ATTR_ENUM_MAX,
-	DCB_FEATCFG_ATTR_MAX = __DCB_FEATCFG_ATTR_ENUM_MAX - 1,
-};
-
-#endif /* __LINUX_DCBNL_H__ */

include/uapi/linux/devlink.h

@@ -13,8 +13,6 @@
 #ifndef _LINUX_DEVLINK_H_
 #define _LINUX_DEVLINK_H_
 
-#include <linux/const.h>
-
 #define DEVLINK_GENL_NAME "devlink"
 #define DEVLINK_GENL_VERSION 0x1
 #define DEVLINK_GENL_MCGRP_CONFIG_NAME "config"
@@ -91,46 +89,6 @@ enum devlink_command {
 	DEVLINK_CMD_REGION_DEL,
 	DEVLINK_CMD_REGION_READ,
 
-	DEVLINK_CMD_PORT_PARAM_GET,	/* can dump */
-	DEVLINK_CMD_PORT_PARAM_SET,
-	DEVLINK_CMD_PORT_PARAM_NEW,
-	DEVLINK_CMD_PORT_PARAM_DEL,
-
-	DEVLINK_CMD_INFO_GET,		/* can dump */
-
-	DEVLINK_CMD_HEALTH_REPORTER_GET,
-	DEVLINK_CMD_HEALTH_REPORTER_SET,
-	DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
-	DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
-	DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
-	DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
-
-	DEVLINK_CMD_FLASH_UPDATE,
-	DEVLINK_CMD_FLASH_UPDATE_END,		/* notification only */
-	DEVLINK_CMD_FLASH_UPDATE_STATUS,	/* notification only */
-
-	DEVLINK_CMD_TRAP_GET,		/* can dump */
-	DEVLINK_CMD_TRAP_SET,
-	DEVLINK_CMD_TRAP_NEW,
-	DEVLINK_CMD_TRAP_DEL,
-
-	DEVLINK_CMD_TRAP_GROUP_GET,	/* can dump */
-	DEVLINK_CMD_TRAP_GROUP_SET,
-	DEVLINK_CMD_TRAP_GROUP_NEW,
-	DEVLINK_CMD_TRAP_GROUP_DEL,
-
-	DEVLINK_CMD_TRAP_POLICER_GET,	/* can dump */
-	DEVLINK_CMD_TRAP_POLICER_SET,
-	DEVLINK_CMD_TRAP_POLICER_NEW,
-	DEVLINK_CMD_TRAP_POLICER_DEL,
-
-	DEVLINK_CMD_HEALTH_REPORTER_TEST,
-
-	DEVLINK_CMD_RATE_GET,		/* can dump */
-	DEVLINK_CMD_RATE_SET,
-	DEVLINK_CMD_RATE_NEW,
-	DEVLINK_CMD_RATE_DEL,
-
 	/* add new commands above here */
 	__DEVLINK_CMD_MAX,
 	DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -193,27 +151,6 @@ enum devlink_port_flavour {
 	DEVLINK_PORT_FLAVOUR_DSA, /* Distributed switch architecture
 				   * interconnect port.
 				   */
-	DEVLINK_PORT_FLAVOUR_PCI_PF, /* Represents eswitch port for
-				      * the PCI PF. It is an internal
-				      * port that faces the PCI PF.
-				      */
-	DEVLINK_PORT_FLAVOUR_PCI_VF, /* Represents eswitch port
-				      * for the PCI VF. It is an internal
-				      * port that faces the PCI VF.
-				      */
-	DEVLINK_PORT_FLAVOUR_VIRTUAL, /* Any virtual port facing the user. */
-	DEVLINK_PORT_FLAVOUR_UNUSED, /* Port which exists in the switch, but
-				      * is not used in any way.
-				      */
-	DEVLINK_PORT_FLAVOUR_PCI_SF, /* Represents eswitch port
-				      * for the PCI SF. It is an internal
-				      * port that faces the PCI SF.
-				      */
-};
-
-enum devlink_rate_type {
-	DEVLINK_RATE_TYPE_LEAF,
-	DEVLINK_RATE_TYPE_NODE,
 };
 
 enum devlink_param_cmode {
@@ -226,118 +163,6 @@ enum devlink_param_cmode {
 	DEVLINK_PARAM_CMODE_MAX = __DEVLINK_PARAM_CMODE_MAX - 1
 };
 
-enum devlink_param_fw_load_policy_value {
-	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER,
-	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH,
-	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK,
-	DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN,
-};
-
-enum devlink_param_reset_dev_on_drv_probe_value {
-	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_UNKNOWN,
-	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_ALWAYS,
-	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_NEVER,
-	DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_DISK,
-};
-
-enum {
-	DEVLINK_ATTR_STATS_RX_PACKETS,		/* u64 */
-	DEVLINK_ATTR_STATS_RX_BYTES,		/* u64 */
-	DEVLINK_ATTR_STATS_RX_DROPPED,		/* u64 */
-
-	__DEVLINK_ATTR_STATS_MAX,
-	DEVLINK_ATTR_STATS_MAX = __DEVLINK_ATTR_STATS_MAX - 1
-};
-
-/* Specify what sections of a flash component can be overwritten when
- * performing an update. Overwriting of firmware binary sections is always
- * implicitly assumed to be allowed.
- *
- * Each section must be documented in
- * Documentation/networking/devlink/devlink-flash.rst
- *
- */
-enum {
-	DEVLINK_FLASH_OVERWRITE_SETTINGS_BIT,
-	DEVLINK_FLASH_OVERWRITE_IDENTIFIERS_BIT,
-
-	__DEVLINK_FLASH_OVERWRITE_MAX_BIT,
-	DEVLINK_FLASH_OVERWRITE_MAX_BIT = __DEVLINK_FLASH_OVERWRITE_MAX_BIT - 1
-};
-
-#define DEVLINK_FLASH_OVERWRITE_SETTINGS _BITUL(DEVLINK_FLASH_OVERWRITE_SETTINGS_BIT)
-#define DEVLINK_FLASH_OVERWRITE_IDENTIFIERS _BITUL(DEVLINK_FLASH_OVERWRITE_IDENTIFIERS_BIT)
-
-#define DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS \
-	(_BITUL(__DEVLINK_FLASH_OVERWRITE_MAX_BIT) - 1)
-
-/**
- * enum devlink_trap_action - Packet trap action.
- * @DEVLINK_TRAP_ACTION_DROP: Packet is dropped by the device and a copy is not
- *                            sent to the CPU.
- * @DEVLINK_TRAP_ACTION_TRAP: The sole copy of the packet is sent to the CPU.
- * @DEVLINK_TRAP_ACTION_MIRROR: Packet is forwarded by the device and a copy is
- *                              sent to the CPU.
- */
-enum devlink_trap_action {
-	DEVLINK_TRAP_ACTION_DROP,
-	DEVLINK_TRAP_ACTION_TRAP,
-	DEVLINK_TRAP_ACTION_MIRROR,
-};
-
-/**
- * enum devlink_trap_type - Packet trap type.
- * @DEVLINK_TRAP_TYPE_DROP: Trap reason is a drop. Trapped packets are only
- *                          processed by devlink and not injected to the
- *                          kernel's Rx path.
- * @DEVLINK_TRAP_TYPE_EXCEPTION: Trap reason is an exception. Packet was not
- *                               forwarded as intended due to an exception
- *                               (e.g., missing neighbour entry) and trapped to
- *                               control plane for resolution. Trapped packets
- *                               are processed by devlink and injected to
- *                               the kernel's Rx path.
- * @DEVLINK_TRAP_TYPE_CONTROL: Packet was trapped because it is required for
- *                             the correct functioning of the control plane.
- *                             For example, an ARP request packet. Trapped
- *                             packets are injected to the kernel's Rx path,
- *                             but not reported to drop monitor.
- */
-enum devlink_trap_type {
-	DEVLINK_TRAP_TYPE_DROP,
-	DEVLINK_TRAP_TYPE_EXCEPTION,
-	DEVLINK_TRAP_TYPE_CONTROL,
-};
-
-enum {
-	/* Trap can report input port as metadata */
-	DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT,
-	/* Trap can report flow action cookie as metadata */
-	DEVLINK_ATTR_TRAP_METADATA_TYPE_FA_COOKIE,
-};
-
-enum devlink_reload_action {
-	DEVLINK_RELOAD_ACTION_UNSPEC,
-	DEVLINK_RELOAD_ACTION_DRIVER_REINIT,	/* Driver entities re-instantiation */
-	DEVLINK_RELOAD_ACTION_FW_ACTIVATE,	/* FW activate */
-
-	/* Add new reload actions above */
-	__DEVLINK_RELOAD_ACTION_MAX,
-	DEVLINK_RELOAD_ACTION_MAX = __DEVLINK_RELOAD_ACTION_MAX - 1
-};
-
-enum devlink_reload_limit {
-	DEVLINK_RELOAD_LIMIT_UNSPEC,	/* unspecified, no constraints */
-	DEVLINK_RELOAD_LIMIT_NO_RESET,	/* No reset allowed, no down time allowed,
-					 * no link flap and no configuration is lost.
-					 */
-
-	/* Add new reload limit above */
-	__DEVLINK_RELOAD_LIMIT_MAX,
-	DEVLINK_RELOAD_LIMIT_MAX = __DEVLINK_RELOAD_LIMIT_MAX - 1
-};
-
-#define DEVLINK_RELOAD_LIMITS_VALID_MASK (_BITUL(__DEVLINK_RELOAD_LIMIT_MAX) - 1)
-
 enum devlink_attr {
 	/* don't change the order or add anything between, this is ABI! */
 	DEVLINK_ATTR_UNSPEC,
@@ -455,104 +280,6 @@ enum devlink_attr {
 	DEVLINK_ATTR_REGION_CHUNK_ADDR,         /* u64 */
 	DEVLINK_ATTR_REGION_CHUNK_LEN,          /* u64 */
 
-	DEVLINK_ATTR_INFO_DRIVER_NAME,		/* string */
-	DEVLINK_ATTR_INFO_SERIAL_NUMBER,	/* string */
-	DEVLINK_ATTR_INFO_VERSION_FIXED,	/* nested */
-	DEVLINK_ATTR_INFO_VERSION_RUNNING,	/* nested */
-	DEVLINK_ATTR_INFO_VERSION_STORED,	/* nested */
-	DEVLINK_ATTR_INFO_VERSION_NAME,		/* string */
-	DEVLINK_ATTR_INFO_VERSION_VALUE,	/* string */
-
-	DEVLINK_ATTR_SB_POOL_CELL_SIZE,		/* u32 */
-
-	DEVLINK_ATTR_FMSG,			/* nested */
-	DEVLINK_ATTR_FMSG_OBJ_NEST_START,	/* flag */
-	DEVLINK_ATTR_FMSG_PAIR_NEST_START,	/* flag */
-	DEVLINK_ATTR_FMSG_ARR_NEST_START,	/* flag */
-	DEVLINK_ATTR_FMSG_NEST_END,		/* flag */
-	DEVLINK_ATTR_FMSG_OBJ_NAME,		/* string */
-	DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE,	/* u8 */
-	DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA,	/* dynamic */
-
-	DEVLINK_ATTR_HEALTH_REPORTER,			/* nested */
-	DEVLINK_ATTR_HEALTH_REPORTER_NAME,		/* string */
-	DEVLINK_ATTR_HEALTH_REPORTER_STATE,		/* u8 */
-	DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,		/* u64 */
-	DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,	/* u64 */
-	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,		/* u64 */
-	DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,	/* u64 */
-	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,	/* u8 */
-
-	DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME,	/* string */
-	DEVLINK_ATTR_FLASH_UPDATE_COMPONENT,	/* string */
-	DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG,	/* string */
-	DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE,	/* u64 */
-	DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL,	/* u64 */
-
-	DEVLINK_ATTR_PORT_PCI_PF_NUMBER,	/* u16 */
-	DEVLINK_ATTR_PORT_PCI_VF_NUMBER,	/* u16 */
-
-	DEVLINK_ATTR_STATS,				/* nested */
-
-	DEVLINK_ATTR_TRAP_NAME,				/* string */
-	/* enum devlink_trap_action */
-	DEVLINK_ATTR_TRAP_ACTION,			/* u8 */
-	/* enum devlink_trap_type */
-	DEVLINK_ATTR_TRAP_TYPE,				/* u8 */
-	DEVLINK_ATTR_TRAP_GENERIC,			/* flag */
-	DEVLINK_ATTR_TRAP_METADATA,			/* nested */
-	DEVLINK_ATTR_TRAP_GROUP_NAME,			/* string */
-
-	DEVLINK_ATTR_RELOAD_FAILED,			/* u8 0 or 1 */
-
-	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,	/* u64 */
-
-	DEVLINK_ATTR_NETNS_FD,			/* u32 */
-	DEVLINK_ATTR_NETNS_PID,			/* u32 */
-	DEVLINK_ATTR_NETNS_ID,			/* u32 */
-
-	DEVLINK_ATTR_HEALTH_REPORTER_AUTO_DUMP,	/* u8 */
-
-	DEVLINK_ATTR_TRAP_POLICER_ID,			/* u32 */
-	DEVLINK_ATTR_TRAP_POLICER_RATE,			/* u64 */
-	DEVLINK_ATTR_TRAP_POLICER_BURST,		/* u64 */
-
-	DEVLINK_ATTR_PORT_FUNCTION,			/* nested */
-
-	DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER,	/* string */
-
-	DEVLINK_ATTR_PORT_LANES,			/* u32 */
-	DEVLINK_ATTR_PORT_SPLITTABLE,			/* u8 */
-
-	DEVLINK_ATTR_PORT_EXTERNAL,		/* u8 */
-	DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,	/* u32 */
-
-	DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT,	/* u64 */
-	DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK,	/* bitfield32 */
-
-	DEVLINK_ATTR_RELOAD_ACTION,		/* u8 */
-	DEVLINK_ATTR_RELOAD_ACTIONS_PERFORMED,	/* bitfield32 */
-	DEVLINK_ATTR_RELOAD_LIMITS,		/* bitfield32 */
-
-	DEVLINK_ATTR_DEV_STATS,			/* nested */
-	DEVLINK_ATTR_RELOAD_STATS,		/* nested */
-	DEVLINK_ATTR_RELOAD_STATS_ENTRY,	/* nested */
-	DEVLINK_ATTR_RELOAD_STATS_LIMIT,	/* u8 */
-	DEVLINK_ATTR_RELOAD_STATS_VALUE,	/* u32 */
-	DEVLINK_ATTR_REMOTE_RELOAD_STATS,	/* nested */
-	DEVLINK_ATTR_RELOAD_ACTION_INFO,        /* nested */
-	DEVLINK_ATTR_RELOAD_ACTION_STATS,       /* nested */
-
-	DEVLINK_ATTR_PORT_PCI_SF_NUMBER,	/* u32 */
-
-	DEVLINK_ATTR_RATE_TYPE,			/* u16 */
-	DEVLINK_ATTR_RATE_TX_SHARE,		/* u64 */
-	DEVLINK_ATTR_RATE_TX_MAX,		/* u64 */
-	DEVLINK_ATTR_RATE_NODE_NAME,		/* string */
-	DEVLINK_ATTR_RATE_PARENT_NODE_NAME,	/* string */
-
-	DEVLINK_ATTR_REGION_MAX_SNAPSHOTS,	/* u32 */
-
 	/* add new attributes above here, update the policy in devlink.c */
 
 	__DEVLINK_ATTR_MAX,
@@ -599,32 +326,4 @@ enum devlink_resource_unit {
 	DEVLINK_RESOURCE_UNIT_ENTRY,
 };
 
-enum devlink_port_function_attr {
-	DEVLINK_PORT_FUNCTION_ATTR_UNSPEC,
-	DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR,	/* binary */
-	DEVLINK_PORT_FN_ATTR_STATE,	/* u8 */
-	DEVLINK_PORT_FN_ATTR_OPSTATE,	/* u8 */
-
-	__DEVLINK_PORT_FUNCTION_ATTR_MAX,
-	DEVLINK_PORT_FUNCTION_ATTR_MAX = __DEVLINK_PORT_FUNCTION_ATTR_MAX - 1
-};
-
-enum devlink_port_fn_state {
-	DEVLINK_PORT_FN_STATE_INACTIVE,
-	DEVLINK_PORT_FN_STATE_ACTIVE,
-};
-
-/**
- * enum devlink_port_fn_opstate - indicates operational state of the function
- * @DEVLINK_PORT_FN_OPSTATE_ATTACHED: Driver is attached to the function.
- * For graceful tear down of the function, after inactivation of the
- * function, user should wait for operational state to turn DETACHED.
- * @DEVLINK_PORT_FN_OPSTATE_DETACHED: Driver is detached from the function.
- * It is safe to delete the port.
- */
-enum devlink_port_fn_opstate {
-	DEVLINK_PORT_FN_OPSTATE_DETACHED,
-	DEVLINK_PORT_FN_OPSTATE_ATTACHED,
-};
-
 #endif /* _LINUX_DEVLINK_H_ */

include/uapi/linux/elf-em.h

@@ -34,23 +34,14 @@
 #define EM_M32R		88	/* Renesas M32R */
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
 #define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
-#define EM_ARCOMPACT	93	/* ARCompact processor */
-#define EM_XTENSA	94	/* Tensilica Xtensa Architecture */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
-#define EM_UNICORE	110	/* UniCore-32 */
 #define EM_ALTERA_NIOS2	113	/* Altera Nios II soft-core processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
-#define EM_HEXAGON	164	/* QUALCOMM Hexagon */
-#define EM_NDS32	167	/* Andes Technology compact code size
-				   embedded RISC processor family */
 #define EM_AARCH64	183	/* ARM 64 bit */
 #define EM_TILEPRO	188	/* Tilera TILEPro */
 #define EM_MICROBLAZE	189	/* Xilinx MicroBlaze */
 #define EM_TILEGX	191	/* Tilera TILE-Gx */
-#define EM_ARCV2	195	/* ARCv2 Cores */
-#define EM_RISCV	243	/* RISC-V */
 #define EM_BPF		247	/* Linux BPF - in-kernel virtual machine */
-#define EM_CSKY		252	/* C-SKY */
 #define EM_FRV		0x5441	/* Fujitsu FR-V */
 
 /*

include/uapi/linux/fou.h

@@ -16,12 +16,6 @@ enum {
 	FOU_ATTR_IPPROTO,			/* u8 */
 	FOU_ATTR_TYPE,				/* u8 */
 	FOU_ATTR_REMCSUM_NOPARTIAL,		/* flag */
-	FOU_ATTR_LOCAL_V4,			/* u32 */
-	FOU_ATTR_LOCAL_V6,			/* in6_addr */
-	FOU_ATTR_PEER_V4,			/* u32 */
-	FOU_ATTR_PEER_V6,			/* in6_addr */
-	FOU_ATTR_PEER_PORT,			/* u16 */
-	FOU_ATTR_IFINDEX,			/* s32 */
 
 	__FOU_ATTR_MAX,
 };

include/uapi/linux/gen_stats.h

@@ -12,8 +12,6 @@ enum {
 	TCA_STATS_APP,
 	TCA_STATS_RATE_EST64,
 	TCA_STATS_PAD,
-	TCA_STATS_BASIC_HW,
-	TCA_STATS_PKT64,
 	__TCA_STATS_MAX,
 };
 #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
@@ -27,6 +25,10 @@ struct gnet_stats_basic {
 	__u64	bytes;
 	__u32	packets;
 };
+struct gnet_stats_basic_packed {
+	__u64	bytes;
+	__u32	packets;
+} __attribute__ ((packed));
 
 /**
  * struct gnet_stats_rate_est - rate estimator

include/uapi/linux/genetlink.h

@@ -48,7 +48,6 @@ enum {
 	CTRL_CMD_NEWMCAST_GRP,
 	CTRL_CMD_DELMCAST_GRP,
 	CTRL_CMD_GETMCAST_GRP, /* unused */
-	CTRL_CMD_GETPOLICY,
 	__CTRL_CMD_MAX,
 };
 
@@ -63,9 +62,6 @@ enum {
 	CTRL_ATTR_MAXATTR,
 	CTRL_ATTR_OPS,
 	CTRL_ATTR_MCAST_GROUPS,
-	CTRL_ATTR_POLICY,
-	CTRL_ATTR_OP_POLICY,
-	CTRL_ATTR_OP,
 	__CTRL_ATTR_MAX,
 };
 
@@ -87,15 +83,6 @@ enum {
 	__CTRL_ATTR_MCAST_GRP_MAX,
 };
 
-enum {
-	CTRL_ATTR_POLICY_UNSPEC,
-	CTRL_ATTR_POLICY_DO,
-	CTRL_ATTR_POLICY_DUMP,
-
-	__CTRL_ATTR_POLICY_DUMP_MAX,
-	CTRL_ATTR_POLICY_DUMP_MAX = __CTRL_ATTR_POLICY_DUMP_MAX - 1
-};
-
 #define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
 
 

include/uapi/linux/hdlc/ioctl.h

@@ -79,15 +79,6 @@ typedef struct {
     unsigned int timeout;
 } cisco_proto;
 
-typedef struct {
-	unsigned short dce; /* 1 for DCE (network side) operation */
-	unsigned int modulo; /* modulo (8 = basic / 128 = extended) */
-	unsigned int window; /* frame window size */
-	unsigned int t1; /* timeout t1 */
-	unsigned int t2; /* timeout t2 */
-	unsigned int n2; /* frame retry counter */
-} x25_hdlc_proto;
-
 /* PPP doesn't need any info now - supply length = 0 to ioctl */
 
 #endif /* __ASSEMBLY__ */

include/uapi/linux/icmpv6.h

@@ -68,7 +68,6 @@ struct icmp6hdr {
 #define icmp6_mtu		icmp6_dataun.un_data32[0]
 #define icmp6_unused		icmp6_dataun.un_data32[0]
 #define icmp6_maxdelay		icmp6_dataun.un_data16[0]
-#define icmp6_datagram_len	icmp6_dataun.un_data8[0]
 #define icmp6_router		icmp6_dataun.u_nd_advt.router
 #define icmp6_solicited		icmp6_dataun.u_nd_advt.solicited
 #define icmp6_override		icmp6_dataun.u_nd_advt.override
@@ -91,8 +90,6 @@ struct icmp6hdr {
 #define ICMPV6_TIME_EXCEED		3
 #define ICMPV6_PARAMPROB		4
 
-#define ICMPV6_ERRMSG_MAX       127
-
 #define ICMPV6_INFOMSG_MASK		0x80
 
 #define ICMPV6_ECHO_REQUEST		128
@@ -111,10 +108,6 @@ struct icmp6hdr {
 #define ICMPV6_MOBILE_PREFIX_SOL	146
 #define ICMPV6_MOBILE_PREFIX_ADV	147
 
-#define ICMPV6_MRDISC_ADV		151
-
-#define ICMPV6_MSG_MAX          255
-
 /*
  *	Codes for Destination Unreachable
  */
@@ -138,11 +131,7 @@ struct icmp6hdr {
 #define ICMPV6_HDR_FIELD		0
 #define ICMPV6_UNK_NEXTHDR		1
 #define ICMPV6_UNK_OPTION		2
-#define ICMPV6_HDR_INCOMP		3
 
-/* Codes for EXT_ECHO (PROBE) */
-#define ICMPV6_EXT_ECHO_REQUEST		160
-#define ICMPV6_EXT_ECHO_REPLY		161
 /*
  *	constants for (set|get)sockopt
  */

include/uapi/linux/if.h

@@ -31,7 +31,6 @@
 #define	IFNAMSIZ	16
 #endif /* __UAPI_DEF_IF_IFNAMSIZ */
 #define	IFALIASZ	256
-#define	ALTIFNAMSIZ	128
 #include <linux/hdlc/ioctl.h>
 
 /* For glibc compatibility. An empty enum does not compile. */
@@ -176,7 +175,6 @@ enum {
 enum {
 	IF_LINK_MODE_DEFAULT,
 	IF_LINK_MODE_DORMANT,	/* limit upward transition to dormant */
-	IF_LINK_MODE_TESTING,	/* limit upward transition to testing */
 };
 
 /*
@@ -212,7 +210,6 @@ struct if_settings {
 		fr_proto		*fr;
 		fr_proto_pvc		*fr_pvc;
 		fr_proto_pvc_info	*fr_pvc_info;
-		x25_hdlc_proto		*x25;
 
 		/* interface settings */
 		sync_serial_settings	*sync;

include/uapi/linux/if_addr.h

@@ -34,7 +34,6 @@ enum {
 	IFA_MULTICAST,
 	IFA_FLAGS,
 	IFA_RT_PRIORITY,  /* u32, priority/metric for prefix route */
-	IFA_TARGET_NETNSID,
 	__IFA_MAX,
 };
 

include/uapi/linux/if_alg.h

@@ -24,22 +24,6 @@ struct sockaddr_alg {
 	__u8	salg_name[64];
 };
 
-/*
- * Linux v4.12 and later removed the 64-byte limit on salg_name[]; it's now an
- * arbitrary-length field.  We had to keep the original struct above for source
- * compatibility with existing userspace programs, though.  Use the new struct
- * below if support for very long algorithm names is needed.  To do this,
- * allocate 'sizeof(struct sockaddr_alg_new) + strlen(algname) + 1' bytes, and
- * copy algname (including the null terminator) into salg_name.
- */
-struct sockaddr_alg_new {
-	__u16	salg_family;
-	__u8	salg_type[14];
-	__u32	salg_feat;
-	__u32	salg_mask;
-	__u8	salg_name[];
-};
-
 struct af_alg_iv {
 	__u32	ivlen;
 	__u8	iv[0];
@@ -51,7 +35,6 @@ struct af_alg_iv {
 #define ALG_SET_OP			3
 #define ALG_SET_AEAD_ASSOCLEN		4
 #define ALG_SET_AEAD_AUTHSIZE		5
-#define ALG_SET_DRBG_ENTROPY		6
 
 /* Operations */
 #define ALG_OP_DECRYPT			0

include/uapi/linux/if_arp.h

@@ -54,7 +54,6 @@
 #define ARPHRD_X25	271		/* CCITT X.25			*/
 #define ARPHRD_HWX25	272		/* Boards with X.25 in firmware	*/
 #define ARPHRD_CAN	280		/* Controller Area Network      */
-#define ARPHRD_MCTP	290
 #define ARPHRD_PPP	512
 #define ARPHRD_CISCO	513		/* Cisco HDLC	 		*/
 #define ARPHRD_HDLC	ARPHRD_CISCO
@@ -119,7 +118,7 @@ struct arpreq {
   struct sockaddr	arp_ha;		/* hardware address		*/
   int			arp_flags;	/* flags			*/
   struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */
-	char		arp_dev[IFNAMSIZ];
+  char			arp_dev[16];
 };
 
 struct arpreq_old {

include/uapi/linux/if_bonding.h

@@ -94,17 +94,6 @@
 #define BOND_XMIT_POLICY_LAYER23	2 /* layer 2+3 (IP ^ MAC) */
 #define BOND_XMIT_POLICY_ENCAP23	3 /* encapsulated layer 2+3 */
 #define BOND_XMIT_POLICY_ENCAP34	4 /* encapsulated layer 3+4 */
-#define BOND_XMIT_POLICY_VLAN_SRCMAC	5 /* vlan + source MAC */
-
-/* 802.3ad port state definitions (43.4.2.2 in the 802.3ad standard) */
-#define LACP_STATE_LACP_ACTIVITY   0x1
-#define LACP_STATE_LACP_TIMEOUT    0x2
-#define LACP_STATE_AGGREGATION     0x4
-#define LACP_STATE_SYNCHRONIZATION 0x8
-#define LACP_STATE_COLLECTING      0x10
-#define LACP_STATE_DISTRIBUTING    0x20
-#define LACP_STATE_DEFAULTED       0x40
-#define LACP_STATE_EXPIRED         0x80
 
 typedef struct ifbond {
 	__s32 bond_mode;
@@ -128,28 +117,15 @@ struct ad_info {
 	__u8 partner_system[ETH_ALEN];
 };
 
-/* Embedded inside LINK_XSTATS_TYPE_BOND */
-enum {
-	BOND_XSTATS_UNSPEC,
-	BOND_XSTATS_3AD,
-	__BOND_XSTATS_MAX
-};
-#define BOND_XSTATS_MAX (__BOND_XSTATS_MAX - 1)
-
-/* Embedded inside BOND_XSTATS_3AD */
-enum {
-	BOND_3AD_STAT_LACPDU_RX,
-	BOND_3AD_STAT_LACPDU_TX,
-	BOND_3AD_STAT_LACPDU_UNKNOWN_RX,
-	BOND_3AD_STAT_LACPDU_ILLEGAL_RX,
-	BOND_3AD_STAT_MARKER_RX,
-	BOND_3AD_STAT_MARKER_TX,
-	BOND_3AD_STAT_MARKER_RESP_RX,
-	BOND_3AD_STAT_MARKER_RESP_TX,
-	BOND_3AD_STAT_MARKER_UNKNOWN_RX,
-	BOND_3AD_STAT_PAD,
-	__BOND_3AD_STAT_MAX
-};
-#define BOND_3AD_STAT_MAX (__BOND_3AD_STAT_MAX - 1)
-
 #endif /* _LINUX_IF_BONDING_H */
+
+/*
+ * Local variables:
+ *  version-control: t
+ *  kept-new-versions: 5
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ *  tab-width: 8
+ * End:
+ */
+