From 13661e195a6ab6d0886702db431fb6e548391e71 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 11 Aug 2020 19:30:15 +0000 Subject: [PATCH] derp: rename "wireguard" packet type to "other". Strictly speaking, we don't know that it's a wireguard packet, just that it doesn't look like a disco packet. Signed-off-by: David Anderson --- derp/derp_server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/derp/derp_server.go b/derp/derp_server.go index a3b18deca..cc43ce325 100644 --- a/derp/derp_server.go +++ b/derp/derp_server.go @@ -65,7 +65,7 @@ type Server struct { packetsRecv, bytesRecv expvar.Int packetsRecvByKind metrics.LabelMap packetsRecvDisco *expvar.Int - packetsRecvWireguard *expvar.Int + packetsRecvOther *expvar.Int packetsDropped expvar.Int packetsDroppedReason metrics.LabelMap packetsDroppedUnknown *expvar.Int // unknown dst pubkey @@ -151,7 +151,7 @@ func NewServer(privateKey key.Private, logf logger.Logf) *Server { sentTo: map[key.Public]map[key.Public]int64{}, } s.packetsRecvDisco = s.packetsRecvByKind.Get("disco") - s.packetsRecvWireguard = s.packetsRecvByKind.Get("wireguard") + s.packetsRecvOther = s.packetsRecvByKind.Get("other") s.packetsDroppedUnknown = s.packetsDroppedReason.Get("unknown_dest") s.packetsDroppedFwdUnknown = s.packetsDroppedReason.Get("unknown_dest_on_fwd") s.packetsDroppedGone = s.packetsDroppedReason.Get("gone") @@ -761,7 +761,7 @@ func (s *Server) recvPacket(br *bufio.Reader, frameLen uint32) (dstKey key.Publi if disco.LooksLikeDiscoWrapper(contents) { s.packetsRecvDisco.Add(1) } else { - s.packetsRecvWireguard.Add(1) + s.packetsRecvOther.Add(1) } return dstKey, contents, nil }