1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-17 18:06:15 -05:00
Commit Graph

4719 Commits

Author SHA1 Message Date
vcptr
75f0879c12 proper handle stdin 2019-12-14 23:48:56 +08:00
vcptr
1bb34bfe17 abstract type for conf load func 2019-12-14 23:48:56 +08:00
vcptr
61e95e06c0 remove unused pkg 2019-12-14 23:48:56 +08:00
vcptr
1e76123a4c main loads multiple 2019-12-14 23:48:56 +08:00
vcptr
904db6bd61 mconfig subcommand ready 2019-12-14 23:48:56 +08:00
vcptr
7b289d16cf conf obj override method 2019-12-14 23:48:56 +08:00
Kslr
0be2dbc37b
Merge pull request #2094 from vcptr/rfc8484
doh URL config accepts full path
2019-12-09 10:01:46 +08:00
vcptr
d6df5d7cf9 doh URL controls full path 2019-12-09 09:37:35 +08:00
Kslr
698b04fa2a
Merge pull request #2086 from vcptr/rfc8484
doh config use RFC8484 url format
2019-12-06 13:31:34 +08:00
vcptr
b4b4b3d032 doh config use RFC8484 url format 2019-12-06 12:55:14 +08:00
Kslr
cb49b2b961
Merge pull request #2059 from vcptr/testfix
fix test err and SyscallConn detects
2019-11-27 16:45:21 +08:00
vcptr
2a78af34fd fix: KCPLarge buffer size too small 2019-11-27 14:40:28 +08:00
vcptr
60603abee7 fix: dns test default timeout too short 2019-11-27 13:06:08 +08:00
vcptr
47660bfee2 fix win test error; dont use ReadV on file 2019-11-27 11:24:40 +08:00
vcptr
c060f9f11f fix test read buf 2019-11-27 09:12:02 +08:00
vcptr
622591bf03 Merge branch 'raymaster' into flymaster 2019-11-27 00:16:37 +08:00
Kslr
45398c2bc9
Merge pull request #2056 from vcptr/userpkg
user-package script allow custom codename/buildname
2019-11-26 19:21:12 +08:00
Kslr
d8a7763847
Merge pull request #2055 from vcptr/dohpr
DOH client supported
2019-11-26 19:19:28 +08:00
vcptr
bd08ba6b15 remove dockerfile 2019-11-26 13:50:25 +08:00
vcptr
82745be6fd adjust args 2019-11-26 13:50:08 +08:00
vcptr
0d99c3f942 add abpath to user-package 2019-11-26 13:50:08 +08:00
vcptr
afd805c7ba fix session key unexported 2019-11-26 13:30:44 +08:00
vcptr
59e3a2a67c add comments to exported func 2019-11-26 13:24:46 +08:00
vcptr
ceb77ac8f5 only add to ipIndexMap if GeoIP is configured
clearer logging for expectIPs

refactor dns init code

optimal to default port logic

clear message exit if doh met error
2019-11-26 13:05:19 +08:00
vcptr
6ef77246ab add DOH dns client 2019-11-25 15:41:36 +08:00
vcptr
ca0ca362d3 Merge branch 'raymaster' into flymaster 2019-11-25 15:29:35 +08:00
Kslr
7313089539
Merge pull request #2043 from vcptr/testbuf
more test code
2019-11-22 20:28:23 +08:00
vcptr
3b9514ec9f minor optm 2019-11-22 17:57:16 +08:00
vcptr
fa30713e76 minor changes to dns from pr #2037 2019-11-22 17:40:24 +08:00
vcptr
905ac82bb1 more test to common/buf 2019-11-22 17:40:24 +08:00
Kslr
ec9cf059e8
Merge pull request #2041 from mellow-io/fix-reader
properly propagate Reader errors
2019-11-22 17:22:47 +08:00
ghost
8da0a53845 properly propagate Reader errors 2019-11-22 10:11:23 +08:00
Kslr
e52d3fa90b
Merge pull request #2037 from weaving118/master
add ip match feature for dns
2019-11-21 22:15:26 +08:00
vcptr
621cb8fc80 Merge branch 'raymaster' into flymaster 2019-11-21 14:37:20 +08:00
weaving118
debb7f0c44
ignore if domain already lookup failed 2019-11-21 02:32:09 +08:00
weaving118
1345185b81
add errExpectedIPNonMatch and return nil if empty response 2019-11-21 01:09:23 +08:00
Kslr
44aafae19e
Merge pull request #2039 from v2fly/fixconftest
fix test failed on logger position
2019-11-20 22:01:38 +08:00
weaving118
e916a3b29d
update confip ip to expectIPs 2019-11-20 17:20:33 +08:00
vcptr
47a5c970fc fix test failed on logger position 2019-11-20 15:08:20 +08:00
vcptr
699e73c760 Merge branch 'raymaster' into flymaster 2019-11-20 11:24:43 +08:00
Kslr
c94f5f66a6
Merge pull request #2038 from vcptr/earlylog
Earlylogger
2019-11-19 18:26:17 +08:00
vcptr
54f903040a early inited log 2019-11-19 14:06:25 +08:00
vcptr
901e4837ad logger module start firstly 2019-11-19 14:06:20 +08:00
vcptr
3c3a828e3b Merge branch 'raymaster' into flymaster 2019-11-19 14:00:46 +08:00
vcptr
8854c7872f early inited log 2019-11-19 09:49:33 +08:00
weaving118
101f5d32fa
add ip match feature for dns 2019-11-18 23:48:42 +08:00
Kslr
7f40be7567
Merge pull request #2002 from forever8938/master
Support external domain file for dns hosts
2019-11-12 01:55:28 +08:00
vcptr
8cfb682f9c Merge branch 'raymaster' into flymaster 2019-11-06 12:47:44 +08:00
Kslr
9a06ff8f91
Merge pull request #2005 from mellow-io/fix-read
fix ReadBuffer()
2019-11-05 18:35:58 +08:00
ghost
f7abe353df fix ReadBuffer() 2019-11-03 17:37:44 +08:00