yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 11:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify flowkey stuff further.

Browse source
This commit is contained in:
cathugger 2018-07-30 02:15:57 +00:00
parent 36dcab9300
commit 68a482ed92
No known key found for this signature in database
GPG key ID: 9BADDA2DAF6F01A8
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/yggdrasil/session.go
View file

@ -426,30 +426,30 @@ func (sinfo *sessionInfo) doSend(bs []byte) {
return return
} // To prevent using empty session keys } // To prevent using empty session keys
var coords []byte
// Read IPv6 flowlabel field (20 bits). // Read IPv6 flowlabel field (20 bits).
// Assumes packet at least contains IPv6 header. // Assumes packet at least contains IPv6 header.
flowlabel := uint(bs[1]&0x0f)<<16 | uint(bs[2])<<8 | uint(bs[3]) flowkey := uint64(bs[1]&0x0f)<<16 | uint64(bs[2])<<8 | uint64(bs[3])
if flowlabel != 0 { if flowkey == 0 /* not specified */ &&
len(bs) >= 48 /* min UDP len, others are bigger */ &&
(bs[6] == 0x06 || bs[6] == 0x11 || bs[6] == 0x84) /* TCP UDP SCTP */ {
// if flowlabel was unspecified (0), try to use known protocols' ports
// protokey: proto | sport | dport
flowkey = uint64(bs[6])<<32 /* proto */ |
uint64(bs[40])<<24 | uint64(bs[41])<<16 /* sport */ |
uint64(bs[42])<<8 | uint64(bs[43]) /* dport */
}
var coords []byte
if flowkey != 0 {
// Now we append something to the coords // Now we append something to the coords
// Specifically, we append a 0, and then arbitrary data // Specifically, we append a 0, and then arbitrary data
// The 0 ensures that the destination node switch forwards to the self peer (router) // The 0 ensures that the destination node switch forwards to the self peer (router)
// The rest is ignored, but it's still part as the coords, so it affects switch queues // The rest is ignored, but it's still part as the coords, so it affects switch queues
// This helps separate traffic streams (coords, flowlabel) to be queued independently // This helps separate traffic streams (coords, flowlabel) to be queued independently
coords = append(coords, sinfo.coords...) // Start with the real coords // TODO could we avoid allocations there and put this work into wire_trafficPacket.encode()?
coords = append(coords, 0) // Then target the local switchport coords = append(coords, sinfo.coords...) // Start with the real coords
coords = wire_put_uint64(uint64(flowlabel), coords) // Then variable-length encoded flowlabel coords = append(coords, 0) // Then target the local switchport
} else if len(bs) >= 48 /* min UDP len, others are bigger */ && coords = wire_put_uint64(flowkey, coords) // Then variable-length encoded flowkey
(bs[6] == 0x06 || bs[6] == 0x11 || bs[6] == 0x84) /* TCP UDP SCTP */ {
// if flowlabel was unspecified (0), try to use known protocols' ports
// protokey: proto | sport | dport
pkey := uint64(bs[6])<<32 /* proto */ |
uint64(bs[40])<<24 | uint64(bs[41])<<16 /* sport */ |
uint64(bs[42])<<8 | uint64(bs[43]) /* dport */
coords = append(coords, sinfo.coords...) // Start with the real coords
coords = append(coords, 0) // Then target the local switchport
coords = wire_put_uint64(pkey, coords) // Then variable-length encoded protokey
} else { } else {
// flowlabel was unspecified (0) and protocol unrecognised. // flowlabel was unspecified (0) and protocol unrecognised.
// To save bytes, we're not including it, therefore we won't need self-port override either. // To save bytes, we're not including it, therefore we won't need self-port override either.