maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pass the desired remote host in ITunnelConnectionStartParams

Browse source
This commit is contained in:
Alex Dima 2021-08-23 14:33:06 +02:00
parent c8209aff4c
commit be7046f091
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/platform/remote/common/remoteAgentConnection.ts
View file

@ -354,6 +354,7 @@ async function doConnectRemoteAgentExtensionHost(options: ISimpleConnectionOptio
}
export interface ITunnelConnectionStartParams {
host: string;
port: number;
}
@ -427,9 +428,9 @@ export async function connectRemoteAgentExtensionHost(options: IConnectionOption
}
}
export async function connectRemoteAgentTunnel(options: IConnectionOptions, tunnelRemotePort: number): Promise<PersistentProtocol> {
export async function connectRemoteAgentTunnel(options: IConnectionOptions, tunnelRemoteHost: string, tunnelRemotePort: number): Promise<PersistentProtocol> {
const simpleOptions = await resolveConnectionOptions(options, generateUuid(), null);
const protocol = await doConnectRemoteAgentTunnel(simpleOptions, { port: tunnelRemotePort }, CancellationToken.None);
const protocol = await doConnectRemoteAgentTunnel(simpleOptions, { host: tunnelRemoteHost, port: tunnelRemotePort }, CancellationToken.None);
return protocol;
}

2
src/vs/platform/remote/node/tunnelService.ts
View file

@ -98,7 +98,7 @@ class NodeRemoteTunnel extends Disposable implements RemoteTunnel {
// pause reading on the socket until we have a chance to forward its data
localSocket.pause();
const protocol = await connectRemoteAgentTunnel(this._options, this.tunnelRemotePort);
const protocol = await connectRemoteAgentTunnel(this._options, this.tunnelRemoteHost, this.tunnelRemotePort);
const remoteSocket = (<NodeSocket>protocol.getSocket()).socket;
const dataChunk = protocol.readEntireBuffer();
protocol.dispose();