From 93ffc565e53dfd9dea6e9bf6b46b66584b78bd28 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 17 Aug 2020 16:17:56 -0700 Subject: [PATCH] derp: remove protocol version 1 support It hasn't existed for a long time and there are no current users. Fixes #199 --- derp/derp.go | 4 ---- derp/derp_server.go | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/derp/derp.go b/derp/derp.go index f3f73c455..b5fadede1 100644 --- a/derp/derp.go +++ b/derp/derp.go @@ -44,10 +44,6 @@ const ( // * version 2: received packets have src addrs in frameRecvPacket at beginning 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 // header. The second field is a big-endian uint32 describing the // length of the remaining frame (not including the initial 5 bytes). diff --git a/derp/derp_server.go b/derp/derp_server.go index 2658f01c3..fbc9fa8df 100644 --- a/derp/derp_server.go +++ b/derp/derp_server.go @@ -614,10 +614,8 @@ func (c *sclient) handleFrameSendPacket(ft frameType, fl uint32) error { } p := pkt{ - bs: contents, - } - if dst.info.Version >= protocolSrcAddrs { - p.src = c.key + bs: contents, + src: c.key, } return c.sendPkt(dst, p) }