diff options
author | 2021-05-21 09:21:42 -0400 | |
---|---|---|
committer | 2021-05-21 09:21:42 -0400 | |
commit | f06784df5a44c2aeb450ff88346a96f0bc9eb732 (patch) | |
tree | 49e9923a65f7cf572a6f0833737b72848299b1c8 /network_cmds | |
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')
-rw-r--r-- | network_cmds/.apple_version | 2 | ||||
-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 | ||||
-rwxr-xr-x | network_cmds/network_cmds.xcodeproj/project.pbxproj | 26 | ||||
-rw-r--r-- | network_cmds/route.tproj/route.c | 2 |
6 files changed, 28 insertions, 14 deletions
diff --git a/network_cmds/.apple_version b/network_cmds/.apple_version index 25cc648..b2c184d 100644 --- a/network_cmds/.apple_version +++ b/network_cmds/.apple_version @@ -1 +1 @@ -606.40.1 +606.100.3 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 } }; diff --git a/network_cmds/network_cmds.xcodeproj/project.pbxproj b/network_cmds/network_cmds.xcodeproj/project.pbxproj index cce64f8..3c5a36d 100755 --- a/network_cmds/network_cmds.xcodeproj/project.pbxproj +++ b/network_cmds/network_cmds.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXAggregateTarget section */ @@ -240,7 +240,8 @@ "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).h", "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE)_xdr.c", ); - script = "/usr/bin/rpcgen -h -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.h ${INPUT_FILE_PATH}\n/usr/bin/rpcgen -c -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}_xdr.c ${INPUT_FILE_PATH}"; + runOncePerArchitecture = 0; + script = "/usr/bin/rpcgen -h -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}.h ${INPUT_FILE_PATH}\n/usr/bin/rpcgen -c -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}_xdr.c ${INPUT_FILE_PATH}\n"; }; /* End PBXBuildRule section */ @@ -3097,6 +3098,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -3134,7 +3136,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = network_cmds; - SDKROOT = iphoneos; + SDKROOT = iphoneos.internal; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -4141,6 +4143,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPRESSION = lossless; + CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; ENABLE_TESTABILITY = YES; @@ -4167,6 +4170,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPRESSION = "respect-asset-catalog"; + CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -4247,7 +4251,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = network_cmds; - SDKROOT = iphoneos; + SDKROOT = iphoneos.internal; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -4257,7 +4261,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = network_cmds; - SDKROOT = iphoneos; + SDKROOT = iphoneos.internal; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -4633,8 +4637,8 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; PRODUCT_NAME = "All-EmbeddedOther"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SDKROOT = iphoneos.internal; + SUPPORTED_PLATFORMS = "appletvos watchos"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -4646,8 +4650,8 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = "All-EmbeddedOther"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SDKROOT = iphoneos.internal; + SUPPORTED_PLATFORMS = "appletvos watchos"; TARGETED_DEVICE_FAMILY = "1,2"; ZERO_LINK = NO; }; @@ -4657,8 +4661,8 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = "All-EmbeddedOther"; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + SDKROOT = iphoneos.internal; + SUPPORTED_PLATFORMS = "appletvos watchos"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = "Ignore Me"; diff --git a/network_cmds/route.tproj/route.c b/network_cmds/route.tproj/route.c index 9f7f4bd..54fb858 100644 --- a/network_cmds/route.tproj/route.c +++ b/network_cmds/route.tproj/route.c @@ -1266,7 +1266,7 @@ char routeflags[] = "\011CLONING\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016b016" "\017PROTO2\020PROTO1\021PRCLONING\022WASCLONED\023PROTO3\024b024" "\025PINNED\026LOCAL\027BROADCAST\030MULTICAST\031IFSCOPE\032CONDEMNED" -"\033IFREF\034PROXY\035ROUTER"; +"\033IFREF\034PROXY\035ROUTER\037GLOBAL"; char ifnetflags[] = "\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6b6\7RUNNING\010NOARP" "\011PPROMISC\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1" |