Commit Graph
100 Commits
Author SHA1 Message Date
ffdfgdfgandGitHub 211f15882a Merge branch 'master' into dev 2020-01-08 23:24:46 +08:00
ffdfgdfg bbab46dd65 change docs path 2020-01-08 23:17:50 +08:00
ffdfgdfg 5d7023f055 change docs path 2020-01-08 22:24:03 +08:00
ffdfgdfg 6c7ac59626 change package path 2020-01-08 21:57:14 +08:00
ffdfgdfgandGitHub 64e71b8bef Merge pull request #352 from avengexyz/master
添加了25.4版本webapi参数说明
2020-01-06 09:41:40 +08:00
ffdfgdfg 933809f939 add work flow 2020-01-05 21:00:31 +08:00
ffdfgdfg c1d66ae6a5 Merge branch 'dev' of https://github.com/cnlh/nps into dev 2020-01-04 21:00:00 +08:00
ffdfgdfg 6bbe276b18 change window calculation, bandwidth calculation 2020-01-04 20:49:17 +08:00
ffdfgdfg f5fce6d1f4 change window calculation 2020-01-02 23:47:27 +08:00
ffdfgdfg a0a2cd1d47 bump version to v0.26.0 2020-01-01 23:34:58 +08:00
ffdfgdfg 49b3da01cd add some logs 2020-01-01 23:18:23 +08:00
ffdfgdfg aad7ed8f24 change slide window design 2020-01-01 22:17:56 +08:00
ffdfgdfgandGitHub e69b596370 Merge pull request #342 from cnlh/dev
fix version v0.25.4
2019-12-30 00:27:36 +08:00
ffdfgdfgandGitHub fe1c6e10dd master to dev (#341) 2019-12-30 00:25:36 +08:00
ffdfgdfg 86e0a52bb9 fix android build 2019-12-30 00:22:50 +08:00
ffdfgdfg 1f64715fab fix mux kcp connection 2019-12-28 20:40:00 +08:00
ffdfgdfg 813eae1216 Merge branch 'dev' of https://github.com/cnlh/nps into dev 2019-12-28 00:22:50 +08:00
ffdfgdfg 9b29bd64bd fix windows 2019-12-27 23:24:19 +08:00
ffdfgdfgandGitHub 3875bbfa17 Merge pull request #334 from cnlh/dev
Dev
2019-12-27 13:19:34 +08:00
ffdfgdfg f364936087 bump version to 0.25.4 2019-12-27 13:14:49 +08:00
ffdfgdfg 5e1b0be81c fix mux send window size counting 2019-12-27 13:02:28 +08:00
ffdfgdfg 076fc8b2e1 fine bandwidth calculation, fix slide window calculated size too large, fix #330 2019-12-27 00:32:40 +08:00
ffdfgdfgandGitHub 258be8e67a add docker image latest tag 2019-12-24 22:00:17 +08:00
ffdfgdfgandGitHub 346cb58613 Merge pull request #328 from cnlh/dev
Dev
2019-12-24 13:28:10 +08:00
ffdfgdfg b1384475d9 version to 0.25.3 2019-12-24 13:21:30 +08:00
ffdfgdfgandGitHub 5390e965a9 Merge pull request #327 from cnlh/master
master
2019-12-24 13:07:11 +08:00
ffdfgdfg bcba0351aa add manifest 2019-12-22 22:55:27 +08:00
ffdfgdfg 8e6132077c Merge remote-tracking branch 'origin/dev' into dev 2019-12-22 19:33:59 +08:00
ffdfgdfg 7361d55e3a temporary fix android internet permission 2019-12-22 19:33:32 +08:00
ffdfgdfgandGitHub eee05abaab Merge pull request #323 from zouri/dev
fix button not working on firefox
2019-12-21 16:24:30 +08:00
ffdfgdfg 231ba13e8c remove mux connection deadline 2019-12-19 22:24:58 +08:00
ffdfgdfgandGitHub 0559d29e74 Merge pull request #316 from cnlh/master
master to dev
2019-12-18 16:21:04 +08:00
ffdfgdfg 726be1cba0 Update build.android.sh 2019-12-18 16:07:36 +08:00
ffdfgdfgandGitHub 90a3409aac Merge pull request #310 from cnlh/dev
dev to master
2019-12-17 18:59:18 +08:00
ffdfgdfg 5a0fe14f23 fix segments size 2019-12-17 18:50:28 +08:00
ffdfgdfg 2629078988 Revert "change mux data struct, fix #250"
This reverts commit ae28d41231.
2019-12-17 15:38:40 +08:00
ffdfgdfg b46e35cf7e build android script 2019-12-17 15:31:25 +08:00
ffdfgdfg 4899bbd9d5 Merge remote-tracking branch 'origin/dev' into dev 2019-12-17 00:07:21 +08:00
ffdfgdfg b558cc6d19 add build android 2019-12-17 00:06:48 +08:00
ffdfgdfg ae28d41231 change mux data struct, fix #250 2019-12-16 23:10:44 +08:00
ffdfgdfg def85f883b Merge remote-tracking branch 'origin/dev' into dev 2019-12-14 18:36:02 +08:00
ffdfgdfg ab67dd5b8a bump fyne version 2019-12-14 18:35:27 +08:00
ffdfgdfg 28f5bdea8e fix config path 2019-12-13 23:06:15 +08:00
ffdfgdfg fa3beabfaf fix mux conn release race condition, add gui 2019-12-13 22:26:41 +08:00
ffdfgdfg 6703a98419 fix mux conn read after Stop() method invoked will panic 2019-12-11 23:32:32 +08:00
ffdfgdfgandGitHub 2f039ace9d Merge pull request #298 from cnlh/dev
Dev
2019-12-09 21:33:42 +08:00
ffdfgdfg 3fa7590400 Merge remote-tracking branch 'origin/dev' into dev 2019-12-07 21:06:34 +08:00
ffdfgdfg f85c5cd9ad add systemd directory determining, fix #295 2019-12-07 21:05:35 +08:00
ffdfgdfgandGitHub f97a9176e7 Merge pull request #291 from cnlh/dev
Fix bugs and optimize functions
2019-12-05 22:44:37 +08:00
ffdfgdfgandGitHub c7e7d2bac6 Update README.md
ci status image
2019-12-05 22:43:22 +08:00
ffdfgdfg 5da5bf1628 fix p2p connection race condition 2019-12-04 13:04:25 +08:00
ffdfgdfg 20ffb44994 Merge remote-tracking branch 'origin/dev' into dev 2019-12-02 21:15:32 +08:00
ffdfgdfg 04c0d59454 remove the default mux connection timeout if options is not set 2019-12-02 21:14:14 +08:00
ffdfgdfgandGitHub 674a178506 Merge pull request #284 from cnlh/master
pr merge to dev
2019-12-01 23:32:11 +08:00
ffdfgdfgandGitHub 63543b5675 Merge pull request #123 from hanxi/new_dev
增加 web_base_url 配置, 用于配置 web 后台可置于代理子路径下
2019-12-01 22:43:19 +08:00
ffdfgdfgandGitHub 9abe5874b7 Merge branch 'dev' into new_dev 2019-12-01 22:41:59 +08:00
ffdfgdfgandGitHub d888511f60 Update index.go
go mod
2019-12-01 22:37:48 +08:00
ffdfgdfgandGitHub e429b17e63 strange 64bit alignment 2019-11-29 00:23:55 +08:00
ffdfgdfgandGitHub 4381eb44b4 Merge pull request #277 from cnlh/master
merge
2019-11-28 21:33:32 +08:00
ffdfgdfgandGitHub f352ee8f39 Update issue templates 2019-11-28 21:21:16 +08:00
ffdfgdfgandGitHub 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
ffdfgdfgandGitHub bd87864e26 Merge pull request #265 from 43280398/dev
Update util.go
2019-11-20 13:33:32 +08:00
ffdfgdfg aaf79b21f0 fine mux connection ping calculation, increase connection waiting time 2019-11-19 23:43:52 +08: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
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
ffdfgdfg 8bcf5313f4 merge 2019-09-25 00:13:34 +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
ffdfgdfg f0201c1039 change slide window 2019-09-22 22:08:51 +08:00
ffdfgdfg 1bf4cf2347 fix conn write block, add priority queue support 2019-09-17 19:05:04 +08:00
ffdfgdfg 6157b1a528 fix block problems 2019-09-15 15:02:10 +08:00
ffdfgdfg 1c1be202b7 test for user close problem 2019-09-11 20:19:14 +08:00
ffdfgdfg 9d3df6be7e add mux slide window 2019-09-08 23:49:16 +08:00
ffdfgdfg 3413ceb7c2 add write queue again 2019-09-02 00:18:52 +08:00
ffdfgdfg 51a3787708 remove mux write queue, add connection close once 2019-09-01 22:52:48 +08:00
ffdfgdfg bb2cffe10a Change pool, change mux connection close ,change copy buffer 2019-08-30 20:05:09 +08:00
ffdfgdfg 41c282b38b fix buffer size bug 2019-08-27 20:07:37 +08:00
ffdfgdfg 53c2e472ae Change BuffSizeCopy pool 2019-08-26 23:29:22 +08:00
ffdfgdfg f35a73f734 mux test 2019-08-26 18:47:23 +08:00
ffdfgdfg 00900c1315 mux test 2019-08-23 18:53:36 +08:00
ffdfgdfgandGitHub 57c49089de Merge pull request #161 from waysup/patch-2
Update README.md
2019-08-19 09:40:23 +08:00
ffdfgdfgandGitHub d35e3510a9 Merge pull request #164 from exfly/feat/go-mod-supported
feat: go mod supported
2019-08-19 09:35:14 +08:00
ffdfgdfg 7178b33807 Change to 755, fixes #176 2019-08-16 10:48:48 +08:00