lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

derp: remove protocol version 1 support 

It hasn't existed for a long time and there are no current users.

Fixes #199
reviewable/pr692/r1
Brad Fitzpatrick 2020-08-17 16:17:56 -07:00
parent 6b80bcf112
commit 93ffc565e5
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
derp/derp.go
View File

@ -44,10 +44,6 @@ const (
// * version 2: received packets have src addrs in frameRecvPacket at beginning // * version 2: received packets have src addrs in frameRecvPacket at beginning
const protocolVersion = 2 const protocolVersion = 2
const (
protocolSrcAddrs = 2 // protocol version at which client expects src addresses
)
// frameType is the one byte frame type at the beginning of the frame // frameType is the one byte frame type at the beginning of the frame
// header. The second field is a big-endian uint32 describing the // header. The second field is a big-endian uint32 describing the
// length of the remaining frame (not including the initial 5 bytes). // length of the remaining frame (not including the initial 5 bytes).

6
derp/derp_server.go
View File

@ -614,10 +614,8 @@ func (c *sclient) handleFrameSendPacket(ft frameType, fl uint32) error {
} }
p := pkt{ p := pkt{
bs: contents, bs: contents,
} src: c.key,
if dst.info.Version >= protocolSrcAddrs {
p.src = c.key
} }
return c.sendPkt(dst, p) return c.sendPkt(dst, p)
} }