TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: rename "wireguard" packet type to "other".

Browse Source 
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 <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-08-11 19:30:15 +00:00
parent 1b5b59231b
commit 13661e195a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
derp/derp_server.go
View File

@ -65,7 +65,7 @@ type Server struct {
packetsRecv, bytesRecv expvar.Int packetsRecv, bytesRecv expvar.Int
packetsRecvByKind metrics.LabelMap packetsRecvByKind metrics.LabelMap
packetsRecvDisco *expvar.Int packetsRecvDisco *expvar.Int
packetsRecvWireguard *expvar.Int packetsRecvOther *expvar.Int
packetsDropped expvar.Int packetsDropped expvar.Int
packetsDroppedReason metrics.LabelMap packetsDroppedReason metrics.LabelMap
packetsDroppedUnknown *expvar.Int // unknown dst pubkey 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{}, sentTo: map[key.Public]map[key.Public]int64{},
} }
s.packetsRecvDisco = s.packetsRecvByKind.Get("disco") 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.packetsDroppedUnknown = s.packetsDroppedReason.Get("unknown_dest")
s.packetsDroppedFwdUnknown = s.packetsDroppedReason.Get("unknown_dest_on_fwd") s.packetsDroppedFwdUnknown = s.packetsDroppedReason.Get("unknown_dest_on_fwd")
s.packetsDroppedGone = s.packetsDroppedReason.Get("gone") 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) { if disco.LooksLikeDiscoWrapper(contents) {
s.packetsRecvDisco.Add(1) s.packetsRecvDisco.Add(1)
} else { } else {
s.packetsRecvWireguard.Add(1) s.packetsRecvOther.Add(1)
} }
return dstKey, contents, nil return dstKey, contents, nil
} }