From bf73c650ac93ae673291c584fe592ea70686e37e Mon Sep 17 00:00:00 2001 From: Hadar Hen Zion Date: Thu, 22 Dec 2016 10:14:40 +0200 Subject: [PATCH 1/4] tc/cls_flower: Add to the usage encapsulation dest UDP port Encapsulation dest UDP port is part of the classifier matching parameters, add it to the usage. Fixes: 41aa17ff4668 ("tc/cls_flower: Add dest UDP port to tunnel params") Signed-off-by: Hadar Hen Zion Reported-by: Simon Horman --- tc/f_flower.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tc/f_flower.c b/tc/f_flower.c index 653dfefc..71e9515f 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -53,10 +53,11 @@ static void explain(void) " dst_port PORT-NUMBER |\n" " src_port PORT-NUMBER |\n" " type ICMP-TYPE |\n" - " code ICMP-CODE }\n" + " code ICMP-CODE |\n" " enc_dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n" " enc_src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n" - " enc_key_id [ KEY-ID ] }\n" + " enc_key_id [ KEY-ID ] |\n" + " enc_dst_port [ UDP-PORT ] }\n" " FILTERID := X:Y:Z\n" " ACTION-SPEC := ... look at individual actions\n" "\n" From f6d3126ef919d5935243921bb86bbeb1e5917a01 Mon Sep 17 00:00:00 2001 From: Hadar Hen Zion Date: Thu, 22 Dec 2016 10:14:41 +0200 Subject: [PATCH 2/4] tc/m_tunnel_key: Add to the usage encapsulation dest UDP port tunnel key set parameters includes also dest UDP port, add it to the usage. Fixes: 449c709c3868 ("tc/m_tunnel_key: Add dest UDP port to tunnel key action") Signed-off-by: Hadar Hen Zion Reported-by: Simon Horman --- tc/m_tunnel_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c index 58a3042a..3ceec1cb 100644 --- a/tc/m_tunnel_key.c +++ b/tc/m_tunnel_key.c @@ -22,7 +22,7 @@ static void explain(void) { fprintf(stderr, "Usage: tunnel_key unset\n"); - fprintf(stderr, " tunnel_key set id TUNNELID src_ip IP dst_ip IP\n"); + fprintf(stderr, " tunnel_key set id TUNNELID src_ip IP dst_ip IP dst_port UDP_PORT\n"); } static void usage(void) From d421bb4efea6470c1667be3e8bfb1529e8e832d0 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 22 Dec 2016 20:52:48 +0200 Subject: [PATCH 3/4] tc: add missing limits.h header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes under musl build issues like: f_matchall.c: In function ‘matchall_parse_opt’: f_matchall.c:48:12: error: ‘LONG_MIN’ undeclared (first use in this function) if (h == LONG_MIN || h == LONG_MAX) { ^ f_matchall.c:48:12: note: each undeclared identifier is reported only once for each function it appears in f_matchall.c:48:29: error: ‘LONG_MAX’ undeclared (first use in this function) if (h == LONG_MIN || h == LONG_MAX) { ^ Signed-off-by: Baruch Siach --- tc/tc_util.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tc/tc_util.h b/tc/tc_util.h index f198a4ad..4db26c6d 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h @@ -2,6 +2,7 @@ #define _TC_UTIL_H_ 1 #define MAX_MSG 16384 +#include #include #include #include From 7f977447773cea1657654c437a1b89234d645b6e Mon Sep 17 00:00:00 2001 From: Alexey Kodanev Date: Fri, 23 Dec 2016 14:03:16 +0300 Subject: [PATCH 4/4] fix typo in ip-xfrm man page, rmd610 -> rmd160 Signed-off-by: Alexey Kodanev --- man/man8/ip-xfrm.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/man8/ip-xfrm.8 b/man/man8/ip-xfrm.8 index 11f71047..a0bbef55 100644 --- a/man/man8/ip-xfrm.8 +++ b/man/man8/ip-xfrm.8 @@ -477,7 +477,7 @@ Encryption algorithms include Authentication algorithms include .BR digest_null ", " hmac(md5) ", " hmac(sha1) ", " hmac(sha256) "," -.BR hmac(sha384) ", " hmac(sha512) ", " hmac(rmd610) ", and " xcbc(aes) "." +.BR hmac(sha384) ", " hmac(sha512) ", " hmac(rmd160) ", and " xcbc(aes) "." Authenticated encryption with associated data (AEAD) algorithms include .BR rfc4106(gcm(aes)) ", " rfc4309(ccm(aes)) ", and " rfc4543(gcm(aes)) "."