From 08145617594619119cf339a0e723a2f9c7e2b08c Mon Sep 17 00:00:00 2001
From: fengfei <fengfei08@gmail.com>
Date: Thu, 2 Nov 2017 21:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B6=E5=8F=91=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9=E4=BB=A5=E5=89=8D=E7=9A=84=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/handlers/ClientChannelHandler.java       |  4 ++--
 .../client/handlers/RealServerChannelHandler.java   |  4 ++--
 .../org/fengfei/lanproxy/protocol/ProxyMessage.java | 13 ++++++-------
 .../server/handlers/ServerChannelHandler.java       |  6 +++---
 .../server/handlers/UserChannelHandler.java         |  4 ++--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/ClientChannelHandler.java b/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/ClientChannelHandler.java
index b6a9bcd..74c538f 100644
--- a/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/ClientChannelHandler.java
+++ b/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/ClientChannelHandler.java
@@ -49,10 +49,10 @@ public class ClientChannelHandler extends SimpleChannelInboundHandler<ProxyMessa
             case ProxyMessage.TYPE_DISCONNECT:
                 handleDisconnectMessage(ctx, proxyMessage);
                 break;
-            case ProxyMessage.TYPE_TRANSFER:
+            case ProxyMessage.P_TYPE_TRANSFER:
                 handleTransferMessage(ctx, proxyMessage);
                 break;
-            case ProxyMessage.TYPE_WRITE_CONTROL:
+            case ProxyMessage.C_TYPE_WRITE_CONTROL:
                 handleWriteControlMessage(ctx, proxyMessage);
                 break;
             default:
diff --git a/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/RealServerChannelHandler.java b/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/RealServerChannelHandler.java
index 8ffd122..0c25465 100755
--- a/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/RealServerChannelHandler.java
+++ b/proxy-client/src/main/java/org/fengfei/lanproxy/client/handlers/RealServerChannelHandler.java
@@ -30,7 +30,7 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
             buf.readBytes(bytes);
             String userId = ClientChannelMannager.getRealServerChannelUserId(realServerChannel);
             ProxyMessage proxyMessage = new ProxyMessage();
-            proxyMessage.setType(ProxyMessage.TYPE_TRANSFER);
+            proxyMessage.setType(ProxyMessage.P_TYPE_TRANSFER);
             proxyMessage.setUri(userId);
             proxyMessage.setData(bytes);
             channel.writeAndFlush(proxyMessage);
@@ -67,7 +67,7 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
         Channel channel = ClientChannelMannager.getCmdChannel();
         if (channel != null) {
             ProxyMessage proxyMessage = new ProxyMessage();
-            proxyMessage.setType(ProxyMessage.TYPE_WRITE_CONTROL);
+            proxyMessage.setType(ProxyMessage.C_TYPE_WRITE_CONTROL);
             proxyMessage.setUri(userId);
             proxyMessage.setData(realServerChannel.isWritable() ? new byte[] { 0x01 } : new byte[] { 0x00 });
             channel.writeAndFlush(proxyMessage);
diff --git a/proxy-protocol/src/main/java/org/fengfei/lanproxy/protocol/ProxyMessage.java b/proxy-protocol/src/main/java/org/fengfei/lanproxy/protocol/ProxyMessage.java
index a1ca689..ac92cc6 100644
--- a/proxy-protocol/src/main/java/org/fengfei/lanproxy/protocol/ProxyMessage.java
+++ b/proxy-protocol/src/main/java/org/fengfei/lanproxy/protocol/ProxyMessage.java
@@ -14,10 +14,10 @@ public class ProxyMessage {
     public static final byte TYPE_HEARTBEAT = 0x07;
 
     /** 认证消息，检测clientKey是否正确 */
-    public static final byte TYPE_AUTH = 0x01;
+    public static final byte C_TYPE_AUTH = 0x01;
 
-    /** 保活确认消息 */
-    public static final byte TYPE_ACK = 0x02;
+    // /** 保活确认消息 */
+    // public static final byte TYPE_ACK = 0x02;
 
     /** 代理后端服务器建立连接消息 */
     public static final byte TYPE_CONNECT = 0x03;
@@ -26,10 +26,10 @@ public class ProxyMessage {
     public static final byte TYPE_DISCONNECT = 0x04;
 
     /** 代理数据传输 */
-    public static final byte TYPE_TRANSFER = 0x05;
+    public static final byte P_TYPE_TRANSFER = 0x05;
 
     /** 用户与代理服务器以及代理客户端与真实服务器连接是否可写状态同步 */
-    public static final byte TYPE_WRITE_CONTROL = 0x06;
+    public static final byte C_TYPE_WRITE_CONTROL = 0x06;
 
     /** 消息类型 */
     private byte type;
@@ -77,8 +77,7 @@ public class ProxyMessage {
 
     @Override
     public String toString() {
-        return "ProxyMessage [type=" + type + ", serialNumber=" + serialNumber + ", uri=" + uri + ", data="
-                + Arrays.toString(data) + "]";
+        return "ProxyMessage [type=" + type + ", serialNumber=" + serialNumber + ", uri=" + uri + ", data=" + Arrays.toString(data) + "]";
     }
 
 }
diff --git a/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/ServerChannelHandler.java b/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/ServerChannelHandler.java
index ba64c4d..f694d12 100644
--- a/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/ServerChannelHandler.java
+++ b/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/ServerChannelHandler.java
@@ -32,7 +32,7 @@ public class ServerChannelHandler extends SimpleChannelInboundHandler<ProxyMessa
             case ProxyMessage.TYPE_HEARTBEAT:
                 handleHeartbeatMessage(ctx, proxyMessage);
                 break;
-            case ProxyMessage.TYPE_AUTH:
+            case ProxyMessage.C_TYPE_AUTH:
                 handleAuthMessage(ctx, proxyMessage);
                 break;
             case ProxyMessage.TYPE_CONNECT:
@@ -41,10 +41,10 @@ public class ServerChannelHandler extends SimpleChannelInboundHandler<ProxyMessa
             case ProxyMessage.TYPE_DISCONNECT:
                 handleDisconnectMessage(ctx, proxyMessage);
                 break;
-            case ProxyMessage.TYPE_TRANSFER:
+            case ProxyMessage.P_TYPE_TRANSFER:
                 handleTransferMessage(ctx, proxyMessage);
                 break;
-            case ProxyMessage.TYPE_WRITE_CONTROL:
+            case ProxyMessage.C_TYPE_WRITE_CONTROL:
                 handleWriteControlMessage(ctx, proxyMessage);
                 break;
             default:
diff --git a/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/UserChannelHandler.java b/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/UserChannelHandler.java
index 710f28a..b8d65e0 100755
--- a/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/UserChannelHandler.java
+++ b/proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/UserChannelHandler.java
@@ -42,7 +42,7 @@ public class UserChannelHandler extends SimpleChannelInboundHandler<ByteBuf> {
             buf.readBytes(bytes);
             String userId = ProxyChannelManager.getUserChannelUserId(userChannel);
             ProxyMessage proxyMessage = new ProxyMessage();
-            proxyMessage.setType(ProxyMessage.TYPE_TRANSFER);
+            proxyMessage.setType(ProxyMessage.P_TYPE_TRANSFER);
             proxyMessage.setUri(userId);
             proxyMessage.setData(bytes);
             proxyChannel.writeAndFlush(proxyMessage);
@@ -124,7 +124,7 @@ public class UserChannelHandler extends SimpleChannelInboundHandler<ByteBuf> {
             // 通知代理客户端，用户连接可写状态
             String userId = ProxyChannelManager.getUserChannelUserId(userChannel);
             ProxyMessage proxyMessage = new ProxyMessage();
-            proxyMessage.setType(ProxyMessage.TYPE_WRITE_CONTROL);
+            proxyMessage.setType(ProxyMessage.C_TYPE_WRITE_CONTROL);
             proxyMessage.setUri(userId);
             proxyMessage.setData(userChannel.isWritable() ? new byte[] { 0x01 } : new byte[] { 0x00 });
             cmdChannel.writeAndFlush(proxyMessage);