lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-13 03:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Use guestVsockPorts (#373)

Browse Source 
This was a funny oversight. We have two port spaces, one for listening
sockets on the host, and one for vsock proxies in the guest, but only
the host "allocator" was being used. This didn't really matter as the
ports in the guest would still be unique, but would still be good to
fix.
This commit is contained in:
Danny Canter
2025-10-29 16:44:28 -07:00
committed by GitHub
parent 8682365800
commit df8b97a9f7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Containerization/LinuxContainer.swift
+3 -1
View File
@@ -678,13 +678,15 @@ extension LinuxContainer {
var socket = socket
let rootInGuest = URL(filePath: self.root)
let port: UInt32
if socket.direction == .into {
port = self.hostVsockPorts.wrappingAdd(1, ordering: .relaxed).oldValue
socket.destination = rootInGuest.appending(path: socket.destination.path)
} else {
port = self.guestVsockPorts.wrappingAdd(1, ordering: .relaxed).oldValue
socket.source = rootInGuest.appending(path: socket.source.path)
}
let port = self.hostVsockPorts.wrappingAdd(1, ordering: .relaxed).oldValue
try await relayManager.start(port: port, socket: socket)
try await relayAgent.relaySocket(port: port, configuration: socket)
}
Sources/Containerization/LinuxPod.swift
+3 -1
View File
@@ -705,13 +705,15 @@ extension LinuxPod {
// Adjust paths to be relative to the container's rootfs
let rootInGuest = URL(filePath: Self.guestRootfsPath(containerID))
let port: UInt32
if socket.direction == .into {
port = self.hostVsockPorts.wrappingAdd(1, ordering: .relaxed).oldValue
socket.destination = rootInGuest.appending(path: socket.destination.path)
} else {
port = self.guestVsockPorts.wrappingAdd(1, ordering: .relaxed).oldValue
socket.source = rootInGuest.appending(path: socket.source.path)
}
let port = self.hostVsockPorts.wrappingAdd(1, ordering: .relaxed).oldValue
try await relayManager.start(port: port, socket: socket)
try await relayAgent.relaySocket(port: port, configuration: socket)
}