github
/
nps
mirror of https://github.com/ehang-io/nps
1
0
Fork 0
Code Issues Releases Wiki Activity
370 Commits
8 Branches
64 Tags
9.4 MiB
Commit Graph

370 Commits (bc23c539814d70178d0cd9beec31ea694688a4a8)

Author SHA1 Message Date
ffdfgdfg 674a178506
Merge pull request #284 from cnlh/master 
pr merge to dev
 2019-12-01 23:32:11 +08:00
Callan Taylor 88dcea59ec Stop tickers to free up resources (#263) 2019-12-01 23:29:36 +08:00
Dan Bent bdf12fe22a add missing call to file.Close() (#245) 2019-12-01 23:23:29 +08:00
李鹏 9bb847df87 client net dail timeout (#125) 
* client net dail timeout

* Delete conn.go

mux 已变更设计

* Revert "Delete conn.go"

This reverts commit 0c944ec41d.

* Update client.go
 2019-12-01 23:18:11 +08:00
ffdfgdfg 63543b5675
Merge pull request #123 from hanxi/new_dev 
增加 web_base_url 配置, 用于配置 web 后台可置于代理子路径下
 2019-12-01 22:43:19 +08:00
ffdfgdfg 9abe5874b7
Merge branch 'dev' into new_dev 2019-12-01 22:41:59 +08:00
ffdfgdfg d888511f60
Update index.go 
go mod
 2019-12-01 22:37:48 +08:00
he liu 605f4aface
Merge pull request #262 from CallanTaylor/close-file 
Close file
 2019-11-30 21:54:16 +08:00
ffdfgdfg e429b17e63
strange 64bit alignment 2019-11-29 00:23:55 +08:00
ffdfgdfg 4381eb44b4
Merge pull request #277 from cnlh/master 
merge
 2019-11-28 21:33:32 +08:00
ffdfgdfg f352ee8f39 Update issue templates 2019-11-28 21:21:16 +08:00
ffdfgdfg fadfc24e52
Merge pull request #276 from cnlh/dev 
Dev 0.24.0 merge
 2019-11-28 20:19:14 +08:00
ffdfgdfg 78ebeba1bb minor bug fix, docker 2019-11-27 22:46:34 +08:00
ffdfgdfg 32e3d411ad change initial window size 2019-11-24 21:19:25 +08:00
ffdfgdfg 405f41f87f change some bandwidth calculation 2019-11-23 00:42:46 +08:00
ffdfgdfg 9bb8230fc1 fix several race condition, change slide window max size 2G to 32M, add buffer release 2019-11-21 23:53:06 +08:00
ffdfgdfg bd87864e26
Merge pull request #265 from 43280398/dev 
Update util.go
 2019-11-20 13:33:32 +08:00
zhangzc bfe08e5114
Update util.go 
修改nginx代理转发后无法获取真实ip
 2019-11-20 11:47:55 +08:00
ffdfgdfg aaf79b21f0 fine mux connection ping calculation, increase connection waiting time 2019-11-19 23:43:52 +08:00
CallanTaylor 592c39fb1d Close file 2019-11-19 13:57:25 +13:00
ffdfgdfg 2ca84c912b fix mux auto disconnect, add mux new connection queue 2019-11-13 23:33:02 +08:00
ffdfgdfg bc1783cfb6 64bit alignment, readme 2019-11-10 21:04:35 +08:00
ffdfgdfg a4bdbb2b54 version 2019-11-09 23:24:26 +08:00
ffdfgdfg f362c96e1e fine mux, add goroutine pool 2019-11-09 23:02:29 +08:00
ffdfgdfg 5f58c34c8b perf test 2019-11-02 22:59:52 +08:00
ffdfgdfg 5f35415849 fix queue bug 2019-10-27 23:25:12 +08:00
ffdfgdfg 442354db17 add test code 2019-10-23 23:35:39 +08:00
ffdfgdfg 23b023c562 add lock free queue 2019-10-21 11:55:29 +08:00
ffdfgdfg c2f4510a0f add test code 2019-10-15 16:32:21 +08:00
刘河 d23ed2126d change now time 2019-10-14 23:46:00 +08:00
刘河 18ca5d04cc connection trace web server 2019-10-14 23:44:07 +08:00
ffdfgdfg f5d5f63366 change slide window bandwidth calculation 2019-10-13 22:45:40 +08:00
ffdfgdfg 1f8e441090 multiple changes 2019-10-12 22:56:37 +08:00
ffdfgdfg 4c8d7b0738 reduce memory allocate 2019-10-08 21:41:25 +08:00
ffdfgdfg d9f9dc6acb change ping calculate, fix window size calculate 2019-10-08 13:38:42 +08:00
ffdfgdfg b3ed822c72 change slide window design 2019-10-07 23:04:54 +08:00
he liu d5488f8aa3
Merge pull request #211 from arugal/master 
optimizing readme for socks5
 2019-09-26 16:50:37 +08:00
ffdfgdfg 8bcf5313f4 merge 2019-09-25 00:13:34 +08:00
刘河 c062cc414a merge master 2019-09-24 23:11:59 +08:00
ffdfgdfg a61ff2d200 merge 2019-09-24 22:29:31 +08:00
ffdfgdfg 0de2c95934 Merge remote-tracking branch 'remotes/origin/master' into mux_test 
# Conflicts:
#	lib/common/util.go
#	lib/conn/conn.go
#	lib/conn/snappy.go
#	lib/mux/conn.go
#	lib/mux/mux.go
#	lib/mux/mux_test.go
#	lib/mux/queue.go
#	lib/pool/pool.go
#	server/proxy/p2p.go
#	server/proxy/udp.go
 2019-09-24 21:57:40 +08:00
ffdfgdfg 847f0ce1d4 fix window write loss 2019-09-23 23:09:58 +08:00
zhangwei a28d7319d8 optimizing readme for socks5 2019-09-23 16:33:42 +08:00
ffdfgdfg f0201c1039 change slide window 2019-09-22 22:08:51 +08:00
he liu 9351c94f35
Merge pull request #181 from libotony/patch-1 
get real ip of http request
 2019-09-20 13:02:08 +08:00
he liu 02be614149
Merge pull request #208 from arugal/master 
support multi account auth with socks5
 2019-09-20 13:00:59 +08:00
zhangwei ee50a67f03 new feature multi user auth with socks5 2019-09-19 21:16:47 +08:00
he liu 445ed1dd60
Merge pull request #207 from evangwt/master 
fix: close health check tcp connection
 2019-09-19 09:49:39 +08:00
evangwt 47527d1512
Merge branch 'master' into master 2019-09-19 09:25:13 +08:00
he2 af8d4a8c12 fix: close health check tcp connection 2019-09-19 09:17:32 +08:00