From 24b6b066eb616f47e28cd54cafeb822aff535828 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Tue, 28 Apr 2020 22:10:41 +0800 Subject: [PATCH] route-dir: TYPE: PP -> PTP --- document/route-dir.en_US.txt | 4 ++-- document/route-dir.zh_TW.txt | 4 ++-- route/PP,10.127.4.253~10.127.69.1 | 2 +- route/PP,10.127.4.254~10.127.11.199 | 2 +- route/PP,10.127.8.185~10.127.69.1 | 2 +- route/PP,10.127.8.193~10.127.10.1 | 2 +- route/PP,10.127.8.193~10.127.8.194 | 2 +- route/PP,10.127.8.193~10.127.8.195 | 2 +- route/PP,10.127.8.194~10.127.8.196 | 2 +- route/PP,10.127.8.195~10.127.8.194 | 2 +- route/PP,172.20.51.99~172.22.127.2 | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/document/route-dir.en_US.txt b/document/route-dir.en_US.txt index a922c93..912484a 100644 --- a/document/route-dir.en_US.txt +++ b/document/route-dir.en_US.txt @@ -29,11 +29,11 @@ Detailed Information of Each Variable ===================================== 1. TYPE: IP Usage Type - Available options are: TUN30, SUBNET, PP, LO (corresponding to the IP address + Available options are: TUN30, SUBNET, PTP, LO (corresponding to the IP address allocation type in the first section respectively) 2. PROTO: VPN Protocol Used - Available options are: Tinc, WireGuard, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN + Available options are: Tinc, WireGuard, L2TP, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN, SLIRP, PPP 3. NAME: Name 3. UPSTREAM: Upstream Node Name diff --git a/document/route-dir.zh_TW.txt b/document/route-dir.zh_TW.txt index 7e412b9..e07be7f 100644 --- a/document/route-dir.zh_TW.txt +++ b/document/route-dir.zh_TW.txt @@ -27,10 +27,10 @@ Shell Script 定義變數的方式作為定義檔語法，此外，定義變數 ============== 1. TYPE: IP 使用類型 - 可用選項有： TUN30, SUBNET, PP, LO （分別對應第一節之 IP 位址分配類型） + 可用選項有： TUN30, SUBNET, PIP, LO （分別對應第一節之 IP 位址分配類型） 2. PROTO: 使用的 VPN 協定 - 可用選項有： Tinc, WireGuard, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN + 可用選項有： Tinc, WireGuard, L2TP, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN, SLIRP, PPP 3. NAME: 這個連線的名稱 5. UPSTREAM: 上游節點名稱 diff --git a/route/PP,10.127.4.253~10.127.69.1 b/route/PP,10.127.4.253~10.127.69.1 index 0248165..caa2ab9 100644 --- a/route/PP,10.127.4.253~10.127.69.1 +++ b/route/PP,10.127.4.253~10.127.69.1 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=MagicNeko-JP3 DOWNSTREAM=santost12 diff --git a/route/PP,10.127.4.254~10.127.11.199 b/route/PP,10.127.4.254~10.127.11.199 index 4d57649..24da0f0 100644 --- a/route/PP,10.127.4.254~10.127.11.199 +++ b/route/PP,10.127.4.254~10.127.11.199 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=Icecat-Explosion DOWNSTREAM=SUNNET diff --git a/route/PP,10.127.8.185~10.127.69.1 b/route/PP,10.127.8.185~10.127.69.1 index db35c6a..106117c 100644 --- a/route/PP,10.127.8.185~10.127.69.1 +++ b/route/PP,10.127.8.185~10.127.69.1 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=staph DOWNSTREAM=santost12 diff --git a/route/PP,10.127.8.193~10.127.10.1 b/route/PP,10.127.8.193~10.127.10.1 index f88a3dd..3080305 100644 --- a/route/PP,10.127.8.193~10.127.10.1 +++ b/route/PP,10.127.8.193~10.127.10.1 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=JerryXiao DOWNSTREAM="LanTian" diff --git a/route/PP,10.127.8.193~10.127.8.194 b/route/PP,10.127.8.193~10.127.8.194 index adf8ca0..478fcfe 100644 --- a/route/PP,10.127.8.193~10.127.8.194 +++ b/route/PP,10.127.8.193~10.127.8.194 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=JerryXiao DOWNSTREAM=JerryXiao-HK1 diff --git a/route/PP,10.127.8.193~10.127.8.195 b/route/PP,10.127.8.193~10.127.8.195 index 28b4cba..cdbbbf2 100644 --- a/route/PP,10.127.8.193~10.127.8.195 +++ b/route/PP,10.127.8.193~10.127.8.195 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=JerryXiao DOWNSTREAM=JerryXiao-SH1 diff --git a/route/PP,10.127.8.194~10.127.8.196 b/route/PP,10.127.8.194~10.127.8.196 index c8dfe8e..0229082 100644 --- a/route/PP,10.127.8.194~10.127.8.196 +++ b/route/PP,10.127.8.194~10.127.8.196 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=JerryXiao-HK1 DOWNSTREAM=JerryXiao-HK2 diff --git a/route/PP,10.127.8.195~10.127.8.194 b/route/PP,10.127.8.195~10.127.8.194 index bf328e7..2518b10 100644 --- a/route/PP,10.127.8.195~10.127.8.194 +++ b/route/PP,10.127.8.195~10.127.8.194 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=JerryXiao-SH1 DOWNSTREAM=JerryXiao-HK1 diff --git a/route/PP,172.20.51.99~172.22.127.2 b/route/PP,172.20.51.99~172.22.127.2 index f4934e3..2c7a8ef 100644 --- a/route/PP,172.20.51.99~172.22.127.2 +++ b/route/PP,172.20.51.99~172.22.127.2 @@ -1,4 +1,4 @@ -TYPE=PP +TYPE=PTP PROTO=WireGuard UPSTREAM=JerryXiao DOWNSTREAM=dfceaef