Fixed send disconnect request twice error

Author: jingyu

services/active-proxy/src/main/java/elastos/carrier/service/activeproxy/ActiveProxy.java

@@ -33,7 +33,7 @@
 
 public class ActiveProxy implements CarrierService {
 	static final String NAME = "ActiveProxy";
-	static final int DEFAULT_PORT = 10088;
+	static final int DEFAULT_PORT = 8090;
 	static final String DEFAULT_PORT_MAPPING_RANGE = "32768-65535";
 
 	@SuppressWarnings("unused")

services/active-proxy/src/main/java/elastos/carrier/service/activeproxy/ProxyConnection.java

@@ -363,7 +363,8 @@ private void handlePacket(Buffer packet) {
 				handleAttach(packet);
 				return;
 			} else {
-				log.error("Connection {} got wrong packet, AUTH or ATTACH excepted", getName());
+				log.error("Connection {} got wrong packet {}, AUTH or ATTACH excepted",
+						getName(), PacketFlag.toString(flag));
 				close();
 			}
 			break;
@@ -373,7 +374,8 @@ private void handlePacket(Buffer packet) {
 				handleKeepAlive(packet);
 				return;
 			} else {
-				log.error("Connection {} got wrong packet, PING excepted", getName());
+				log.error("Connection {} got wrong packet {}, PING excepted",
+						getName(), PacketFlag.toString(flag));
 				close();
 			}
 			break;
@@ -383,7 +385,8 @@ private void handlePacket(Buffer packet) {
 				handleConnectAck(packet);
 				return;
 			} else {
-				log.error("Connection {} got wrong packet, CONNECT ACK excepted", getName());
+				log.error("Connection {} got wrong packet {}, CONNECT ACK excepted",
+						getName(), PacketFlag.toString(flag));
 				close();
 			}
 			break;
@@ -396,7 +399,8 @@ private void handlePacket(Buffer packet) {
 				handleDisconnect(packet);
 				return;
 			} else {
-				log.error("Connection {} got wrong packet, DATA or DISCONNECT excepted", getName());
+				log.error("Connection {} got wrong packet {}, DATA or DISCONNECT excepted",
+						getName(), PacketFlag.toString(flag));
 				close();
 			}
 			break;
@@ -546,8 +550,13 @@ public void connectClient(NetSocket clientSocket) {
 
 		clientSocket.closeHandler(clientClose);
 		clientSocket.exceptionHandler(t -> {
-			log.error("Client socket error", t);
-			clientClose.handle(null);
+			if (log.isDebugEnabled())
+				log.error("Client socket error", t);
+			else
+				log.error("Client socket error: {}", t.getMessage());
+
+			clientSocket.close();
+			this.clientSocket = null;
 		});
 		clientSocket.handler(this::handleClientData);
 
@@ -558,10 +567,10 @@ public void connectClient(NetSocket clientSocket) {
 	}
 
 	private void disconnectClient() {
-		if (this.clientSocket != null) {
+		if (clientSocket != null) {
 			needSendDisconnect = false;
-			this.clientSocket.close();
-			this.clientSocket = null;
+			clientSocket.close();
+			clientSocket = null;
 		}
 	}
 

services/dht-proxy/src/main/java/elastos/carrier/service/dhtproxy/DHTProxy.java

@@ -33,7 +33,7 @@
 
 public class DHTProxy implements CarrierService {
 	private static final String NAME = "DHT Proxy";
-	private static final int DEFAULT_PORT = 10080;
+	private static final int DEFAULT_PORT = 8088;
 
 	private ServiceContext context;
 	private ProxyServer server;