Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 09:01:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Еще немного магии с портами

Browse source
This commit is contained in:
Gravit 2019-05-07 23:52:04 +07:00
parent 686ffa6371
commit 8873d6ec90
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java
View file

@ -28,6 +28,7 @@ public abstract class ClientJSONPoint {
protected WebSocketClientHandler webSocketClientHandler; protected WebSocketClientHandler webSocketClientHandler;
protected Bootstrap bootstrap = new Bootstrap(); protected Bootstrap bootstrap = new Bootstrap();
protected boolean ssl = false; protected boolean ssl = false;
protected int port = -1;
public boolean isClosed; public boolean isClosed;
public ClientJSONPoint(final String uri) throws SSLException { public ClientJSONPoint(final String uri) throws SSLException {
@ -44,6 +45,12 @@ public ClientJSONPoint(URI uri) throws SSLException {
{ {
ssl = true; ssl = true;
} }
if(uri.getPort() == -1)
{
if("ws".equals(protocol)) port = 80;
else port = 443;
}
else port = uri.getPort();
final SslContext sslCtx; final SslContext sslCtx;
if (ssl) { if (ssl) {
sslCtx = SslContextBuilder.forClient().build(); sslCtx = SslContextBuilder.forClient().build();
@ -55,7 +62,7 @@ public ClientJSONPoint(URI uri) throws SSLException {
public void initChannel(SocketChannel ch) throws Exception { public void initChannel(SocketChannel ch) throws Exception {
ChannelPipeline pipeline = ch.pipeline(); ChannelPipeline pipeline = ch.pipeline();
if (sslCtx != null) { if (sslCtx != null) {
pipeline.addLast(sslCtx.newHandler(ch.alloc(), uri.getHost(), 443)); pipeline.addLast(sslCtx.newHandler(ch.alloc(), uri.getHost(), port));
} }
pipeline.addLast("http-codec", new HttpClientCodec()); pipeline.addLast("http-codec", new HttpClientCodec());
pipeline.addLast("aggregator", new HttpObjectAggregator(65536)); pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
@ -70,7 +77,7 @@ public void open() throws Exception {
new WebSocketClientHandler( new WebSocketClientHandler(
WebSocketClientHandshakerFactory.newHandshaker( WebSocketClientHandshakerFactory.newHandshaker(
uri, WebSocketVersion.V13, null, false, EmptyHttpHeaders.INSTANCE, 1280000), this); uri, WebSocketVersion.V13, null, false, EmptyHttpHeaders.INSTANCE, 1280000), this);
ch = bootstrap.connect(uri.getHost(), ssl ? 443 : uri.getPort()).sync().channel(); ch = bootstrap.connect(uri.getHost(), port).sync().channel();
webSocketClientHandler.handshakeFuture().sync(); webSocketClientHandler.handshakeFuture().sync();
} }
public ChannelFuture send(String text) public ChannelFuture send(String text)