diff options
| author |   Cameron Katri <me@cameronkatri.com> | 2021-05-21 09:21:42 -0400 |
|---|---|---|
| committer | Cameron Katri <me@cameronkatri.com> | 2021-05-21 09:21:42 -0400 |
| commit | f06784df5a44c2aeb450ff88346a96f0bc9eb732 (patch) | |
| tree | 49e9923a65f7cf572a6f0833737b72848299b1c8 /network_cmds/netstat.tproj | |
| parent | 0e3bb24ea8cde1573760b88ad56c1cc00be15cc8 (diff) | |
| parent | 8d788054a62508f8d1b93067be16fb73f987ca8e (diff) | |
| download | apple_cmds-f06784df5a44c2aeb450ff88346a96f0bc9eb732.tar.gz apple_cmds-f06784df5a44c2aeb450ff88346a96f0bc9eb732.tar.zst apple_cmds-f06784df5a44c2aeb450ff88346a96f0bc9eb732.zip | |
Merge branch 'apple'
Diffstat (limited to 'network_cmds/netstat.tproj')
| -rw-r--r-- | network_cmds/netstat.tproj/ipsec.c | 8 | ||||
| -rw-r--r-- | network_cmds/netstat.tproj/netstat.1 | 1 | ||||
| -rw-r--r-- | network_cmds/netstat.tproj/route.c | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/network_cmds/netstat.tproj/ipsec.c b/network_cmds/netstat.tproj/ipsec.c index 0eab162..393f053 100644 --- a/network_cmds/netstat.tproj/ipsec.c +++ b/network_cmds/netstat.tproj/ipsec.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012 Apple Inc. All rights reserved. + * Copyright (c) 2008-2012, 2021 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -160,6 +160,12 @@ static struct val2str ipsec_espnames[] = { #ifdef SADB_X_EALG_RIJNDAELCBC { SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", }, #endif +#ifdef SADB_X_EALG_AES_GCM + { SADB_X_EALG_AES_GCM, "aes-gcm", }, +#endif +#ifdef SADB_X_EALG_CHACHA20POLY1305 + { SADB_X_EALG_CHACHA20POLY1305, "chacha20-poly1305", }, +#endif { -1, NULL }, }; diff --git a/network_cmds/netstat.tproj/netstat.1 b/network_cmds/netstat.tproj/netstat.1 index 61ab843..5e2abee 100644 --- a/network_cmds/netstat.tproj/netstat.1 +++ b/network_cmds/netstat.tproj/netstat.1 @@ -395,6 +395,7 @@ U RTF_UP Route usable W RTF_WASCLONED Route was generated as a result of cloning X RTF_XRESOLVE External daemon translates proto to link address Y RTF_PROXY Proxying; cloned routes will not be scoped +g RTF_GLOBAL Route to a destination of the global internet (policy hint) .El .Pp Direct routes are created for each interface attached to the local host; diff --git a/network_cmds/netstat.tproj/route.c b/network_cmds/netstat.tproj/route.c index 943e3c8..31e2bea 100644 --- a/network_cmds/netstat.tproj/route.c +++ b/network_cmds/netstat.tproj/route.c @@ -120,6 +120,9 @@ struct bits { { RTF_IFREF, 'i' }, { RTF_PROXY, 'Y' }, { RTF_ROUTER, 'r' }, +#ifdef RTF_GLOBAL + { RTF_GLOBAL, 'g' }, +#endif /* RTF_GLOBAL */ { 0 } }; |