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

Clean up / clarify coords sending code.

Browse Source
This commit is contained in:
cathugger 2018-07-30 00:01:37 +00:00
parent 11b0a82c4a
commit fec7100898
No known key found for this signature in database
GPG Key ID: 9BADDA2DAF6F01A8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/yggdrasil/session.go
View File

@ -428,7 +428,7 @@ func (sinfo *sessionInfo) doSend(bs []byte) {
var coords []byte var coords []byte
// Read IPv6 flowlabel field (20 bits). // Read IPv6 flowlabel field (20 bits).
// XXX(cathugger): is len(bs) validated there? // Assumes packet at least contains IPv6 header.
flowlabel := uint(bs[1]&0x0f)<<16 | uint(bs[2])<<8 | uint(bs[3]) flowlabel := uint(bs[1]&0x0f)<<16 | uint(bs[2])<<8 | uint(bs[3])
if flowlabel != 0 { if flowlabel != 0 {
// Now we append something to the coords // Now we append something to the coords
@ -439,12 +439,13 @@ func (sinfo *sessionInfo) doSend(bs []byte) {
coords = append(coords, sinfo.coords...) // Start with the real coords coords = append(coords, sinfo.coords...) // Start with the real coords
coords = append(coords, 0) // Then target the local switchport coords = append(coords, 0) // Then target the local switchport
coords = append(coords, wire_encode_uint64(uint64(flowlabel))...) // Then variable-length encoded flowlabel coords = wire_put_uint64(uint64(flowlabel), coords) // Then variable-length encoded flowlabel
} else { } else {
// 0 value means that flowlabels aren't being generated by OS. // 0 value means that flowlabels aren't being generated by OS.
// 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.
// So just use sinfo.coords directly to avoid golang GC allocations. // So just use sinfo.coords directly to avoid golang GC allocations.
// XXX: investigate where flowlabels aren't included, and attempt to look into TCP/UDP/SCTP/DCCP headers' sport/dport fields? // Recent enough Linux kernel supports flowlabels out of the box so this will be rare.
// XXX Attempt to look into TCP/UDP/SCTP/DCCP headers' sport/dport fields there?
coords = sinfo.coords coords = sinfo.coords
} }
payload, nonce := boxSeal(&sinfo.sharedSesKey, bs, &sinfo.myNonce) payload, nonce := boxSeal(&sinfo.sharedSesKey, bs, &sinfo.myNonce)