github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity
2,823 Commits
3 Branches
350 Tags
65 MiB
Commit Graph

410 Commits (973378d610b839bcf4c08b687c962d296e09a54a)

Author SHA1 Message Date
Darien Raymond 2a3facab5a
Merge branch 'master' of https://github.com/v2ray/v2ray-core 2017-04-05 13:46:13 +02:00
Darien Raymond 55328921b5
wait for done 2017-04-05 13:46:11 +02:00
Darien Raymond 0a15bceb55
fix dead lock 2017-04-05 12:56:50 +02:00
Darien Raymond 947492a71c
close all sessions after main connection ends 2017-04-05 11:02:49 +02:00
Darien Raymond 2e5cb82790
update proto 2017-04-04 12:28:14 +02:00
Darien Raymond 7195c17af6
close server down link 2017-04-04 11:20:07 +02:00
Darien Raymond 18b0b87c52
no-op timer 2017-04-04 10:24:38 +02:00
Darien Raymond 55ecd92064
simplify mux code 2017-04-04 00:17:38 +02:00
Darien Raymond bf0a4c428e
refactor mux code 2017-04-03 23:43:33 +02:00
Darien Raymond 682235cacc
refactor server worker 2017-04-03 17:28:15 +02:00
Darien Raymond c4ba853887
refactor error messages 2017-04-03 13:07:12 +02:00
Darien Raymond 72d9cb8a74
bug fixes 2017-04-03 12:55:46 +02:00
Darien Raymond 852fd14ba9
wait for handler init 2017-04-03 01:07:18 +02:00
Darien Raymond 5686566139
apply mux in client 2017-04-02 21:30:21 +02:00
Darien Raymond 2111c7e9ca
update proto def 2017-04-02 14:24:10 +02:00
Darien Raymond 9d6513d3d3
remove unused code 2017-04-02 14:23:58 +02:00
Darien Raymond 1e06cf34d9
apply mux in inbound handler 2017-04-02 14:06:20 +02:00
Darien Raymond 3161c56aba
refactor 2017-04-02 13:43:24 +02:00
Darien Raymond 73c4696e00
mux io 2017-04-02 09:48:30 +02:00
Darien Raymond 9e6a57b2b8
mux client 2017-04-01 00:53:01 +02:00
Darien Raymond eab2f1effc
refactor 2017-03-27 01:47:01 +02:00
Darien Raymond 514dcffe2e
Fix a potential issue causing high CPU usage 2017-03-02 11:54:40 +01:00
Darien Raymond 9206d7a741
fix sync issue in time calculation 2017-02-27 21:34:35 +01:00
Darien Raymond d93ff628bc
refactor tcp worker 2017-02-26 14:38:41 +01:00
Darien Raymond e480091388
smart error propagation 2017-02-21 23:14:07 +01:00
Darien Raymond 020b436827
merge bufio into buf 2017-02-15 22:51:01 +01:00
Darien Raymond 48eb40ff39
dice.RandomUint16 2017-02-14 22:29:44 +01:00
Darien Raymond 6d446f57f7
remove cancel signal 2017-02-13 23:03:42 +01:00
Darien Raymond 02028bf8be
fix panic when there is no available handler 2017-02-13 13:08:28 +01:00
Darien Raymond c0ea29a2ed
switch to info 2017-02-11 07:39:06 +01:00
Darien Raymond 6888093197
gofmt 2017-02-10 16:42:24 +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 5e7fb6d0dd
refine error handling in retry logic 2017-02-10 11:41:50 +01:00
Darien Raymond d04d92c187
update context functions 2017-02-09 22:49:38 +01:00
Darien Raymond d7167f552d
remove allowPassiveConnection from config 2017-02-07 21:28:21 +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 d72029211f
completely remove allow passive connection 2017-02-07 17:37:26 +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 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 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 d3d2fab1d9
refine error messages 2017-02-02 14:42:31 +01:00
Darien Raymond c8f48fde4d
remove unused file 2017-02-01 22:04:28 +01:00
Darien Raymond f046f334cd
move common/log to app/log 2017-02-01 21:35:40 +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 bfcc75f5d1
fix goroutine leak in dynamic port 2017-01-29 12:58:52 +01:00
Darien Raymond 19ca32efd7
fix tcp connection source 2017-01-29 07:58:29 +01:00
Darien Raymond f6e0d08d34
Fix HTTP proxy 2017-01-28 23:34:55 +01:00
Darien Raymond fab20bb0cf
close outbound connections when context is done 2017-01-28 21:24:46 +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
Darien Raymond 8231d2cdad
dns test 2017-01-27 21:19:46 +01:00
Darien Raymond 9716d7fdfe
Fix usage of source in context 2017-01-27 20:38:01 +01:00
Darien Raymond 18e1ca85aa
rename udp.Server 2017-01-27 14:45:16 +01:00
Darien Raymond 83c35c1e41
remove unnecessary log 2017-01-27 14:30:09 +01:00
Darien Raymond 15e0b7125d
fix udp worker 2017-01-27 14:27:02 +01:00
Darien Raymond 866a4d879c
fix udp handling 2017-01-27 14:10:36 +01:00
Darien Raymond 6c45f593dd
bug fixes in outbound handler 2017-01-26 22:47:31 +01:00
Darien Raymond 7f36a5d1d3
rename proxy interfaces 2017-01-26 20:57:18 +01:00
Darien Raymond ca721230e1
split listening settings from inbound proxies and apply context 2017-01-26 20:46:44 +01:00
Darien Raymond 34a2ae0ab7
implement default outbound handler 2017-01-15 00:48:37 +01:00
Darien Raymond b8f01e0c03
merge sender and receiver to proxyman 2017-01-15 00:17:06 +01:00
Darien Raymond 8b00d6fc30
clean imports 2017-01-14 00:27:45 +01:00
Darien Raymond c48e1f02a6
comments 2017-01-13 14:33:32 +01:00
Darien Raymond 07866e6d39
check for nil 2017-01-13 14:33:28 +01:00
Darien Raymond f7e1f00c88
rename dispatcher.Interface 2017-01-13 13:53:44 +01:00
Darien Raymond 289c467a12
remove unnecessary code 2017-01-13 13:47:44 +01:00
Darien Raymond 17504d2aac
context'ize apps 2017-01-13 13:41:40 +01:00
Darien Raymond 148e4832eb
leverage global object creator in proxies. 2017-01-13 00:56:21 +01:00
Darien Raymond d24fe9dbfb
separate network and transport protocol 2017-01-12 12:54:34 +01:00
Darien Raymond 2eb313d0c2
refresher prototype 2017-01-10 17:30:21 +01:00
Darien Raymond 0e940fb1fa
close both stream immediately after error 2017-01-10 15:10:30 +01:00
Darien Raymond 72992c7478
able to close ray stream with error 2017-01-10 14:22:42 +01:00
Darien Raymond 1cf9cd5d78
receiver prototype 2017-01-09 17:50:13 +01:00
Darien Raymond ed3033e785
socks submodule 2017-01-08 10:10:37 +01:00
Darien Raymond a150ceb3ea
release initialzers after initialized. 2017-01-06 15:34:21 +01:00
Darien Raymond b11d48d73f
simplify app design 2017-01-06 15:32:36 +01:00
Darien Raymond 762afc1d8f
remove unused types 2017-01-05 23:11:05 +01:00
Darien Raymond e678000c44
remove release() pattern 2017-01-04 12:52:24 +01:00
Darien Raymond 49210d8362
refine stream handling 2017-01-04 12:34:01 +01:00
Darien Raymond 31d6e74482
remove rawtcp 2017-01-03 14:53:59 +01:00
Darien Raymond ff01a886da
simplify comments 2017-01-03 14:21:59 +01:00
Darien Raymond c9a421fba6
remove generate package comments in .pb.go files. 2017-01-03 14:17:44 +01:00
Darien Raymond 6c39ce0714
doc 2017-01-03 13:06:03 +01:00
Darien Raymond 20fe6d10a4
rollback gitignore change 2017-01-02 20:52:45 +01:00
Darien Raymond 52e1dfaeac
remove all generated files 2017-01-02 08:15:31 +01:00
Darien Raymond 5857aea881
remove inspector 2017-01-01 23:08:39 +01:00
Darien Raymond bdfb879963
comments 2016-12-29 01:05:16 +01:00
Darien Raymond e6214b7a87
fix lint warnings 2016-12-29 00:58:00 +01:00
Darien Raymond 7bc98503a8
remove buggy CloseWrite() 2016-12-29 00:56:17 +01:00
Darien Raymond 7c751fcca0
common.Must 2016-12-28 00:53:29 +01:00
Darien Raymond 3ddacbb9c9
prototype for payload inspector 2016-12-23 16:54:15 +01:00
Darien Raymond a4dfca0ef7
accommodate protobuf compiler change 2016-12-23 12:42:25 +01:00
Darien Raymond 7dc7937443
rename ws to websocket 2016-12-23 00:30:46 +01:00
Darien Raymond eb782436b3
proto option for C# namespace 2016-12-23 00:24:28 +01:00
Darien Raymond a24b11af27
fix lint warnings 2016-12-22 13:33:28 +01:00
Darien Raymond ceaf5d1178
fix lint warnings 2016-12-21 15:37:16 +01:00
Darien Raymond eddde847df
comments 2016-12-21 10:46:27 +01:00
Darien Raymond 095c29fa8c
decouple outbound handler manager 2016-12-16 23:02:11 +01:00
Darien Raymond c4144af223
decouple dns server 2016-12-16 16:20:12 +01:00
Darien Raymond 5e297692da
decouple core and dispatcher impl 2016-12-16 15:39:47 +01:00
Darien Raymond 50bc195f7f
rename TypedSettings to TypedMessage 2016-12-15 11:51:09 +01:00
Darien Raymond eee23e6718
fix api usage 2016-12-11 21:43:16 +01:00
dd 20c330d03c fix dns query 2016-12-12 00:12:58 +08:00
Darien Raymond 1948d0738f
refactor io package 2016-12-09 13:17:34 +01:00
Darien Raymond 055023fdd5
refactor buffer 2016-12-09 12:08:25 +01:00
Darien Raymond 7a80409e30
rename alloc to buf 2016-12-09 11:35:27 +01:00
Darien Raymond 0ad629ca31
remove use of prepend 2016-12-08 11:21:24 +01:00
Darien Raymond 943d43040b
name confict 2016-12-07 14:35:10 +01:00
Darien Raymond a11c225cbf
protobuf refresh 2016-12-07 14:33:31 +01:00
Darien Raymond 8c8f0a53fd
rewrite alloc.buffer 2016-12-06 11:03:42 +01:00
Darien Raymond cf3eb0e77d
refine buffer usage 2016-12-05 15:19:14 +01:00
Darien Raymond efb24a4d21
rewrite error lib 2016-12-04 09:10:47 +01:00
Darien Raymond f95c322677
rename 'this' 2016-11-27 21:39:09 +01:00
Darien Raymond d00f8eef56
remove use of 'v' as a variable name 2016-11-27 17:01:44 +01:00
Darien Raymond c041740940
remove ErrMissingApplication 2016-11-21 21:13:01 +01:00
Darien Raymond def8a19a7e
small fixes 2016-11-19 22:38:50 +01:00
Darien Raymond 65a49e7fa0
small fixes 2016-11-19 00:37:11 +01:00
Darien Raymond ad3f450bce
fix usage of io.EOF 2016-11-17 23:21:44 +01:00
Darien Raymond fc81b0aae2
config for inbound tag routing 2016-11-13 21:23:34 +01:00
Darien Raymond 9471b5b066
refine dispatcher 2016-11-13 14:33:00 +01:00
Darien Raymond 5dc05d6352
allow outbound to be proxied 2016-11-10 23:41:28 +01:00
Darien Raymond d343cb1ee6
proxy connection 2016-11-09 00:17:09 +01:00
Darien Raymond 531be77a59
remove test case depending on external resources 2016-10-24 16:49:41 +02:00
Darien Raymond a7ef82ffbc
fix test break 2016-10-19 12:01:11 +02:00
Darien Raymond aae99a8e98
use session in router 2016-10-18 23:01:39 +02:00
Darien Raymond e13c97d162
rename IP to CIDR in router 2016-10-18 16:42:22 +02:00
Darien Raymond 4e80ed05d9
comments 2016-10-18 10:31:39 +02:00
Darien Raymond 5a311cbe08
json config parser 2016-10-17 14:35:13 +02:00
Darien Raymond e866ff24a4
refine app settings in v2ray config 2016-10-16 16:04:30 +02:00
Darien Raymond be026870f7
protogen update 2016-10-16 00:23:27 +02:00
Darien Raymond fc6a706166
refactor protos 2016-10-12 18:43:55 +02:00
Darien Raymond 22ef12a456
simplify router 2016-10-12 16:11:13 +02:00
Darien Raymond 63f3108737
protobuf for router 2016-10-11 23:02:44 +02:00
Darien Raymond 1d13f47f9c
protobuf for stream settings 2016-10-02 23:43:58 +02:00
Darien Raymond af6abfa3e3
update proto generated code 2016-09-26 15:14:39 +02:00
Darien Raymond 91f2a40dae
refine proto package names 2016-09-26 15:14:16 +02:00
Darien Raymond d38e62932d
proto for dns config 2016-09-20 16:05:35 +02:00
Darien Raymond 7de7588ec2
proto for destination 2016-09-20 11:53:05 +02:00
Darien Raymond c518726910
network proto 2016-09-20 10:44:44 +02:00
Darien Raymond 9ade07db03
remove IsTCP() and IsUDP() 2016-09-19 16:39:11 +02:00
Darien Raymond ea2c491ade
global proto gen 2016-08-28 23:41:51 +02:00