MetaCubeX
91e48b707b
Merge remote-tracking branch 'yaling888/with-tun' into Alpha
2022-04-05 14:44:40 +08:00
fishg
93d2cfa091
fix: when ssh connect to a ip, if this ip map to a domain in clash, change ip to host may redirect to a diffrent ip
2022-04-05 03:26:23 +08:00
MetaCubeX
30f1b29257
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
MetaCubeX
f01ac69654
Merge remote-tracking branch 'clash/dev' into Alpha
...
# Conflicts:
# .github/workflows/codeql-analysis.yml
# .github/workflows/docker.yml
# .github/workflows/linter.yml
# .github/workflows/stale.yml
# Makefile
# component/dialer/dialer.go
# config/config.go
# constant/metadata.go
# constant/rule.go
# rule/common/domain.go
# rule/common/domain_keyword.go
# rule/common/domain_suffix.go
# rule/common/final.go
# rule/common/ipcidr.go
# rule/geoip.go
# rule/parser.go
# rule/port.go
# rule/process.go
2022-03-15 23:13:41 +08:00
yaling888
46b9a1092d
Chore: embed the RuleExtra into Base
2022-03-13 01:22:05 +08:00
Kr328
b866f06414
Chore: move find connection process to tunnel ( #2016 )
2022-03-12 19:07:53 +08:00
yaling888
b192238699
Merge from remote branch
2022-02-23 01:00:27 +08:00
Skyxim
b15344ec78
[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
Clash-Mini
9475799615
make tun config compatible with premium
2022-01-05 00:33:42 +08:00
Maze.tsz
3bb32d12e0
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
HamsterReserved
8679968ab0
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
Mazeorz
900e852525
[test]
2021-11-17 16:03:47 +08:00
Dreamacro
d40e5e4fe6
Fix: codeql alerts
2021-11-08 00:32:21 +08:00
yaling888
2680e8ffa3
Merge from remote branch
2021-10-28 11:36:11 +08:00
Dreamacro
81d5da51a3
Fix: unexpected proxy dial behavior on mapping mode
2021-10-18 21:08:27 +08:00
yaling888
ba2fd00f01
Merge from remote branch
2021-07-28 22:13:21 +08:00
xᴊᴀsᴏɴʟʏᴜ
3705996974
Chore: split SOCKS version inbound metadata type ( #1513 )
2021-07-27 13:58:29 +08:00
yaling888
d7732f6ebc
Code: refresh code
2021-07-01 22:49:29 +08:00
maskedeken
83efe2ae57
Feature: add TCP TPROXY support ( #1049 )
2020-11-09 10:46:10 +08:00
Dreamacro
2dece02df6
Chore: code adjustments
2020-06-07 16:54:41 +08:00
Dreamacro
dcf97ff5b4
Fix: should prehandle metadata before resolve
2020-02-07 20:53:43 +08:00
Dreamacro
19bb0b655c
Fix: match log display
2020-01-31 14:58:54 +08:00
Dreamacro
26ce3e8814
Improve: udp NAT type
2020-01-31 14:43:54 +08:00
Dreamacro
207371aeae
Feature: add experimental connections API
2019-10-27 21:44:07 +08:00
Jason Lyu
4cd8b6f24f
Fix: some UDP issues ( #265 )
2019-10-11 20:11:18 +08:00
Dreamacro
225c530d13
Feature: add DST-PORT and SRC-PORT
2019-05-09 21:00:29 +08:00
Dreamacro
1339487ce4
Fix: tun2socks not lookup IP
2019-02-11 15:44:42 +08:00
宋辰文
42d33fe629
Feature: SOURCE-IP-CIDR rule type ( #96 )
2019-02-02 21:03:13 +08:00
Dreamacro
bfe51e46b0
Improve: lazy resolve ip
2019-02-02 20:47:38 +08:00
Dreamacro
03c249ecb1
Feature: add custom DNS support ( #56 )
2018-12-05 21:13:29 +08:00
Dreamacro
2fd59cb31c
Chore: make the code more semantic
2018-09-30 12:25:52 +08:00