yaling888
bac04ab54b
Merge branch 'ogn-dev' into with-tun
2022-03-20 21:26:25 +08:00
MetaCubeX
2df890c4ee
Merge remote-tracking branch 'clash/dev' into Alpha
...
# Conflicts:
# Makefile
2022-03-19 14:53:47 +08:00
risetechlab
f9cc1cc363
Fix: routing-mark option doesn't work on proxies ( #2028 )
2022-03-19 13:29:30 +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
609d69191a
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
yaling888
346d817dba
Chore: Merge branch 'ogn-dev' into with-tun
2022-03-16 20:16:30 +08:00
Dreamacro
6a661bff0c
Migration: go 1.18
2022-03-16 12:10:13 +08:00
yaling888
ac5c57ecef
Chore: compatible with VMESS WS older version configurations
2022-02-23 14:21:53 +08:00
yaling888
b192238699
Merge from remote branch
2022-02-23 01:00:27 +08:00
Clash-Mini
2bf34c766e
[Feat]
...
support trojan xtls
change geodataloader mode as memconservative
2022-02-04 23:33:36 +08:00
Clash-Mini
be0fadc09e
[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
Clash-Mini
a5ce62db33
Merge branch 'clash-dev' into Dev
2022-01-25 15:05:24 +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
Digital Pencil
8f3385bbb6
Feature: support snell v3 ( #1884 )
2022-01-10 20:24:20 +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
2022-01-02 01:09:29 +08:00
Dreamacro
204a72bbd3
Chore: remove forward compatible code
2022-01-02 00:48:57 +08:00
xsxun
8955107d6b
Update vless.go
2021-12-20 12:59:06 +08:00
Maze.tsz
8df3efe932
[Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题
2021-12-06 00:19:03 +08:00
Maze.tsz
645c3154d6
[Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题
2021-12-05 03:51:26 +08:00
Maze.tsz
a847d7b58d
[Fix] 修正因xray服务端alpn参数为http/1.1而导致无法连接的问题
2021-12-05 02:18:58 +08:00
Dreamacro
4524cf4418
Fix: should return io.EOF immediately
2021-11-20 12:44:31 +08:00
Dreamacro
0db15d46c3
Change: use nop packet conn for reject
2021-11-20 12:34:14 +08:00
Mazeorz
0001a1b844
[Fix]Vless tls must not be true
2021-11-17 19:09:01 +08:00
Mazeorz
b20e202321
[Fix]Vless tls must not be true
2021-11-17 17:56:24 +08:00
Mazeorz
1f3968bd50
[test]core 1.8
2021-11-17 15:00:32 +08:00
bobo liu
bd2ea2b917
Feature: mark on socket ( #1705 )
2021-11-08 16:59:48 +08:00
Dreamacro
e622d8dd38
Fix: parse dial interface option
2021-11-08 13:31:08 +08:00
Dreamacro
d40e5e4fe6
Fix: codeql alerts
2021-11-08 00:32:21 +08:00
Dreamacro
1a7830f18e
Feature: dial different NIC for all proxies ( #1714 )
2021-11-07 16:48:51 +08:00
yaling888
2680e8ffa3
Merge from remote branch
2021-10-28 11:36:11 +08:00
yaling888
2953772a0e
Style: format code
2021-10-28 00:06:55 +08:00
Dreamacro
df3a491d40
Feature: support trojan websocket
2021-10-16 20:19:59 +08:00
Dreamacro
68753b4ae1
Chore: contexify ProxyAdapter ListenPacket
2021-10-15 21:44:53 +08:00
Dreamacro
4ce35870fe
Chore: remove deprecated ioutil
2021-10-09 20:35:06 +08:00
Dreamacro
4f1fac02ab
Chore: add remove TODO
2021-10-05 12:42:21 +08:00
yaling888
ae619e4163
Fix: VLESS WSOpts
2021-09-08 21:32:08 +08:00
yaling888
738bd3b0dd
Fix: vmess ws headers not set properly ( #1595 )
2021-09-08 21:20:16 +08:00
maskedeken
400dc923e0
Fix: vmess ws headers not set properly ( #1595 )
2021-09-08 14:44:24 +08:00
yaling888
6ddd9e6fb8
Merge from remote branch
2021-09-08 04:42:56 +08:00
yaling888
9254d2411e
Fix: VLESS WSOpts Headers
2021-09-08 04:34:11 +08:00
Kr328
a5b950a779
Feature: add dhcp type dns client ( #1509 )
2021-09-06 23:07:34 +08:00
yaling888
48aef1829f
Merge from remote branch
2021-09-01 00:38:43 +08:00
秋のかえで
0267b2efad
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
yaling888
ba2fd00f01
Merge from remote branch
2021-07-28 22:13:21 +08:00
ayanamist
53e17a916b
Chore: logging remote port on request ( #1494 )
2021-07-19 15:31:38 +08:00
yaling888
96e5a52651
Style: code style
2021-07-09 02:19:43 +08:00
yaling888
b4d93c4438
Feature: add xtls support for VLESS
2021-07-06 23:55:34 +08:00
yaling888
3afe3810bf
Merge from remote branch
2021-07-03 22:31:12 +08:00
Dreamacro
995aa7a8fc
Fix: remove ClientSessionCache and add NextProtos for vmess to fix #1468
2021-07-03 20:34:44 +08:00
yaling888
d7732f6ebc
Code: refresh code
2021-07-01 22:49:29 +08:00
Dreamacro
045edc188c
Style: code style
2021-06-10 14:05:56 +08:00
