TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-21 04:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: revert rename of pkt to sendMsg

Browse Source 
New plan, sorry.

Most reverts 77921a31b181c59c6f0f92f27614b828fc63d6e9, except some doc changes.
This commit is contained in:
Brad Fitzpatrick 2020-03-21 22:17:22 -07:00
parent c34b350efa
commit 8519a1b29f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
derp/derp_server.go
View File

@ -235,7 +235,7 @@ func (s *Server) accept(nc Conn, brw *bufio.ReadWriter, remoteAddr string) error
done: ctx.Done(), done: ctx.Done(),
remoteAddr: remoteAddr, remoteAddr: remoteAddr,
connectedAt: time.Now(), connectedAt: time.Now(),
sendQueue: make(chan sendMsg, perClientSendQueueDepth), sendQueue: make(chan pkt, perClientSendQueueDepth),
} }
if clientInfo != nil { if clientInfo != nil {
c.info = *clientInfo c.info = *clientInfo
@ -311,11 +311,11 @@ func (c *sclient) handleFrameSendPacket(ft frameType, fl uint32) error {
return nil return nil
} }
msg := sendMsg{ p := pkt{
bs: contents, bs: contents,
} }
if dst.info.Version >= protocolSrcAddrs { if dst.info.Version >= protocolSrcAddrs {
msg.src = c.key p.src = c.key
} }
// Attempt to queue for sending up to 3 times. On each attempt, if // Attempt to queue for sending up to 3 times. On each attempt, if
// the queue is full, try to drop from queue head to prioritize // the queue is full, try to drop from queue head to prioritize
@ -332,7 +332,7 @@ func (c *sclient) handleFrameSendPacket(ft frameType, fl uint32) error {
default: default:
} }
select { select {
case dst.sendQueue <- msg: case dst.sendQueue <- p:
return nil return nil
default: default:
} }
@ -471,7 +471,7 @@ type sclient struct {
logf logger.Logf logf logger.Logf
done <-chan struct{} // closed when connection closes done <-chan struct{} // closed when connection closes
remoteAddr string // usually ip:port from net.Conn.RemoteAddr().String() remoteAddr string // usually ip:port from net.Conn.RemoteAddr().String()
sendQueue chan sendMsg // messages (packets) queued to this client; never closed sendQueue chan pkt // packets queued to this client; never closed
// Owned by run, not thread-safe. // Owned by run, not thread-safe.
br *bufio.Reader br *bufio.Reader
@ -482,13 +482,13 @@ type sclient struct {
bw *bufio.Writer bw *bufio.Writer
} }
// sendMsg is a request to write a frame to an sclient (usually a data packet). // pkt is a request to write a data frame to an sclient.
type sendMsg struct { type pkt struct {
// src is the who's the sender of the packet. // src is the who's the sender of the packet.
src key.Public src key.Public
// bs is the data packet bytes. // bs is the data packet bytes.
// The memory is owned by sendMsg. // The memory is owned by pkt.
bs []byte bs []byte
// TODO(danderson): enqueue time, to measure queue latency? // TODO(danderson): enqueue time, to measure queue latency?