xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2616 commits 17 branches 83 tags 10 MiB
Commit graph

339 commits

Author SHA1 Message Date
gVisor bot
560862d4e2 chore: add parse-pure-ip in sniffer 2022-10-14 08:42:28 +08:00
gVisor bot
02dd19e311 chore: add force-dns-mapping in sniffer 2022-10-14 07:46:33 +08:00
gVisor bot
48f30b01ef fix: ebpf support 2022-08-22 23:17:41 +08:00
gVisor bot
c1bd1de57e rm EBpf tun && disable android ebpf 2022-08-08 10:21:16 +08:00
gVisor bot
e96e586a37 Migration: go1.19 2022-08-07 21:45:50 +08:00
gVisor bot
31d17d28d3 Merge branch 'dev' into Alpha 2022-08-01 22:13:46 +08:00
gVisor bot
1013612dc1 fix: repeat set http status 2022-08-01 22:12:36 +08:00
gVisor bot
2c10af7b1d support ebpf 2022-07-29 09:08:35 +08:00
gVisor bot
9ea1020d84 clean code 2022-07-24 01:07:30 +08:00
gVisor bot
100b6b7f9b Merge pull request #129 from zhudan/Alpha 
入站增加TFO支持(默认不开启)
 2022-07-22 06:32:34 -04:00
gVisor bot
9daef5bf44 inbound tfo 2022-07-22 15:16:09 +08:00
gVisor bot
21d44fa391 refactor: DoH use fragment setting params 2022-07-21 21:40:28 +08:00
gVisor bot
b25ad6fda0 chore: log level should be setting after launched 2022-07-16 13:33:27 +08:00
gVisor bot
27b5ecf3ab fix: skip-cert-verify not work 2022-07-11 12:37:27 +08:00
gVisor bot
91e1649822 feat: add fingerprint for tls verify 2022-07-10 20:44:24 +08:00
gVisor bot
12338f285b feat: try h3 connect DOH, failed will fall back h2; turn on with dns.prefer-h3: true 2022-07-03 21:59:47 +08:00
gVisor bot
21e9374ed6 Merge branch 'dev' into Alpha 2022-06-26 21:53:03 +08:00
gVisor bot
3116efd498 chore: RESTful test group use request context 2022-06-25 08:53:11 +08:00
gVisor bot
62eca0c8fa ClashX hack. (#102) 2022-06-24 20:08:33 +08:00
gVisor bot
f9150e09ea feat: RESTful api add interface-name field on patch config 2022-06-18 17:29:19 +08:00
gVisor bot
14dafb2d5c feat: add param general.enable-process, it will always find process or uid, default value is false 2022-06-14 23:08:07 +08:00
gVisor bot
271be43a9d refactor: finding process and uid should to find with match process or uid rule, reduce memory allocation 2022-06-14 22:52:56 +08:00
gVisor bot
272b3e924a Chore: add redir-host deprecated warnning 2022-06-14 11:26:04 +08:00
gVisor bot
b0f7b9e4e0 feat: proxies group URLTest api 2022-05-30 22:07:09 +08:00
gVisor bot
322edc166f feat: RESTful API support set tcp-concurrent 2022-05-26 19:49:12 +08:00
gVisor bot
6f2dc0336f feat: RESTful API support update Geo file 
and can set update url by user, eg.
geox-url:
  geoip: "http://xxxx/gepip.dat"
  mmdb: "http://xxxx/country.mmdb"
  geosite: "http://xxxx/geosite.dat"
 2022-05-24 15:04:13 +08:00
gVisor bot
09690122e4 feat: RESTful API support disable sniffer 2022-05-24 13:44:52 +08:00
gVisor bot
010a2aaf9c feat: fallback can be select by user 2022-05-24 10:17:44 +08:00
gVisor bot
ba7e0887bd feat: IN-TYPE rule support 
eg. IN-TYPE,SOCKS/REDIR/INNER,Proxy
support list: HTTP HTTPS SOCKS SOCKS4 SOCKS5 REDIR TPROXY TUN INNER
 2022-05-20 23:17:16 +08:00
gVisor bot
2a00f57fd9 feat: 安卓恢复进程规则，可通过enable-process开关，默认true 2022-05-19 20:44:09 +08:00
gVisor bot
d3e20a87de fix: 热重载Tun配置 2022-05-19 19:19:19 +08:00
gVisor bot
cae1e23735 chore: 暴露数据给前端 2022-05-17 16:47:21 +08:00
gVisor bot
125f35e426 fix: 当dns被禁用时，dns将根据general ipv6设置解析dns 2022-05-17 09:01:41 +08:00
gVisor bot
c3e7173187 chore: remove Script mode residual code. 2022-05-14 13:00:33 +08:00
gVisor bot
3d0048425b fix: limit load provider concurrent size 2022-05-08 22:52:46 +08:00
gVisor bot
e6df3342da fix: Adjust the timing of loading proxy selection 2022-05-08 07:58:26 +08:00
gVisor bot
4ccedb34e8 fix: provider auto update 2022-05-08 00:04:16 +08:00
gVisor bot
85a465bacd chore: Initialize provider ahead of time 2022-05-05 21:14:46 +08:00
gVisor bot
cb06de7d15 chore: sniffer param skip-sni renamed to ship-domain, old param will be removed in the release version 2022-05-03 23:10:59 +08:00
gVisor bot
4d8ba83abe fix: patch update support tun 2022-05-03 19:31:00 +08:00
gVisor bot
adcad74452 refactor: provider init order 2022-05-02 16:47:48 +08:00
gVisor bot
4464d486fb fix: tun dns 2022-05-02 14:21:37 +08:00
gVisor bot
b6efac8d79 refactor: remove dns and tun relationship, the enabled of dns module should be decided by user 2022-05-01 09:41:27 +08:00
gVisor bot
07b2f4e4f3 fix: rule provider http api crash 2022-04-28 09:44:29 +08:00
gVisor bot
88346ccdcd Merge remote-tracking branch 'meta/Alpha' into Alpha 2022-04-28 08:56:00 +08:00
gVisor bot
c076d38ab1 refactor: adjust provider loading order, remove meaningless pointers 2022-04-28 08:55:45 +08:00
gVisor bot
d1aa6d1431 refactor: tcp concurrent 2022-04-27 21:37:20 +08:00
gVisor bot
c9740c2708 Fix: make log api unblocked 2022-04-26 22:36:10 +08:00
gVisor bot
ad67a1c34c Chore: use generics as possible 2022-04-25 13:18:30 +08:00
gVisor bot
83ecca0061 fix: ipv6 enable logic 2022-04-23 14:21:58 +08:00
gVisor bot
fbcf9b6801 fix: ipv6 enable logic 2022-04-23 02:03:10 +08:00
gVisor bot
532ec82a08 feat: support tcp concurrent, Separate dialing and dns resolver ipv6 
tcp-concurrent:true
 2022-04-23 00:27:22 +08:00
gVisor bot
03a014957f feat: add sniffer port whitelist, when empty will add all ports 2022-04-21 07:06:08 -07: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
e11775a9b1 fix: sniffer npe 2022-04-16 08:45:18 +08:00
gVisor bot
642ce5c403 fix: adjust loading timing 2022-04-16 08:29:38 +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
895d93b10b chore:merge & adjust code 2022-04-12 20:20:04 +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
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
323dea4352 Chore: adjust gVisor stack 2022-03-28 03:25:55 +08:00
gVisor bot
67d04485ca Refactor: MainResolver 2022-03-28 00:44:13 +08:00
gVisor bot
89861038cd [skip ci] [Fix] ban auto set iptables when tun is enabled 2022-03-23 20:37:46 +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
6addcc260f bypass support for auto-iptables 2022-03-23 11:36:13 +08:00
gVisor bot
22db48dd37 [skip ci] 
# Conflicts:
#	.github/workflows/linter.yml
#	.github/workflows/release.yml
#	config/config.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
 2022-03-23 01:41:42 +08:00
gVisor bot
c38ae18a59 Feature: flush fakeip pool 2022-03-23 01:05:43 +08:00
gVisor bot
56dc81ea73 Refactor: iptables auto config, disabled by default 2022-03-22 05:38:42 +08:00
gVisor bot
81363e3dfc Merge pull request #22 from Adlyq/Alpha-pr 
[skip ci]
[Fix] skip when country code not found in GeoIP.dat
 2022-03-22 00:33:02 +08:00
gVisor bot
e632b76c8f [Fix] do not monitor when auto-iptables is false 2022-03-21 20:29:07 +08:00
gVisor bot
e773595e33 auto change interface for tproxy 2022-03-21 19:51:27 +08:00
gVisor bot
f42365f4f9 init sequence adjustment 2022-03-21 19:47:21 +08:00
gVisor bot
652759a9ae [skip ci][内容] 
1.调整部分代码
 2022-03-20 02:39:48 +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
0bd8e30655 update 2022-03-18 00:24:38 +08:00
gVisor bot
b8c9a1bf6d update 2022-03-17 23:24:07 +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
gVisor bot
e855cefc13 [Skip CI] 2022-03-15 02:20:19 +08:00
gVisor bot
c8861d83f8 Chore: bump to go1.18rc1, use netip.Addr to replace net.IP with system TUN stack 2022-03-12 02:16:13 +08:00
gVisor bot
0175b103d0 Chore: refactor TUN 2022-03-09 05:08:35 +08:00
gVisor bot
f8e9902530 Chore: code style 2022-03-09 00:32:21 +08:00
gVisor bot
dd2ebb5903 Fix: iptables routing mark init 2022-03-03 05:02:17 +08:00
gVisor bot
e04b6de377 Chore: use "-m mark --mark" instead of "-m owner --uid-owner" 2022-02-23 14:19:59 +08:00
gVisor bot
e5358cd03a Feature: resolve ip with a proxy adapter 2022-02-23 02:38:50 +08:00
gVisor bot
7f0de1861a Merge from remote branch 2022-02-23 01:00:27 +08:00
gVisor bot
47359cc80f Fix: routing-mark should effect on root 2022-02-17 14:23:47 +08:00
gVisor bot
f5933b91f1 [build] 2022-02-06 01:59:35 +08:00
gVisor bot
b75e8f9500 [FEAT] Add geodata loader mode switch 2022-02-05 02:42:49 +08:00
gVisor bot
e3a61dbbd3 [FEAT] Add geodata loader mode switch 2022-02-05 00:51:06 +08:00
gVisor bot
0aead76a23 [Feat] 
update gvisor
Chore: use "-m mark --mark" instead of "-m owner --uid-owner"
 2022-02-04 06:11:24 +08:00
gVisor bot
15ed2ca588 Merge remote-tracking branch 'pro-plus/plus-pro' into Feature 
# Conflicts:
#	.github/workflows/Alpha.yml
#	.github/workflows/codeql-analysis.yml
#	.github/workflows/docker.yml
#	.github/workflows/linter.yml
#	.github/workflows/stale.yml
#	Makefile
#	README.md
#	adapter/outbound/vless.go
#	component/dialer/dialer.go
#	component/geodata/geodata.go
#	component/geodata/router/condition.go
#	config/config.go
#	config/initial.go
#	constant/metadata.go
#	constant/path.go
#	constant/rule.go
#	constant/rule_extra.go
#	dns/filters.go
#	go.mod
#	go.sum
#	hub/executor/executor.go
#	hub/route/configs.go
#	listener/listener.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/dev_windows_extra.go
#	listener/tun/dev/wintun/dll_windows.go
#	listener/tun/dev/wintun/session_windows.go
#	listener/tun/ipstack/gvisor/tun.go
#	listener/tun/ipstack/gvisor/tundns.go
#	listener/tun/ipstack/stack_adapter.go
#	listener/tun/ipstack/system/tun.go
#	listener/tun/tun_adapter.go
#	main.go
#	rule/base.go
#	rule/common/process.go
#	rule/geoip.go
#	rule/parser.go
#	rule/port.go
#	test/go.mod
#	test/go.sum
#	test/vless_test.go
#	transport/vless/xtls.go
#	tunnel/tunnel.go
 2022-02-04 05:30:21 +08:00
gVisor bot
fdb0a3f5a8 Chore: use "-m mark --mark" instead of "-m owner --uid-owner" 2022-02-02 21:59:44 +08:00
gVisor bot
39c3ca2b75 [Fixed] select group crash 2022-01-21 22:38:02 +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
7a9458b858 [Fixed] compatible cfw 2022-01-05 19:28:54 +08:00
gVisor bot
3fe8a4777d make tun config compatible with premium 2022-01-05 11:24:00 +08:00
gVisor bot
fd5852ce1c Merge from remote branch 2022-01-05 01:46:37 +08:00
gVisor bot
f507672d4b make tun config compatible with premium 2022-01-05 00:33:42 +08:00
gVisor bot
63254f0306 merge clash 1.9.0 2022-01-04 17:58:50 +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
0ecc9f4941 [fix] 2021-12-27 03:16:48 +08:00
gVisor bot
074c28f0bd Chore: ReCreate* do side effect job (#1849) 2021-12-26 22:08:53 +08:00
gVisor bot
5317d6e3e6 [Feature] 添加unified-delay boolean 控制延迟测试，默认为false，当设置true时忽略握手延迟，将统一延迟结果，从而利于不同协议的url-test 2021-12-26 21:20:41 +08:00
gVisor bot
46b2d3b0c1 [Fixed] launch resolver an enhancer when tun mode 2021-12-09 23:00:54 +08:00
gVisor bot
a7d32607ce Merge from remote branch 2021-12-09 21:38:24 +08:00
gVisor bot
4d8017574c Chore: builtin right mime of .js (#1808) 2021-12-08 13:38:25 +08:00
gVisor bot
2ce11362da fix AutoIptables 2021-12-04 19:59:41 +08:00
gVisor bot
165e7ccc76 [style] 2021-12-04 17:41:13 +08:00
gVisor bot
934efb3d85 [fix]Linux TProxy 2021-12-04 14:34:01 +08:00
gVisor bot
97e89ed33b style 2021-12-03 21:54:45 +08:00
gVisor bot
88a91ae1b8 test 2021-12-03 20:38:40 +08:00
gVisor bot
590565f5c1 Feature:Supported Rule-Set 2021-12-02 22:56:17 +08:00
gVisor bot
c5257c5190 [style] 2021-12-01 16:51:31 +08:00
gVisor bot
b90fe87a17 fix proxies callback 2021-11-21 16:57:22 +08:00
gVisor bot
e69c54cfcd [test] 2021-11-17 16:03:47 +08:00
gVisor bot
d3521e6b3a [test]core 1.8 2021-11-16 20:08:52 +08:00
gVisor bot
1e98d26dbb Merge from remote branch 2021-11-09 21:11:38 +08:00
gVisor bot
5c51a83fa5 Feature: resolve ip with proxy adapter 2021-11-09 19:44:16 +08:00
gVisor bot
2762c33ad3 Feature: dial different NIC for all proxies (#1714) 2021-11-07 16:48:51 +08:00
gVisor bot
801dc4886d Chore: use custom buffer pool for lwIP stack 2021-11-04 18:33:11 +08:00
gVisor bot
feff4a93a9 Wintun: use new swdevice-based API for upcoming Wintun 0.14 2021-11-03 15:10:31 +08:00
gVisor bot
5cca04291b Wintun: use new swdevice-based API for upcoming Wintun 0.14 2021-11-03 15:02:40 +08:00
gVisor bot
f7d136f56c Merge from remote branch 2021-10-28 11:36:11 +08:00
gVisor bot
aba096784d Merge remote branch 2021-10-21 22:37:30 +08:00
gVisor bot
ef87959c2f Chore: script built 2021-10-21 20:22:23 +08:00
gVisor bot
54c22a2fce Feature: add mode script 2021-10-15 14:11:14 +08:00
gVisor bot
653f2de2c0 Style: use gofumpt for fmt 2021-10-10 23:44:09 +08:00
gVisor bot
0ebd7b6949 Chore: remove deprecated ioutil 2021-10-09 20:35:06 +08:00
gVisor bot
554efd8a27 Feature: add lwIP TCP/IP stack to tun listener 2021-09-30 04:05:52 +08:00
gVisor bot
317bf173df Merge from remote branch 2021-09-08 04:42:56 +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
edf35558f0 Feature: add geoip-code option 2021-08-25 15:15:13 +08:00
gVisor bot
2e762b39b7 Merge from remote branch 2021-07-28 22:13:21 +08:00
gVisor bot
6b418d4369 Chore: logging real listen port (#1492) 2021-07-19 14:07:51 +08:00
gVisor bot
dd6e71d58f Feature: SOCKS4/SOCKS4A Inbound Compatible Support (#1491) 2021-07-18 16:09:09 +08:00
gVisor bot
a078203976 Fix: reorder apply config to ensure update proxies and rules 2021-07-10 17:01:40 +08:00
gVisor bot
c3090aacb1 Style: code style 2021-07-09 02:19:43 +08:00
gVisor bot
8b2f737511 Merge from remote branch 2021-07-07 03:53:32 +08:00
gVisor bot
e259cea893 Chore: move provider interface to constant 2021-07-06 00:31:13 +08:00
gVisor bot
38c102a93d Code: refresh code 2021-07-01 22:49:29 +08:00
gVisor bot
a2948cd3b6 Change: config reload API use default path when both path and payload don't exist (#1447) 2021-06-21 17:33:34 +08:00
gVisor bot
894e2843d5 Style: code style 2021-06-13 17:23:10 +08:00