Skip to content
This repository was archived by the owner on Oct 27, 2023. It is now read-only.

Commit e21b2f1

Browse files
zhoreeqzhoreeq
committed
Merge branch 'master' into minecraft
2 parents 910cbe5 + 35020b0 commit e21b2f1

File tree

7 files changed

+109
-97
lines changed

7 files changed

+109
-97
lines changed

‎assets/peers.txt‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,66 @@
1+
tcp://140.238.168.104:17117
12
tcp://159.203.12.215:1010
2-
tls://159.203.12.215:1020
3+
tcp://185.165.169.234:8880
34
tcp://195.123.245.146:7743
5+
tcp://[2001:470:1f13:e56::64]:39565
6+
tcp://212.129.52.193:39565
7+
tcp://213.188.197.95:10010
8+
tcp://213.188.199.150:10010
9+
tcp://213.188.210.9:10010
410
tcp://217.195.164.4:10000
5-
tcp://37.205.14.171:46370
611
tcp://[2a03:3b40:fe:ab::1]:46370
12+
tcp://[2a04:5b81:2010::90]:2000
713
tcp://[2a05:9403::8b]:7743
8-
tls://217.195.164.4:10531
9-
tcp://212.129.52.193:39565
14+
tcp://[2a09:8280:1::3:312]:10010
15+
tcp://[2a09:8280:1::3:313]:10010
16+
tcp://[2a09:8280:1::a:2e2]:10010
17+
tcp://37.205.14.171:46370
18+
tcp://46.151.26.194:60575
1019
tcp://51.15.204.214:12345
11-
tcp://[2001:470:1f13:e56::64]:39565
12-
tls://212.129.52.193:39575
13-
tls://51.15.204.214:54321
14-
tls://[2001:470:1f13:e56::64]:39575
20+
tcp://78.27.153.163:33165
1521
tcp://94.130.203.208:5999
1622
tcp://bunkertreff.ddns.net:5454
23+
tcp://curiosity.tdjs.tech:30003
24+
tcp://lancis.iscute.moe:49273
25+
tcp://lan.tdem.in:50001
26+
tcp://longseason.1200bps.xyz:13121
1727
tcp://ygg.cofob.ru:80
18-
tcp://yugudorashiru.de:80
19-
tls://ygg.cofob.ru:443
20-
tls://yugudorashiru.de:443
21-
tcp://213.188.197.95:10010
22-
tcp://[2a09:8280:1::3:313]:10010
23-
tls://213.188.197.95:10020
24-
tls://[2a09:8280:1::3:313]:10020
25-
tls://45.147.198.155:6010
26-
tls://94.103.82.150:8080
2728
tcp://yggdrasil.frank2.net:1337
28-
tcp://185.165.169.234:8880
29-
tls://185.165.169.234:8443
30-
tcp://46.151.26.194:60575
31-
tcp://lan.tdem.in:50001
32-
tcp://ygg-ru.cofob.ru:18000
33-
tcp://ygg-ru2.cofob.ru:80
3429
tcp://ygg.loskiq.dev:17313
30+
tcp://yggnode.cf:18226
31+
tcp://ygg-ru2.cofob.ru:80
32+
tcp://ygg-ru.cofob.ru:18000
3533
tcp://ygg.tomasgl.ru:61933
3634
tcp://ygg.tomasgl.ru:61933?key=c5e0c28a600c2118e986196a0bbcbda4934d8e9278ceabea48838dc5d8fae576
37-
tcp://yggnode.cf:18226
38-
tls://185.22.60.71:8443
39-
tls://46.151.26.194:8443
40-
tls://[2a01:d0:ffff:4353::2]:6010
41-
tls://lan.tdem.in:50002
42-
tls://ygg-ru.cofob.ru:18001
43-
tls://ygg-ru2.cofob.ru:443
44-
tls://ygg.loskiq.dev:17314
45-
tls://ygg.tomasgl.ru:61944
46-
tls://ygg.tomasgl.ru:61944?key=c5e0c28a600c2118e986196a0bbcbda4934d8e9278ceabea48838dc5d8fae576
47-
tls://yggnode.cf:18227
35+
tcp://yugudorashiru.de:80
4836
tcp://y.zbin.eu:7743
49-
tcp://[2a04:5b81:2010::90]:2000
37+
tls://140.238.168.104:17121
38+
tls://159.203.12.215:1020
5039
tls://185.130.44.194:7040
40+
tls://185.165.169.234:8443
41+
tls://185.22.60.71:8443
42+
tls://[2001:470:1f13:e56::64]:39575
43+
tls://212.129.52.193:39575
44+
tls://213.188.197.95:10020
45+
tls://213.188.199.150:10020
46+
tls://217.195.164.4:10531
47+
tls://[2a01:d0:ffff:4353::2]:6010
5148
tls://[2a07:e01:105:444:c634:6bff:feb5:6e28]:7040
52-
tcp://140.238.168.104:17117
53-
tls://140.238.168.104:17121
54-
tcp://78.27.153.163:33165
49+
tls://[2a09:8280:1::3:313]:10020
50+
tls://[2a09:8280:1::a:2e2]:10020
51+
tls://45.147.198.155:6010
52+
tls://46.151.26.194:8443
53+
tls://51.15.204.214:54321
5554
tls://78.27.153.163:33166
56-
tcp://curiosity.tdjs.tech:30003
57-
tcp://213.188.199.150:10010
58-
tcp://213.188.210.9:10010
59-
tcp://[2a09:8280:1::3:312]:10010
60-
tcp://[2a09:8280:1::a:2e2]:10010
61-
tcp://lancis.iscute.moe:49273
62-
tcp://longseason.1200bps.xyz:13121
55+
tls://94.103.82.150:8080
6356
tls://lancis.iscute.moe:49274
57+
tls://lan.tdem.in:50002
6458
tls://longseason.1200bps.xyz:13122
59+
tls://ygg.cofob.ru:443
60+
tls://ygg.loskiq.dev:17314
61+
tls://yggnode.cf:18227
62+
tls://ygg-ru2.cofob.ru:443
63+
tls://ygg-ru.cofob.ru:18001
64+
tls://ygg.tomasgl.ru:61944
65+
tls://ygg.tomasgl.ru:61944?key=c5e0c28a600c2118e986196a0bbcbda4934d8e9278ceabea48838dc5d8fae576
66+
tls://yugudorashiru.de:443

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/mitchellh/mapstructure v1.4.1
1414
github.com/vishvananda/netlink v1.1.0
1515
github.com/yggdrasil-network/yggdrasil-go v0.4.0
16-
github.com/zhoreeq/meshname v0.1.0
16+
github.com/zhoreeq/meshname v0.1.2
1717
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b
1818
golang.org/x/text v0.3.7-0.20210503195748-5c7c50ebbd4f
1919
)

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ github.com/yggdrasil-network/yggdrasil-go v0.4.0 h1:H2CS2pTjCTzNQMHFU7sEW3Ge59fQ
4949
github.com/yggdrasil-network/yggdrasil-go v0.4.0/go.mod h1:/iMJjOrXRsjlFgqhWOPhecOKi7xHmHiY4/En3A42Fog=
5050
github.com/zhoreeq/meshname v0.1.0 h1:o7HlQeki4zxv+iorEhmmr4qRQdA2c43/+DLjeOO1Z6g=
5151
github.com/zhoreeq/meshname v0.1.0/go.mod h1:3I8MpFZ304bAYiD+e+ovlMDDZat8aKyUlqllUok4qm0=
52+
github.com/zhoreeq/meshname v0.1.2 h1:82jjvRNx9U5OA+WgufQwu/6TFdfCaOeSaXW1ili4K0I=
53+
github.com/zhoreeq/meshname v0.1.2/go.mod h1:3I8MpFZ304bAYiD+e+ovlMDDZat8aKyUlqllUok4qm0=
5254
gitlab.com/golang-commonmark/puny v0.0.0-20191124015043-9f83538fa04f h1:Wku8eEdeJqIOFHtrfkYUByc4bCaTeA6fL0UJgfEiFMI=
5355
gitlab.com/golang-commonmark/puny v0.0.0-20191124015043-9f83538fa04f/go.mod h1:Tiuhl+njh/JIg0uS/sOJVYi0x2HEa5rc1OAaVsb5tAs=
5456
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

‎make_assets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PEER_LIST=${PEER_LIST:-"assets/peers.txt"}
77
# Create peers.go "asset" file
88
make_peers_go() {
99
PEERS_GO_FILE="src/autopeering/peers.go"
10-
printf "package autopeering\nvar PublicPeers = []string{\n" >$PEERS_GO_FILE
10+
printf "package autopeering\n\nvar PublicPeers = []string{\n" >$PEERS_GO_FILE
1111
while IFS= read -r line
1212
do
1313
printf "\t\"$line\",\n" >> $PEERS_GO_FILE

‎src/autopeering/module.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
const (
1919
linkLocalPrefix = "fe80"
20-
autopeerTimeout = time.Minute
20+
autopeerTimeout = 30 * time.Second
2121
peerCheckTimeout = 10 * time.Second
2222
)
2323

@@ -69,6 +69,7 @@ func (ap *AutoPeering) checkPeerLoop() {
6969

7070
for _, p := range ap.core.GetPeers() {
7171
if p.Remote[:4] != linkLocalPrefix {
72+
ap.log.Debugln("autopeering: remote peer is connected ", p.Remote)
7273
havePeers = true
7374
break
7475
}
@@ -77,15 +78,18 @@ func (ap *AutoPeering) checkPeerLoop() {
7778
if havePeers {
7879
ap.hadPeers = time.Now()
7980
} else if time.Since(ap.hadPeers) > autopeerTimeout {
81+
ap.log.Debugln("autopeering: adding a new peer")
8082
ap.hadPeers = time.Now()
8183
peers := RandomPick(GetClosestPeers(*ap.publicPeers, 10), 1)
8284
if len(peers) == 1 {
8385
peerUri := ap.getPeerUri(peers[0])
8486

8587
ap.log.Infoln("autopeering: adding new peer", peerUri)
86-
if err := ap.core.CallPeer(peerUri, ""); err != nil {
87-
ap.log.Infoln("autopeering: Failed to connect to peer:", err)
88-
}
88+
go func(){
89+
if err := ap.core.CallPeer(peerUri, ""); err != nil {
90+
ap.log.Infoln("autopeering: peer connection failed:", err)
91+
}
92+
}()
8993
}
9094
}
9195

‎src/autopeering/peers.go‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,69 @@
11
package autopeering
22

33
var PublicPeers = []string{
4+
"tcp://140.238.168.104:17117",
45
"tcp://159.203.12.215:1010",
5-
"tls://159.203.12.215:1020",
6+
"tcp://185.165.169.234:8880",
67
"tcp://195.123.245.146:7743",
8+
"tcp://[2001:470:1f13:e56::64]:39565",
9+
"tcp://212.129.52.193:39565",
10+
"tcp://213.188.197.95:10010",
11+
"tcp://213.188.199.150:10010",
12+
"tcp://213.188.210.9:10010",
713
"tcp://217.195.164.4:10000",
8-
"tcp://37.205.14.171:46370",
914
"tcp://[2a03:3b40:fe:ab::1]:46370",
15+
"tcp://[2a04:5b81:2010::90]:2000",
1016
"tcp://[2a05:9403::8b]:7743",
11-
"tls://217.195.164.4:10531",
12-
"tcp://212.129.52.193:39565",
17+
"tcp://[2a09:8280:1::3:312]:10010",
18+
"tcp://[2a09:8280:1::3:313]:10010",
19+
"tcp://[2a09:8280:1::a:2e2]:10010",
20+
"tcp://37.205.14.171:46370",
21+
"tcp://46.151.26.194:60575",
1322
"tcp://51.15.204.214:12345",
14-
"tcp://[2001:470:1f13:e56::64]:39565",
15-
"tls://212.129.52.193:39575",
16-
"tls://51.15.204.214:54321",
17-
"tls://[2001:470:1f13:e56::64]:39575",
23+
"tcp://78.27.153.163:33165",
1824
"tcp://94.130.203.208:5999",
1925
"tcp://bunkertreff.ddns.net:5454",
26+
"tcp://curiosity.tdjs.tech:30003",
27+
"tcp://lancis.iscute.moe:49273",
28+
"tcp://lan.tdem.in:50001",
29+
"tcp://longseason.1200bps.xyz:13121",
2030
"tcp://ygg.cofob.ru:80",
21-
"tcp://yugudorashiru.de:80",
22-
"tls://ygg.cofob.ru:443",
23-
"tls://yugudorashiru.de:443",
24-
"tcp://213.188.197.95:10010",
25-
"tcp://[2a09:8280:1::3:313]:10010",
26-
"tls://213.188.197.95:10020",
27-
"tls://[2a09:8280:1::3:313]:10020",
28-
"tls://45.147.198.155:6010",
29-
"tls://94.103.82.150:8080",
3031
"tcp://yggdrasil.frank2.net:1337",
31-
"tcp://185.165.169.234:8880",
32-
"tls://185.165.169.234:8443",
33-
"tcp://46.151.26.194:60575",
34-
"tcp://lan.tdem.in:50001",
35-
"tcp://ygg-ru.cofob.ru:18000",
36-
"tcp://ygg-ru2.cofob.ru:80",
3732
"tcp://ygg.loskiq.dev:17313",
33+
"tcp://yggnode.cf:18226",
34+
"tcp://ygg-ru2.cofob.ru:80",
35+
"tcp://ygg-ru.cofob.ru:18000",
3836
"tcp://ygg.tomasgl.ru:61933",
3937
"tcp://ygg.tomasgl.ru:61933?key=c5e0c28a600c2118e986196a0bbcbda4934d8e9278ceabea48838dc5d8fae576",
40-
"tcp://yggnode.cf:18226",
38+
"tcp://yugudorashiru.de:80",
39+
"tcp://y.zbin.eu:7743",
40+
"tls://140.238.168.104:17121",
41+
"tls://159.203.12.215:1020",
42+
"tls://185.130.44.194:7040",
43+
"tls://185.165.169.234:8443",
4144
"tls://185.22.60.71:8443",
42-
"tls://46.151.26.194:8443",
45+
"tls://[2001:470:1f13:e56::64]:39575",
46+
"tls://212.129.52.193:39575",
47+
"tls://213.188.197.95:10020",
48+
"tls://213.188.199.150:10020",
49+
"tls://217.195.164.4:10531",
4350
"tls://[2a01:d0:ffff:4353::2]:6010",
51+
"tls://[2a07:e01:105:444:c634:6bff:feb5:6e28]:7040",
52+
"tls://[2a09:8280:1::3:313]:10020",
53+
"tls://[2a09:8280:1::a:2e2]:10020",
54+
"tls://45.147.198.155:6010",
55+
"tls://46.151.26.194:8443",
56+
"tls://51.15.204.214:54321",
57+
"tls://78.27.153.163:33166",
58+
"tls://94.103.82.150:8080",
59+
"tls://lancis.iscute.moe:49274",
4460
"tls://lan.tdem.in:50002",
45-
"tls://ygg-ru.cofob.ru:18001",
46-
"tls://ygg-ru2.cofob.ru:443",
61+
"tls://longseason.1200bps.xyz:13122",
62+
"tls://ygg.cofob.ru:443",
4763
"tls://ygg.loskiq.dev:17314",
64+
"tls://yggnode.cf:18227",
65+
"tls://ygg-ru2.cofob.ru:443",
66+
"tls://ygg-ru.cofob.ru:18001",
4867
"tls://ygg.tomasgl.ru:61944",
4968
"tls://ygg.tomasgl.ru:61944?key=c5e0c28a600c2118e986196a0bbcbda4934d8e9278ceabea48838dc5d8fae576",
50-
"tls://yggnode.cf:18227",
51-
"tcp://y.zbin.eu:7743",
52-
"tcp://[2a04:5b81:2010::90]:2000",
53-
"tls://185.130.44.194:7040",
54-
"tls://[2a07:e01:105:444:c634:6bff:feb5:6e28]:7040",
55-
"tcp://140.238.168.104:17117",
56-
"tls://140.238.168.104:17121",
57-
"tcp://78.27.153.163:33165",
58-
"tls://78.27.153.163:33166",
59-
"tcp://curiosity.tdjs.tech:30003",
60-
"tcp://213.188.199.150:10010",
61-
"tcp://213.188.210.9:10010",
62-
"tcp://[2a09:8280:1::3:312]:10010",
63-
"tcp://[2a09:8280:1::a:2e2]:10010",
64-
"tcp://lancis.iscute.moe:49273",
65-
"tcp://longseason.1200bps.xyz:13121",
66-
"tls://lancis.iscute.moe:49274",
67-
"tls://longseason.1200bps.xyz:13122"}
69+
"tls://yugudorashiru.de:443"}

‎src/meshname/module.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ func (s *MeshnameServer) Init(yggcore *core.Core, yggConfig *config.NodeConfig,
2727
s.server = _meshname.New(
2828
log,
2929
popConfig.Meshname.Listen,
30-
map[string]*net.IPNet{"ygg": yggIPNet, "meshname": yggIPNet},
30+
map[string]*net.IPNet{"ygg": yggIPNet, "meshname": yggIPNet, "vapordns": yggIPNet},
31+
false, // enable meship protocol
32+
false, // allow remote queries
3133
)
3234

3335
if dnsRecords, err := _meshname.ParseDNSRecordsMap(popConfig.Meshname.Config); err == nil {

0 commit comments

Comments
 (0)