From e815af6e41217054a49ebeaa3bf9e336b829c553 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 29 Apr 2017 15:14:46 +0300 Subject: [PATCH] =?UTF-8?q?MCSM:=20=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8C=D0=BD=D0=BE?= =?UTF-8?q?=D0=B9=20=D1=84=D1=80=D0=B0=D0=B7=D1=8B=20=D0=B2=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mcserver-manager/build.gradle | 2 +- mcserver-manager/src/main/java/asys/mcsmanager/Activator.java | 3 ++- .../src/main/java/asys/mcsmanager/server/Server.java | 4 +++- .../main/java/asys/mcsmanager/server/ServerPacketHandler.java | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mcserver-manager/build.gradle b/mcserver-manager/build.gradle index c0d01c2..449b573 100644 --- a/mcserver-manager/build.gradle +++ b/mcserver-manager/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.7-SNAPSHOT' +version = '0.7.1-SNAPSHOT' apply plugin: 'osgi' diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java b/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java index da3cb2a..60ebd89 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java @@ -39,9 +39,10 @@ public class Activator implements BundleActivator, ServiceListener { String host = config.getString("asys.mcsmanager.host", "127.0.0.1"); int port = config.getInt("asys.mcsmanager.port", 8779); + String passcode = config.getString("asys.mcsmanager.passcode", "testpasscode"); logger.debug("Start server manager: {}:{}", host, port); serverManager = new Server(); - serverManager.start(host, port); + serverManager.start(host, port, passcode); serviceConfigTracker.close(); } diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java b/mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java index 77321f5..e0d0f49 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java @@ -23,8 +23,10 @@ public class Server { 1, CS_Ping.class ); private EventLoopGroup bossGroup, workerGroup; + static String passcode; - public void start(String host, int port) { + public void start(String host, int port, String passcode) { + Server.passcode = passcode; bossGroup = new NioEventLoopGroup(1); workerGroup = new NioEventLoopGroup(); diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java b/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java index 1584932..cf6dabd 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java @@ -23,7 +23,6 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke 2, SC_HandshakeResult.class ); private static Map, IPacketHandler> handshakeHandlers; - private static final String PASSCODE = "testpassphrase"; ServerPacketHandler() { if (handshakeHandlers == null) { @@ -46,7 +45,7 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke } private void handleCSHandshake(CS_Handshake packet, ChannelHandlerContext context) { - if (!packet.getPasscode().equalsIgnoreCase(PASSCODE)) { + if (!packet.getPasscode().equalsIgnoreCase(Server.passcode)) { try { context.channel().writeAndFlush(HandshakeResult.INVALID_PASSCODE).sync().channel().close(); } catch (InterruptedException ignore) {