Commit graph

297 commits

Author SHA1 Message Date
gVisor bot
2bbfa562ce refactor: deprecated params(up_mbps,down_mpbs,auth) in hysteria; up/down no use append unit equivalent up_mbps/down_mbps, default unit is Mbps; up/down become a required option. 2022-06-12 11:52:15 +08:00
gVisor bot
d39783fe7e fix: sni invalid on hysteria 2022-06-12 00:00:42 +08:00
gVisor bot
0bd925db78 fix: Vmess URI Scheme 解析问题 2022-06-10 03:15:30 +08:00
gVisor bot
15ce48e1ae fix: vmess ws 2022-06-09 16:23:15 +08:00
gVisor bot
2d16e6d021 chore: refine code 2022-06-08 01:47:50 +08:00
gVisor bot
41d0aac5ec fix: group filter touch provider 2022-06-07 17:19:25 +08:00
gVisor bot
0165dc980d fix: hysteria dialer 2022-06-07 15:49:10 +08:00
gVisor bot
a03df5233f fix: hysteria parse auth 2022-06-07 15:24:46 +08:00
gVisor bot
15154fba73 fix: hysteria parse 2022-06-07 14:53:00 +08:00
gVisor bot
3c5b69b884 feat: add hysteria 2022-06-07 13:46:54 +08:00
gVisor bot
aa76324ac6 feat: add support for shadowsocks 2022 ciphers 2022-06-06 19:56:36 +08:00
gVisor bot
1db0adfadc Chore: make hadowsocks2 lib embed 2022-06-04 20:29:33 +08:00
gVisor bot
dc18026481 Chore: embed shadowsocks2 2022-06-01 21:43:20 +08:00
gVisor bot
b0f7b9e4e0 feat: proxies group URLTest api 2022-05-30 22:07:09 +08:00
gVisor bot
7a75f2b125 fix: 调整获取远程目的的位置 2022-05-28 20:01:27 +08:00
gVisor bot
82dcecc693 fix: npe 2022-05-27 20:33:27 +08:00
gVisor bot
9dd290cdbd refactor: 获取远程目的从tunnel中剔除,移至tracker 2022-05-27 09:00:48 +08:00
gVisor bot
f30721e3bf refactor: 优化UDP远程目标获取 2022-05-26 23:41:09 +08:00
gVisor bot
cae1e23735 chore: 暴露数据给前端 2022-05-17 16:47:21 +08:00
gVisor bot
d1e6239372 chore: the uuid-map is transferred to the protocol 2022-05-06 13:28:09 +08:00
gVisor bot
bb8fbd97db fix uuid match 2022-05-06 13:08:27 +08:00
gVisor bot
319884469d feat: Expose remote destination (udp proxy maybe domain of node) 2022-05-04 16:57:08 +08:00
gVisor bot
5bdd18552f chore: adjust pass to reject.go 2022-05-02 09:16:47 +08:00
gVisor bot
12170b0395 fix trojan and snell's normal udp 2022-05-02 06:28:27 +08:00
gVisor bot
453fa9732e fix trojan and snell's udp over tcp 2022-04-30 22:26:38 +08:00
gVisor bot
e2c75161b1 support udp in relay if last proxy could udp-over-tcp 2022-04-30 11:36:42 +08:00
gVisor bot
78c766d08f feat: support uuid with custom string 2022-04-27 18:02:29 +08:00
gVisor bot
a317531428 Revert: "fix: proxy-groups filter logic"
This reverts commit 8a85c63b08.
2022-04-22 18:56:35 +08:00
gVisor bot
5386a5f00e fix: proxy-groups filter logic 2022-04-22 17:27:55 +08:00
gVisor bot
4ea3422e5f [fix] logic 2022-04-21 18:56:33 +08:00
gVisor bot
e2dbbb7cfe Refactor: metadata use netip.Addr 2022-04-20 22:52:05 +08:00
gVisor bot
f59183bf08 Chore: add none alias to dummy on ShadowsocksR (#2056) 2022-04-19 22:49:22 +08:00
gVisor bot
e76e0f5e03 fix: PASS policy inconsistent names 2022-04-17 14:11:58 +08:00
gVisor bot
351182d8f3 feat: support http headers 2022-04-14 13:07:39 +08:00
gVisor bot
c75b4e045a Chore: add none alias to dummy on ShadowsocksR (#2056) 2022-04-13 10:06:06 +08:00
gVisor bot
16b78b89d7 [Fix] VLESS http conn with tls false
[Chore] Upgrade Dependencies
2022-03-31 00:08:43 +08:00
gVisor bot
b523e9e927 Merge remote-tracking branch 'Meta/Alpha' into Alpha 2022-03-30 13:19:05 +08:00
gVisor bot
05125430dd Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha
# Conflicts:
#	README.md
#	adapter/outbound/trojan.go
#	adapter/outbound/vless.go
#	transport/trojan/trojan.go
2022-03-30 13:15:45 +08:00
gVisor bot
58e51e8f21 Feature: Trojan XTLS 2022-03-30 00:15:39 +08:00
gVisor bot
5911d62fba Chore: adjust VLESS 2022-03-29 23:50:41 +08:00
gVisor bot
e0c7b12d41 Fix: Vless UDP 2022-03-29 07:24:11 +08:00
gVisor bot
d66febb1a6 [Fixed]尝试修复PASS空指针问题
[Chore]调整workflows测试
2022-03-28 16:36:34 +08:00
gVisor bot
7b4e06816f Merge remote-tracking branch 'tun/with-tun' into Alpha 2022-03-28 10:51:59 +08:00
gVisor bot
67d04485ca Refactor: MainResolver 2022-03-28 00:44:13 +08:00
gVisor bot
eea2e3def9 [commit]
[Feat] add Pass type for support temporary skip rule set
2022-03-27 23:44:51 +08:00
gVisor bot
9b48fc9d8d Merge branch 'ogn-dev' into with-tun 2022-03-20 21:26:25 +08:00
gVisor bot
14a9087538 Merge remote-tracking branch 'clash/dev' into Alpha
# Conflicts:
#	Makefile
2022-03-19 14:53:47 +08:00
gVisor bot
87164f52af Fix: routing-mark option doesn't work on proxies (#2028) 2022-03-19 13:29:30 +08:00
gVisor bot
db31cfbd7f Merge remote-tracking branch 'yaling888/with-tun' into Alpha
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	.github/workflows/linter.yml
#	.github/workflows/release.yml
#	Makefile
#	README.md
#	adapter/outbound/vless.go
#	component/geodata/memconservative/cache.go
#	component/geodata/router/condition.go
#	component/geodata/router/condition_geoip.go
#	component/geodata/standard/standard.go
#	component/geodata/utils.go
#	config/config.go
#	config/initial.go
#	constant/metadata.go
#	constant/path.go
#	constant/rule.go
#	constant/rule_extra.go
#	dns/client.go
#	dns/filters.go
#	dns/resolver.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
#	hub/route/configs.go
#	listener/listener.go
#	listener/tproxy/tproxy_linux_iptables.go
#	listener/tun/dev/dev.go
#	listener/tun/dev/dev_darwin.go
#	listener/tun/dev/dev_linux.go
#	listener/tun/dev/dev_windows.go
#	listener/tun/dev/wintun/config.go
#	listener/tun/dev/wintun/dll_windows.go
#	listener/tun/dev/wintun/session_windows.go
#	listener/tun/dev/wintun/wintun_windows.go
#	listener/tun/ipstack/commons/dns.go
#	listener/tun/ipstack/gvisor/tun.go
#	listener/tun/ipstack/gvisor/tundns.go
#	listener/tun/ipstack/gvisor/utils.go
#	listener/tun/ipstack/stack_adapter.go
#	listener/tun/ipstack/system/dns.go
#	listener/tun/ipstack/system/tcp.go
#	listener/tun/ipstack/system/tun.go
#	listener/tun/tun_adapter.go
#	main.go
#	rule/common/base.go
#	rule/common/domain.go
#	rule/common/domain_keyword.go
#	rule/common/domain_suffix.go
#	rule/common/final.go
#	rule/common/geoip.go
#	rule/common/geosite.go
#	rule/common/ipcidr.go
#	rule/common/port.go
#	rule/parser.go
#	rule/process.go
#	test/go.mod
#	test/go.sum
#	transport/vless/xtls.go
#	tunnel/tunnel.go
2022-03-17 17:41:02 +08:00
gVisor bot
50ab57c72e Merge remote-tracking branch 'clash/dev' into Alpha
# Conflicts:
#	.github/workflows/docker.yml
#	adapter/outboundgroup/fallback.go
#	adapter/outboundgroup/loadbalance.go
#	adapter/outboundgroup/relay.go
#	adapter/outboundgroup/selector.go
#	adapter/outboundgroup/urltest.go
#	config/config.go
#	go.mod
#	go.sum
#	main.go
#	test/go.mod
#	test/go.sum
2022-03-17 01:41:51 +08:00
gVisor bot
446fd99436 Chore: Merge branch 'ogn-dev' into with-tun 2022-03-16 20:16:30 +08:00
gVisor bot
907c68c9cb Migration: go 1.18 2022-03-16 12:10:13 +08:00
gVisor bot
19613a4fad Chore: compatible with VMESS WS older version configurations 2022-02-23 14:21:53 +08:00
gVisor bot
7f0de1861a Merge from remote branch 2022-02-23 01:00:27 +08:00
gVisor bot
c57d92d7c1 [Feat]
support trojan xtls
change geodataloader mode as memconservative
2022-02-04 23:33:36 +08:00
gVisor bot
095a65abd9 [Feat]
1.Add DNS over QUIC support
2.Replace Country.mmdb with GeoIP.dat
3.build with Alpha tag
2022-01-27 12:25:53 +08:00
gVisor bot
9afe58058d Merge branch 'clash-dev' into Dev 2022-01-25 15:05:24 +08:00
gVisor bot
3c645b4f54 [Refactor]
1.allow maybe empty group
2.use COMPATIBLE(DIRECT alias) when proxy group is empty
3.http provider pass through tunnel
2022-01-18 21:09:36 +08:00
gVisor bot
70c8e6e1ba Feature: support snell v3 (#1884) 2022-01-10 20:24:20 +08:00
gVisor bot
4208d48a9d Merge remote-tracking branch 'clash/dev' into Meta
# Conflicts:
#	.github/workflows/docker.yml
#	dns/server.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
#	test/go.mod
#	test/go.sum
2022-01-04 17:31:07 +08:00
gVisor bot
85f1b22340 Fix: multiple port string parsing overflow (#1868)
Ports in TCP and UDP should be parsed as an unsigned integer,
otherwise ports > 32767 get truncated to 32767. As this is
the case with Metadata.UDPAddr(), this fundamentally breaks
UDP connections where demand for high port numbers is high.

This commit fixes all known cases where ParseInt is used for ports,
and has been verified to fix Discord voice connections on port
50001~50004.

Fixes: d40e5e4fe6

Co-authored-by: Hamster Tian <haotia@gmail.com>
2022-01-02 01:09:29 +08:00
gVisor bot
6fa3953335 Chore: remove forward compatible code 2022-01-02 00:48:57 +08:00
gVisor bot
7a2769621b Update vless.go 2021-12-20 12:59:06 +08:00
gVisor bot
2cd16ea478 [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-06 00:19:03 +08:00
gVisor bot
bcf5a8d10c [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-05 03:51:26 +08:00
gVisor bot
885ea9f7bf [Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题 2021-12-05 02:18:58 +08:00
gVisor bot
9f8324e9e3 Fix: should return io.EOF immediately 2021-11-20 12:44:31 +08:00
gVisor bot
8e330640ea Change: use nop packet conn for reject 2021-11-20 12:34:14 +08:00
gVisor bot
1100475326 [Fix]Vless tls must not be true 2021-11-17 19:09:01 +08:00
gVisor bot
6a72feb8b5 [Fix]Vless tls must not be true 2021-11-17 17:56:24 +08:00
gVisor bot
f5d2e7cd04 [test]core 1.8 2021-11-17 15:00:32 +08:00
gVisor bot
fa244e6cfd Feature: mark on socket (#1705) 2021-11-08 16:59:48 +08:00
gVisor bot
a3189021a5 Fix: parse dial interface option 2021-11-08 13:31:08 +08:00
gVisor bot
af069e3340 Fix: codeql alerts 2021-11-08 00:32:21 +08:00
gVisor bot
2762c33ad3 Feature: dial different NIC for all proxies (#1714) 2021-11-07 16:48:51 +08:00
gVisor bot
f7d136f56c Merge from remote branch 2021-10-28 11:36:11 +08:00
gVisor bot
0387c93c56 Style: format code 2021-10-28 00:06:55 +08:00
gVisor bot
1b7ad8f494 Feature: support trojan websocket 2021-10-16 20:19:59 +08:00
gVisor bot
50a2222cd2 Chore: contexify ProxyAdapter ListenPacket 2021-10-15 21:44:53 +08:00
gVisor bot
0ebd7b6949 Chore: remove deprecated ioutil 2021-10-09 20:35:06 +08:00
gVisor bot
7f798f26ed Chore: add remove TODO 2021-10-05 12:42:21 +08:00
gVisor bot
554165397c Fix: VLESS WSOpts 2021-09-08 21:32:08 +08:00
gVisor bot
b883eb6e55 Fix: vmess ws headers not set properly (#1595) 2021-09-08 21:20:16 +08:00
gVisor bot
9c46fabbe4 Fix: vmess ws headers not set properly (#1595) 2021-09-08 14:44:24 +08:00
gVisor bot
317bf173df Merge from remote branch 2021-09-08 04:42:56 +08:00
gVisor bot
cfa6da15e7 Fix: VLESS WSOpts Headers 2021-09-08 04:34:11 +08:00
gVisor bot
da551ac737 Feature: add dhcp type dns client (#1509) 2021-09-06 23:07:34 +08:00
gVisor bot
8595347485 Merge from remote branch 2021-09-01 00:38:43 +08:00
gVisor bot
d99920a3e6 Feature: add vmess WebSocket early data (#1505)
Co-authored-by: ShinyGwyn <79344143+ShinyGwyn@users.noreply.github.com>
2021-08-22 00:25:29 +08:00
gVisor bot
2e762b39b7 Merge from remote branch 2021-07-28 22:13:21 +08:00
gVisor bot
7fa486ea4c Chore: logging remote port on request (#1494) 2021-07-19 15:31:38 +08:00
gVisor bot
c3090aacb1 Style: code style 2021-07-09 02:19:43 +08:00
gVisor bot
c17b71b12b Feature: add xtls support for VLESS 2021-07-06 23:55:34 +08:00
gVisor bot
b5939c1cc3 Merge from remote branch 2021-07-03 22:31:12 +08:00
gVisor bot
089faa30a5 Fix: remove ClientSessionCache and add NextProtos for vmess to fix #1468 2021-07-03 20:34:44 +08:00
gVisor bot
38c102a93d Code: refresh code 2021-07-01 22:49:29 +08:00
gVisor bot
542325aae4 Style: code style 2021-06-10 14:05:56 +08:00