Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 10:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a placeholder for already forwarded root ports (#119792)

Browse Source 
when possible
Fixes microsoft/vscode-remote-release#4749
This commit is contained in:
Alex Ross
2021-03-24 14:57:12 +01:00
committed by GitHub
parent 74cf3fb202
commit 2d9069014e
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/api/node/extHostTunnelService.ts
View File

@@ -168,6 +168,8 @@ export function tryFindRootPorts(connections: { socket: number, ip: string, port
}
} while (mostChild);
ports.set(connection.port, { host: connection.ip, port: connection.port, pid: bestMatch.pid, detail: bestMatch.cmd, ppid: bestMatch.ppid });
} else {
ports.set(connection.port, { host: connection.ip, port: connection.port, ppid: Number.MAX_VALUE });
}
}
@@ -264,7 +266,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
this._candidateFindingEnabled = enable;
// Regularly scan to see if the candidate ports have changed.
let movingAverage = new MovingAverage();
let oldPorts: { host: string, port: number, detail: string }[] | undefined = undefined;
let oldPorts: { host: string, port: number, detail?: string }[] | undefined = undefined;
while (this._candidateFindingEnabled) {
const startTime = new Date().getTime();
const newPorts = await this.findCandidatePorts();
@@ -349,7 +351,7 @@ export class ExtHostTunnelService extends Disposable implements IExtHostTunnelSe
}
async $applyCandidateFilter(candidates: CandidatePort[]): Promise<CandidatePort[]> {
const filter = await Promise.all(candidates.map(candidate => this._showCandidatePort(candidate.host, candidate.port, candidate.detail)));
const filter = await Promise.all(candidates.map(candidate => this._showCandidatePort(candidate.host, candidate.port, candidate.detail ?? '')));
const result = candidates.filter((candidate, index) => filter[index]);
this.logService.trace(`ForwardedPorts: (ExtHostTunnelService) filtered from ${candidates.map(port => port.port).join(', ')} to ${result.map(port => port.port).join(', ')}`);
return result;