From 2a02286e3655f7d4bf61b1f34b49bfdef89a1672 Mon Sep 17 00:00:00 2001 From: Neo_Chen Date: Sun, 10 May 2020 18:32:01 +0800 Subject: [PATCH] route-dir: deprecate PTP --- document/peer-dir.txt | 1 + document/route-dir.txt | 9 ++++----- route/PTP,10.127.13.2~10.127.13.1 | 5 ----- route/PTP,10.127.4.15~10.127.13.1 | 5 ----- route/PTP,10.127.4.253~10.127.69.1 | 4 ---- route/PTP,10.127.4.254~10.127.11.199 | 4 ---- route/PTP,10.127.8.185~10.127.69.1 | 4 ---- route/PTP,10.127.8.193~10.127.10.1 | 4 ---- route/PTP,10.127.8.193~10.127.8.194 | 4 ---- route/PTP,10.127.8.193~10.127.8.195 | 4 ---- route/PTP,10.127.8.194~10.127.8.196 | 4 ---- route/PTP,10.127.8.195~10.127.8.194 | 4 ---- route/PTP,172.20.51.99~172.22.127.2 | 4 ---- 13 files changed, 5 insertions(+), 51 deletions(-) create mode 100644 document/peer-dir.txt delete mode 100644 route/PTP,10.127.13.2~10.127.13.1 delete mode 100644 route/PTP,10.127.4.15~10.127.13.1 delete mode 100644 route/PTP,10.127.4.253~10.127.69.1 delete mode 100644 route/PTP,10.127.4.254~10.127.11.199 delete mode 100644 route/PTP,10.127.8.185~10.127.69.1 delete mode 100644 route/PTP,10.127.8.193~10.127.10.1 delete mode 100644 route/PTP,10.127.8.193~10.127.8.194 delete mode 100644 route/PTP,10.127.8.193~10.127.8.195 delete mode 100644 route/PTP,10.127.8.194~10.127.8.196 delete mode 100644 route/PTP,10.127.8.195~10.127.8.194 delete mode 100644 route/PTP,172.20.51.99~172.22.127.2 diff --git a/document/peer-dir.txt b/document/peer-dir.txt new file mode 100644 index 0000000..3837914 --- /dev/null +++ b/document/peer-dir.txt @@ -0,0 +1 @@ +DESC="" diff --git a/document/route-dir.txt b/document/route-dir.txt index 3e37fd5..da0fa53 100644 --- a/document/route-dir.txt +++ b/document/route-dir.txt @@ -5,9 +5,8 @@ According to the common usage of this VPN network, the IP allocation can be classified into the following rules, with its format normalized, as the file name of the routing distribution definition file: -1. /30 Tunnel: `10.127.0.x/30` （where x is divisible by 4） +1. /30 Tunnel: `10.127.0.x/30` （where x is divisible by 4） **DEPRECATED** 2. Normal Subnet: `10.127.x.y/z` (where z must be greater than 16） -3. Point-to-Point: `PTP,10.127.x.x~10.127.x.x` （IP on both sides is /32） 4. Loopback Address: `10.127.255.x/32` Definition Format @@ -19,11 +18,11 @@ will be used as the syntax of the definition file. In addition, variables must be present if it's not optional and defined in the same order as the following: TYPE= - PROTO= (only for peer-to-peer /30 tunnels and peer-to-peer /32 peers) + PROTO= (only for peer-to-peer /30 tunnels) NAME= (optional for anything other than Contiguous Subnet and Loopback Address) ASN= (only for Contiguous Subnet and Loopback Address) - UPSTREAM= (only for peer-to-peer /30 tunnels and peer-to-peer /32 peers) - DOWNSTREAM= (only for peer-to-peer /30 tunnels and peer-to-peer /32 peers) + UPSTREAM= (only for peer-to-peer /30 tunnels) + DOWNSTREAM= (only for peer-to-peer /30 tunnels) DESC= Detailed Information of Each Variable diff --git a/route/PTP,10.127.13.2~10.127.13.1 b/route/PTP,10.127.13.2~10.127.13.1 deleted file mode 100644 index 480047f..0000000 --- a/route/PTP,10.127.13.2~10.127.13.1 +++ /dev/null @@ -1,5 +0,0 @@ -TYPE="PTP" -NAME="Ndoskrnl's Master Router" -PROTO="WireGuard" -UPSTREAM="Ndoskrnl-US01" -DOWNSTREAM="Ndoskrnl-CN01" diff --git a/route/PTP,10.127.4.15~10.127.13.1 b/route/PTP,10.127.4.15~10.127.13.1 deleted file mode 100644 index 15d3bb0..0000000 --- a/route/PTP,10.127.4.15~10.127.13.1 +++ /dev/null @@ -1,5 +0,0 @@ -TYPE="PTP" -NAME="Ndoskrnl's Master Router" -PROTO="WireGuard" -UPSTREAM="MagicNeko-JP03" -DOWNSTREAM="Ndoskrnl-US01" diff --git a/route/PTP,10.127.4.253~10.127.69.1 b/route/PTP,10.127.4.253~10.127.69.1 deleted file mode 100644 index 8b5e46a..0000000 --- a/route/PTP,10.127.4.253~10.127.69.1 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="MagicNeko-JP03" -DOWNSTREAM="santost12" diff --git a/route/PTP,10.127.4.254~10.127.11.199 b/route/PTP,10.127.4.254~10.127.11.199 deleted file mode 100644 index 42b6ac7..0000000 --- a/route/PTP,10.127.4.254~10.127.11.199 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="MagicNeko-HK01" -DOWNSTREAM="SUNNET" diff --git a/route/PTP,10.127.8.185~10.127.69.1 b/route/PTP,10.127.8.185~10.127.69.1 deleted file mode 100644 index e34b944..0000000 --- a/route/PTP,10.127.8.185~10.127.69.1 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="staph" -DOWNSTREAM="santost12" diff --git a/route/PTP,10.127.8.193~10.127.10.1 b/route/PTP,10.127.8.193~10.127.10.1 deleted file mode 100644 index d67d5ce..0000000 --- a/route/PTP,10.127.8.193~10.127.10.1 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="JerryXiao" -DOWNSTREAM="LanTian" diff --git a/route/PTP,10.127.8.193~10.127.8.194 b/route/PTP,10.127.8.193~10.127.8.194 deleted file mode 100644 index 17defda..0000000 --- a/route/PTP,10.127.8.193~10.127.8.194 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="JerryXiao" -DOWNSTREAM="JerryXiao-HK1" diff --git a/route/PTP,10.127.8.193~10.127.8.195 b/route/PTP,10.127.8.193~10.127.8.195 deleted file mode 100644 index de95441..0000000 --- a/route/PTP,10.127.8.193~10.127.8.195 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="JerryXiao" -DOWNSTREAM="JerryXiao-SH1" diff --git a/route/PTP,10.127.8.194~10.127.8.196 b/route/PTP,10.127.8.194~10.127.8.196 deleted file mode 100644 index 17f50f1..0000000 --- a/route/PTP,10.127.8.194~10.127.8.196 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="JerryXiao-HK1" -DOWNSTREAM="JerryXiao-HK2" diff --git a/route/PTP,10.127.8.195~10.127.8.194 b/route/PTP,10.127.8.195~10.127.8.194 deleted file mode 100644 index 39c84bb..0000000 --- a/route/PTP,10.127.8.195~10.127.8.194 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="JerryXiao-SH1" -DOWNSTREAM="JerryXiao-HK1" diff --git a/route/PTP,172.20.51.99~172.22.127.2 b/route/PTP,172.20.51.99~172.22.127.2 deleted file mode 100644 index 810b399..0000000 --- a/route/PTP,172.20.51.99~172.22.127.2 +++ /dev/null @@ -1,4 +0,0 @@ -TYPE="PTP" -PROTO="WireGuard" -UPSTREAM="JerryXiao" -DOWNSTREAM="dfceaef"