mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-10 00:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
922 Commits 20 Branches 67 Tags 10 MiB
ca07a705dc
Commit Graph

57 Commits

Author SHA1 Message Date
RPRX
ca07a705dc
Generate *.pb.go files with protoc v5.27.0 
Download https://github.com/protocolbuffers/protobuf/releases/tag/v27.0
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
(Xray-core/) go run ./infra/vprotogen
 2024-05-26 03:20:53 +00:00
yuhan6665
017f53b5fc
Add session context outbounds as slice (#3356) 
* Add session context outbounds as slice

slice is needed for dialer proxy where two outbounds work on top of each other
There are two sets of target addr for example
It also enable Xtls to correctly do splice copy by checking both outbounds are ready to do direct copy

* Fill outbound tag info

* Splice now checks capalibility from all outbounds

* Fix unit tests
 2024-05-13 21:52:24 -04:00
Aubrey Yang
8374d59ce6
Fix IPv6 random IP logic error (#3232) 
* Update handler.go

fix CIDR6

* Update handler.go
 2024-04-06 18:01:07 -04:00
yuhan6665
e2302b421c Update proto file for websocket and httpupgrade (breaking) 2024-03-30 07:42:41 +00:00
风扇滑翔翼
70a5fe9a25 Allow to send through random IPv6 2024-03-23 07:23:19 -10:00
yuhan6665
657c5c8570 Update HTTPUpgrade spelling and proto 2024-03-20 13:08:43 -04:00
yuhan6665
fa5d7a255b
Least load balancer (#2999) 
* v5: Health Check & LeastLoad Strategy (rebased from 2c5a71490368500a982018a74a6d519c7e121816)

Some changes will be necessary to integrate it into V2Ray

* Update proto

* parse duration conf with time.Parse()

* moving health ping to observatory as a standalone component

* moving health ping to observatory as a standalone component: auto generated file

* add initialization for health ping

* incorporate changes in router implementation

* support principle target output

* add v4 json support for BurstObservatory & fix balancer reference

* update API command

* remove cancelled API

* return zero length value when observer is not found

* remove duplicated targeted dispatch

* adjust test with updated structure

* bug fix for observer

* fix strategy selector

* fix strategy least load

* Fix ticker usage

ticker.Close does not close ticker.C

* feat: Replace default Health Ping URL to HTTPS (#1991)

* fix selectLeastLoad() returns wrong number of nodes (#2083)

* Test: fix leastload strategy unit test

* fix(router): panic caused by concurrent map read and write (#2678)

* Clean up code

---------

Co-authored-by: Jebbs <qjebbs@gmail.com>
Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>
Co-authored-by: 世界 <i@sekai.icu>
Co-authored-by: Bernd Eichelberger <46166740+4-FLOSS-Free-Libre-Open-Source-Software@users.noreply.github.com>
Co-authored-by: 秋のかえで <autmaple@protonmail.com>
Co-authored-by: Rinka <kujourinka@gmail.com>
 2024-02-17 22:51:37 -05:00
nobody
d20a835016
Fix concurrent map writes error in ohm.Select(). (#2943) 
* Add unit test for ohm.tagsCache.

* Fix concurrent map writes in ohm.Select().

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2024-01-16 10:52:01 -05:00
nobody
7f7f57d3b6
Add tags cache to app.proxyman.ohm.Select() (#2927) 
* Add tags cache to ohm.Select().

* Refactor round-robin.

* Fix a bug.

---------

Co-authored-by: nobody <nobody@nowhere.mars>
 2024-01-12 10:36:48 -05:00
Hossin Asaadi
81f9f567ff
sort Outbound selector output (#2914) 
* clean code

* sort oubound selector output

* clean up

* fix duplicate outbound
 2024-01-10 11:26:27 -05:00
yuhan6665
d60281d0a5 Add DestIpAddress() in Dialer interface 
Android client prepares an IP before proxy connection is established. It is useful when connecting to wireguard (or quic) outbound with domain address. E.g. engage.cloudflareclient.com:2408
 2023-12-18 18:36:56 -05:00
yuhan6665
d9fd3f8eb1
Freedom xdomain strategy (#2719) 
* 统一 `domainStrategy` 行为.

* aliases NG.

* 化简.

* 调整.

* Let it crash.

* Update proto

---------

Co-authored-by: rui0572 <125641819+rui0572@users.noreply.github.com>
 2023-11-12 16:27:39 -05:00
yuhan6665
efd32b0fb2 Enable splice for freedom outbound (downlink only) 
- Add outbound name
- Add outbound conn in ctx
- Refactor splice: it can be turn on from all inbounds and outbounds
- Refactor splice: Add splice copy to vless inbound
- Fix http error test
- Add freedom splice toggle via env var
- Populate outbound obj in context
- Use CanSpliceCopy to mark a connection
- Turn off splice by default
 2023-09-07 14:17:39 -04:00
dyhkwong
b8bd243df5
Fix buffer.UDP destination override (#2356) 2023-08-29 07:12:36 +00:00
cty123
7aeca33729 fix: revert previous change on IsValid() function; add validation in getUoTConnection(); 2023-07-19 15:53:01 -04:00
RPRX
62e881b01a
5*60 -> 2*60 2023-06-18 15:33:30 +00:00
yuhan6665
d11d72be6c Update proto file and fix protoc version parsing 
The new protoc cli return version v23.1,
so we parse the file version v4.23.1 without "4."
 2023-06-11 13:36:06 -04:00
世界
18e5b0963f
Update dependencies 2023-04-23 19:32:07 +08:00
RPRX
06c9e50c52
Add "xudpProxyUDP443" to Mux config & XUDP rejects UDP/443 traffic by default (client side, excluding reverse proxy) 2023-04-14 22:51:18 +00:00
RPRX
24a2be43ef
Replace "only" with "xudpConcurrency" in Mux config 2023-04-10 10:36:07 +08:00
RPRX
29d7865d78
Refine "only" in Mux config 2023-04-10 10:15:16 +08:00
RPRX
be23d5d3b7
XUDP protocol: Add Global ID & UoT Migration 
The first UoT protocol that supports UoT Migration
Thank @yuhan6665 for testing
 2023-04-06 10:21:35 +00:00
世界
f57ec13880
Update UoT protocol 2023-03-17 13:17:08 +08:00
RPRX
b70912799b
Generate *.pb.go files with protoc v3.21.12 
https://github.com/protocolbuffers/protobuf/releases/tag/v21.12
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
go run ./infra/vprotogen
 2023-01-30 04:35:30 +00:00
yuhan6665
8117b66949 Generate all protos 2022-10-10 13:17:32 -04:00
yuhan6665
debd2e3ba8 Remove compatibility code 
The minimum support go version is already 1.18
 2022-09-16 20:39:07 -04:00
Mocking
4140bcd11a Enhancement of "redirect" function, adding support for MacOS 
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
"inbounds": [
{
"listen": "127.0.0.1",
"port": 1122,
"protocol": "dokodemo-door",
"tag": "dokodemo",
"settings": {
"network": "tcp",
"followRedirect": true,
"userLevel": 0
},
"streamSettings": {
"sockopt": {
"tproxy": "Redirect"
}
}
}
]

还原#1189 提交
 2022-08-22 10:33:58 -04:00
S-Mocking
59602db02d
Add "tproxy" option (#1189) 
* Add "tproxy" option
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
  "inbounds": [
    {
      "listen": "127.0.0.1",
      "port": 1122,
      "protocol": "dokodemo-door",
      "tag": "dokodemo",
      "settings": {
        "network": "tcp",
        "followRedirect": true,
        "userLevel": 0
      },
      "streamSettings": {
        "sockopt": {
          "tproxy": "pf"
        }
      }
    }
  ]

* Add "tproxy" option
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
  "inbounds": [
    {
      "listen": "127.0.0.1",
      "port": 1122,
      "protocol": "dokodemo-door",
      "tag": "dokodemo",
      "settings": {
        "network": "tcp",
        "followRedirect": true,
        "userLevel": 0
      },
      "streamSettings": {
        "sockopt": {
          "tproxy": "pf"
        }
      }
    }
  ]

* Add "tproxy" option
Added the function of "MacOS" FreeBSD firewall traffic forwarding and resolving destination address
example:
  "inbounds": [
    {
      "listen": "127.0.0.1",
      "port": 1122,
      "protocol": "dokodemo-door",
      "tag": "dokodemo",
      "settings": {
        "network": "tcp",
        "followRedirect": true,
        "userLevel": 0
      },
      "streamSettings": {
        "sockopt": {
          "tproxy": "pf"
        }
      }
    }
  ]

Co-authored-by: Mocking <fanhaiwang0817@gmail.com>
 2022-08-20 09:02:18 -04:00
世界
c3505632fd
Add udp over tcp support for shadowsocks-2022 2022-06-01 11:49:02 +08:00
世界
6f93ef7736
Remove useless error log 2022-06-01 11:11:53 +08:00
世界
f046feb9ca
Reformat code 2022-05-18 15:29:01 +08:00
yuhan6665
41ce6ccf9f
Make reverse proxy compatible with v2fly (#924) 
* Make reverse proxy compatible with v2fly

* Fix gitignore

* Regenerate proto files

- fix v2ray name in loopback

* Fix fly.org in unit tests
 2022-02-04 21:59:50 -05:00
Machtergreifung
9ad26fa049
chore fixed (#897) 
* chore fixed
 2022-01-12 21:51:47 -05:00
yuhan6665
e93da4bd02
Fix some tests and format code (#830) 
* Increase some tls test timeout

* Fix TestUserValidator

* Change all tests to VMessAEAD

Old VMess MD5 tests will be rejected and fail in 2022

* Chore: auto format code
 2021-12-14 19:28:47 -05:00
lucifer9
d6ae4e9ba2 Make it easier to configure multiple listening ports 2021-11-17 23:13:15 -05:00
yuhan6665
abb8ba8b0e
Observatory related fixes (#788) 
* fix:observatory not supported by multi-json

* Fix: observatory starts with empty config & fails to close (#957)

* Update strategy_leastping.go (#1019)

* add custom probe URL support for observatory

* add custom probe interval for observer

* apply coding style

* Fix: observatory log & JSON config(#1211)

Co-authored-by: ihotte <ihotte@yeah.net>

* Change default probe url from api.v2fly.org to www.google.com

* Cherry-pick missing code from branch 'dev-advloadblancer-2'

Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>
Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Co-authored-by: fanyiguan <52657276+fanyiguang@users.noreply.github.com>
Co-authored-by: ihotte <3087168217@qq.com>
Co-authored-by: ihotte <ihotte@yeah.net>
 2021-10-26 13:00:31 +08:00
Ovear
3c7189a3e7
Fix: Remove udp connection twice 2021-10-22 12:38:40 +08:00
世界
a3023e43ef
Add routeOnly sniffing option 2021-10-22 11:57:23 +08:00
yuhan6665
e286cdcaa8
Style: format code by gofumpt (#761) 2021-10-20 00:57:14 +08:00
hmol233
7033f7cf5f
Fix: protobuf file (#724) 2021-09-20 22:41:09 +08:00
Arthur Morgan
24b637cd5e
Fix: CounterConnection with ReadV/WriteV (#720) 
Co-authored-by: JimhHan <50871214+JimhHan@users.noreply.github.com>
 2021-09-20 20:11:21 +08:00
yuhan6665
42d158bd85
vprotogen refine (#717) 
* Update all proto files with existing vprotogen
* Chore: remove protoc-gen-gofast
* Feat: vprotogen adds version detector to block generation code from old protobuf version
* Feat: vprotogen refine logic

Co-authored-by: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
 2021-09-18 01:16:14 +08:00
yuhan6665
f50eff5ebb
Add Fake DNS support (#309) 
Co-authored-by: Xiaokang Wang <xiaokangwang@outlook.com>
Co-authored-by: loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com>
Co-authored-by: kslr <kslrwang@gmail.com>
 2021-03-07 04:39:50 +00:00
Jim Han
9aa49be703
Restrict tag to be unique (#258) 2021-02-18 09:53:10 +00:00
秋のかえで
0b4858d016
Feature: Exclude some domains in sniffing destOverride (#151) 
Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
 2021-01-21 20:50:09 +00:00
Jim Han
7f5e34c857
Regenerate .pb.go files (#187) 
Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
 2021-01-21 18:58:19 +00:00
RPRX
ee15cc253f
Improve configuration detector (cone or symmetric) 2021-01-10 07:50:21 +00:00
RPRX
43eb5d1b25
16 -> 60, 8 -> 300 
https://github.com/XTLS/Xray-core/issues/129#issuecomment-757355137

十分感谢 @GleenJi 等协助测试
 2021-01-10 04:50:26 +00:00
RPRX
310a938511
VLESS & VMess are not ready to accept FullCone yet 2020-12-30 08:10:26 +00:00
RPRX
2da07e0f8a
Refactor: FullCone TPROXY Inbound & Socks Outbound 
https://t.me/projectXray/116037
 2020-12-29 11:50:17 +00:00