mirror of
https://github.com/e1732a364fed/v2ray_simple.git
synced 2025-12-24 13:27:56 +08:00
令编译打包使用xz; main加defer close;地址若错误也不fatal;
This commit is contained in:
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
@@ -174,14 +174,14 @@ jobs:
|
||||
cp -r ${GITHUB_WORKSPACE}/examples ./build_assets/examples
|
||||
|
||||
|
||||
- name: Create ZIP archive
|
||||
- name: Create xz archive
|
||||
shell: bash
|
||||
run: |
|
||||
pushd build_assets || exit 1
|
||||
touch -mt $(date +%Y01010000) *
|
||||
zip -9vr ../verysimple-$ASSET_NAME.zip .
|
||||
tar -cJf ../verysimple-$ASSET_NAME.tar.xz .
|
||||
popd || exit 1
|
||||
FILE=./verysimple-$ASSET_NAME.zip
|
||||
FILE=./verysimple-$ASSET_NAME.tar.xz
|
||||
DGST=$FILE.dgst
|
||||
for METHOD in {"md5","sha1","sha256","sha512"}
|
||||
do
|
||||
@@ -203,7 +203,7 @@ jobs:
|
||||
if: github.event_name == 'release'
|
||||
with:
|
||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
file: ./verysimple-${{ steps.get_filename.outputs.ASSET_NAME }}.zip*
|
||||
file: ./verysimple-${{ steps.get_filename.outputs.ASSET_NAME }}.tar.xz*
|
||||
tag: ${{ github.ref }}
|
||||
file_glob: true
|
||||
|
||||
14
Makefile
14
Makefile
@@ -39,7 +39,7 @@ ifdef PACK
|
||||
define compile
|
||||
GOOS=$(2) GOARCH=$(3) $(cmd) $(1)
|
||||
mv $(1) verysimple$(4)
|
||||
tar -czf $(1).tgz verysimple$(4) examples/
|
||||
tar -cJf $(1).tar.xz verysimple$(4) examples/
|
||||
rm verysimple$(4)
|
||||
endef
|
||||
|
||||
@@ -86,9 +86,9 @@ clean:
|
||||
rm -f $(macM1Fn)
|
||||
rm -f $(androidArm64Fn)
|
||||
|
||||
rm -f $(linuxAmdFn).tgz
|
||||
rm -f $(linuxArmFn).tgz
|
||||
rm -f ${winFn}.tgz
|
||||
rm -f $(macFn).tgz
|
||||
rm -f $(macM1Fn).tgz
|
||||
rm -f $(androidArm64Fn).tgz
|
||||
rm -f $(linuxAmdFn).tar.xz
|
||||
rm -f $(linuxArmFn).tar.xz
|
||||
rm -f ${winFn}.tar.xz
|
||||
rm -f $(macFn).tar.xz
|
||||
rm -f $(macM1Fn).tar.xz
|
||||
rm -f $(androidArm64Fn).tar.xz
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
|
||||
```sh
|
||||
wget https://github.com/hahahrfool/v2ray_simple/releases/download/v1.1.0/verysimple_linux_amd64_v1.1.0.tgz
|
||||
wget https://github.com/hahahrfool/v2ray_simple/releases/download/v1.1.2/verysimple_linux_amd64_v1.1.2.tgz
|
||||
|
||||
tar -xzf verysimple_linux_amd64_v1.1.0.tgz
|
||||
tar -xzf verysimple_linux_amd64_v1.1.2.tgz
|
||||
sudo mkdir -p /usr/local/etc/verysimple
|
||||
sudo mv verysimple /usr/local/etc/verysimple/
|
||||
sudo cp examples/vlesss.server.toml /usr/local/etc/verysimple/server.toml
|
||||
|
||||
10
main.go
10
main.go
@@ -1037,6 +1037,7 @@ func dialClient(iics incomingInserverConnState, targetAddr netLayer.Addr, client
|
||||
defer iics.baseLocalConn.Close()
|
||||
}
|
||||
}
|
||||
defer wlc.Close()
|
||||
|
||||
var err error
|
||||
|
||||
@@ -1072,7 +1073,11 @@ func dialClient(iics incomingInserverConnState, targetAddr netLayer.Addr, client
|
||||
|
||||
realTargetAddr, err = netLayer.NewAddr(client.AddrStr())
|
||||
if err != nil {
|
||||
log.Fatalf("convert addr err:%s\n", err)
|
||||
|
||||
if ce := utils.CanLogErr("dial client convert addr err"); ce != nil {
|
||||
ce.Write(zap.Error(err))
|
||||
}
|
||||
return nil, utils.NumErr{N: 15, Prefix: "dial client convert addr err "}
|
||||
}
|
||||
realTargetAddr.Network = client.Network()
|
||||
}
|
||||
@@ -1111,7 +1116,6 @@ func dialClient(iics incomingInserverConnState, targetAddr netLayer.Addr, client
|
||||
clientConn, err = realTargetAddr.Dial()
|
||||
if err != nil {
|
||||
if ce := utils.CanLogErr("failed in dial"); ce != nil {
|
||||
//log.Printf("failed in dial %s , Reason: , %s\n", realTargetAddr.String(), err)
|
||||
ce.Write(
|
||||
zap.String("target", realTargetAddr.String()),
|
||||
zap.Error(err),
|
||||
@@ -1120,6 +1124,8 @@ func dialClient(iics incomingInserverConnState, targetAddr netLayer.Addr, client
|
||||
return nil, utils.NumErr{N: 2, Prefix: "dialClient err, "}
|
||||
}
|
||||
|
||||
defer clientConn.Close()
|
||||
|
||||
//log.Println("dial real addr ok", realTargetAddr)
|
||||
|
||||
////////////////////////////// tls握手阶段 /////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user