sync/NeoNetwork
1
0
Fork 0
mirror of https://github.com/NeoCloud/NeoNetwork synced 2024-11-22 12:00:40 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Myer921 2020-05-25 10:43:14 +08:00
commit 012784d34b
No known key found for this signature in database
GPG key ID: 9E1B111EDB23F381
255 changed files with 1222 additions and 1366 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.editorconfig Normal file
View file

@ -0,0 +1,8 @@
root = true
[*.toml]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false

4
.github/workflows/roa.yml vendored
View file

@ -6,7 +6,7 @@ on:
push:
branches: [master]
schedule:
- cron: '0 6 * * 1'
- cron: "0 6 * * 1"
jobs:
build:
@ -29,6 +29,7 @@ jobs:
eval "$(pyenv virtualenv-init -)"
pyenv install 3.8.2
pyenv shell 3.8.2
pip install toml tabulate
- name: Run roa script
shell: bash
@ -46,6 +47,7 @@ jobs:
pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json
pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json
pyenv exec python3 scripts/roa.py --summary --output roa_dir/README.txt
- name: Upload files
env:

2
.github/workflows/test-your-pr.yml vendored
View file

@ -29,6 +29,7 @@ jobs:
eval "$(pyenv virtualenv-init -)"
pyenv install 3.8.2
pyenv shell 3.8.2
pip install toml tabulate
- name: Run roa script
shell: bash
@ -46,3 +47,4 @@ jobs:
pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json
pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json
pyenv exec python3 scripts/roa.py --summary --output roa_dir/README.txt

3
.vscode/extensions.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"recommendations": ["bungcip.better-toml", "bodil.prettier-toml"]
}

4
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,4 @@
{
"editor.formatOnSave": true,
"python.formatting.provider": "black"
}

4
asn/AS134098
View file

@ -1,4 +0,0 @@
NAME="Licson Internal Network"
OWNER="licson"
DESC=""
VALID="YES"

4
asn/AS134098.toml Normal file
View file

@ -0,0 +1,4 @@
name = "Licson Internal Network"
owner = "licson"
source = "Internet"
vaild = true

3
asn/AS4201270000
View file

@ -1,3 +0,0 @@
NAME="NeoNetwork Origin"
OWNER="Neo_Chen"
DESC=""

2
asn/AS4201270000.toml Normal file
View file

@ -0,0 +1,2 @@
name = "NeoNetwork Origin"
owner = "Neo_Chen"

3
asn/AS4201270001
View file

@ -1,3 +0,0 @@
NAME="Septs Inter-NeoNetwork Exchange"
OWNER="Septs"
DESC=""

2
asn/AS4201270001.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Septs Inter-NeoNetwork Exchange"
owner = "septs"

3
asn/AS4201270002
View file

@ -1,3 +0,0 @@
NAME="Septs Home"
OWNER="Septs"
DESC=""

2
asn/AS4201270002.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Septs HomeLabs"
owner = "septs"

3
asn/AS4201270003
View file

@ -1,3 +0,0 @@
NAME="chenx97"
OWNER="chenx97"
DESC=""

2
asn/AS4201270003.toml Normal file
View file

@ -0,0 +1,2 @@
name = "chenx97"
owner = "chenx97"

3
asn/AS4201270004
View file

@ -1,3 +0,0 @@
NAME="frank"
OWNER="frank"
DESC=""

2
asn/AS4201270004.toml Normal file
View file

@ -0,0 +1,2 @@
name = "frank"
owner = "frank"

3
asn/AS4201270005
View file

@ -1,3 +0,0 @@
NAME="Icecat"
OWNER="Icecat"
DESC="NextMoe Group Access Network"

3
asn/AS4201270005.toml Normal file
View file

@ -0,0 +1,3 @@
name = "Icecat"
owner = "Icecat"
description = "NextMoe Group Access Network"

3
asn/AS4201270006
View file

@ -1,3 +0,0 @@
NAME="Jerry Network"
OWNER="JerryXiao"
DESC=""

2
asn/AS4201270006.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Jerry Network"
owner = "JerryXiao"

3
asn/AS4201270007
View file

@ -1,3 +0,0 @@
NAME="Staph"
OWNER="Staph"
DESC=""

2
asn/AS4201270007.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Staph"
owner = "Staph"

3
asn/AS4201270008
View file

@ -1,3 +0,0 @@
NAME="MagicNeko"
OWNER="Icecat"
DESC="MagicNeko Network Internet exchange"

3
asn/AS4201270008.toml Normal file
View file

@ -0,0 +1,3 @@
name = "MagicNeko"
owner = "Icecat"
description = "MagicNeko Network Internet exchange"

3
asn/AS4201270009
View file

@ -1,3 +0,0 @@
NAME="santost12"
OWNER="santost12"
DESC=""

2
asn/AS4201270009.toml Normal file
View file

@ -0,0 +1,2 @@
name = "santost12"
owner = "santost12"

3
asn/AS4201270010
View file

@ -1,3 +0,0 @@
NAME="Lan Tian"
OWNER="Lan Tian"
DESC=""

2
asn/AS4201270010.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Lan Tian"
owner = "Lan Tian"

3
asn/AS4201270011
View file

@ -1,3 +0,0 @@
NAME="LINE-NZ"
OWNER="LINE-NZ"
DESC=""

2
asn/AS4201270011.toml Normal file
View file

@ -0,0 +1,2 @@
name = "LINE-NZ"
owner = "LINE-NZ"

3
asn/AS4201270012
View file

@ -1,3 +0,0 @@
NAME="Yhi Interconnect"
OWNER="Junde Yhi"
DESC=""

2
asn/AS4201270012.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Yhi Interconnect"
owner = "Junde Yhi"

3
asn/AS4201270013
View file

@ -1,3 +0,0 @@
NAME="NDOSKRNL"
OWNER="Ndoskrnl"
DESC="Ndoskrnl's Network"

3
asn/AS4201270013.toml Normal file
View file

@ -0,0 +1,3 @@
name = "NDOSKRNL"
owner = "Ndoskrnl"
description = "Ndoskrnl's Network"

3
asn/AS4201270014
View file

@ -1,3 +0,0 @@
NAME="leedagee"
OWNER="leedagee"
DESC=""

2
asn/AS4201270014.toml Normal file
View file

@ -0,0 +1,2 @@
name = "leedagee"
owner = "leedagee"

3
asn/AS4201270015
View file

@ -1,3 +0,0 @@
NAME="James58899"
OWNER="James58899"
DESC=""

2
asn/AS4201270015.toml Normal file
View file

@ -0,0 +1,2 @@
name = "James58899"
owner = "James58899"

3
asn/AS4242420140
View file

@ -1,3 +0,0 @@
NAME="Yangfl Network"
OWNER="Yangfl"
DESC=""

2
asn/AS4242420140.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Yangfl Network"
owner = "Yangfl"

3
asn/AS4242420916
View file

@ -1,3 +0,0 @@
NAME="alanyhq"
OWNER="alanyhq"
DESC="alanyhq main"

3
asn/AS4242420916.toml Normal file
View file

@ -0,0 +1,3 @@
name = "alanyhq"
owner = "alanyhq"
description = "alanyhq main"

3
asn/AS4242421037
View file

@ -1,3 +0,0 @@
NAME="LibreHouse"
OWNER="LibreHouse"
DESC=""

2
asn/AS4242421037.toml Normal file
View file

@ -0,0 +1,2 @@
name = "SUNNET"
owner = "SUNNET"

3
asn/AS4242423088
View file

@ -1,3 +0,0 @@
NAME="SUNNET"
OWNER="SUNNET"
DESC=""

2
asn/AS4242423088.toml Normal file
View file

@ -0,0 +1,2 @@
name = "Yangfl Network"
owner = "Yangfl"

6
document/asn-dir.txt
View file

@ -1,6 +1,7 @@
# as-dir Template
# ===============
# Filename format: AS<Number>
# ASN range: 4201270000 ~ 4201279999
# Remove any line which starts with '#' when applying
# AS Name
NAME=""
@ -8,7 +9,10 @@ NAME=""
OWNER=""
# Description
DESC=""
# Source of this ASN
# Possible values: "NeoNetwork", "DN42" or "INET"
SOURCE=""
# if it's a ASN registered from *NIC, this variable records
# whether members of NeoNetwork have validated its ownership yet
# possible value: "YES" "NO"
# Possible values: "YES" "NO"
VALID=""

2
document/route-dir.txt
View file

@ -36,7 +36,7 @@ Detailed Information of Each Variable
Available options are: Tinc, WireGuard, L2TP, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN, SLIRP, PPP
3. NAME: Name
4. ASN: ASN
4. ASN: ASN (without prefix "AS")
5. UPSTREAM: Upstream Node Name
6. DOWNSTREAM: Downstream Node Name
7. DESC: Description

13
entity/Icecat
View file

@ -1,13 +0,0 @@
NAME="Icecat"
DESC=""
CONTACT=(
"EMAIL:"
"TELEGRAM:@fakeicecat"
"IRC:"
"MASTODON:"
"GITHUB:Myer921"
)
BABEL=(
""
)
AUTH=""

5
entity/Icecat.toml Normal file
View file

@ -0,0 +1,5 @@
name = "Icecat"
[contact]
telegram = "fakeicecat"
github = "Myer921"

13
entity/James58899
View file

@ -1,13 +0,0 @@
NAME="James58899"
DESC=""
CONTACT=(
"EMAIL:"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:"
)
BABEL=(
""
)
AUTH=""

1
entity/James58899.toml Normal file
View file

@ -0,0 +1 @@
name = "James58899"

13
entity/JerryXiao
View file

@ -1,13 +0,0 @@
NAME="JerryXiao"
DESC=""
CONTACT=(
"EMAIL:neonet@mail.jerryxiao.cc"
"TELEGRAM:@JerryXiao"
"IRC:JerryXiao@hackint"
"MASTODON:"
"GITHUB:isjerryxiao"
)
BABEL=(
""
)
AUTH="PGP:186242204A2EC70438E9CE3B9D9CE43650FF2BAA"

10
entity/JerryXiao.toml Normal file
View file

@ -0,0 +1,10 @@
name = "JerryXiao"
[contact]
email = "neonet@mail.jerryxiao.cc"
telegram = "JerryXiao"
irc = "JerryXiao@hackint"
github = "isjerryxiao"
[persona]
pgp = "186242204A2EC70438E9CE3B9D9CE43650FF2BAA"

19
entity/Junde Yhi
View file

@ -1,19 +0,0 @@
NAME="Junde Yhi"
DESC=""
CONTACT=(
"EMAIL:lmy441900@live.com"
"TELEGRAM:@lmy441900"
"MASTODON:@lmy441900@sn.angry.im"
"GITHUB:lmy441900"
)
BABEL=(
"zh-N"
"zh-hans-N"
"zh-hant-2"
"en-3"
"de-0"
"ru-0"
"jp-0"
"fi-0"
)
AUTH="PGP:E6C74782A1FBEE741D09885FD274286F672C800A"

20
entity/Junde Yhi.toml Normal file
View file

@ -0,0 +1,20 @@
name = "Junde Yhi"
babel = [
"zh-N",
"zh-hans-N",
"zh-hant-2",
"en-3",
"de-0",
"ru-0",
"jp-0",
"fi-0",
]
[contact]
email = "lmy441900@live.com"
telegram = "lmy441900"
mastodon = "@lmy441900@sn.angry.im"
github = "lmy441900"
[persona]
pgp = "E6C74782A1FBEE741D09885FD274286F672C800A"

13
entity/LINE-NZ
View file

@ -1,13 +0,0 @@
NAME="LINE-NZ"
DESC=""
CONTACT=(
"EMAIL:dn42@line.co.nz"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:line-nz"
)
BABEL=(
"en"
)
AUTH=""

6
entity/LINE-NZ.toml Normal file
View file

@ -0,0 +1,6 @@
name = "LINE-NZ"
babel = ["en"]
[contact]
email = "dn42@line.co.nz"
github = "line-nz"

13
entity/Lan Tian
View file

@ -1,13 +0,0 @@
NAME="Lan Tian"
DESC=""
CONTACT=(
"EMAIL:"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:"
)
BABEL=(
""
)
AUTH=""

1
entity/Lan Tian.toml Normal file
View file

@ -0,0 +1 @@
name = "Lan Tian"

17
entity/LibreHouse
View file

@ -1,17 +0,0 @@
NAME="LibreHouse"
DESC=""
CONTACT=(
"EMAIL:i+noc@outv.im"
"TELEGRAM:@outvi"
"IRC:"
"MASTODON:@outvi@moe.cat"
"GITHUB:@outloudvi"
)
BABEL=(
"zh-N"
"zh-hans-N"
"zh-hant-3"
"en-2"
"ja-0"
)
AUTH=""

11
entity/LibreHouse.toml Normal file
View file

@ -0,0 +1,11 @@
name = "LibreHouse"
babel = ["zh-N", "en-2"]
[contact]
email = "i+noc@outv.im"
telegram = "outvi"
mastodon = "@outvi@moe.cat"
github = "outloudvi"
[persona]
pgp = "47627D2288B20CC033C7B7D72D83E4E89C15DA36"

13
entity/Ndoskrnl
View file

@ -1,13 +0,0 @@
NAME="Ndoskrnl"
DESC="We can start chat happily with Google Translate :)"
CONTACT=(
"EMAIL:lollipop.studio.cn@gmail.com"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:magic0whi"
)
BABEL=(
"zh|en-1"
)
AUTH=""

7
entity/Ndoskrnl.toml Normal file
View file

@ -0,0 +1,7 @@
name = "Ndoskrnl"
description = "We can start chat happily with Google Translate :)"
babel = ["en-1", "zh-1"]
[contact]
email = "lollipop.studio.cn@gmail.com"
github = "magic0whi"

14
entity/Neo_Chen
View file

@ -1,14 +0,0 @@
NAME="Neo_Chen"
DESC=""
CONTACT=(
"EMAIL:chenkolei@gmail.com"
"TELEGRAM:@Neo_Chen"
"IRC:Neo_Chen"
"MASTODON:@Neo_Chen@mastodon.xyz"
"GITHUB:NeoChen1024"
)
BABEL=(
"zh-N"
"en-2"
)
AUTH="PGP:D306BB628837043150CD1E42CA0957540FD996CD"

12
entity/Neo_Chen.toml Normal file
View file

@ -0,0 +1,12 @@
name = "Neo_Chen"
babel = ["zh-N", "en-2"]
[contact]
email = "chenkolei@gmail.com"
telegram = "Neo_Chen"
irc = "Neo_Chen"
mastodon = "@Neo_Chen@mastodon.xyz"
github = "Neo_Chen"
[persona]
pgp = "D306BB628837043150CD1E42CA0957540FD996CD"

13
entity/SUNNET
View file

@ -1,13 +0,0 @@
NAME="SUNNET"
DESC=""
CONTACT=(
"EMAIL:"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:"
)
BABEL=(
""
)
AUTH=""

1
entity/SUNNET.toml Normal file
View file

@ -0,0 +1 @@
name = "SUNNET"

13
entity/Septs
View file

@ -1,13 +0,0 @@
NAME="Septs"
DESC=""
CONTACT=(
"EMAIL:bgp@septs.email"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:"
)
BABEL=(
""
)
AUTH=""

17
entity/Staph
View file

@ -1,17 +0,0 @@
NAME="Staph"
DESC="A programming prokaryotic organism"
CONTACT=(
"EMAIL: staph@aosc.io"
"TELEGRAM: @Staph"
"IRC: Staph_aureus"
"MASTODON:"
"GITHUB: StephDC"
)
BABEL=(
"zh-N"
"en-4"
"ja-2"
"es-1"
"fr-1"
)
AUTH=""

9
entity/Staph.toml Normal file
View file

@ -0,0 +1,9 @@
name = "Staph"
description = "A programming prokaryotic organism"
babel = ["zh-N", "en-4", "ja-2", "es-1", "fr-1"]
[contact]
email = "staph@aosc.io"
telegram = "Staph"
irc = "Staph_aureus"
github = "StephDC"

13
entity/Yangfl
View file

@ -1,13 +0,0 @@
NAME="Yangfl Network"
DESC=""
CONTACT=(
"EMAIL:"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:"
)
BABEL=(
""
)
AUTH=""

1
entity/Yangfl.toml Normal file
View file

@ -0,0 +1 @@
name = "Yangfl Network"

14
entity/alanyhq
View file

@ -1,14 +0,0 @@
NAME="alanyhq"
DESC=""
CONTACT=(
"EMAIL:"
"TELEGRAM:@alanyhq"
"IRC:alanyhq"
"MASTODON:"
"GITHUB:"
)
BABEL=(
"zh-N"
"en-2"
)
AUTH=""

5
entity/alanyhq.toml Normal file
View file

@ -0,0 +1,5 @@
name = "alanyhq"
babel = ["zh-N", "en-2"]
[contact]
telegram = "alanyhq"

13
entity/chenx97
View file

@ -1,13 +0,0 @@
NAME="chenx97"
DESC=""
CONTACT=(
"EMAIL:chenx97@gmail.com"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:chenx97"
)
BABEL=(
""
)
AUTH=""

5
entity/chenx97.toml Normal file
View file

@ -0,0 +1,5 @@
name = "chenx97"
[contact]
email = "chenx97@gmail.com"
github = "chenx97"

13
entity/frank
View file

@ -1,13 +0,0 @@
NAME="frank"
DESC=""
CONTACT=(
"EMAIL:"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:"
)
BABEL=(
""
)
AUTH=""

1
entity/frank.toml Normal file
View file

@ -0,0 +1 @@
name = "frank"

13
entity/leedagee
View file

@ -1,13 +0,0 @@
NAME="leedagee"
DESC=""
CONTACT=(
"EMAIL:leedageea@gmail.com"
"TELEGRAM:@leedagee"
"IRC:lizr"
"GITHUB:leedagee"
)
BABEL=(
"zh-N"
"en-2"
)
AUTH="PGP:47627D2288B20CC033C7B7D72D83E4E89C15DA36"

8
entity/leedagee.toml Normal file
View file

@ -0,0 +1,8 @@
name = "leedagee"
babel = ["zh-N", "zh-hans-N", "zh-hant-3", "en-2", "ja-0"]
[contact]
email = "leedageea@gmail.com"
telegram = "leedagee"
irc = "lizr"
github = "leedagee"

13
entity/licson
View file

@ -1,13 +0,0 @@
NAME="licson"
DESC=""
CONTACT=(
"EMAIL:admin@licson.net"
"TELEGRAM:licson"
"IRC:licson"
"MASTODON:"
"GITHUB:licson0729"
)
BABEL=(
""
)
AUTH=""

6
entity/licson.toml Normal file
View file

@ -0,0 +1,6 @@
name = "licson"
[contact]
email = "admin@licson.net"
telegram = "licson"
github = "licson0729"

13
entity/santost12
View file

@ -1,13 +0,0 @@
NAME="santost12"
DESC=""
CONTACT=(
"EMAIL:tylersantos12@protonmail.com"
"TELEGRAM:"
"IRC:"
"MASTODON:"
"GITHUB:santost12"
)
BABEL=(
""
)
AUTH=""

5
entity/santost12.toml Normal file
View file

@ -0,0 +1,5 @@
name = "santost12"
[contact]
email = "tylersantos12@protonmail.com"
github = "santost12"

6
entity/septs.toml Normal file
View file

@ -0,0 +1,6 @@
name = "septs"
[contact]
email = "bgp@septs.email"
telegram = "septs"
github = "septs"

6
node/Icecat-GroupAccessNetwork
View file

@ -1,6 +0,0 @@
ASN="4201270005"
DESC=""
IP=(
"10.127.233.1/24"
"fd10:127:233:1c3c::1/64"
)

3
node/Icecat.toml Normal file
View file

@ -0,0 +1,3 @@
[Icecat-GroupAccessNetwork]
asn = 4201270005
cidr = ["10.127.233.1/24", "fd10:127:233:1c3c::1/64"]

4
node/James58899
View file

@ -1,4 +0,0 @@
ASN="4201270015"
DESC=""
IP=(
)

2
node/James58899.toml Normal file
View file

@ -0,0 +1,2 @@
[James58899]
asn = 4201270015

5
node/JerryXiao
View file

@ -1,5 +0,0 @@
ASN="4201270006"
DESC=""
IP=(
"10.127.x.x/x"
)

4
node/JerryXiao-HK1
View file

@ -1,4 +0,0 @@
ASN="4201270006"
DESC=""
IP=(
)

4
node/JerryXiao-HK2
View file

@ -1,4 +0,0 @@
ASN="4201270006"
DESC=""
IP=(
)

4
node/JerryXiao-SH1
View file

@ -1,4 +0,0 @@
ASN="4201270006"
DESC=""
IP=(
)

11
node/JerryXiao.toml Normal file
View file

@ -0,0 +1,11 @@
[JerryXiao]
asn = 4201270006
[JerryXiao-SH1]
asn = 4201270006
[JerryXiao-HK1]
asn = 4201270006
[JerryXiao-HK2]
asn = 4201270006

5
node/LINE-NZ-AU01
View file

@ -1,5 +0,0 @@
ASN="4201270011"
DESC="LINE-NZ Cloud"
IP=(
"10.127.22.9/29"
)

5
node/LINE-NZ-NZ01
View file

@ -1,5 +0,0 @@
ASN="4201270011"
DESC="LINE-NZ Home"
IP=(
"10.127.22.1/29"
)

9
node/LINE-NZ.toml Normal file
View file

@ -0,0 +1,9 @@
[LINE-NZ-NZ01]
asn = 4201270011
description = "LINE-NZ Home"
cidr = ["10.127.22.1/29"]
[LINE-NZ-AU01]
asn = 4201270011
description = "LINE-NZ Cloud"
cidr = ["10.127.22.9/29"]

4
node/LanTian
View file

@ -1,4 +0,0 @@
ASN="4201270010"
DESC=""
IP=(
)

Some files were not shown because too many files have changed in this diff Show more