lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-10-07 03:01:36 -07:00
Code Issues Releases Wiki Activity
2,299 Commits 23 Branches 479 Tags
c422196280347eff800f9340ed8c900789308a88
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Darien Raymond c422196280 safe return in blackhole 2017-02-11 00:41:14 +01:00
Darien Raymond 237ccf505c Merge branch 'master' of https://github.com/v2ray/v2ray-core 2017-02-10 17:19:16 +01:00
Darien Raymond 6c0fc4b0ec fix ineffectual assign in core 2017-02-10 16:54:51 +01:00
Darien Raymond 5ccc915f8f typo 2017-02-10 16:50:45 +01:00
Darien Raymond 6888093197 gofmt 2017-02-10 16:42:24 +01:00
Darien Raymond 2ba59428c9 remove lock in websocket connection 2017-02-10 16:41:54 +01:00
Darien Raymond cc58f5cb8f doc 2017-02-10 16:38:32 +01:00
Darien Raymond a32063dfb5 refactor core 2017-02-10 16:25:54 +01:00
Darien Raymond e57124ab87 remove unnecessary error message 2017-02-10 12:01:52 +01:00
Darien Raymond 396cf21597 output detailed error message 2017-02-10 12:00:37 +01:00
Darien Raymond cfcf16feed fix typo 2017-02-10 11:57:59 +01:00
Darien Raymond 1aeab3dd96 normalized path in websocket 2017-02-10 11:47:53 +01:00
Darien Raymond 5e7fb6d0dd refine error handling in retry logic 2017-02-10 11:41:50 +01:00
Darien Raymond 51745e772c rename 2017-02-09 22:55:12 +01:00
Darien Raymond d04d92c187 update context functions 2017-02-09 22:49:38 +01:00
Darien Raymond d270a99d4f simplify code 2017-02-09 12:31:40 +01:00
Darien Raymond 0d68293ef8 fix test break 2017-02-09 12:31:26 +01:00
Darien Raymond cdb0b94046 cleanup websocket code 2017-02-09 11:42:17 +01:00
Darien Raymond e5fbe56e2e fix test break 2017-02-09 11:42:03 +01:00
Darien Raymond 5ec3fe093d fix test break 2017-02-08 19:00:13 +01:00
Darien Raymond 3be6c72211 cleanup websocket code 2017-02-08 18:30:16 +01:00
Darien Raymond fc1b37d809 test case for TLS over websocket 2017-02-08 17:57:21 +01:00
Darien Raymond f99bd8b8b2 remove unused functions 2017-02-08 10:38:36 +01:00
Darien Raymond 27b0401c20 remove context functions for allow passive connection 2017-02-08 10:37:53 +01:00
Darien Raymond dc8e94ac79 test case for transport config 2017-02-08 10:26:58 +01:00
Darien Raymond 5de7fb8bc2 comments 2017-02-08 10:01:22 +01:00
Darien Raymond d2968e08ea suspend ipv6 test 2017-02-08 00:45:29 +01:00
Darien Raymond 2a486c6b9e ipv6 test 2017-02-08 00:26:40 +01:00
Darien Raymond 6bcce77afb fix import 2017-02-07 23:33:40 +01:00
Darien Raymond a0f2dabe5c fix kcp test 2017-02-07 23:33:21 +01:00
Darien Raymond d2538839af fix byte assertion 2017-02-07 23:33:02 +01:00
Darien Raymond 8b1bedc607 fix time update in travis 2017-02-07 22:38:25 +01:00
Darien Raymond d7167f552d remove allowPassiveConnection from config 2017-02-07 21:28:21 +01:00
Darien Raymond bd308e7817 sync time for test 2017-02-07 21:24:14 +01:00
Darien Raymond e7a7b38319 Merge branch 'master' of https://github.com/v2ray/v2ray-core 2017-02-07 21:11:50 +01:00
Darien Raymond b652032d9d update for mux 2017-02-07 21:11:47 +01:00
Darien Raymond b9eb40622d Merge branch 'master' of https://github.com/v2ray/v2ray-core 2017-02-07 17:37:29 +01:00
Darien Raymond d72029211f completely remove allow passive connection 2017-02-07 17:37:26 +01:00
Darien Raymond 338c4f5cc9 Update .travis.yml 2017-02-07 17:03:42 +01:00
Darien Raymond c245b4506e Update .travis.yml 2017-02-07 10:29:18 +01:00
Darien Raymond 4e8e15d528 refine error handling in byte reader 2017-02-07 00:39:07 +01:00
Darien Raymond 3643dc37e0 refine kcp output 2017-02-07 00:38:46 +01:00
Darien Raymond 14bbb58b12 fix bytes assertion 2017-02-06 23:25:52 +01:00
Darien Raymond a8abd68574 Merge branch 'master' of https://github.com/v2ray/v2ray-core 2017-02-06 23:21:46 +01:00
Darien Raymond d27743b3b9 rewrite vmess test 2017-02-06 15:36:55 +01:00
Darien Raymond 2897df5a7a don't copy leftoever if at head 2017-02-06 14:06:41 +01:00
Darien Raymond 775b4ef542 update auth test 2017-02-06 14:02:17 +01:00
Darien Raymond ce34a25e66 fix build break 2017-02-06 13:49:03 +01:00
Darien Raymond 47c3646162 refine authentication reader 2017-02-06 13:31:36 +01:00
Darien Raymond 6144b2ff55 update reference 2017-02-05 09:15:52 +01:00
Darien Raymond a13a8cffd8 test v2ray close 2017-02-05 08:44:08 +01:00
Darien Raymond 05626ca0fe check if hub is initialized. 2017-02-05 08:38:25 +01:00
Darien Raymond 08bed9e768 update 2017-02-04 23:52:37 +01:00
Darien Raymond e665de182d dispatcher test 2017-02-04 23:40:10 +01:00
Darien Raymond 9978cf07e6 fix udp dispatcher 2017-02-04 21:55:59 +01:00
Darien Raymond 4812e66229 fix stream settings check 2017-02-04 00:27:16 +01:00
Darien Raymond b5d14b6823 update java options 2017-02-03 23:15:10 +01:00
Darien Raymond b07d947311 update proto for mux 2017-02-03 23:09:24 +01:00
Darien Raymond 310d81b07c Update version 2017-02-03 23:01:55 +01:00
Darien Raymond 43fb425fd7 unified dispatcher interface 2017-02-03 22:50:01 +01:00
Darien Raymond c4d0227977 simplify dialer and dispatcher parameters 2017-02-03 22:35:09 +01:00
Darien Raymond 504ff4b0c4 remove mux settings from vmess 2017-02-03 00:14:43 +01:00
Darien Raymond d3d2fab1d9 refine error messages 2017-02-02 14:42:31 +01:00
Darien Raymond 8afdbbfc9f fix error usage 2017-02-02 10:51:15 +01:00
Darien Raymond 815e13f302 rename 2017-02-01 23:05:27 +01:00
Darien Raymond c8f48fde4d remove unused file 2017-02-01 22:04:28 +01:00
Darien Raymond 2f771e7742 fix test break 2017-02-01 21:47:02 +01:00
Darien Raymond f046f334cd move common/log to app/log 2017-02-01 21:35:40 +01:00
Darien Raymond 57fc444b3c check nil for outbound config 2017-02-01 12:15:18 +01:00
Darien Raymond d742cf71cb Merge branch 'master' of https://github.com/v2ray/v2ray-core 2017-01-31 21:30:18 +01:00
Darien Raymond 08b9778f05 refine user timeout 2017-01-31 17:46:39 +01:00
Darien Raymond ad7d98473f remove timeout reader 2017-01-31 16:49:59 +01:00
Darien Raymond 31294ba79a update default config 2017-01-31 14:44:08 +01:00
Darien Raymond df44a53ca0 update release ci 2017-01-31 14:36:20 +01:00
Darien Raymond 52ee3ff79c update wait logic 2017-01-31 14:15:34 +01:00
Darien Raymond 23a8da215f close timer sooner 2017-01-31 12:54:01 +01:00
Darien Raymond c462e35aad cancel sessions after inactivity 2017-01-31 12:42:05 +01:00
Darien Raymond 75b5a62c11 update 2017-01-30 23:09:20 +01:00
Darien Raymond 16b96ef32f update travis config 2017-01-30 23:05:03 +01:00
Darien Raymond cbebbc3e68 remove aggressive reader 2017-01-30 22:07:22 +01:00
Darien Raymond bd69763c63 session frame support 2017-01-30 22:02:28 +01:00
Darien Raymond 509700eddb typo 2017-01-30 21:37:50 +01:00
Darien Raymond e7aa920c27 refine dyn port 2017-01-30 21:35:34 +01:00
Darien Raymond f7f935a3c4 just use stable and forget it 2017-01-30 15:04:36 +01:00
Darien Raymond 4a660e5634 update golang version to 1.7.5 2017-01-29 21:42:31 +01:00
Darien Raymond bfcc75f5d1 fix goroutine leak in dynamic port 2017-01-29 12:58:52 +01:00
Darien Raymond ebf15aa6bb fix test cases 2017-01-29 09:02:19 +01:00
Darien Raymond 6629b6dd28 fix socks password authentication 2017-01-29 08:25:01 +01:00
Darien Raymond 20e785fa80 typo 2017-01-29 08:20:47 +01:00
Darien Raymond 61bc7b9100 fix error format 2017-01-29 08:20:15 +01:00
Darien Raymond 19ca32efd7 fix tcp connection source 2017-01-29 07:58:29 +01:00
Darien Raymond e9600f0aa5 Fix test break 2017-01-28 23:35:02 +01:00
Darien Raymond f6e0d08d34 Fix HTTP proxy 2017-01-28 23:34:55 +01:00
Darien Raymond c09ca41161 handle close wait 2017-01-28 22:31:21 +01:00
Darien Raymond fab20bb0cf close outbound connections when context is done 2017-01-28 21:24:46 +01:00
Darien Raymond 9139a87865 closw conn in the same routine 2017-01-28 16:28:18 +01:00
Darien Raymond 1ee9450dfc release buffer 2017-01-28 16:27:46 +01:00
Darien Raymond 0bf5f3e531 fix #374 2017-01-28 09:04:29 +01:00
Darien Raymond c5ecdc8078 fix nil address in inbound proxyman 2017-01-27 23:52:29 +01:00
Darien Raymond 09e5ae7a4b remove unnecessary code 2017-01-27 22:49:54 +01:00