From 68dfb71db20a525b347c94f50d6da1590dffa846 Mon Sep 17 00:00:00 2001 From: "MagicNeko(Dev:Desktop)" Date: Fri, 29 Jan 2021 17:54:40 +0800 Subject: [PATCH] Changes from the MagicNeko VPN project, please see github pr for details --- asn/AS4201270008.toml | 3 --- asn/AS4201270017.toml | 3 --- entity/CainSakura.toml | 7 ------- node/CainSakura.toml | 3 --- node/MagicNeko.toml | 24 ---------------------- node/magicneko.toml | 19 ++---------------- peer/koishi.toml | 1 - peer/liqingge.toml | 1 - peer/pan.toml | 2 +- peer/santost12-Network.toml | 3 +-- peer/septs.toml | 1 - peer/staph.toml | 2 +- peer/yuezhengling.toml | 11 ---------- route/AS140913.toml | 10 ++++++++++ route/AS4201270005.toml | 40 ++++++++++--------------------------- route/AS4201270008.toml | 30 ---------------------------- route/AS4201270017.toml | 4 ---- 17 files changed, 26 insertions(+), 138 deletions(-) delete mode 100644 asn/AS4201270008.toml delete mode 100644 asn/AS4201270017.toml delete mode 100644 entity/CainSakura.toml delete mode 100644 node/CainSakura.toml delete mode 100644 node/MagicNeko.toml delete mode 100644 peer/koishi.toml delete mode 100644 peer/liqingge.toml delete mode 100644 peer/yuezhengling.toml create mode 100644 route/AS140913.toml delete mode 100644 route/AS4201270008.toml delete mode 100644 route/AS4201270017.toml diff --git a/asn/AS4201270008.toml b/asn/AS4201270008.toml deleted file mode 100644 index 73a8087..0000000 --- a/asn/AS4201270008.toml +++ /dev/null @@ -1,3 +0,0 @@ -name = "MagicNeko Asia Experimental Network" -owner = "magicneko" -description = "MagicNeko Network" diff --git a/asn/AS4201270017.toml b/asn/AS4201270017.toml deleted file mode 100644 index cf2ce75..0000000 --- a/asn/AS4201270017.toml +++ /dev/null @@ -1,3 +0,0 @@ -name = "Mcnetwork (MagicNeko other networks)" -owner = "icecat" -description = "Transition the Mcnetwork community network into an intermediate ASN of the BGP network" diff --git a/entity/CainSakura.toml b/entity/CainSakura.toml deleted file mode 100644 index 3ef9f64..0000000 --- a/entity/CainSakura.toml +++ /dev/null @@ -1,7 +0,0 @@ -name = "CainSakura" - -[contact] -telegram = "CainSakura" -github = "CainSakura" -email = "cain@iloli.cc" - diff --git a/node/CainSakura.toml b/node/CainSakura.toml deleted file mode 100644 index b44af17..0000000 --- a/node/CainSakura.toml +++ /dev/null @@ -1,3 +0,0 @@ -[CainSakura-home] -asn = 4201270017 -cidr = ["10.127.234.1/24", "fd10:127:234::1/48"] diff --git a/node/MagicNeko.toml b/node/MagicNeko.toml deleted file mode 100644 index 38dd958..0000000 --- a/node/MagicNeko.toml +++ /dev/null @@ -1,24 +0,0 @@ -[MagicNeko-HK01] -asn = 4201270008 -description = "Magicneko IX LAN interconnection" -cidr = ["10.127.4.10/24", "fd10:127:0233:7170:2021::10.127.4.10/80"] - -[MagicNeko-JP02] -asn = 4201270008 -description = "Magicneko IX LAN interconnection" -cidr = ["10.127.4.14/24", "fd10:127:0233:7170:2021::10.127.4.14/80"] - -[MagicNeko-JP03] -asn = 4201270008 -description = "MagicNeko IX LAN interconnection" -cidr = ["10.127.4.15/24", "fd10:127:0233:7170:2021::10.127.4.15/80"] - -[MagicNeko-TW01] -asn = 4201270008 -description = "MagicNeko IX LAN interconnection" -cidr = ["10.127.4.17/24", "fd10:127:0233:7170:2021::10.127.4.17/80"] - -[MagicNeko-UK01] -asn = 4201270008 -description = "MagicNeko IX LAN interconnection" -cidr = ["10.127.4.18/24", "fd10:127:0233:7170:2021::10.127.4.18/80"] diff --git a/node/magicneko.toml b/node/magicneko.toml index d6bb438..d087147 100644 --- a/node/magicneko.toml +++ b/node/magicneko.toml @@ -1,17 +1,2 @@ -[liqingge] -asn = 4201270005 -cidr = ["10.127.233.1/24", "10.127.234.1/24" , "10.127.235.1/24" , "10.127.236.1/24" , "fd10:127:233:1c3c::1/64" , "fd10:127:234::/48"] - -[luotianyi] -asn = 4201270008 -cidr = ["10.127.4.10/32", "fd10:127:233:1270:10:127:4:10/128"] - -[koishi] -asn = 4201270008 -cidr = ["10.127.4.8/32", "fd10:127:233:1270:10:127:4:8/128" , "fd10:127:233:1270::1/128"] - -[yuezhengling] -asn = 4201270008 -cidr = ["10.127.4.15/32", "fd10:127:233:1270:10:127:4:15/128"] - - +[magicneko] +asn = 140913 diff --git a/peer/koishi.toml b/peer/koishi.toml deleted file mode 100644 index 20363ae..0000000 --- a/peer/koishi.toml +++ /dev/null @@ -1 +0,0 @@ -to-peer = ["liqingge" , "yuezhengling" , "luotianyi" ,"JerryXiao-HK1"] diff --git a/peer/liqingge.toml b/peer/liqingge.toml deleted file mode 100644 index 083bd91..0000000 --- a/peer/liqingge.toml +++ /dev/null @@ -1 +0,0 @@ -to-peer = ["koishi" , "yuezhengling" , "luotianyi" ,"JerryXiao-SH1"] diff --git a/peer/pan.toml b/peer/pan.toml index 7a3f667..7cd821f 100644 --- a/peer/pan.toml +++ b/peer/pan.toml @@ -1 +1 @@ -to-peer = ["MagicNeko-JP03", "NeoPDP-11", "NeoSystem", "NeoVAX"] +to-peer = ["NeoPDP-11", "NeoSystem", "NeoVAX"] diff --git a/peer/santost12-Network.toml b/peer/santost12-Network.toml index 12b780f..49229e2 100644 --- a/peer/santost12-Network.toml +++ b/peer/santost12-Network.toml @@ -1,3 +1,2 @@ to-peer = [ - "MagicNeko-JP03", -] + ] diff --git a/peer/septs.toml b/peer/septs.toml index 5bd6745..0490eec 100644 --- a/peer/septs.toml +++ b/peer/septs.toml @@ -2,7 +2,6 @@ to-peer = [ "James58899", "JerryXiao", "LanTian", - "MagicNeko-JP03", "frank-hsinchu", "megumiLHS", ] diff --git a/peer/staph.toml b/peer/staph.toml index a8eee01..2ae4b5d 100644 --- a/peer/staph.toml +++ b/peer/staph.toml @@ -1 +1 @@ -to-peer = ["MagicNeko-UK01", "septs"] +to-peer = ["septs"] diff --git a/peer/yuezhengling.toml b/peer/yuezhengling.toml deleted file mode 100644 index 8cc2b68..0000000 --- a/peer/yuezhengling.toml +++ /dev/null @@ -1,11 +0,0 @@ -to-peer = [ - "liqingge", - "koishi", - "luotianyi", - "JerryXiao", - "Ndoskrnl-US01", - "chenx97", - "frank-hsinchu", - "megumiLHS", - "santost12-Network", -] diff --git a/route/AS140913.toml b/route/AS140913.toml new file mode 100644 index 0000000..670a47e --- /dev/null +++ b/route/AS140913.toml @@ -0,0 +1,10 @@ +["10.127.4.0/24"] +type = "subnet" +name = "MagicNeko-Asia Backbone node(name:houraisankaguya+fujiwaranomokou)" +description = "MagicNeko-Asia Backbone node(name:houraisankaguya+fujiwaranomokou)" + +["fd10:127:0233::/48"] +type = "subnet" +name = "Magicneko Asia address occupied" +description = "Magicneko Asia address occupied(/48 not route)" + diff --git a/route/AS4201270005.toml b/route/AS4201270005.toml index 2bc65c5..ea5ec08 100644 --- a/route/AS4201270005.toml +++ b/route/AS4201270005.toml @@ -1,41 +1,23 @@ ["10.127.233.0/24"] type = "subnet" -name = "Icecat Residential network occupation address" -description = "For Mobile device internal network segment for testing connectivity quality, No SLA(=172.24.5.0/24)" +name = "MagicNeko-CN office node(name:liqingge)" +description = "MagicNeko CN office node (office network in Northeast China)" + +["10.127.234.0/24"] +type = "subnet" +name = "MagicNeko-CN office VPN+IX Node(name:liqingge)" +description = "MagicNeko CN office node (office network in Northeast China)" ["fd10:127:0233:1c3c::/64"] type = "subnet" -name = "icecat" -description = "Icecat Residential network occupation address" +name = "MagicNeko-CN office node(name:liqingge)" +description = "MagicNeko CN office node (office network in Northeast China)" supernet = "fd10:127:0233::/48" ["fd10:127:0233:1c3a::/64"] type = "subnet" -name = "MagicNeko VPN" -description = "For Magicneko Explosion Network Interworking address, No SLA" +name = "MagicNeko-CN office VPN+IX Node(name:liqingge)" +description = "MagicNeko CN office node (office network in Northeast China)" supernet = "fd10:127:0233::/48" -["10.127.234.0/24"] -type = "subnet" -name = "CainSakura-home-devices" -description = "For home devices internal network segment for testing connectivity quality, No SLA" -["10.127.235.0/24"] -type = "subnet" -name = "Icecat Global Tunnel Address (OpenVPN)" -description = "For Magicneko Explosion Network Interworking address, No SLA" - -["10.127.236.0/24"] -type = "subnet" -name = "MagicNeko VPN" -description = "For Magicneko Explosion Network Interworking address, No SLA" - -["fd10:127:0234::/48"] -type = "subnet" -name = "CainSakura-home-devices" -description = "For home devices internal network segment for testing connectivity quality, No SLA" - -["10.127.255.18/32"] -type = "loopback" -name = "icecat-video" -description = "Video encoding node, used to monitor (Cyan) online live broadcast in the live room and record encoding" diff --git a/route/AS4201270008.toml b/route/AS4201270008.toml deleted file mode 100644 index d77c21b..0000000 --- a/route/AS4201270008.toml +++ /dev/null @@ -1,30 +0,0 @@ -["10.127.237.0/24"] -type = "subnet" -name = "MagicNeko IX (Will not broadcast)" -description = "For Magicneko Explosion Network Interworking address, No SLA" - -["10.127.255.117/32"] -type = "loopback" -name = "magicneko-tw" -description = "magicneko-tw/frr" - -["fd10:127:0233::/48"] -type = "subnet" -name = "icecat" -description = "Magicneko ipv6 reserved segment" - -["10.127.255.54/32"] -type = "loopback" -name = "anycast-recur-4" -description = "Anycast recursive DNS" - -["fd10:127:53:53::/64"] -type = "loopback" -name = "anycast-recur-6" -description = "Anycast recursive DNS" -supernet = "fd10:127:53::/48" - -["10.127.255.18/32"] -type = "loopback" -name = "Video encoding node(Anycast)" -description = "Video encoding node, used to monitor (Cyan) online live broadcast in the live room and record encoding" diff --git a/route/AS4201270017.toml b/route/AS4201270017.toml deleted file mode 100644 index daa85f7..0000000 --- a/route/AS4201270017.toml +++ /dev/null @@ -1,4 +0,0 @@ -["10.127.4.0/24"] -type = "subnet" -name = "MagicNeko Network IPv4" -description = "For Magicneko Explosion Network Interworking address, No SLA"