Commit Graph

237 Commits

Author SHA1 Message Date
gVisor bot
915f40e71b Chore: IpToAddr 2022-04-20 22:09:16 +08:00
gVisor bot
a4654d30d5 chore: upgrade dependencies 2022-04-20 01:31:33 +08:00
gVisor bot
a84d76fd04 Improve: replace bootstrap dns (#2080) 2022-04-19 22:49:39 +08:00
gVisor bot
caf271a669 Chore: fix typo 2022-04-19 22:38:20 +08:00
gVisor bot
66503d64e3 Chore: persistence fakeip pool state 2022-04-19 22:37:47 +08:00
gVisor bot
b6a134b34c refactor: sniffer param force and reverses deprecated, will be removed when release version, replace force-domain and skip-sni,
force-domain add '+' equivalent to force is true
sniffer:
  enable: true
  force-domain:
    - "google.com"
  skip-sni:
    - www.baidu.com
  sniffing:
    - tls
2022-04-17 20:02:13 +08:00
gVisor bot
363f9ff181 fix: domain tree match failed 2022-04-16 11:55:49 +08:00
gVisor bot
566ed821fc fix: domain type fix Mapping 2022-04-16 09:51:31 +08:00
gVisor bot
181d213321 chore: log style 2022-04-16 09:04:43 +08:00
gVisor bot
baac54e8ee fix: reverse error when force is false 2022-04-16 08:53:31 +08:00
gVisor bot
6c56a3b80e feat: add domain list for sniffer, reverse force logic
when force is false, if domain in the list, will force replace
when force is true, if sniff domain in the list, will skip it
2022-04-16 08:21:31 +08:00
gVisor bot
d55f77798d chore:adjust sniffer debuglog info 2022-04-13 08:38:55 +08:00
gVisor bot
ebacc76433 Fix: fakeip pool cycle used 2022-04-13 02:19:42 +08:00
gVisor bot
7b22a3bd62 chore: adjust code 2022-04-12 21:39:31 +08:00
gVisor bot
bc33cd5630 Refactor: fakeip pool use netip.Prefix, supports ipv6 range 2022-04-12 20:32:08 +08:00
gVisor bot
895d93b10b chore:merge & adjust code 2022-04-12 20:20:04 +08:00
gVisor bot
89d75e59d1 Refactor: DomainTrie use generics 2022-04-12 18:45:47 +08:00
gVisor bot
b1cf4dc1a2 Refactor: lrucache use generics 2022-04-12 18:44:07 +08:00
gVisor bot
c9a9c49a16 chore: adjust code 2022-04-11 13:23:59 +08:00
gVisor bot
d7d6ed5c70 fix: code logic error 2022-04-10 20:01:35 +08:00
gVisor bot
b2becaffe3 feat: sniffer support
sniffer:
  enable: true
  force: false # Overwrite domain
  sniffing:
    - tls
2022-04-09 22:30:36 +08:00
gVisor bot
2b5e14533b chore: reduce a little memory 2022-04-09 22:24:48 +08:00
gVisor bot
0042b5de3b disable process name on android 2022-04-09 17:54:01 +08:00
gVisor bot
0d1e4405da Merge remote-tracking branch 'Plus/with-tun' into Alpha 2022-04-02 20:48:11 +08:00
gVisor bot
ee3f94425e feat: 添加tls sni 嗅探
# Conflicts:
#	tunnel/statistic/tracker.go
#	tunnel/tunnel.go
2022-03-31 21:27:25 +08:00
gVisor bot
1c4e024030 Chore: revert "Feature: add tls SNI sniffing (#68)"
This reverts commit 24ce6622a2.
2022-03-31 21:20:46 +08:00
gVisor bot
016d88e5ea Feature: add tls SNI sniffing (#68) 2022-03-31 19:34:40 +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
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
17da2d36a5 Chore: regenerate protoc file 2022-03-27 07:12:12 +08:00
gVisor bot
31708f1e74 [Fixed]
弃用过期函数,修复Process Name获取问题
2022-03-26 16:17:44 +08:00
gVisor bot
00b632e032 build test 2022-03-24 23:42:49 +08:00
gVisor bot
a52743bd28 [SKIP CI]
Merge remote-tracking branch 'Pro-Plus/with-tun' into Alpha

# Conflicts:
#	README.md
#	hub/route/server.go
2022-03-23 13:23:34 +08:00
gVisor bot
c38ae18a59 Feature: flush fakeip pool 2022-03-23 01:05:43 +08:00
gVisor bot
9b48fc9d8d Merge branch 'ogn-dev' into with-tun 2022-03-20 21:26:25 +08:00
gVisor bot
29b8076c75 Merge remote-tracking branch 'yaling888/with-tun' into Alpha
# Conflicts:
#	listener/tun/tun_adapter.go
2022-03-19 22:37:51 +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
90b7714f2c Chore: fix typo (#2033) 2022-03-19 13:58:51 +08:00
gVisor bot
f18800de42 [内容]
1.autoIptables 开关
2.go.mod 调整
3.processName 调整
4.makefile 调整
5.Tun模块 部分代码调整
2022-03-19 01:11:27 +08:00
gVisor bot
598ec35701 Chore: make fake ip pool start with the third ip 2022-03-18 05:17:47 +08:00
gVisor bot
2e68885dc7 Merge remote-tracking branch 'upstream/Alpha' into Alpha 2022-03-17 23:40:51 +08:00
gVisor bot
b8c9a1bf6d update 2022-03-17 23:24:07 +08:00
gVisor bot
3dc7fb7e27 [Fix] Process name display for Android 2022-03-17 20:31:16 +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
9ef90782ce Chore: use gateway address of fake ip pool as the TUN device address 2022-03-17 07:41:18 +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
f7759c1468 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