TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-03 14:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: cleanup incomingFile (#9678)

Browse Source 
This is being moved to taildrop, so clean it up to stop depending
on so much unreleated functionality by removing a dependency
on peerAPIHandler.

Updates tailscale/corp#14772

Signed-off-by: Joe Tsai <joetsai@digital-static.net>
Co-authored-by: Rhea Ghosh <rhea@tailscale.com>
This commit is contained in:
Joe Tsai 2023-10-05 16:26:06 -07:00 committed by GitHub
parent 3ee756757b
commit c42398b5b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipn/ipnlocal/peerapi.go
View File

@ -39,6 +39,7 @@ import (
"tailscale.com/net/sockstats" "tailscale.com/net/sockstats"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/taildrop" "tailscale.com/taildrop"
"tailscale.com/tstime"
"tailscale.com/types/views" "tailscale.com/types/views"
"tailscale.com/util/clientmetric" "tailscale.com/util/clientmetric"
"tailscale.com/version/distro" "tailscale.com/version/distro"
@ -586,11 +587,13 @@ func (h *peerAPIHandler) handleServeSockStats(w http.ResponseWriter, r *http.Req
} }
type incomingFile struct { type incomingFile struct {
clock tstime.Clock
name string // "foo.jpg" name string // "foo.jpg"
started time.Time started time.Time
size int64 // or -1 if unknown; never 0 size int64 // or -1 if unknown; never 0
w io.Writer // underlying writer w io.Writer // underlying writer
ph *peerAPIHandler sendFileNotify func() // called when done
partialPath string // non-empty in direct mode partialPath string // non-empty in direct mode
mu sync.Mutex mu sync.Mutex
@ -603,25 +606,23 @@ func (f *incomingFile) markAndNotifyDone() {
f.mu.Lock() f.mu.Lock()
f.done = true f.done = true
f.mu.Unlock() f.mu.Unlock()
b := f.ph.ps.b f.sendFileNotify()
b.sendFileNotify()
} }
func (f *incomingFile) Write(p []byte) (n int, err error) { func (f *incomingFile) Write(p []byte) (n int, err error) {
n, err = f.w.Write(p) n, err = f.w.Write(p)
b := f.ph.ps.b
var needNotify bool var needNotify bool
defer func() { defer func() {
if needNotify { if needNotify {
b.sendFileNotify() f.sendFileNotify()
} }
}() }()
if n > 0 { if n > 0 {
f.mu.Lock() f.mu.Lock()
defer f.mu.Unlock() defer f.mu.Unlock()
f.copied += int64(n) f.copied += int64(n)
now := b.clock.Now() now := f.clock.Now()
if f.lastNotify.IsZero() || now.Sub(f.lastNotify) > time.Second { if f.lastNotify.IsZero() || now.Sub(f.lastNotify) > time.Second {
f.lastNotify = now f.lastNotify = now
needNotify = true needNotify = true
@ -760,11 +761,12 @@ func (h *peerAPIHandler) handlePeerPut(w http.ResponseWriter, r *http.Request) {
var inFile *incomingFile var inFile *incomingFile
if r.ContentLength != 0 { if r.ContentLength != 0 {
inFile = &incomingFile{ inFile = &incomingFile{
clock: h.ps.b.clock,
name: baseName, name: baseName,
started: h.ps.b.clock.Now(), started: h.ps.b.clock.Now(),
size: r.ContentLength, size: r.ContentLength,
w: f, w: f,
ph: h, sendFileNotify: h.ps.b.sendFileNotify,
} }
if h.ps.taildrop.DirectFileMode { if h.ps.taildrop.DirectFileMode {
inFile.partialPath = partialFile inFile.partialPath = partialFile