mirror of
https://github.com/tailscale/tailscale.git
synced 2025-08-11 21:27:31 +00:00
net/{netx,memnet},all: add netx.DialFunc, move memnet Network impl
This adds netx.DialFunc, unifying a type we have a bazillion other
places, giving it now a nice short name that's clickable in
editors, etc.
That highlighted that my earlier move (03b47a55c7
) of stuff from
nettest into netx moved too much: it also dragged along the memnet
impl, meaning all users of netx.DialFunc who just wanted netx for the
type definition were instead also pulling in all of memnet.
So move the memnet implementation netx.Network into memnet, a package
we already had.
Then use netx.DialFunc in a bunch of places. I'm sure I missed some.
And plenty remain in other repos, to be updated later.
Updates tailscale/corp#27636
Change-Id: I7296cd4591218e8624e214f8c70dab05fb884e95
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:

committed by
Brad Fitzpatrick

parent
b95df54b06
commit
fb96137d79
@@ -6,3 +6,82 @@
|
||||
// in tests and other situations where you don't want to use the
|
||||
// network.
|
||||
package memnet
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/netip"
|
||||
"sync"
|
||||
|
||||
"tailscale.com/net/netx"
|
||||
)
|
||||
|
||||
var _ netx.Network = (*Network)(nil)
|
||||
|
||||
// Network implements [Network] using an in-memory network, usually
|
||||
// used for testing.
|
||||
//
|
||||
// As of 2025-04-08, it only supports TCP.
|
||||
//
|
||||
// Its zero value is a valid [netx.Network] implementation.
|
||||
type Network struct {
|
||||
mu sync.Mutex
|
||||
lns map[string]*Listener // address -> listener
|
||||
}
|
||||
|
||||
func (m *Network) Listen(network, address string) (net.Listener, error) {
|
||||
if network != "tcp" && network != "tcp4" && network != "tcp6" {
|
||||
return nil, fmt.Errorf("memNetwork: Listen called with unsupported network %q", network)
|
||||
}
|
||||
ap, err := netip.ParseAddrPort(address)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("memNetwork: Listen called with invalid address %q: %w", address, err)
|
||||
}
|
||||
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
|
||||
if m.lns == nil {
|
||||
m.lns = make(map[string]*Listener)
|
||||
}
|
||||
port := ap.Port()
|
||||
for {
|
||||
if port == 0 {
|
||||
port = 33000
|
||||
}
|
||||
key := net.JoinHostPort(ap.Addr().String(), fmt.Sprint(port))
|
||||
_, ok := m.lns[key]
|
||||
if ok {
|
||||
if ap.Port() != 0 {
|
||||
return nil, fmt.Errorf("memNetwork: Listen called with duplicate address %q", address)
|
||||
}
|
||||
port++
|
||||
continue
|
||||
}
|
||||
ln := Listen(key)
|
||||
m.lns[key] = ln
|
||||
return ln, nil
|
||||
}
|
||||
}
|
||||
|
||||
func (m *Network) NewLocalTCPListener() net.Listener {
|
||||
ln, err := m.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("memNetwork: failed to create local TCP listener: %v", err))
|
||||
}
|
||||
return ln
|
||||
}
|
||||
|
||||
func (m *Network) Dial(ctx context.Context, network, address string) (net.Conn, error) {
|
||||
if network != "tcp" && network != "tcp4" && network != "tcp6" {
|
||||
return nil, fmt.Errorf("memNetwork: Dial called with unsupported network %q", network)
|
||||
}
|
||||
m.mu.Lock()
|
||||
ln, ok := m.lns[address]
|
||||
m.mu.Unlock()
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("memNetwork: Dial called on unknown address %q", address)
|
||||
}
|
||||
return ln.Dial(ctx, network, address)
|
||||
}
|
||||
|
Reference in New Issue
Block a user