Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #1

Merged
merged 558 commits into from
Mar 8, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
558 commits
Select commit Hold shift + click to select a range
a42a1cb
Update version
DarienRaymond Dec 7, 2017
4c7c42d
grow buffer size slower
DarienRaymond Dec 8, 2017
49ec887
update issue template
DarienRaymond Dec 8, 2017
4146590
general purpose logger
DarienRaymond Dec 10, 2017
742d9d2
migrate to new severity def
DarienRaymond Dec 10, 2017
03403bb
trim space before parsing address
DarienRaymond Dec 10, 2017
ba26fd8
update dead link
DarienRaymond Dec 11, 2017
cad3ab4
hide console window when running v2ctl. fix #779
DarienRaymond Dec 13, 2017
4091f23
remove official server
DarienRaymond Dec 13, 2017
123977e
fix misspelling
DarienRaymond Dec 13, 2017
08411e3
update README
DarienRaymond Dec 14, 2017
6797483
remove unused web server
DarienRaymond Dec 14, 2017
484bdee
comments
DarienRaymond Dec 14, 2017
bf1f099
add download count
DarienRaymond Dec 14, 2017
bc92678
fix crash on init timeout = 0
DarienRaymond Dec 14, 2017
0032760
cleanup kcp connection
DarienRaymond Dec 14, 2017
2acef1c
cleanup kcp connection
DarienRaymond Dec 14, 2017
4fad49f
fix build break
DarienRaymond Dec 14, 2017
6c3ef14
fix test break
DarienRaymond Dec 14, 2017
c6b07a8
Update version
DarienRaymond Dec 15, 2017
0959755
fix a buffer leak in buffered reader
DarienRaymond Dec 16, 2017
80e43a6
reduce websocket memory usage
DarienRaymond Dec 16, 2017
9561301
update headers test cases
DarienRaymond Dec 16, 2017
048ffbc
simplify tls config
DarienRaymond Dec 16, 2017
3cc6d8f
fix a data race in KCP
DarienRaymond Dec 17, 2017
88b81a0
Update version
DarienRaymond Dec 17, 2017
a0b2c28
more test cases
DarienRaymond Dec 17, 2017
91ca88b
read original addr from x-forwarded-for header if present
DarienRaymond Dec 18, 2017
1f22679
remove header operation to http protocol package
DarienRaymond Dec 18, 2017
12ae92a
exclude errorgen from coverage
DarienRaymond Dec 18, 2017
b8dc01b
Support Linux on s390x
astrataro Dec 18, 2017
a908f02
Build s390x in Travis-CI script
astrataro Dec 19, 2017
6c14ecb
Merge pull request #786 from astrataro/patch-1
DarienRaymond Dec 19, 2017
054ceb8
avoid port in-use error in websocket test
DarienRaymond Dec 19, 2017
f4c35db
merge log into common log
DarienRaymond Dec 19, 2017
49b2701
register logger on start
DarienRaymond Dec 19, 2017
3b45a8d
comments
DarienRaymond Dec 19, 2017
49056d2
remove unused function
DarienRaymond Dec 19, 2017
9e50a8d
fix test
DarienRaymond Dec 19, 2017
7d11286
fix test
DarienRaymond Dec 19, 2017
ab4f245
overrideable dns
DarienRaymond Dec 19, 2017
c277c6d
fix test
DarienRaymond Dec 19, 2017
7078f23
fix nil pointer on close().
DarienRaymond Dec 19, 2017
35545cb
fix test
DarienRaymond Dec 19, 2017
c911127
test cases for common
DarienRaymond Dec 20, 2017
11d726f
refine log handlers
DarienRaymond Dec 21, 2017
2b8cc43
fix a typo
DarienRaymond Dec 21, 2017
3938c65
fix log format
DarienRaymond Dec 21, 2017
7fdaa02
comments
DarienRaymond Dec 22, 2017
4656d5f
fix lint warnings
DarienRaymond Dec 22, 2017
7554150
Update version
DarienRaymond Dec 22, 2017
e736c08
report pack error instead of panic
DarienRaymond Dec 23, 2017
76fa495
update protoc
DarienRaymond Dec 23, 2017
0e571c9
new use protogen
DarienRaymond Dec 23, 2017
e8cad4a
remove old protogen
DarienRaymond Dec 23, 2017
a82ca01
release script relocation
DarienRaymond Dec 25, 2017
1777540
update geoip.dat
DarienRaymond Dec 25, 2017
664b840
send username/password together with initial handshake data in socks …
DarienRaymond Dec 26, 2017
8a09c6c
migrate to signal.Semaphore and Notifier
DarienRaymond Dec 27, 2017
9b15e2f
more informational logs
DarienRaymond Dec 27, 2017
2bf5a00
fix error levels
DarienRaymond Dec 27, 2017
bc52a10
rename dns.Server
DarienRaymond Dec 28, 2017
b15f337
Update version
DarienRaymond Dec 28, 2017
64859ff
specify release description
DarienRaymond Dec 28, 2017
7cf654a
fix a typo
DarienRaymond Dec 30, 2017
27a6365
update License
DarienRaymond Jan 1, 2018
30f2770
Use 'h2' for ALPN in TCP
DarienRaymond Jan 2, 2018
9ccdf67
fix lint warnings
DarienRaymond Jan 2, 2018
24395a3
comments for protos.
DarienRaymond Jan 4, 2018
c5d3565
comments for typed messages
DarienRaymond Jan 4, 2018
5a3c7fd
remove use of unsafe
DarienRaymond Jan 5, 2018
292d7cc
massive refactoring for interoperability
DarienRaymond Jan 10, 2018
e4554e5
fix test break
DarienRaymond Jan 10, 2018
ec54b04
fix test break
DarienRaymond Jan 10, 2018
7d2c34f
remove unused code
DarienRaymond Jan 10, 2018
6a7887b
fix LocalNameServer
DarienRaymond Jan 10, 2018
68ef98a
remove unused code
DarienRaymond Jan 10, 2018
c45b24c
fix creation logic
DarienRaymond Jan 10, 2018
efc8c23
support dial for v2ray instance
DarienRaymond Jan 10, 2018
7fab28c
fix build break
DarienRaymond Jan 10, 2018
fa72ccc
Update version
DarienRaymond Jan 12, 2018
72e9ef8
fix release ci
DarienRaymond Jan 12, 2018
ddb6437
remove unused code
DarienRaymond Jan 12, 2018
b5caea6
gofmt
DarienRaymond Jan 12, 2018
a6c0ef1
check connection state for every write operation
DarienRaymond Jan 17, 2018
630a76d
kcp cleanup
DarienRaymond Jan 17, 2018
fbfbbb8
id of v2ray instance
DarienRaymond Jan 17, 2018
14176a3
fix error usage
DarienRaymond Jan 18, 2018
0e01e28
use uuid as struct
DarienRaymond Jan 18, 2018
4b5e41c
fix UDP handling in Shadowsocks client
DarienRaymond Jan 19, 2018
c3dce11
fix a typo
DarienRaymond Jan 19, 2018
9cd0e90
injectable clock
DarienRaymond Jan 23, 2018
8923159
commander interface
DarienRaymond Jan 24, 2018
0273b36
prepare for remove function
DarienRaymond Jan 30, 2018
cf832a4
adjust init sequence
DarienRaymond Jan 31, 2018
384844f
fix #840
DarienRaymond Feb 2, 2018
1e6d556
prototype of commander
DarienRaymond Feb 5, 2018
3a0f211
gofmt
DarienRaymond Feb 5, 2018
ede2c39
non-blocking timer. Fixes #848
DarienRaymond Feb 6, 2018
01c76d7
listen on localhost only
DarienRaymond Feb 6, 2018
2328c69
include new packages
DarienRaymond Feb 6, 2018
deaee9f
test case for removing handler on the fly
DarienRaymond Feb 6, 2018
8b5fe1a
correct handler running status
DarienRaymond Feb 7, 2018
8b83bf2
comments and test cases.
DarienRaymond Feb 7, 2018
a1ae4aa
cleanup session history
DarienRaymond Feb 7, 2018
efcb567
remove context in struct
DarienRaymond Feb 8, 2018
9a46cf3
fix default outbound handler
DarienRaymond Feb 8, 2018
5755d41
fix encoding test
DarienRaymond Feb 8, 2018
c368412
test case for periodic task
DarienRaymond Feb 8, 2018
9fdb783
fix kcp test
DarienRaymond Feb 8, 2018
acc6ea3
fix websocket test
DarienRaymond Feb 8, 2018
dffaef6
use periodic task in dns.Server
DarienRaymond Feb 8, 2018
32f1ba7
properly start and close outbound handlers
DarienRaymond Feb 8, 2018
b5facc0
remove context from mux.Client
DarienRaymond Feb 8, 2018
0e8d9ae
Update version
DarienRaymond Feb 8, 2018
278fd72
remove context in udp hub
DarienRaymond Feb 8, 2018
862f9a1
comments and refactoring
DarienRaymond Feb 8, 2018
90925bd
use go 1.9.4
DarienRaymond Feb 8, 2018
f8ce194
remove unused code
DarienRaymond Feb 8, 2018
495ae1c
implement remove user operation
DarienRaymond Feb 8, 2018
d9040b5
decouple commander interface from grpc
DarienRaymond Feb 8, 2018
c05dade
fix commander test
DarienRaymond Feb 8, 2018
c1fc7c7
fix command listener
DarienRaymond Feb 8, 2018
87ba7dd
implement remove user in vmess
DarienRaymond Feb 9, 2018
05d93e5
fix handling for empty email addresses
DarienRaymond Feb 9, 2018
8460d01
fix address parsing for mux
DarienRaymond Feb 9, 2018
30a0aa6
don't read 0 bytes
DarienRaymond Feb 9, 2018
42d83a7
fix transfer for mux
DarienRaymond Feb 9, 2018
92aef24
remove unnecessary proxy functions
DarienRaymond Feb 9, 2018
c4f1e10
comments
DarienRaymond Feb 10, 2018
6f4bddd
disable mux command temporarily
DarienRaymond Feb 10, 2018
0a6a954
fix kcp for not sending data immediately
DarienRaymond Feb 11, 2018
ae52e32
send ack more frequently too
DarienRaymond Feb 11, 2018
693c9bd
Merge pull request #1 from v2ray/master
Ariselia Feb 11, 2018
684d862
Update Golang tarball version.
Ariselia Feb 11, 2018
058882e
Merge pull request #861 from Ariselia/master
DarienRaymond Feb 11, 2018
9333649
Update version
DarienRaymond Feb 11, 2018
997c852
remove unused code
DarienRaymond Feb 11, 2018
20fc495
comments
DarienRaymond Feb 11, 2018
34f51c6
enable mux command for next version
DarienRaymond Feb 11, 2018
d065e72
Added Additional Debug output and error message for #854
xiaokangwang Feb 12, 2018
f4ec85d
fix loading of json config
DarienRaymond Feb 12, 2018
5133ca1
Merge pull request #863 from v2ray/DetailedOriginalAddress]
DarienRaymond Feb 12, 2018
94e9301
update log
DarienRaymond Feb 12, 2018
d801be7
comments
DarienRaymond Feb 12, 2018
03ba5ef
properly close shadowsocks client udp connection
DarienRaymond Feb 12, 2018
7391b24
simplify udp hub
DarienRaymond Feb 12, 2018
ae4dece
explictly use the io.Writer instance for writing net.Buffers
DarienRaymond Feb 12, 2018
ae395bb
increase udp hub capacity
DarienRaymond Feb 12, 2018
31d1fb6
fix lint errors
DarienRaymond Feb 12, 2018
ccb2a9f
comments
DarienRaymond Feb 13, 2018
1e0b35f
fix nil reference in udp worker
DarienRaymond Feb 14, 2018
c48fa50
logger service
DarienRaymond Feb 14, 2018
42e9af6
details about GetFeature
DarienRaymond Feb 14, 2018
84f8192
fix default logger
DarienRaymond Feb 14, 2018
9412523
include log command
DarienRaymond Feb 14, 2018
2a07838
extendable config format
DarienRaymond Feb 14, 2018
e9e6b21
Update version
DarienRaymond Feb 15, 2018
242e65e
move Println to main
DarienRaymond Feb 16, 2018
3d8f837
comments
DarienRaymond Feb 16, 2018
07ca879
update coverall script
DarienRaymond Feb 16, 2018
95be224
fix coverage test
DarienRaymond Feb 16, 2018
2789798
remove clock feature
DarienRaymond Feb 16, 2018
5bd3cee
gofmt
DarienRaymond Feb 17, 2018
ab9ca3b
move json config into a separate package
DarienRaymond Feb 17, 2018
512fa40
try Go 1.10
DarienRaymond Feb 17, 2018
baeef07
fix yaml syntax
DarienRaymond Feb 17, 2018
39cfc98
test case for policy
DarienRaymond Feb 17, 2018
e49d49b
test case for adding and removing user by command
DarienRaymond Feb 19, 2018
e7858e7
properly set timeout in dokodemo door
DarienRaymond Feb 19, 2018
226d65c
fix error handling in vmess outbound
DarienRaymond Feb 19, 2018
f123182
fix error handling in ray
DarienRaymond Feb 19, 2018
b3e46f5
fix error handling in buf.Copy
DarienRaymond Feb 19, 2018
446059f
fix error handling in outbound handler
DarienRaymond Feb 19, 2018
1f8fcb5
fix error handling in freedom, shadowsocks and socks
DarienRaymond Feb 19, 2018
b3fd320
more test cases
DarienRaymond Feb 19, 2018
c25a76a
integration test case for policy
DarienRaymond Feb 20, 2018
f084954
remove commander from core feature
DarienRaymond Feb 20, 2018
c335789
close inner features before resetting
DarienRaymond Feb 20, 2018
3734195
fix log test
DarienRaymond Feb 20, 2018
955444a
fix setter methods
DarienRaymond Feb 20, 2018
655fb40
remove json tag
DarienRaymond Feb 20, 2018
87ef3b0
test case for dial
DarienRaymond Feb 20, 2018
af967c2
use golang 1.10 for release
DarienRaymond Feb 21, 2018
88b25d3
simplify context retrieval
DarienRaymond Feb 21, 2018
0982445
update Must2
DarienRaymond Feb 21, 2018
1077e33
unify address reading in socks and shadowsocks
DarienRaymond Feb 22, 2018
7e6b45a
format
DarienRaymond Feb 22, 2018
0920af1
remove redundent code
DarienRaymond Feb 22, 2018
cdfbd03
remove unused function
DarienRaymond Feb 22, 2018
80a1e73
fix error propagation in vmess server
DarienRaymond Feb 22, 2018
6b872c2
session id
DarienRaymond Feb 22, 2018
bc19794
simplify log
DarienRaymond Feb 22, 2018
df34931
fix log test
DarienRaymond Feb 22, 2018
0a3b3d0
refactor UDPNameServer clean up task
DarienRaymond Feb 22, 2018
3c1a7ad
Update version
DarienRaymond Feb 22, 2018
546c2fb
settings for forcing secure encryption in vmess server
DarienRaymond Feb 23, 2018
16c6a5f
fix test break
DarienRaymond Feb 23, 2018
768e30c
disable socks 4 when auth is required.
DarienRaymond Feb 23, 2018
798212b
fix timer settings
DarienRaymond Feb 23, 2018
a059ee2
fix lint errors
DarienRaymond Feb 23, 2018
af1abf6
unify all address reading and writing
DarienRaymond Feb 23, 2018
61c258f
input channel was being closed too quickly
DarienRaymond Feb 23, 2018
c43a5e7
use AddressParser in mux
DarienRaymond Feb 23, 2018
a42b4b5
test case for write address
DarienRaymond Feb 24, 2018
dfd4d39
fix version format
DarienRaymond Feb 24, 2018
2b4104e
benchmark for dice
DarienRaymond Feb 24, 2018
1e0cad5
buffered input in kcp client
DarienRaymond Feb 24, 2018
caa52e9
early release buffers for better reusing
DarienRaymond Feb 24, 2018
4783b8f
stop doing anything after being released. fixes #804
DarienRaymond Feb 25, 2018
58e79db
refactor kcp.ReadSegment
DarienRaymond Feb 25, 2018
2c56f5f
Remove duplicate len function call.
yujinqiu Feb 26, 2018
861ff94
Fix sniff typo
yujinqiu Feb 26, 2018
0179b73
Merge pull request #884 from yujinqiu/fix-sniffer-typo
DarienRaymond Feb 26, 2018
fec56dd
Merge pull request #883 from yujinqiu/fix-dup-func-call
DarienRaymond Feb 26, 2018
6a3abf3
fix data race when caching session id
DarienRaymond Feb 26, 2018
b7d48fe
prevent reading 0 bytes
DarienRaymond Feb 26, 2018
bdab1af
update tls config generation
DarienRaymond Feb 28, 2018
a7d4679
try parse domain address as IP. fixes #894.
DarienRaymond Mar 1, 2018
af29e42
move tcp.PickPort to its own package
DarienRaymond Mar 1, 2018
d207d95
h2 transport
DarienRaymond Mar 1, 2018
e5d3783
consume config in dialer and hub
DarienRaymond Mar 1, 2018
59958fe
refactor udp worker
DarienRaymond Mar 1, 2018
c4dd86d
update geoip
DarienRaymond Mar 1, 2018
a4f6ee6
print version when starts
DarienRaymond Mar 1, 2018
8d679fb
include h2
DarienRaymond Mar 1, 2018
ed5f0b9
remove id in log
DarienRaymond Mar 1, 2018
20be8aa
test case for h2 transport
DarienRaymond Mar 1, 2018
2e7944a
concurrent connection in h2
DarienRaymond Mar 1, 2018
8c499d8
Update version
DarienRaymond Mar 1, 2018
7b28be5
fix typo
Mar 2, 2018
6b4272d
update release key. fixes #907
DarienRaymond Mar 2, 2018
a52eb8f
allow underscore in domain name. fixes #917
DarienRaymond Mar 4, 2018
9100a78
refactor
DarienRaymond Mar 4, 2018
6e293f4
verify command
DarienRaymond Mar 4, 2018
e1bdca4
fix context reference
DarienRaymond Mar 5, 2018
794dfd5
Dedup protocol registration
yujinqiu Mar 6, 2018
4b5a581
Merge pull request #924 from yujinqiu/dedup-protocol-register
DarienRaymond Mar 6, 2018
a1401e7
fix compatibility with shadowrocket. fixes #920
DarienRaymond Mar 6, 2018
4d1bb21
Update version
DarienRaymond Mar 6, 2018
2dc6d29
Capture command output
yujinqiu Mar 6, 2018
dde9aaa
Fix typo
yujinqiu Mar 6, 2018
9ae3a68
Merge pull request #927 from yujinqiu/fix-error-output
DarienRaymond Mar 6, 2018
2628fc7
Merge pull request #928 from yujinqiu/fix-typo
DarienRaymond Mar 6, 2018
0e12ffd
Fix typo
yujinqiu Mar 6, 2018
ce7cacc
Merge pull request #929 from yujinqiu/fix-download-typo
DarienRaymond Mar 6, 2018
ff1e386
Merge pull request #931 from wuxiangzhou2010/master
DarienRaymond Mar 7, 2018
2c85405
test case for mux over shadowsocks
DarienRaymond Mar 7, 2018
8864195
Fix executable typo
yujinqiu Mar 8, 2018
51bd513
Merge pull request #934 from yujinqiu/fix-execute-typo
DarienRaymond Mar 8, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
hide console window when running v2ctl. fix v2ray#779
  • Loading branch information
DarienRaymond committed Dec 13, 2017
commit cad3ab41aaa2cda8f33df64d22e6111f6bdcf45c
1 change: 1 addition & 0 deletions main/config_json.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ func jsonToProto(input io.Reader) (*core.Config, error) {
cmd := exec.Command(v2ctl, "config")
cmd.Stdin = input
cmd.Stderr = os.Stderr
cmd.SysProcAttr = getSysProcAttr()

stdoutReader, err := cmd.StdoutPipe()
if err != nil {
Expand Down
9 changes: 9 additions & 0 deletions main/config_json_other.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// +build !windows

package main

import "syscall"

func getSysProcAttr() *syscall.SysProcAttr {
return nil
}
11 changes: 11 additions & 0 deletions main/config_json_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// +build windows

package main

import "syscall"

func getSysProcAttr() *syscall.SysProcAttr {
return &syscall.SysProcAttr{
HideWindow: true,
}
}