支持vless+xtls

.github/workflows/build-2100.yml

@@ -8,8 +8,8 @@ on:
 #    - 'v*'
   #  branches: 
   #    - master
-  schedule:
-    - cron: 0 17 * * 4
+  #schedule:
+    #- cron: 0 17 * * 4
 #  watch:
 #    types: [started]
 

.github/workflows/build-MT7620d-mi3.yml

@@ -0,0 +1,108 @@
+name: Build MT7620-mi3
+
+on: 
+#  release:
+#    types: [published]
+#  push:
+#    tags:
+#    - 'v*'
+  #  branches: 
+  #    - master
+ # schedule:
+ #   - cron: 0 17 * * 4
+ # watch:
+ #   types: [started]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Initialization environment
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install unzip libtool-bin curl cmake gperf gawk flex bison nano xxd fakeroot \
+        cpio git python-docutils gettext automake autopoint texinfo build-essential help2man \
+        pkg-config zlib1g-dev libgmp3-dev libmpc-dev libmpfr-dev libncurses5-dev libltdl-dev wget
+    - name: Clone source code
+      run: |
+        cd toolchain-mipsel
+        sh dl_toolchain.sh
+        mkdir -p /opt/images/
+    - name: Build Firmware
+      env:
+        TNAME: "MI-3"
+      run: |
+        cwd=`pwd`
+        CONFIG_TOOLCHAIN_DIR=${cwd//\//\\\/}\\/toolchain-mipsel
+        cd trunk
+        for m in $TNAME;
+        do
+        if [ ! -f configs/templates/$m.config ] ; then
+        echo "configs/templates/$m.config not found "
+        exit 1
+        fi
+        cp -f configs/templates/$m.config .config
+        #####################################################################################
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_MENTOHUST/d' .config #删除配置项MENTOHUST
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_SCUTCLIENT/d' .config #删除配置项SCUTCLIENT
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS/d' .config #删除配置项SS plus+
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_SSSERVER/d' .config #删除配置项SS server
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_DNSFORWARDER/d' .config #删除配置项DNSFORWARDER
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_ADBYBY/d' .config #删除配置项adbyby plus+
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_FRPC/d' .config #删除配置项adbyby plus+
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_FRPS/d' .config #删除配置项adbyby plus+
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_TUNSAFE/d' .config #删除配置项adbyby plus+
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_ALIDDNS/d' .config #删除配置项阿里DDNS
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_SMARTDNS/d' .config
+        sed -i '/CONFIG_FIRMWARE_INCLUDE_SRELAY/d' .config
+        ######################################################################
+        echo "CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n" >> .config #MENTOHUST
+        echo "CONFIG_FIRMWARE_INCLUDE_SCUTCLIENT=n" >> .config #SCUTCLIENT
+        echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y" >> .config #SS plus+
+        echo "CONFIG_FIRMWARE_INCLUDE_SSSERVER=n" >> .config #SS server
+        echo "CONFIG_FIRMWARE_INCLUDE_DNSFORWARDER=n" >> .config #DNSFORWARDER
+        echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=y" >> .config #adbyby plus+
+        echo "CONFIG_FIRMWARE_INCLUDE_FRPC=n" >> .config #内网穿透FRPC
+        echo "CONFIG_FIRMWARE_INCLUDE_FRPS=n" >> .config #内网穿透FRPS
+        echo "CONFIG_FIRMWARE_INCLUDE_TUNSAFE=n" >> .config #TUNSAFE
+        echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=n" >> .config #阿里DDNS
+        echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNS=n" >> .config #smartdns
+        echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNSBIN=n" >> .config #smartdns二进制文件
+        echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=y" >> .config #v2ray二进制文件
+        echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=n" >> .config #集成trojan执行文件，如果不集成，会从网上下载下来执行，不影响正常使用
+        echo "CONFIG_FIRMWARE_INCLUDE_KOOLPROXY=n" >> .config #KP广告过滤
+        echo "CONFIG_FIRMWARE_INCLUDE_CADDY=n" >> .config #在线文件管理服务
+        echo "CONFIG_FIRMWARE_INCLUDE_CADDYBIN=n" >> .config #集成caddu执行文件，此文件有13M,请注意固件大小。如果不集成，会从网上下载下来执行，不影响正常使用
+        echo "CONFIG_FIRMWARE_INCLUDE_KUMASOCKS=y" >> .config
+        echo "CONFIG_FIRMWARE_INCLUDE_ADGUARDHOME=n" >> .config
+        echo "CONFIG_FIRMWARE_INCLUDE_IPT2SOCKS=n" >> .config
+        echo "CONFIG_FIRMWARE_INCLUDE_MICROSOCKS=n" >> .config
+        echo "CONFIG_FIRMWARE_INCLUDE_SRELAY=n" >> .config
+        echo "CONFIG_FIRMWARE_INCLUDE_WYY=n" >> .config #网易云解锁
+        echo "CONFIG_FIRMWARE_INCLUDE_WYYBIN=n" >> .config #网易云解锁GO版本执行文件（4M多）注意固件超大小
+        echo "CONFIG_FIRMWARE_INCLUDE_ZEROTIER=y" >> .config #zerotier ~1.3M
+        ####################################################################################
+        #if [ "$m" = "PSG1208" ] || [ "$m" = "PSG1218" ] || [ "$m" = "PSG712" ]; then
+        #sed -i '/CONFIG_FIRMWARE_INCLUDE_TTYD/d' .config
+        #sed -i '/CONFIG_FIRMWARE_INCLUDE_ALIDDNS/d' .config
+        #echo "CONFIG_FIRMWARE_INCLUDE_TTYD=n" >> .config
+        #echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=n" >> .config
+        #echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNSBIN=n" >> .config
+        #echo "CONFIG_FIRMWARE_INCLUDE_KOOLPROXY=n" >> .config
+        #fi
+        sed -i "s/^CONFIG_TOOLCHAIN_DIR=.*$/CONFIG_TOOLCHAIN_DIR=${CONFIG_TOOLCHAIN_DIR}/g" .config
+        sudo ./clear_tree_simple
+        sudo ./build_firmware_modify $m 0
+        sudo mv -f images/*.trx /opt/images/
+        done
+    - name : Upload packages
+      uses: actions/upload-artifact@master
+      if: always()
+      with:
+        name: Padavan-packages
+        path: /opt/images

README.md

@@ -146,3 +146,41 @@ fakeroot ./build_firmware_modify PSG1218
 * 汉化字典来自：https://github.com/gorden5566/padavan
 * hanwckf更新日志：https://www.jianshu.com/p/d76a63a12eae
 
+
+{
+  "v": "2",
+  "ps": "Singapore②",
+  "add": "52.81.000.000",
+  "port": "30002",
+  "id": "8A5B5082-0216-D2A3-BA59-73BEC6BA78B7",
+  "aid": "0",
+  "net": "tcp",
+  "type": "none",
+  "host": "Singapore-digitaloceanbbb",
+  "path": "",
+  "tls": "tls",
+  "sni": ""
+}
+
+
+
+# VMess + TCP，不加密（仅作示例，不安全）
+vmess://[email protected]:31415?encryption=none#VMessTCPNaked
+# VMess + TCP，自动选择加密。编程人员特别注意不是所有的 URL 都有问号，注意处理边缘情况。
+vmess://[email protected]:9265#VMessTCPAuto
+# VMess + TCP，手动选择加密
+vmess://[email protected]:35897?encryption=aes-128-gcm#VMessTCPAES
+# VMess + TCP + TLS，内层不加密
+vmess://[email protected]:9323?encryption=none&security=tls#VMessTCPTLSNaked
+# VMess + TCP + TLS，内层也自动选择加密
+vmess://[email protected]:8462?security=tls#VMessTCPTLS
+# VMess + TCP + TLS，内层不加密，手动指定 SNI
+vmess://[email protected]:64338?encryption=none&security=tls&sni=fastgit.org#VMessTCPTLSSNI
+# VLESS + TCP + XTLS
+vless://[email protected]:3279?security=xtls&flow=rprx-xtls-splice#VLESSTCPXTLSSplice
+# VLESS + mKCP + Seed
+vless://[email protected]:50288?type=kcp&seed=69f04be3-d64e-45a3-8550-af3172c63055#VLESSmKCPSeed
+# VLESS + mKCP + Seed，伪装成 Wireguard
+vless://[email protected]:41971?type=kcp&headerType=wireguard&seed=69f04be3-d64e-45a3-8550-af3172c63055#VLESSmKCPSeedWG
+# VMess + WebSocket + TLS
+vmess://[email protected]:6939?type=ws&security=tls&host=qv2ray.net&path=%2Fsomewhere#VMessWebSocketTLS

trunk/configs/templates/MI-3.config

@@ -19,7 +19,7 @@ CONFIG_TOOLCHAIN_DIR=/opt/rt-n56u/toolchain-mipsel
 #CONFIG_FIRMWARE_TYPE_ROOTFS_IN_RAM=y
 
 ### Force MT7620 CPU clock to 600MHz (override Uboot settings)
-#CONFIG_FIRMWARE_CPU_600MHZ=y
+CONFIG_FIRMWARE_CPU_600MHZ=y
 
 ### Enable MT7620 CPU sleep mode (downclock to 200MHz on idle)
 #CONFIG_FIRMWARE_CPU_SLEEP=y
@@ -40,7 +40,7 @@ CONFIG_FIRMWARE_ENABLE_IPV6=y
 CONFIG_FIRMWARE_ENABLE_USB=y
 
 ### Enable NTFS filesystem support via Paragon "ufsd" driver. ~0.4MB
-CONFIG_FIRMWARE_ENABLE_UFSD=y
+CONFIG_FIRMWARE_ENABLE_UFSD=n
 
 ### Enable FAT/FAT32 filesystem support. ~0.1MB
 CONFIG_FIRMWARE_ENABLE_FAT=y
@@ -55,7 +55,7 @@ CONFIG_FIRMWARE_ENABLE_EXT2=y
 CONFIG_FIRMWARE_ENABLE_EXT3=y
 
 ### Enable EXT4 (EXT3/2 too) filesystem support. ~0.4MB
-CONFIG_FIRMWARE_ENABLE_EXT4=y
+CONFIG_FIRMWARE_ENABLE_EXT4=n
 
 ### Enable XFS filesystem support. ~0.6MB
 CONFIG_FIRMWARE_ENABLE_XFS=n
@@ -76,7 +76,7 @@ CONFIG_FIRMWARE_INCLUDE_HID=n
 CONFIG_FIRMWARE_INCLUDE_SERIAL=y
 
 ### Include USB-Audio modules ~0.46MB
-CONFIG_FIRMWARE_INCLUDE_AUDIO=y
+CONFIG_FIRMWARE_INCLUDE_AUDIO=n
 
 ### Include network QoS scheduling modules. ~0.2MB
 CONFIG_FIRMWARE_INCLUDE_QOS=n
@@ -137,10 +137,10 @@ CONFIG_FIRMWARE_INCLUDE_HDPARM=y
 CONFIG_FIRMWARE_INCLUDE_PARTED=y
 
 ### Include SMB (and WINS) server. ~1.5MB
-CONFIG_FIRMWARE_INCLUDE_SMBD=y
+CONFIG_FIRMWARE_INCLUDE_SMBD=n
 
 ### using samba3.6 instead of samba3
-CONFIG_FIRMWARE_INCLUDE_SMBD36=y
+CONFIG_FIRMWARE_INCLUDE_SMBD36=n
 
 ### Include WINS server only. ~0.4MB
 CONFIG_FIRMWARE_INCLUDE_WINS=n
@@ -149,7 +149,7 @@ CONFIG_FIRMWARE_INCLUDE_WINS=n
 CONFIG_FIRMWARE_INCLUDE_SMBD_SYSLOG=n
 
 ### Include FTP server. ~0.2MB
-CONFIG_FIRMWARE_INCLUDE_FTPD=y
+CONFIG_FIRMWARE_INCLUDE_FTPD=n
 
 ### Include alternative L2TP control client RP-L2TP. ~0.1MB
 CONFIG_FIRMWARE_INCLUDE_RPL2TP=n
@@ -203,10 +203,10 @@ CONFIG_FIRMWARE_INCLUDE_TRANSMISSION=n
 CONFIG_FIRMWARE_INCLUDE_TRANSMISSION_WEB_CONTROL=n
 
 ### Include Aria2 download manager. openssl ~1.2MB, aria2 ~3.5MB
-CONFIG_FIRMWARE_INCLUDE_ARIA=y
+CONFIG_FIRMWARE_INCLUDE_ARIA=n
 
 ### Include Aria2 WEB control. ~0.7MB
-CONFIG_FIRMWARE_INCLUDE_ARIA_WEB_CONTROL=y
+CONFIG_FIRMWARE_INCLUDE_ARIA_WEB_CONTROL=n
 
 CONFIG_FIRMWARE_INCLUDE_CURL=y
 

trunk/configs/templates/MI-R3G.config

@@ -19,7 +19,7 @@ CONFIG_TOOLCHAIN_DIR=/opt/rt-n56u/toolchain-mipsel
 #CONFIG_FIRMWARE_TYPE_ROOTFS_IN_RAM=y
 
 ### Force MT7621 CPU clock to 900MHz (override Uboot settings)
-#CONFIG_FIRMWARE_CPU_900MHZ=y
+CONFIG_FIRMWARE_CPU_900MHZ=y
 
 ### Enable MT7621 CPU sleep mode (downclock to 220MHz on idle)
 #CONFIG_FIRMWARE_CPU_SLEEP=y
@@ -48,25 +48,25 @@ CONFIG_FIRMWARE_ENABLE_FAT=y
 CONFIG_FIRMWARE_ENABLE_EXFAT=y
 
 ### Enable EXT2 filesystem support. ~0.1MB
-CONFIG_FIRMWARE_ENABLE_EXT2=y
+CONFIG_FIRMWARE_ENABLE_EXT2=n
 
 ### Enable EXT3 filesystem support. ~0.2MB
-CONFIG_FIRMWARE_ENABLE_EXT3=y
+CONFIG_FIRMWARE_ENABLE_EXT3=n
 
 ### Enable EXT4 (EXT3/2 too) filesystem support. ~0.4MB
-CONFIG_FIRMWARE_ENABLE_EXT4=y
+CONFIG_FIRMWARE_ENABLE_EXT4=n
 
 ### Enable XFS filesystem support. ~0.6MB
 CONFIG_FIRMWARE_ENABLE_XFS=n
 
 ### Enable FUSE (filesystems in userspace) support. ~0.1MB
-CONFIG_FIRMWARE_ENABLE_FUSE=y
+CONFIG_FIRMWARE_ENABLE_FUSE=n
 
 ### Enable swap files/partitions support. ~0.05MB
 CONFIG_FIRMWARE_ENABLE_SWAP=n
 
 ### Include UVC camera modules. ~0.2MB
-CONFIG_FIRMWARE_INCLUDE_UVC=y
+CONFIG_FIRMWARE_INCLUDE_UVC=n
 
 ### Include USB-HID modules. ~0.2MB
 CONFIG_FIRMWARE_INCLUDE_HID=n
@@ -75,7 +75,7 @@ CONFIG_FIRMWARE_INCLUDE_HID=n
 CONFIG_FIRMWARE_INCLUDE_SERIAL=y
 
 ### Include USB-Audio modules ~0.46MB
-CONFIG_FIRMWARE_INCLUDE_AUDIO=y
+CONFIG_FIRMWARE_INCLUDE_AUDIO=n
 
 ### Include XFRM (IPsec) modules & iptables extension ~ 0.2MB
 CONFIG_FIRMWARE_INCLUDE_XFRM=n

trunk/configs/templates/RM2100.config

@@ -21,7 +21,7 @@ CONFIG_TOOLCHAIN_DIR=/opt/rt-n56u/toolchain-mipsel
 #CONFIG_FIRMWARE_TYPE_ROOTFS_IN_RAM=y
 
 ### Force MT7621 CPU clock to 900MHz (override Uboot settings)
-#CONFIG_FIRMWARE_CPU_900MHZ=y
+CONFIG_FIRMWARE_CPU_900MHZ=y
 
 ### Enable MT7621 CPU sleep mode (downclock to 220MHz on idle)
 #CONFIG_FIRMWARE_CPU_SLEEP=y

trunk/user/adguardhome/adguardhome.sh

@@ -79,7 +79,11 @@ dns:
   ratelimit_whitelist: []
   refuse_any: true
   bootstrap_dns:
+  - 223.5.5.5
+  - 119.29.29.29
   - 1.1.1.1
+  - 1.0.0.1
+  - 114.114.114.114
   all_servers: true
   allowed_clients: []
   disallowed_clients: []
@@ -90,7 +94,8 @@ dns:
   safebrowsing_enabled: false
   resolveraddress: ""
   upstream_dns:
-  - 1.1.1.1
+  - https://dns.alidns.com/dns-query
+  - https://doh.pub/dns-query
 tls:
   enabled: false
   server_name: ""

trunk/user/htop/Makefile

@@ -12,7 +12,7 @@ download_test:
 
 extract_test:
 	( if [ ! -d $(SRC_NAME) ]; then \
-		tar zxf $(SRC_NAME).tar.gz; \
+		tar -xf $(SRC_NAME).tar.gz; \
 	fi )
 
 config_test:

trunk/user/httpd/variables.c

@@ -148,6 +148,7 @@
 			{"v2_quic_key_x", "24", NULL, FALSE},
 			{"v2_quic_security_x", "24", NULL, FALSE},
 			{"v2_tls_x", "24", NULL, FALSE},
+		        {"v2_flow_x", "24", NULL, FALSE},
 			{"tj_tls_host_x", "24", NULL, FALSE},
 			{"switch_enable_x", "24", NULL, FALSE},
 			{0,0,0,0}
@@ -982,6 +983,9 @@
 	struct variable variables_ZeroConf[] = {
 			{"zerotier_enable", "", NULL, EVM_RESTART_ZEROTIER},
 			{"zerotier_id", "", NULL, EVM_RESTART_ZEROTIER},
+		        {"zerotier_moonid", "", NULL, EVM_RESTART_ZEROTIER},
+			{"zerotiermoon_enable", "", NULL, EVM_RESTART_ZEROTIER},
+			{"zerotiermoon_ip", "", NULL, EVM_RESTART_ZEROTIER},
 			{"zerotier_nat", "", NULL, EVM_RESTART_ZEROTIER},
 			{"zero_staticnum_x", "", NULL, EVM_RESTART_ZEROTIER},
 			{"ZeroList", "Group", ARGV((char*)variables_ZeroConf_ZeroList, "8", "55", "zero_staticnum_x"), EVM_RESTART_ZEROTIER},
@@ -1017,6 +1021,7 @@
 			{"d_v2_host","",NULL, EVM_RESTART_SHADOWSOCKS},
 			{"d_v2_path","",NULL, EVM_RESTART_SHADOWSOCKS},
 			{"d_v2_tls","",NULL, EVM_RESTART_SHADOWSOCKS},
+		        {"d_v2_flow","",NULL, EVM_RESTART_SHADOWSOCKS},
 			{"d_ss_password","",NULL, EVM_RESTART_SHADOWSOCKS},
 			{"d_ss_method","",NULL, EVM_RESTART_SHADOWSOCKS},
 			{"d_ss_protocol","",NULL, EVM_RESTART_SHADOWSOCKS},