From aad3632e3d20e87f114a1f8eae4969fabfdede2e Mon Sep 17 00:00:00 2001 From: hahahrfool <75717694+hahahrfool@users.noreply.github.com> Date: Sun, 10 Apr 2022 12:09:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E4=BB=A3=E7=A0=81=E3=80=81?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++++++++ cli.go | 2 +- proxy/socks5/server.go | 2 +- proxy/socks5/udp_test.go | 7 ++++++- proxy/vless/server.go | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fdc5108..51faf80 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ +[![GoDoc][1]][2] [![MIT licensed][3]][4] [![Go Report Card][5]][6] + +[1]: https://godoc.org/github.com/hahahrfool/v2ray_simple?status.svg +[2]: https://godoc.org/github.com/hahahrfool/v2ray_simple +[3]: https://img.shields.io/badge/license-MIT-blue.svg +[4]: LICENSE +[5]: https://goreportcard.com/badge/github.com/hahahrfool/v2ray_simple +[6]: https://goreportcard.com/report/github.com/hahahrfool/v2ray_simple + # verysimple verysimple, 实际上 谐音来自 V2ray Simple (显然只适用于汉语母语者), @@ -542,3 +551,6 @@ github.com/manifoldco/promptui 为了支持hysteria 的阻塞控制,从 https://github.com/HyNetwork/hysteria 的 pkg/congestion里拷贝了 brutal.go 和 pacer.go 到我们的 quic文件夹中. +## Stargazers over time + +[![Stargazers over time](https://starchart.cc/hahahrfool/v2ray_simple.svg)](https://starchart.cc/hahahrfool/v2ray_simple) \ No newline at end of file diff --git a/cli.go b/cli.go index 63987ad..c943279 100644 --- a/cli.go +++ b/cli.go @@ -656,7 +656,7 @@ func interactively_hotRemoveServerOrClient() { Validate: validateFunc, } - result, err = promptIdx.Run() + _, err = promptIdx.Run() if err != nil { fmt.Printf("Prompt failed %v\n", err) diff --git a/proxy/socks5/server.go b/proxy/socks5/server.go index 039dff2..ddf0da9 100644 --- a/proxy/socks5/server.go +++ b/proxy/socks5/server.go @@ -326,7 +326,7 @@ func (u *UDPConn) ReadMsgFrom() ([]byte, netLayer.Addr, error) { newStart := off + l if clientSupposedAddrIsNothing { - clientSupposedAddrIsNothing = false + //clientSupposedAddrIsNothing = false u.clientSupposedAddr = addr } return bs[newStart:n], netLayer.Addr{ diff --git a/proxy/socks5/udp_test.go b/proxy/socks5/udp_test.go index 34b6b1b..6580f9a 100644 --- a/proxy/socks5/udp_test.go +++ b/proxy/socks5/udp_test.go @@ -33,11 +33,16 @@ func TestUDP(t *testing.T) { for { lc, err := listener.Accept() if err != nil { - t.Logf("failed in accept: %v", err) + t.Logf("failed in accept: %s", err.Error()) t.Fail() } t.Log("socks5 server got new conn") _, wlc, targetAddr, err := s.Handshake(lc) + + if err != nil { + t.Logf("failed in Handshake: %s", err.Error()) + t.Fail() + } if targetAddr.IsUDP() { t.Log("socks5 server got udp associate") } diff --git a/proxy/vless/server.go b/proxy/vless/server.go index f9afd05..57ca2fd 100644 --- a/proxy/vless/server.go +++ b/proxy/vless/server.go @@ -290,7 +290,7 @@ realPart: targetAddr.Network = "udp" } - var ip_or_domain_bytesLength byte = 0 + var ip_or_domain_bytesLength byte addrTypeByte, err := readbuf.ReadByte()