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

72 Commits (b610fc0a70b5e444abd3afe513bfff6ca6c85efb)

Author SHA1 Message Date
vcptr 0fd0c374c1 fix config compatibility with old inbound/inboundDetors/out 2020-03-24 21:52:03 +08:00
vcptr 0d71d3dcf8 revert back to multiconfig 2020-03-19 19:11:16 +08:00
ToutyRater 30b5f521c4 typo 2020-03-12 00:42:29 +08:00
vcptr 556f4bf743 Merge branch 'raymaster' into flymaster 2020-01-03 08:52:41 +08:00
Kslr fdbec9a141
Revert "multiple config" 2020-01-02 01:23:56 +08:00
Kslr e6f226c64d
Revert "add arg -confdir" 2020-01-02 01:14:36 +08:00
vcptr 3ca28ce2d8 Merge branch 'raymaster' into flymaster 2019-12-31 16:13:31 +08:00
vcptr c3f55dcd67 filter .json in confDir 2019-12-31 13:11:34 +08:00
vcptr 5ae47d45c2 multiconf with -confdir arg 2019-12-31 11:45:19 +08:00
vcptr 1aefd6ce40 Merge branch 'raymaster' into flymaster 2019-12-31 09:06:49 +08:00
Shelikhoo 4448d37c2b
Merge branch 'master' of github.com:v2ray/v2ray-core 2019-12-26 19:34:48 +08:00
vcptr a36631357c add comments to new added code 2019-12-24 01:06:01 +08:00
vcptr f54bbb903d fix testcase 2019-12-16 10:29:18 +08:00
vcptr 3b4a4607e5 fix test case; outbound with tail appends 2019-12-15 00:14:46 +08:00
vcptr 75f0879c12 proper handle stdin 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
vcptr b4b4b3d032 doh config use RFC8484 url format 2019-12-06 12:55:14 +08:00
vcptr 622591bf03 Merge branch 'raymaster' into flymaster 2019-11-27 00:16:37 +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 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 1345185b81
add errExpectedIPNonMatch and return nil if empty response 2019-11-21 01:09:23 +08:00
vcptr 47a5c970fc fix test failed on logger position 2019-11-20 15:08:20 +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
weaving118 101f5d32fa
add ip match feature for dns 2019-11-18 23:48:42 +08:00
forever8938 6bfe044cfa
Support external domain file for dns hosts 2019-11-02 15:49:29 +08:00
vcptr 0d60a9e719 logger module start firstly 2019-10-31 19:13:19 +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
wuxiaolong 97764114ea Support http outbound 2019-07-24 09:15:05 +08:00
vcptr fcb3896a33 add doc about timeout 2019-07-14 12:59:35 +08:00
Kslr 2c4c5c50c2 Sync from ray 2019-07-12 15:41:43 +08:00
Kslr 0a7d99803d fix incompatible errors when building with bazel 0.26+ 
a0aa7b7374
 2019-07-12 14:38:48 +08:00
Kslr e43acf6e2a add: mute access/error logger seperately 
4c93d36d49
 2019-07-12 14:34:38 +08:00
vcptr 01e3a5f809 add StatsService.GetSysStats 2019-07-08 14:12:17 +08:00
Kslr 3deb5f26c9
Merge pull request #1750 from sosiska/patch-1 
Some code improvements
 2019-07-04 21:40:48 +08:00
lucifer9 4cc5558a4e delete some unnecessary comments 2019-06-29 10:22:22 +08:00
Kirill Motkov 0401a91ef4 Some code improvements 
* Rewrite empty string checks more idiomatically.
* Change strings.ToLower comparisons to strings.EqualFold.
* Rewrite switch statement with only one case as if.
 2019-06-28 17:53:44 +03:00
lucifer9 a0aa7b7374 fix incompatible errors when building with bazel 0.26+ 2019-06-26 13:51:33 +08:00
boypt 79cf94be6c add: mute access/error logger seperately 2019-06-11 15:29:52 +08:00
Kslr 09075e62fd Fix IP rule with custom GeoIP file 
b0edbec53e
 2019-06-03 15:09:04 +08:00
Kslr eb3df1a58e fix: json field tag syntax 
sync ad4f41e1c0
 2019-06-03 14:52:35 +08:00
Kslr b0edbec53e
Merge pull request #1694 from heapops/bugfix_rule_ip_ext_file 
Fix IP rule with custom GeoIP file
 2019-05-31 12:53:46 +08:00
boypt ad4f41e1c0 fix: json field tag syntax 2019-05-30 16:48:34 +08:00