mirror of
https://github.com/Devolutions/IronRDP.git
synced 2025-08-04 07:08:17 +00:00
review fix
This commit is contained in:
parent
b2f731cf68
commit
e453b4d5ad
4 changed files with 8 additions and 8 deletions
|
@ -120,7 +120,7 @@ public partial class MainWindow : Window
|
||||||
Debug.WriteLine("Connecting via WebSocket proxy");
|
Debug.WriteLine("Connecting via WebSocket proxy");
|
||||||
(res, framed) = await Connection.ConnectWs(
|
(res, framed) = await Connection.ConnectWs(
|
||||||
config,
|
config,
|
||||||
new RdcleanPathConfig(new Uri(wsProxy), wsProxyToken),
|
new RdCleanPathConfig(new Uri(wsProxy), wsProxyToken),
|
||||||
server,
|
server,
|
||||||
factory);
|
factory);
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ namespace Devolutions.IronRdp.ConnectExample
|
||||||
{
|
{
|
||||||
(res, framed) = await Connection.ConnectWs(
|
(res, framed) = await Connection.ConnectWs(
|
||||||
buildConfig(serverName, username, password, domain, 1980, 1080),
|
buildConfig(serverName, username, password, domain, 1980, 1080),
|
||||||
new RdcleanPathConfig(new Uri(wsProxy), wsProxyToken),
|
new RdCleanPathConfig(new Uri(wsProxy), wsProxyToken),
|
||||||
serverName,
|
serverName,
|
||||||
null);
|
null);
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,11 +35,11 @@ public static class Connection
|
||||||
return (result, framedSsl);
|
return (result, framedSsl);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<(ConnectionResult, Framed<Stream>)> ConnectWs(Config config, RdcleanPathConfig rdcleanPathConfig, string serverName, CliprdrBackendFactory? factory, int port = 3389, CancellationToken token = default)
|
public static async Task<(ConnectionResult, Framed<Stream>)> ConnectWs(Config config, RdCleanPathConfig rdCleanPathConfig, string serverName, CliprdrBackendFactory? factory, int port = 3389, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
var websocket = new ClientWebSocket();
|
var websocket = new ClientWebSocket();
|
||||||
|
|
||||||
await websocket.ConnectAsync(rdcleanPathConfig.Uri, token);
|
await websocket.ConnectAsync(rdCleanPathConfig.GatewayUri, token);
|
||||||
var stream = new WebsocketStream(websocket);
|
var stream = new WebsocketStream(websocket);
|
||||||
var framed = new Framed<Stream>(stream);
|
var framed = new Framed<Stream>(stream);
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ public static class Connection
|
||||||
|
|
||||||
string destination = serverName + ":" + port;
|
string destination = serverName + ":" + port;
|
||||||
|
|
||||||
var serverPublicKey = await ConnectRdCleanPath(framed, connector, destination, rdcleanPathConfig.AuthToken);
|
var serverPublicKey = await ConnectRdCleanPath(framed, connector, destination, rdCleanPathConfig.AuthToken);
|
||||||
|
|
||||||
var result = await ConnectFinalize(serverName, connector, serverPublicKey, framed);
|
var result = await ConnectFinalize(serverName, connector, serverPublicKey, framed);
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
using System;
|
namespace Devolutions.IronRdp;
|
||||||
|
|
||||||
public class RdcleanPathConfig
|
public class RdCleanPathConfig
|
||||||
{
|
{
|
||||||
public Uri GatewayUri { get; private set; }
|
public Uri GatewayUri { get; private set; }
|
||||||
|
|
||||||
public string AuthToken { get; private set; }
|
public string AuthToken { get; private set; }
|
||||||
|
|
||||||
public RdcleanPathConfig(Uri url, string authToken)
|
public RdCleanPathConfig(Uri url, string authToken)
|
||||||
{
|
{
|
||||||
GatewayUri = url;
|
GatewayUri = url;
|
||||||
AuthToken = authToken;
|
AuthToken = authToken;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue