git: b4e3f3c2de6e - main - pfctl: Add missing 'va' code point name

[Kristof Provost]

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=b4e3f3c2de6e6dc614f99615e50d0d87f3367ca0

commit b4e3f3c2de6e6dc614f99615e50d0d87f3367ca0
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-03-04 12:50:28 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-03-06 09:07:55 +0000

    pfctl: Add missing 'va' code point name
    
    Add the 'va' (voice-admit, RFC5865) symbolic name.
    
    Reviewed by:    rgrimes, gbe (man page)
    MFC after:      2 weeks
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D29069
---
 sbin/pfctl/parse.y       | 3 ++-
 share/man/man5/pf.conf.5 | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 1182dde3b079..9db85538feaf 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -6342,7 +6342,8 @@ map_tos(char *s, int *val)
 		{ "lowdelay",		IPTOS_LOWDELAY },
 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
 		{ "reliability",	IPTOS_RELIABILITY },
-		{ "throughput",		IPTOS_THROUGHPUT }
+		{ "throughput",		IPTOS_THROUGHPUT },
+		{ "va",			IPTOS_DSCP_VA }
 	};
 	const struct keywords	*p;
 
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 8846199deccb..d31d20e29bea 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -681,6 +681,7 @@ given as one of
 .Ar reliability ,
 or one of the DiffServ Code Points:
 .Ar ef ,
+.Ar va ,
 .Ar af11 No ... Ar af43 ,
 .Ar cs0 No ... Ar cs7 ;
 or as either hex or decimal.
@@ -1737,6 +1738,7 @@ given as one of
 .Ar reliability ,
 or one of the DiffServ Code Points:
 .Ar ef ,
+.Ar va ,
 .Ar af11 No ... Ar af43 ,
 .Ar cs0 No ... Ar cs7 ;
 or as either hex or decimal.