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

4604 Commits (622591bf03f3b53f61a46fc5c712647374633202)

Author SHA1 Message Date
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
forever8938 6bfe044cfa
Support external domain file for dns hosts 2019-11-02 15:49:29 +08:00
vcptr 63b7eeacd1 docker file compatible with ray version 2019-11-02 13:38:29 +08:00
vcptr b9480cb4b4 arm release include GOARM=6 2019-10-31 19:24:37 +08:00
vcptr 0d60a9e719 logger module start firstly 2019-10-31 19:13:19 +08:00
vcptr 0eb590ce7a docker pkg with name docker-fly 2019-10-31 17:30:10 +08:00
vcptr 3c8c9adcf7 Merge branch 'dockerdev' into flymaster 2019-10-31 12:38:01 +08:00
vcptr bec564b455 adjust args 2019-10-31 11:44:57 +08:00
vcptr 4da588d406 add abpath to user-package 2019-10-31 11:29:18 +08:00
Shelikhoo 275e2d5af7
Fix build error, blaim golang.org/x/crypto@v0.0.0-20190308221718-c2843e01d9a2 2019-10-30 21:36:12 +08:00
Shelikhoo 95f808ccd8
Fix merge error 2019-10-30 20:24:38 +08:00
Shelikhoo aecf18af0c
Fix merge error 2019-10-30 20:15:31 +08:00
Shelikhoo 35e9da8ca6
Merge branch 'master' of github.com:v2ray/v2ray-core 
This are significant amount of change introduced in this merge, needs 
additional testing.
 2019-10-30 20:03:11 +08:00
Shelikhoo b258ca7290
Set core version 2019-10-30 18:46:33 +08:00
Shelikhoo d1881e2bc6
Output Release ID 2019-10-30 17:04:17 +08:00
Shelikhoo 0e39a08e10
Fix X file mode 2019-10-30 15:53:04 +08:00