matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2016-12-29 10:31:44 -08:00
parent c2078f8dc4 7f97744777
commit d34adf67b5
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/man8/ip-xfrm.8
View File

@ -477,7 +477,7 @@ Encryption algorithms include
Authentication algorithms include Authentication algorithms include
.BR digest_null ", " hmac(md5) ", " hmac(sha1) ", " hmac(sha256) "," .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 Authenticated encryption with associated data (AEAD) algorithms include
.BR rfc4106(gcm(aes)) ", " rfc4309(ccm(aes)) ", and " rfc4543(gcm(aes)) "." .BR rfc4106(gcm(aes)) ", " rfc4309(ccm(aes)) ", and " rfc4543(gcm(aes)) "."

9
tc/f_flower.c
View File

@ -53,10 +53,11 @@ static void explain(void)
" dst_port PORT-NUMBER |\n" " dst_port PORT-NUMBER |\n"
" src_port PORT-NUMBER |\n" " src_port PORT-NUMBER |\n"
" type ICMP-TYPE |\n" " type ICMP-TYPE |\n"
" code ICMP-CODE }\n" " code ICMP-CODE |\n"
" enc_dst_ip PREFIX |\n" " enc_dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
" enc_src_ip PREFIX |\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" " FILTERID := X:Y:Z\n"
" MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n" " MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n"
" ACTION-SPEC := ... look at individual actions\n" " ACTION-SPEC := ... look at individual actions\n"

2
tc/m_tunnel_key.c
View File

@ -22,7 +22,7 @@
static void explain(void) static void explain(void)
{ {
fprintf(stderr, "Usage: tunnel_key unset\n"); 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) static void usage(void)

1
tc/tc_util.h
View File

@ -2,6 +2,7 @@
#define _TC_UTIL_H_ 1 #define _TC_UTIL_H_ 1
#define MAX_MSG 16384 #define MAX_MSG 16384
#include <limits.h>
#include <linux/pkt_sched.h> #include <linux/pkt_sched.h>
#include <linux/pkt_cls.h> #include <linux/pkt_cls.h>
#include <linux/gen_stats.h> #include <linux/gen_stats.h>