mirror of
https://github.com/apple/container.git
synced 2026-07-13 13:07:06 +00:00
AJ Emory
afeceb05d4
## Type of Change - [x] Bug fix - [ ] New feature - [ ] Breaking change - [ ] Documentation update ## Motivation and Context Closes #1569 Separates generic runtime infrastructure from Linux-specific implementation into distinct SPM targets: - ContainerRuntimeClient — generic runtime plugin client API - ContainerRuntimeLinuxClient — Linux-specific types - ContainerRuntimeLinuxServer — Linux runtime service + interface strategy implementations Renames types to reflect the runtime/sandbox distinction: - SandboxClient → RuntimeClient - SandboxService → RuntimeService - SandboxRoutes → RuntimeRoutes - SandboxKeys → RuntimeKeys Breaking for external consumers: - ContainerSandboxService removed, replaced by ContainerRuntimeClient + ContainerRuntimeLinuxServer - Public types renamed ## Testing - [x] Tested locally - [ ] Added/updated tests - [ ] Added/updated docs
57 lines
2.3 KiB
Swift
57 lines
2.3 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 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 ContainerRuntimeClient
|
|
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, *)
|
|
public 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,
|
|
// https://github.com/apple/containerization/pull/38
|
|
mtu: attachment.mtu ?? 1280
|
|
)
|
|
}
|
|
}
|