1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-26 09:25:23 +00:00
Commit Graph

5214 Commits

Author SHA1 Message Date
JimhHan
c4e47e4fbe
fix: vprotogen in windows (#365) 2020-10-29 09:04:12 +08:00
Xiaokang Wang
3684dc15de
Merge pull request #351 from v2fly/dev-fix-mutijson-dep
Fix json parsing dependency introduced by mutijson config
2020-10-26 15:44:58 +00:00
Kslr
dabf8456f0
Merge pull request #358 from v2fly/dependabot/go_modules/github.com/miekg/dns-1.1.35
Bump github.com/miekg/dns from 1.1.34 to 1.1.35
2020-10-26 15:35:14 +08:00
Kslr
52d0dafe15
Merge pull request #359 from v2fly/dependabot/github_actions/golangci/golangci-lint-action-v2.3.0
Bump golangci/golangci-lint-action from v2.2.1 to v2.3.0
2020-10-26 15:34:37 +08:00
dependabot[bot]
6c3113c273
Bump golangci/golangci-lint-action from v2.2.1 to v2.3.0
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from v2.2.1 to v2.3.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v2.2.1...e868220d9fd3b523f1a8fcfb69749e8c7521ba14)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-26 07:02:21 +00:00
dependabot[bot]
e9bd1db096
Bump github.com/miekg/dns from 1.1.34 to 1.1.35
Bumps [github.com/miekg/dns](https://github.com/miekg/dns) from 1.1.34 to 1.1.35.
- [Release notes](https://github.com/miekg/dns/releases)
- [Changelog](https://github.com/miekg/dns/blob/master/Makefile.release)
- [Commits](https://github.com/miekg/dns/compare/v1.1.34...v1.1.35)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-26 06:09:53 +00:00
Kslr
a770d72ca4
Merge pull request #168 from p4gefau1t/fix-mkcp-control-window
fix mkcp sending window
2020-10-26 00:46:14 +08:00
Shelikhoo
9391f7c377
Apply Coding Style 2020-10-23 19:51:39 +01:00
Kslr
0dc17643a0
Merge pull request #299 from forever8938/master
Load JSON internally by default
2020-10-24 01:39:11 +08:00
Shelikhoo
0aee8053e8
Merge branch 'master' of github.com:v2fly/v2ray-core 2020-10-23 17:02:59 +01:00
Shelikhoo
fd2638c522
Fix json parsing dependency introduced by mutijson config 2020-10-23 15:04:03 +01:00
RPRX
6f2907e375
v4.31.3 2020-10-23 07:00:20 +00:00
RPRX
bce857f213
Upgrade dependencies 2020-10-23 01:15:22 +00:00
GitHub Action
f3b0342a87 update geoip, geosite 2020-10-23 00:13:12 +00:00
RPRX
3e87b187c4
Adjust VLESS & Trojan Validator 2020-10-22 04:53:27 +00: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
c325faef38
Adjust Trojan over XTLS 2020-10-21 09:32:16 +00:00
dependabot[bot]
358810b37f
Bump google.golang.org/grpc from 1.32.0 to 1.33.1 (#339)
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.32.0 to 1.33.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.32.0...v1.33.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-21 14:50:56 +08:00
RPRX
13ae4c25ac
Add flow to Trojan config.proto 2020-10-21 03:12:44 +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
RPRX
b562f21ca2
Upgrade github.com/xtls/go 2020-10-20 16:30:02 +08: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
dependabot[bot]
5bd893b2dd
Bump github.com/miekg/dns from 1.1.33 to 1.1.34 (#333)
Bumps [github.com/miekg/dns](https://github.com/miekg/dns) from 1.1.33 to 1.1.34.
- [Release notes](https://github.com/miekg/dns/releases)
- [Changelog](https://github.com/miekg/dns/blob/master/Makefile.release)
- [Commits](https://github.com/miekg/dns/compare/v1.1.33...v1.1.34)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-19 10:48:05 +00:00
ayanamist
5230dfb71e
Support YAML config through JSON (#331) 2020-10-19 07:28:33 +08:00
RPRX
47afbbe798 Remove .dev/protoc 2020-10-18 16:05:25 +08:00
RPRX
834c80836e
v4.31.2 2020-10-18 06:38:59 +00:00
RPRX
9f4640ce81
Upgrade other dependencies 2020-10-18 01:26:43 +00:00
HalfLife
878f724ccf
grpc: rollback from 1.33.0 to 1.32.0 (#330) 2020-10-18 01:06:02 +00:00
RPRX
af1f508574
v4.31.1 2020-10-16 12:39:25 +00:00
GitHub Action
9cfbcfa307 update geoip, geosite 2020-10-16 00:12:53 +00:00
RPRX
17682f9f12
Upgrade all dependencies 2020-10-15 11:33:33 +00:00
RPRX
31788c6e19
1.15.2 -> 1.15.3 2020-10-15 11:07:54 +00:00
RPRX
74d9415418
Merge pull request #322 from v2fly/dependabot/go_modules/github.com/miekg/dns-1.1.33
Bump github.com/miekg/dns from 1.1.32 to 1.1.33
2020-10-15 11:07:19 +00:00
dependabot[bot]
90da2808b9
Bump github.com/miekg/dns from 1.1.32 to 1.1.33
Bumps [github.com/miekg/dns](https://github.com/miekg/dns) from 1.1.32 to 1.1.33.
- [Release notes](https://github.com/miekg/dns/releases)
- [Changelog](https://github.com/miekg/dns/blob/master/Makefile.release)
- [Commits](https://github.com/miekg/dns/compare/v1.1.32...v1.1.33)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-15 05:45:49 +00:00
Kslr
f7ed96f5d4
Merge pull request #292 from Loyalsoldier/refine-code
Refine code according to golangci-lint results
2020-10-13 13:50:04 +08:00
RPRX
95e7e0dee7
AtWarning() -> AtInfo() 2020-10-13 04:53:34 +00:00
RPRX
d1ed330f9f
Remove XTLS WriteMultiBuffer method 2020-10-13 04:33:11 +00:00
dependabot[bot]
cc0f6e6a07
Bump github.com/miekg/dns from 1.1.31 to 1.1.32 (#305)
Bumps [github.com/miekg/dns](https://github.com/miekg/dns) from 1.1.31 to 1.1.32.
- [Release notes](https://github.com/miekg/dns/releases)
- [Changelog](https://github.com/miekg/dns/blob/master/Makefile.release)
- [Commits](https://github.com/miekg/dns/compare/v1.1.31...v1.1.32)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-12 15:29:50 +08:00
dependabot[bot]
348e668bed
Bump golangci/golangci-lint-action from v2 to v2.2.1 (#306)
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from v2 to v2.2.1.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/v2...54a84d46fb7183443c869b1b7d0dc34f640fcfd7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-12 15:23:58 +08:00
dependabot[bot]
33c41d2381
Bump actions/stale from v3.0.11 to v3.0.12 (#307)
Bumps [actions/stale](https://github.com/actions/stale) from v3.0.11 to v3.0.12.
- [Release notes](https://github.com/actions/stale/releases)
- [Commits](https://github.com/actions/stale/compare/v3.0.11...44f9eae0adddf72dbf3eedfacc999f70afcec1a8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-12 15:23:02 +08:00
Loyalsoldier
7b8a0faee1
Fix user-package codename & buildtime error (#303) 2020-10-12 09:41:27 +08:00
loyalsoldier
784775f689
Refine code according to golangci-lint results 2020-10-11 19:22:46 +08:00
RPRX
ff6bb51732
Fix XTLS over mKCP (#302) 2020-10-11 02:52:38 +00:00
forever8938
51d3fc694f
Load JSON internally by default
why not?
2020-10-10 21:06:13 +08:00
Loyalsoldier
c50fef48a7
Refine golangci-lint settings (#294) 2020-10-10 00:19:09 +08:00
Loyalsoldier
ed97a250e4
Refine golangci-lint settings (#293) 2020-10-09 22:06:40 +08:00