diff --git a/asn/AS4201270005.toml b/asn/AS4201270005.toml index e4b6b1f..b4d3d08 100644 --- a/asn/AS4201270005.toml +++ b/asn/AS4201270005.toml @@ -1,3 +1,4 @@ -name = "Icecat" -owner = "icecat" -description = "NextMoe Group Access Network" +name = "MagicNeko CN(Optical Cable Project in Northeast China)" +owner = "magicneko" +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/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/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" 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..d6bb438 --- /dev/null +++ b/node/magicneko.toml @@ -0,0 +1,17 @@ +[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"] + + 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", 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"