lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-18 02:16:10 -05:00
Code Issues Releases Wiki Activity
6,316 Commits 21 Branches 437 Tags 71 MiB
7b434ced58
Commit Graph

367 Commits

Author SHA1 Message Date
Loyalsoldier
7805ca2ac1
Refine geodata related tests (#967) 2021-05-04 16:30:23 +08:00
Shelikhoo
40a7847d7f
update json configure for websocket header 2021-05-01 15:49:42 +01:00
Loyalsoldier
980fb59878
Fix: observatory starts with empty config & fails to close (#957) 2021-05-01 22:28:23 +08:00
秋のかえで
b68411f460
Fix: browserforwarder panics with empty config (#954) 
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2021-05-01 20:50:30 +08:00
Loyalsoldier
625a15e03b
Chore: format code by new customized goimports (#950) 2021-05-01 11:15:39 +08:00
Loyalsoldier
0fe129de65
Infra: use customized goimports (#949) 2021-05-01 11:11:37 +08:00
Loyalsoldier
7e876709fe
Refactor: memory-efficient geo file decoder (#934) 2021-05-01 07:59:29 +08:00
Shelikhoo
95432b2131
fix:browser forwarder not supported by multi-json 2021-04-30 20:53:08 +01:00
Shelikhoo
347b0c3e85
fix:observatory not supported by multi-json 2021-04-30 15:25:24 +01:00
Loyalsoldier
a21e4a7deb
Fix: FakeDNS IPv6 & refine JSON unmarshal (#925) 2021-04-22 08:12:52 +08:00
QxQ
3a51c255eb
Update uuid.go 2021-04-18 15:38:04 +08:00
Shelikhoo
3138b3e815
removed tool to prepare for v5 2021-04-17 10:50:53 +01:00
Shelikhoo
0c6a2e06b9
added json loading of the PinnedPeerCertificateChainSha256 2021-04-16 23:52:49 +01:00
Shelikhoo
ebb720804d
refactored cert pin 2021-04-15 20:02:48 +01:00
Shelikhoo
29718735be
apply coding style 2021-04-15 19:02:57 +01:00
Shelikhoo
92b845a45b
added calculation of certificate hash as separate command and tlsping, use base64 to represent fingerprint to align with jsonPb 2021-04-15 19:01:55 +01:00
Shelikhoo
3cd145a6f0
fix not creating test dir in some environment 2021-04-13 18:15:06 +01:00
Shelikhoo
d7c9a98d76
apply coding style 2021-04-13 16:06:48 +01:00
Shelikhoo
8323add330
apply coding style 2021-04-13 15:50:29 +01:00
Shelikhoo
1e282944a6
apply coding style 2021-04-13 15:39:10 +01:00
Shelikhoo
f5d2ddedb4
Merge branch 'dev-fakednsimprovement' 2021-04-13 15:14:47 +01:00
Shelikhoo
6dcdd2afad
Merge branch 'dev-advloadblancer-2' 2021-04-13 15:09:32 +01:00
Loyalsoldier
7790d33185
Fix: v2ray.location.asset env not working (#889) 2021-04-12 10:01:30 +08:00
Shelikhoo
726f023a5d
fix incorrect service name 2021-04-12 01:18:20 +01:00
Loyalsoldier
31abe08c05
Chore: simplify DNS hosts struct (#888) 2021-04-11 12:46:02 +08:00
Loyalsoldier
bada0e48b4
Feat: DNS hosts support multiple addresses (#884) 2021-04-10 21:56:08 +08:00
Shelikhoo
488f9845c6
added fake dns + others matching logic 2021-04-10 13:40:15 +01:00
Shelikhoo
94ab10fce3
added json parser for multi fake dns pool 2021-04-10 00:08:50 +01:00
Loyalsoldier
3f40089caf
Feat: add disableFallback & skipFallback option for DNS (#864) 2021-04-09 10:35:26 +08:00
Shelikhoo
32f6af48d1
Added json loading for the observatory 2021-04-08 23:18:25 +01:00
Shelikhoo
fc2a37492a
rewrite the test case to confirm the new parsing rule 2021-04-08 23:18:25 +01:00
Shelikhoo
017a11cfd5
allow the loading of router strategy 2021-04-08 23:18:25 +01:00
Shelikhoo
459a914ab7
apply coding style 2021-04-08 23:18:23 +01:00
Shelikhoo
a42ef81ac0
finish remaining grpc observatory api 2021-04-08 23:17:00 +01:00
Shelikhoo
3a705cec5a
reflective api loader 2021-04-08 23:16:59 +01:00
Shelikhoo
71b2ff65f4
Remove unhelpful name 2021-04-08 23:16:59 +01:00
Shelikhoo
f518b63157
Direct reflective json loader 2021-04-08 23:16:59 +01:00
Shelikhoo
99f761a12e
V2Ray Service Loader 2021-04-08 23:16:59 +01:00
Loyalsoldier
10ca68f277
Feat: remove geo files from repo & refine tests (#869) 2021-04-07 03:08:03 +08:00
Loyalsoldier
3a50affa0a
Feat: add reverse match for GeoIP (#860) 2021-04-06 12:29:12 +08:00
Shelikhoo
6b542f59a9
shadowsocks iv check config file 2021-04-01 20:59:36 +01:00
loyalsoldier
a0c817888b
Chore: format code 2021-03-28 08:44:04 +08:00
loyalsoldier
24948c6520
Merge branch 'master' into dev-wsimprovement 2021-03-28 08:40:05 +08:00
Loyalsoldier
921c6d71ee
Feat: format code in one-key (#802) 2021-03-24 14:43:00 +08:00
Loyalsoldier
1454bed646
Feat: vprotogen refine logic (#820) 2021-03-24 13:03:14 +08:00
Loyalsoldier
389ff73a26
Feat: vprotogen adds version detector (#819) 
* Feat: vprotogen adds version detector to block generation code from old protobuf version
* Chore: update .gitignore
 2021-03-24 11:49:32 +08:00
Shelikhoo
6c1abd9c6a
added use browser forwarding setting to the websocket config 2021-03-20 22:05:02 +00:00
Shelikhoo
e161d6cc1f
added parsing of browser forwarder config 2021-03-20 22:03:45 +00:00
Loyalsoldier
e6aaa57def
Feat: add queryStrategy option for DNS (#794) 2021-03-19 15:55:18 +08:00
Loyalsoldier
7459e2c5ef
Fix: vprotogen loop dependency (#797) 
* Chore: remove protoc-gen-gofast
* Fix: loop dependency
* Chore: regenerate VLESS pb.go file
* Fix: compare test
 2021-03-18 18:32:40 +08:00
RPRX
00879c483e
Add grpcSettings & gunSettings to streamSettings 2021-03-17 10:09:07 +00:00
Loyalsoldier
933861a761
FakeDNS: use 198.18.0.0/15 as default IP pool (#779) 2021-03-15 16:47:10 +08:00
Loyalsoldier
88e1e25aa9
Chore: format import using goimports (#780) 2021-03-14 07:09:51 +08:00
Xiaokang Wang
0e5e5164ff
loopback outbound, allow you to redirect connection to the dispatcher again (#770) 
* Added Loop back proxy

* Added json processing for lo proxy

* Fix bug for lo proxy

* Fix bug for lo proxy

* rename the outbound name

* Loopback: update naming and fix lint issues

* Chore: change lo to loopback

Co-authored-by: kslr <kslrwang@gmail.com>
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2021-03-13 17:25:56 +08:00
RPRX
3b7ed982fb
Add grpcSettings (alias of gunSettings) 2021-03-11 16:01:57 +00:00
Xiaokang Wang
aaa9e788e7
Grpc Gun Transport (#757) 
* introduce grpc transport structure

* fix package name inconsistency

* grpc gun transport dialer and listener

* add selective build tag

* add grpc:gun listener

* add grpc:gun config

* add generated files

* various bug fix for gun:grpc transport

* Cache dialed connections

* grpc:gun Use V2Ray Managed Dial function

* Update destination.pb.go

* Update gun.go

* GunSettings -> GunConfig

* gu -> gs

* add grpc alias

Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
Co-authored-by: kslr <kslrwang@gmail.com>
 2021-03-11 16:46:17 +08:00
CalmLong
630ec22108
DNS: refine Android bootstrap DNS logic (#767) 2021-03-10 21:23:15 +08:00
Shelikhoo
e22cf451f4
Allow bulk definition of domain matcher at parent level 2021-03-05 18:37:32 +00:00
Shelikhoo
7dabfb755e
merge vmess zero encryption support 2021-03-04 00:12:37 +00:00
Shelikhoo
0010783191
Merge chained proxy with transport support 2021-03-03 23:27:26 +00:00
Shelikhoo
38b0f026fe
json parsing rule for domain matcher 2021-03-03 22:35:55 +00:00
Shelikhoo
1368e92605
Imaginary Security Lever: zero: turn off all security on payload data 2021-03-01 15:39:52 +00:00
Shelikhoo
dd51d32250
Added Transport Layer Chained Proxy Support 2021-02-28 18:47:31 +00:00
Loyalsoldier
9d13f99633
Chore: format file & change names of test cases (#707) 2021-02-24 17:12:44 +08:00
CalmLong
7ebf3afc31
Feat: add disableCache option for DNS (#705) 
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2021-02-24 16:03:50 +08:00
Loyalsoldier
f94dd11a8c
Chore: change module name (#677) 2021-02-17 04:31:50 +08:00
Xiaokang Wang
38da831b75
Feature: Fake DNS support (#406) 
* Add fake dns

A new config object "fake" in DnsObject for toggling fake dns function

Compare with sniffing, fake dns is not limited to http and tls traffic.
It works across all inbounds. For example, when dns request come
from one inbound, the local DNS server of v2ray will response with a
unique fake IP for every unique domain name. Then later on v2ray
received a request to one of the fake IP from any inbounds, it will
override the request destination with the previously saved domain.

By default, v2ray cache up to 65535 addresses. The old records will
be discarded bases on LRU. The fake IP will be 240.x.x.x

* fix an edge case when encounter a fake IP in use

* Move lru to common.cache package

* Added the necessary change to obtain request IP from sniffer

* Refactor the code so that it may stop depending on global variables in the future.

* Replace string manipulation code with more generic codes, hopefully this will work for both IPv4 and IPv6 networks.

* Try to use IPv4 version of address if possible

* Added Test Case for Fake Dns

* Added More Test Case for Fake Dns

* Stop user from creating a instance with LRU size more than subnet size, it will create a infinite loop

* Move Fake DNS to a separate package

* Generated Code for fakedns

* Encapsulate Fake DNS as a Instance wide service

* Added Support for metadata sniffer, which will be used for Fake DNS

* Dependency injection for fake dns

* Fake DNS As a Sniffer

* Remove stub object

* Remove global variable

* Update generated protobuf file for metadata only sniffing

* Apply Fake DNS config to session

* Loading for fake dns settings

* Bug fix

* Include fake dns in all

* Fix FakeDns Lint Condition

* Fix sniffer config

* Fix lint message

* Fix dependency resolution

* Fix fake dns not loaded as sniffer

* reduce ttl for fake dns

* Apply Coding Style

* Apply Coding Style

* Apply Coding Style

* Apply Coding Style

* Apply Coding Style

* Fix crashed when no fake dns

* Apply Coding Style

* Fix Fake DNS do not apply to UDP socket

* Fixed a bug prevent FakeDNS App Setting from become effective

* Fixed a caveat prevent FakeDNS App Setting from become effective

* Use log comparison to reduce in issue when it comes to really high value typical for ipv6 subnet

* Add build tag for fakedns

* Removal of FakeDNS specific logic at DNS client: making it a standard dns client

* Regenerate auto generated file

* Amended version of configure file

* Bug fixes for fakeDNS

* Bug fixes for fakeDNS

* Fix test: remove reference to removed attribute

* Test: fix codacy issue

* Conf: Remove old field support

* Test: fix codacy issue

* Change test scale for TestFakeDnsHolderCreateMappingAndRollOver

* Test: fix codacy issue

Co-authored-by: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Co-authored-by: kslr <kslrwang@gmail.com>
 2021-02-08 18:18:52 +08:00
CalmLong
3eb13868f2
Feature: android binary runtime default dns set 8.8.8.8:53 (#572) 
ref https://github.com/golang/go/issues/8877
ref https://github.com/v2ray/v2ray-core/issues/1909
 2021-01-02 15:48:13 +08:00
RPRX
4d2e782fbe
Disable session resumption by default (#569) 2021-01-01 17:01:14 +08:00
Kslr
42f0f5dfec
remove deprecate ciphers in shadowsocks (#566) 
* remove deprecate ciphers in shadowsocks
 2021-01-01 10:18:00 +08:00
Loyalsoldier
7a020d2d71
DNS & Routing: refine rule parsing process (#528) 2020-12-18 08:36:34 +08:00
dyhkwong
291eff1aa3
Refine Android build (#525) 
Co-authored-by: ghost <noreply@example.com>
 2020-12-17 08:50:13 +08:00
Loyalsoldier
166d1afee5
DNS: add clientip for specific nameserver (#504) 2020-12-12 07:15:29 +08:00
CalmLong
6858a7b0a7
Routing: consistent with domains key in DNS configuration (#502) 2020-12-11 21:16:52 +08:00
Loyalsoldier
7de5bca056
Remove Bazel (#469) 
due to https://github.com/v2fly/v2ray-core/pull/468
 2020-11-30 20:48:17 +08:00
Loyalsoldier
b68f943c78
Fix lint according to golangci-lint (#439) 2020-11-22 05:05:01 +08:00
Kslr
623cb24644
Remove XTLS (#431) 
* remove xtls

* generate pb

* Update protoc

* Clean up go.mod & go.sum

* format code

* restore vless flow

* fix codacy

* do NOT interfere with pb.go files

Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2020-11-20 15:53:10 +08:00
Chinsyo
231f5bf024
Add missing deprecation notice to deprecated code (#437) 2020-11-20 15:18:44 +08:00
Ye Zhihao
5b2a9e8769
API: Reflection Service Support (#435) 2020-11-20 01:57:31 +08:00
Xiaokang Wang
fb0aadeea9
Transfer VSign and related project to V2Fly and share under the same license as v2ray-core (#392) 
* Move VSign to V2Fly

* Use transfered V2BuildAssist  project
 2020-11-08 03:11:45 +08:00
RPRX
21739e6f38
32 -> 0 2020-11-02 11:00:08 +00:00
lucifer
770b994337
Refine unix domain socket (#367) 2020-10-29 07:30:38 +00:00
Loyalsoldier
f17063a08a
Update vprotogen (#366) 
* Refine vprotogen
* Regenerate pb.go files
 2020-10-29 09:27:05 +08:00
maskedeken
24f688cc20
Trojan Protocol Handler implements UserManager (#344) 
* Trojan Protocol Handler implements UserManager

* Update validator.go

Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
 2020-10-22 04:01:26 +00:00
RPRX
25c461e072
LookPath overwrites protoc 2020-10-21 02:30:16 +00:00
ekenchan
3fc985dd0e
Add trojan over xtls support (#334) 
* Add trojan over xtls support

* Add comments

* improve PR quality

* improve PR quality

* add xtls-rprx-origin-udp443 and xtls-rprx-direct-udp443

Co-authored-by: Eken Chan <maskedeken@yahoo.com>
 2020-10-20 10:44:31 +00:00
kslr
3c6e11673f revert: support yaml config 2020-10-20 14:01:16 +08:00
RPRX
2aedff1218
Command -> LookPath 2020-10-20 03:07:10 +00:00
RPRX
d03584425c
Remove .dev/protoc & Detect and show download link 2020-10-19 15:20:19 +00:00
RPRX
3d378fc280
Fix generate .pb.go under Windows 2020-10-19 14:39:51 +00:00
ayanamist
5230dfb71e
Support YAML config through JSON (#331) 2020-10-19 07:28:33 +08:00
loyalsoldier
784775f689
Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
lucifer
425b4b497d
Add padding to abstract unix domain socket in fallbacks (#277) 
* fix fall back to abstract unix domain socket in vless and trojan

* Update trojan.go

* Update vless.go

* Update trojan.go

* Update vless.go

Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
 2020-10-08 00:35:21 +00:00
Loyalsoldier
ba99e32b2d
Bazel: discard GOPATH (#278) 2020-10-07 18:35:21 +08:00
Loyalsoldier
6e4701b700
Build: do NOT rely on GOPATH & refine user-package.sh (#270) 
* Build: do NOT rely on GOPATH

* Format pipelines
 2020-10-07 14:29:07 +08:00
Kslr
359f84407a
compiler use gogcc, remove gcflags and asmflags (#269) 2020-10-07 10:02:40 +08:00
RPRX
bcc7b78ff7
Add XTLS support to mKCP (#267) 2020-10-06 16:25:02 +00:00
Kslr
03fb762169
removes all file system paths from the compiled executable, to improve build reproducibility 2020-10-06 13:17:30 +08:00
RPRX
b8a78038a2
VLESS PREVIEW 2.3 2020-10-04 10:51:29 +00:00
loyalsoldier
b181045b0c
Errorgen: support to run outside of GOPATH 2020-10-04 13:06:12 +08:00
loyalsoldier
9b249f912b
Make variables of vprotogen easier to find 2020-10-04 10:05:00 +08:00
RPRX
271532fc84
Add full VLESS fallbacks support to Trojan (#254) 
* Add full VLESS fallbacks support to Trojan

* Adjustments according to linter

* Use common.Must2() for pro.Write()
 2020-10-03 13:12:35 +00:00
RPRX
60909dad31
VLESS PREVIEW 2.2 2020-10-03 03:23:24 +00:00
Kslr
9f344fa1c9
remove shadowsosks ota (#238) 
* remove shadowsosks ota

* remove unused buf.Reader
 2020-10-02 16:13:31 +08:00
Loyalsoldier
dcf368bd93
Refine Azure Pipelines & Bazel: remove unnecessary steps (#246) 
* Bazel: remove GPG sign
* Azure Pipelines: remove unnecessary steps
 2020-10-02 16:09:33 +08:00
RPRX
cde63bfac1
Add XTLS support to DomainSocket (#241) 2020-09-30 08:40:08 +00:00
Loyalsoldier
dfed0dc03a
Refine: geofile reading errors (#236) 2020-09-29 14:01:12 +08:00
maskedeken
e445d21f4b
Add trojan protocol support (#181) 
* Add trojan protocol support

Co-authored-by: Eken Chan <ekenchan@msn.com>
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Co-authored-by: GitHub Action <action@github.com>
 2020-09-26 23:31:24 +08:00
RPRX
648d4180aa
VLESS PREVIEW 2 2020-09-24 01:59:14 +00:00
RPRX
97eddc2374
Add XTLS support 2020-09-21 14:56:43 +00:00
RPRX
ee1e18df24
Schedulers -> Flow 2020-09-11 03:37:23 +00:00
Kslr
2a3fe11952
VMess AEAD will be used when alterId is 0 2020-09-09 00:02:53 +08:00
RPRX
16fe0b03f6
Do not convert @ to \x00 2020-09-07 16:39:53 +08:00
lucifer9
801b9490b8
fix abstract UDS & add PROXY protocol support to DS inbound 2020-09-04 15:35:54 +08:00
Felix Yan
11bf22b234
Fix dns tests by setting v2ray.location.asset 2020-09-03 16:47:40 +08:00
Felix Yan
7001483b62
Don't copy assets if they are already present 
They can now reside in system path (like /usr/share/v2ray), so it's not
possible to copy into there.
 2020-09-03 16:17:44 +08:00
RPRX
84aaf3a1e3
VLESS PREVIEW 1.5 2020-08-28 07:51:09 +00:00
loyalsoldier
6f52a79e2e
Fix: module path 2020-08-28 03:55:07 +08:00
loyalsoldier
cafc80d23a
vprotogen: do NOT rely on GOBIN & GOPATH 2020-08-27 23:18:06 +08:00
loyalsoldier
4fbefc18f4
Protoc: do NOT rely on GOPATH 2020-08-26 17:37:51 +08:00
RPRX
a3bc930075
Add PROXY protocol support to WS inbound 
https://github.com/v2fly/v2ray-core/pull/103
 2020-08-26 04:29:12 +00:00
Loyalsoldier
ef460f68f8
Adjust Protocol Buffers (#109) 
* Update protoc binary executable files to v3.13.0

* Write proto files in more standard way

* Make go generate & vprotogen compatible with protoc-gen-gofast

* Regenerate pb.go files according to new proto files

* Clean go.sum by running go mod tidy

* Implement mustEmbedUnimplementedServiceServer for gPRC services
 2020-08-24 12:10:26 +00:00
lucifer
5df17338a1
Add PROXY protocol support to tcp inbound (#103) 
* Add  PROXY protocol support to tcp inbound

* add settings for PROXY protocol

* Adjust hub.go

Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
 2020-08-21 13:31:44 +00:00
Vigilans
22b4e68a2d Log matched rules and DNS to use during priority matching 
2. Dotless domain support in static host & modify first letter's captial in log
 2020-08-16 22:18:28 +08:00
Vigilans
dfeaef75e7 Refactor DNS Server to record original rule of domain matchers 2020-08-16 22:18:12 +08:00
Kslr
111d48130d
Merge pull request #89 from Vigilans/vigilans/dns-dotless-domain 
Dotless and local domain support in built-in DNS
 2020-08-09 19:27:53 +08:00
Vigilans
40c0bcc3ab Support source port matching in routing config 2020-08-09 16:53:45 +08:00
Vigilans
17f51f412c Dotless domain support in built-in DNS 2020-08-09 16:51:06 +08:00
RPRX
5e753007ad
Fix test 2020-08-03 15:17:06 +00:00
RPRX
1cfc02e720
VLESS PREVIEW 1.2 2020-08-03 06:13:26 +00:00
RPRX
bad7e2cfd8
VLESS PREVIEW 1.1 2020-07-28 15:00:23 +00:00
RPRX
e46531261b
Add linux riscv64 build 2020-07-19 20:51:39 +00:00
RPRX
c8f266c740
Adjust Bazel 2020-07-19 02:40:33 +00:00
yuhan6665
2e20d34f84 Fix parser for shadowsocks cipher none 2020-07-11 15:27:15 -04:00
Shelikhoo
d2266bb52c
Alias for ext: to reduce ambiguous ext: used without context 2020-07-11 09:24:03 +08:00
Shelikhoo
432bc627bb
Adopt to new signature key and format 2020-07-04 20:28:15 +08:00
rprx
a2c86aaaeb
Adjust arm build 2020-06-28 10:11:50 +00:00
Kslr
a8f3450b89
Merge pull request #38 from yuhan6665/master 
Add stats counter for outbounds
 2020-06-28 16:29:29 +08:00
rprx
694180fc9a
Add windows arm build (#39) 
* Add windows arm build

* Add windows arm build

* Add windows arm build
 2020-06-28 00:46:43 +08:00
yuhan6665
886598542c Add stats counter for outbounds 2020-06-27 00:31:46 -04:00
Agioi Theodoroi
bbd3988f3d
clean up code 2020-06-27 07:51:42 +08:00
Darhwa
8e791e92bc
Further strip unique signatures of tls handshake 
1. allow users to disable session ticket
2. set default alpn to ["h2", "http/1.1"]
 2020-06-18 11:32:37 +08:00
Shelikhoo
aece8a6a86
Added Seed to mKCP, encrypts the packets 2020-06-09 08:36:40 +08:00
Shelikhoo
d06a4d1f50
Added TestsEnabled Settings to enable VMessAEAD test 2020-06-08 16:50:50 +08:00
Shelikhoo
00103d1f73
Fix tests 2020-06-08 16:16:50 +08:00
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
heapops
0563d3a4bf Fix ip rule with custom geoip file 
Signed-off-by: heapops <heapbin1@gmail.com>
 2019-05-18 13:10:40 +08:00
Kslr
11dddd9864 fly e043c4d, set cache to tmp dir 2019-05-17 17:35:34 +08:00
eric
778767a125 fix port field parsing. fixes #1684 2019-05-11 23:14:38 +08:00
Shelikhoo
969d134681
set cache to tmp dir 2019-04-16 09:15:37 +08:00
Shelikhoo
c096ee0a81
Fix build break 2019-04-16 08:36:12 +08:00