From 0407e5314d62a7a6a1159e761ef1aa5ad226315e Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 23 Oct 2020 01:08:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?MagicNeko=20=E7=BD=91=E7=BB=9C=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E5=8F=98=E6=9B=B4(=E5=88=9D=E7=89=88)=20---=20edited:?= =?UTF-8?q?MagicNeko?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asn/AS4201270005.toml | 5 +++-- asn/AS4201270008.toml | 4 ++-- route/AS4201270005.toml | 21 ++++++++++++++++++++- route/AS4201270017.toml | 19 ------------------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/asn/AS4201270005.toml b/asn/AS4201270005.toml index e4b6b1f..b66b0e6 100644 --- a/asn/AS4201270005.toml +++ b/asn/AS4201270005.toml @@ -1,3 +1,4 @@ -name = "Icecat" +name = "MagicNeko CN(Optical Cable Project in Northeast China)" owner = "icecat" -description = "NextMoe Group Access Network" +description = "MagicNeko CN(Optical Cable Project in Northeast China)" + diff --git a/asn/AS4201270008.toml b/asn/AS4201270008.toml index f2f4db0..73a8087 100644 --- a/asn/AS4201270008.toml +++ b/asn/AS4201270008.toml @@ -1,3 +1,3 @@ -name = "MagicNeko Experimental Network" -owner = "icecat" +name = "MagicNeko Asia Experimental Network" +owner = "magicneko" description = "MagicNeko Network" diff --git a/route/AS4201270005.toml b/route/AS4201270005.toml index a0ece05..ec8797f 100644 --- a/route/AS4201270005.toml +++ b/route/AS4201270005.toml @@ -9,10 +9,29 @@ name = "icecat" description = "Icecat Residential network occupation address" supernet = "fd10:127:0233::/48" - ["fd10:127:0233:1c3a::/64"] type = "subnet" name = "MagicNeko VPN" description = "For Magicneko Explosion Network Interworking address, No SLA" 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" + diff --git a/route/AS4201270017.toml b/route/AS4201270017.toml index d37358f..e69de29 100644 --- a/route/AS4201270017.toml +++ b/route/AS4201270017.toml @@ -1,19 +0,0 @@ -["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" From fad952233dda9b104e5b053edfbd453ec5e1a19e Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 23 Oct 2020 01:10:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=BB=E4=BA=A4(?= =?UTF-8?q?=E4=BB=8E=20Icecat=20=E4=BA=A4=E7=BB=B4=20MagicNeko=20)=20---?= =?UTF-8?q?=20edited:MagicNeko?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asn/AS4201270005.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asn/AS4201270005.toml b/asn/AS4201270005.toml index b66b0e6..b4d3d08 100644 --- a/asn/AS4201270005.toml +++ b/asn/AS4201270005.toml @@ -1,4 +1,4 @@ name = "MagicNeko CN(Optical Cable Project in Northeast China)" -owner = "icecat" +owner = "magicneko" description = "MagicNeko CN(Optical Cable Project in Northeast China)" From 85cb16f75afea3a7e0a1bb97273fd1bf495b072a Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 23 Oct 2020 01:11:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=A7=BB=E4=BA=A4?= =?UTF-8?q?=EF=BC=88=E4=BB=8E=20Icecat=20=E5=88=B0=20MagicNeko=20=EF=BC=89?= =?UTF-8?q?=20---=20edited:MagicNeko?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entity/magicneko.toml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 entity/magicneko.toml diff --git a/entity/magicneko.toml b/entity/magicneko.toml new file mode 100644 index 0000000..268ea91 --- /dev/null +++ b/entity/magicneko.toml @@ -0,0 +1,6 @@ +name = "MagicNeko" + +[contact] +telegram = "fakeicecat" +github = "Myer921" +email = "icecat@catio.network" From 80cdd16c584b9f0e315082fd822d1caedae9be2e Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 23 Oct 2020 01:33:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node/Icecat.toml | 3 --- node/magicneko.toml | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) delete mode 100644 node/Icecat.toml create mode 100644 node/magicneko.toml diff --git a/node/Icecat.toml b/node/Icecat.toml deleted file mode 100644 index 2847f79..0000000 --- a/node/Icecat.toml +++ /dev/null @@ -1,3 +0,0 @@ -[Icecat-GroupAccessNetwork] -asn = 4201270005 -cidr = ["10.127.233.1/24", "fd10:127:233:1c3c::1/64"] diff --git a/node/magicneko.toml b/node/magicneko.toml new file mode 100644 index 0000000..d5eb81a --- /dev/null +++ b/node/magicneko.toml @@ -0,0 +1,17 @@ +[MagicNekoCN-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"] + +[MagicNekoAsia-luotianyi] +asn = 4201270008 +cidr = ["10.127.4.10/32", "fd10:127:233:1270:10:127:4:10/128"] + +[MagicNekoAsia-koishi] +asn = 4201270008 +cidr = ["10.127.4.8/32", "fd10:127:233:1270:10:127:4:8/128" , "fd10:127:233:1270::1/128"] + +[MagicNekoAsia-yuezhengling] +asn = 4201270008 +cidr = ["10.127.4.15/32", "fd10:127:233:1270:10:127:4:15/128"] + + From cad9d2c6763fa1e8b2541c420b3c6769307a3568 Mon Sep 17 00:00:00 2001 From: Myer921 Date: Fri, 23 Oct 2020 01:48:24 +0800 Subject: [PATCH 5/5] modified: dns/db.10.127 modified: node/magicneko.toml deleted: peer/MagicNeko-HK01.toml new file: peer/koishi.toml new file: peer/liqingge.toml renamed: peer/MagicNeko-JP03.toml -> peer/yuezhengling.toml --- dns/db.10.127 | 6 +++--- node/magicneko.toml | 8 ++++---- peer/MagicNeko-HK01.toml | 1 - peer/koishi.toml | 1 + peer/liqingge.toml | 1 + peer/{MagicNeko-JP03.toml => yuezhengling.toml} | 3 +++ 6 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 peer/MagicNeko-HK01.toml create mode 100644 peer/koishi.toml create mode 100644 peer/liqingge.toml rename peer/{MagicNeko-JP03.toml => yuezhengling.toml} (74%) diff --git a/dns/db.10.127 b/dns/db.10.127 index edce17e..90599ad 100644 --- a/dns/db.10.127 +++ b/dns/db.10.127 @@ -19,7 +19,7 @@ $TTL 604800 1.3 IN PTR pan.neo. 16.2 IN PTR caasih.neo. -1.233 IN PTR icecat-gw04.magicneko.imiku.cn. +1.233 IN PTR liqingge.gw.magicneko.neo. 1.4 IN PTR Abolition-hk.bb.magicneko.neo. 10.4 IN PTR 10.127.4.10.hk-01.bb.magicneko.neo. 12.4 IN PTR 10.127.4.12.hk-02.bb.magicneko.neo. @@ -55,9 +55,9 @@ $TTL 604800 ; Loopback Addresses 1.255 IN PTR NeoPDP-11.neo. -2.255 IN PTR ucbvax.neo. 4.255 IN PTR pan.neo. -53.255 IN PTR JerryXiao-Anycast4.neo. +53.255 IN PTR anycast-auth-4.neo. +54.255 IN PTR anycast-recur-4.neo. 56.255 IN PTR frank-hsinchu-1.neo. 80.255 IN PTR NeoSystem.neo. 117.255 IN PTR magicneko-tw.neo. diff --git a/node/magicneko.toml b/node/magicneko.toml index d5eb81a..d6bb438 100644 --- a/node/magicneko.toml +++ b/node/magicneko.toml @@ -1,16 +1,16 @@ -[MagicNekoCN-liqingge] +[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"] -[MagicNekoAsia-luotianyi] +[luotianyi] asn = 4201270008 cidr = ["10.127.4.10/32", "fd10:127:233:1270:10:127:4:10/128"] -[MagicNekoAsia-koishi] +[koishi] asn = 4201270008 cidr = ["10.127.4.8/32", "fd10:127:233:1270:10:127:4:8/128" , "fd10:127:233:1270::1/128"] -[MagicNekoAsia-yuezhengling] +[yuezhengling] asn = 4201270008 cidr = ["10.127.4.15/32", "fd10:127:233:1270:10:127:4:15/128"] diff --git a/peer/MagicNeko-HK01.toml b/peer/MagicNeko-HK01.toml deleted file mode 100644 index 1a43d55..0000000 --- a/peer/MagicNeko-HK01.toml +++ /dev/null @@ -1 +0,0 @@ -to-peer = ["Icecat-GroupAccessNetwork", "SUNNET"] diff --git a/peer/koishi.toml b/peer/koishi.toml new file mode 100644 index 0000000..20363ae --- /dev/null +++ b/peer/koishi.toml @@ -0,0 +1 @@ +to-peer = ["liqingge" , "yuezhengling" , "luotianyi" ,"JerryXiao-HK1"] diff --git a/peer/liqingge.toml b/peer/liqingge.toml new file mode 100644 index 0000000..083bd91 --- /dev/null +++ b/peer/liqingge.toml @@ -0,0 +1 @@ +to-peer = ["koishi" , "yuezhengling" , "luotianyi" ,"JerryXiao-SH1"] diff --git a/peer/MagicNeko-JP03.toml b/peer/yuezhengling.toml similarity index 74% rename from peer/MagicNeko-JP03.toml rename to peer/yuezhengling.toml index 11591f4..8cc2b68 100644 --- a/peer/MagicNeko-JP03.toml +++ b/peer/yuezhengling.toml @@ -1,4 +1,7 @@ to-peer = [ + "liqingge", + "koishi", + "luotianyi", "JerryXiao", "Ndoskrnl-US01", "chenx97",