mirror of
https://github.com/apple/container.git
synced 2026-07-13 13:07:06 +00:00
356c8d2f88
- Closes #461. - Extract core types into ContainerResources target. - Extract ContainerNetworkServiceClient from ContainerNetworkService. - Relocate sandbox client from ContainerClient to ContainerSandboxServiceClient. - Relocate ContainerClient to ContainerAPIServiceClient. - Common structure from services and clients under Source/Services. Updated project hierarchy: ``` Sources/CAuditToken - audit token access wrapper Sources/CLI - CLI executable Sources/ContainerBuild - builder Sources/ContainerCommands - CLI command implementations Sources/ContainerLog - logging helpers Sources/ContainerPersistence - persistent data and system property helpers Sources/ContainerPlugin - plugin system Sources/ContainerResource - resource (container, image, volume, network) types Sources/ContainerVersion - version helpers Sources/ContainerXPC - XPC helpers Sources/CVersion - injected project version Sources/DNSServer - container DNS resolver Sources/Helpers - service executables Sources/Services/*/Client - service clients Sources/Services/*/Server - service implementations Sources/SocketForwarder - port forwarding Sources/TerminalProgress - progress bar ``` ## Type of Change - [ ] Bug fix - [ ] New feature - [x] Breaking change - [ ] Documentation update ## Motivation and Context The ContainerClient library was a bit of a grab bag. This refactor applies a more sensible project and library structure for resource data types, services, and clients. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
50 lines
2.1 KiB
Swift
50 lines
2.1 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025-2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import ContainerResource
|
|
import ContainerSandboxService
|
|
import ContainerXPC
|
|
import Containerization
|
|
import ContainerizationError
|
|
import Logging
|
|
import Virtualization
|
|
import vmnet
|
|
|
|
/// Interface strategy for containers that use macOS's custom network feature.
|
|
@available(macOS 26, *)
|
|
struct NonisolatedInterfaceStrategy: InterfaceStrategy {
|
|
private let log: Logger
|
|
|
|
public init(log: Logger) {
|
|
self.log = log
|
|
}
|
|
|
|
public func toInterface(attachment: Attachment, interfaceIndex: Int, additionalData: XPCMessage?) throws -> Interface {
|
|
guard let additionalData else {
|
|
throw ContainerizationError(.invalidState, message: "network state does not contain custom network reference")
|
|
}
|
|
|
|
var status: vmnet_return_t = .VMNET_SUCCESS
|
|
guard let networkRef = vmnet_network_create_with_serialization(additionalData.underlying, &status) else {
|
|
throw ContainerizationError(.invalidState, message: "cannot deserialize custom network reference, status \(status)")
|
|
}
|
|
|
|
log.info("creating NATNetworkInterface with network reference")
|
|
let ipv4Gateway = interfaceIndex == 0 ? attachment.ipv4Gateway : nil
|
|
return NATNetworkInterface(ipv4Address: attachment.ipv4Address, ipv4Gateway: ipv4Gateway, reference: networkRef, macAddress: attachment.macAddress)
|
|
}
|
|
}
|