Merge remote-tracking branch 'origin/master' into SIP003_DEV

CC-Cheunggg · Apr 28, 2020 · 25fba28 · 25fba28
2 parents e1377c6 + a8e88e9
commit 25fba28
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: java
+jdk:
+ - openjdk8
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Releases](https://img.shields.io/github/downloads/RPCheung/shadowsockets-core/total.svg)](https://github.com/RPCheung/shadowsockets-core/releases)
-
+[![Build Status](https://travis-ci.org/RPCheung/shadowsockets-core.svg?branch=master)](https://travis-ci.org/github/RPCheung/shadowsockets-core)
 ## 计划
 
 - [x] TCP隧道

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.2.1-bin.zip
diff --git a/src/main/java/com/cheung/shadowsocks/codec/ShadowsocksDecoder.java b/src/main/java/com/cheung/shadowsocks/codec/ShadowsocksDecoder.java
@@ -15,6 +15,7 @@
 import io.netty.channel.EventLoopGroup;
 import io.netty.handler.codec.ReplayingDecoder;
 import io.netty.handler.codec.socks.SocksAddressType;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,21 +53,31 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
  @Override
  public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
  ByteBuf buff = (ByteBuf) msg;
- ByteBuf data = Unpooled.copiedBuffer(CryptUtil.decrypt(_crypt, buff));
- CryptUtil.releaseByteBufAllRefCnt(buff);
- super.channelRead(ctx, data);
+ try {
+ ByteBuf data = Unpooled.copiedBuffer(CryptUtil.decrypt(_crypt, buff));
+ super.channelRead(ctx, data);
+ } finally {
+ CryptUtil.releaseByteBufAllRefCnt(buff);
+ }
  }
 
  @Override
- protected void decode(ChannelHandlerContext ctx, ByteBuf data, List<Object> out) throws Exception {
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+ logger.error("decode error", cause);
+ ctx.close();
+ }
 
+ @Override
+ protected void decode(ChannelHandlerContext ctx, ByteBuf data, List<Object> out) throws Exception {
+ // 这个方法里面的 ByteBuf 会自动释放
  switch (state()) {
  case HOST_TYPE: {
  hostType = SocksAddressType.valueOf(data.readByte());
  if ((hostType != SocksAddressType.IPv4)
  && (hostType != SocksAddressType.IPv6)
  && (hostType != SocksAddressType.DOMAIN)) {
  CryptUtil.releaseByteBufAllRefCnt(data);
+ ctx.close();
  logger.error("UNKNOWN HOST TYPE.");
  return;
  }
@@ -96,6 +107,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf data, List<Object> out)
  if (hostType == SocksAddressType.UNKNOWN) {
  logger.error("UNKNOWN HOST TYPE.");
  CryptUtil.releaseByteBufAllRefCnt(data);
+ ctx.close();
  return;
  }
  checkpoint(ReadState.PORT);

diff --git a/src/main/java/com/cheung/shadowsocks/proxy/InternetDataHandler.java b/src/main/java/com/cheung/shadowsocks/proxy/InternetDataHandler.java
@@ -37,7 +37,6 @@ public void channelActive(ChannelHandlerContext ctx) {
  ctx.channel().writeAndFlush(Unpooled.copiedBuffer(data));
  }
  }
-
  }