cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-22 16:30:27 +00:00
Code Releases Activity

Merge pull request #239 from neilalexander/getroutes

Browse Source 
CKR tweaks
This commit is contained in:
Arceliar 2018-12-10 17:27:58 -06:00 committed by GitHub
commit 977a0e7215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/yggdrasil/admin.go
View File

@ -268,11 +268,11 @@ func (a *admin) init(c *Core, listenaddr string) {
return admin_info{"source_subnets": subnets}, nil return admin_info{"source_subnets": subnets}, nil
}) })
a.addHandler("getRoutes", []string{}, func(in admin_info) (admin_info, error) { a.addHandler("getRoutes", []string{}, func(in admin_info) (admin_info, error) {
var routes []string routes := make(admin_info)
a.core.router.doAdmin(func() { a.core.router.doAdmin(func() {
getRoutes := func(ckrs []cryptokey_route) { getRoutes := func(ckrs []cryptokey_route) {
for _, ckr := range ckrs { for _, ckr := range ckrs {
routes = append(routes, fmt.Sprintf("%s via %s", ckr.subnet.String(), hex.EncodeToString(ckr.destination[:]))) routes[ckr.subnet.String()] = hex.EncodeToString(ckr.destination[:])
} }
} }
getRoutes(a.core.router.cryptokey.ipv4routes) getRoutes(a.core.router.cryptokey.ipv4routes)

10
src/yggdrasil/ckr.go
View File

@ -241,6 +241,16 @@ func (c *cryptokey) getPublicKeyForAddress(addr address, addrlen int) (boxPubKey
for _, route := range *routingtable { for _, route := range *routingtable {
// Does this subnet match the given IP? // Does this subnet match the given IP?
if route.subnet.Contains(ip) { if route.subnet.Contains(ip) {
// Check if the routing cache is above a certain size, if it is evict
// a random entry so we can make room for this one. We take advantage
// of the fact that the iteration order is random here
for k := range *routingcache {
if len(*routingcache) < 1024 {
break
}
delete(*routingcache, k)
}
// Cache the entry for future packets to get a faster lookup // Cache the entry for future packets to get a faster lookup
(*routingcache)[addr] = route (*routingcache)[addr] = route