archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vnet: add network.logf

Browse Source 
Updates #13038

Change-Id: Ia5a9359b8bfa18264d64600dfa1ef01eb8728dc2
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
dependabot/go_modules/github.com/docker/docker-26.1.5incompatible
Brad Fitzpatrick 3 months ago committed by Maisem Ali
parent 082e46b48d
commit 17a10f702f
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
tstest/natlab/vnet/conf.go
Unescape Escape View File

@ -6,9 +6,11 @@ package vnet
import ( import (
"cmp" "cmp"
"fmt" "fmt"
"log"
"net/netip" "net/netip"
"slices" "slices"
"tailscale.com/types/logger"
"tailscale.com/util/set" "tailscale.com/util/set"
) )
@ -181,6 +183,7 @@ func (s *Server) initFromConfig(c *Config) error {
wanIP: conf.wanIP, wanIP: conf.wanIP,
lanIP: conf.lanIP, lanIP: conf.lanIP,
nodesByIP: map[netip.Addr]*node{}, nodesByIP: map[netip.Addr]*node{},
logf: logger.WithPrefix(log.Printf, fmt.Sprintf("[net-%v] ", conf.mac)),
} }
netOfConf[conf] = n netOfConf[conf] = n
s.networks.Add(n) s.networks.Add(n)

35
tstest/natlab/vnet/vnet.go
Unescape Escape View File

@ -407,6 +407,7 @@ type network struct {
wanIP netip.Addr wanIP netip.Addr
lanIP netip.Prefix // with host bits set (e.g. 192.168.2.1/24) lanIP netip.Prefix // with host bits set (e.g. 192.168.2.1/24)
nodesByIP map[netip.Addr]*node nodesByIP map[netip.Addr]*node
logf func(format string, args ...any)
ns *stack.Stack ns *stack.Stack
linkEP *channel.Endpoint linkEP *channel.Endpoint
@ -722,7 +723,7 @@ func (n *network) writeEth(res []byte) {
return return
} }
if srcMAC == dstMAC { if srcMAC == dstMAC {
log.Printf("dropping write of packet from %v to itself", srcMAC) n.logf("dropping write of packet from %v to itself", srcMAC)
return return
} }
if writeFunc, ok := n.writeFunc.Load(dstMAC); ok { if writeFunc, ok := n.writeFunc.Load(dstMAC); ok {
@ -739,12 +740,12 @@ func (n *network) HandleEthernetPacket(ep EthernetPacket) {
switch ep.le.EthernetType { switch ep.le.EthernetType {
default: default:
log.Printf("Dropping non-IP packet: %v", ep.le.EthernetType) n.logf("Dropping non-IP packet: %v", ep.le.EthernetType)
return return
case layers.EthernetTypeARP: case layers.EthernetTypeARP:
res, err := n.createARPResponse(packet) res, err := n.createARPResponse(packet)
if err != nil { if err != nil {
log.Printf("createARPResponse: %v", err) n.logf("createARPResponse: %v", err)
} else { } else {
n.writeEth(res) n.writeEth(res)
} }
@ -774,7 +775,7 @@ func (n *network) HandleEthernetPacket(ep EthernetPacket) {
func (n *network) HandleUDPPacket(p UDPPacket) { func (n *network) HandleUDPPacket(p UDPPacket) {
dst := n.doNATIn(p.Src, p.Dst) dst := n.doNATIn(p.Src, p.Dst)
if !dst.IsValid() { if !dst.IsValid() {
log.Printf("Warning: NAT dropped packet; no mapping for %v=>%v", p.Src, p.Dst) n.logf("Warning: NAT dropped packet; no mapping for %v=>%v", p.Src, p.Dst)
return return
} }
p.Dst = dst p.Dst = dst
@ -791,7 +792,7 @@ func (n *network) WriteUDPPacketNoNAT(p UDPPacket) {
src, dst := p.Src, p.Dst src, dst := p.Src, p.Dst
node, ok := n.nodesByIP[dst.Addr()] node, ok := n.nodesByIP[dst.Addr()]
if !ok { if !ok {
log.Printf("no node for dest IP %v in UDP packet %v=>%v", dst.Addr(), p.Src, p.Dst) n.logf("no node for dest IP %v in UDP packet %v=>%v", dst.Addr(), p.Src, p.Dst)
return return
} }
@ -816,7 +817,7 @@ func (n *network) WriteUDPPacketNoNAT(p UDPPacket) {
buffer := gopacket.NewSerializeBuffer() buffer := gopacket.NewSerializeBuffer()
options := gopacket.SerializeOptions{FixLengths: true, ComputeChecksums: true} options := gopacket.SerializeOptions{FixLengths: true, ComputeChecksums: true}
if err := gopacket.SerializeLayers(buffer, options, eth, ip, udp, gopacket.Payload(p.Payload)); err != nil { if err := gopacket.SerializeLayers(buffer, options, eth, ip, udp, gopacket.Payload(p.Payload)); err != nil {
log.Printf("serializing UDP: %v", err) n.logf("serializing UDP: %v", err)
return return
} }
ethRaw := buffer.Bytes() ethRaw := buffer.Bytes()
@ -843,7 +844,7 @@ func (n *network) HandleEthernetIPv4PacketForRouter(ep EthernetPacket) {
if isDHCPRequest(packet) { if isDHCPRequest(packet) {
res, err := n.s.createDHCPResponse(packet) res, err := n.s.createDHCPResponse(packet)
if err != nil { if err != nil {
log.Printf("createDHCPResponse: %v", err) n.logf("createDHCPResponse: %v", err)
return return
} }
writePkt(res) writePkt(res)
@ -860,7 +861,7 @@ func (n *network) HandleEthernetIPv4PacketForRouter(ep EthernetPacket) {
// on gateway instead? // on gateway instead?
res, err := n.s.createDNSResponse(packet) res, err := n.s.createDNSResponse(packet)
if err != nil { if err != nil {
log.Printf("createDNSResponse: %v", err) n.logf("createDNSResponse: %v", err)
return return
} }
writePkt(res) writePkt(res)
@ -1214,15 +1215,15 @@ func (n *network) doNATIn(src, dst netip.AddrPort) (newDst netip.AddrPort) {
// First see if there's a port mapping, before doing NAT. // First see if there's a port mapping, before doing NAT.
if lanAP, ok := n.portMap[dst]; ok { if lanAP, ok := n.portMap[dst]; ok {
if now.Before(lanAP.expiry) { if now.Before(lanAP.expiry) {
log.Printf("XXX NAT: doNatIn: port mapping %v=>%v", dst, lanAP.dst) n.logf("XXX NAT: doNatIn: port mapping %v=>%v", dst, lanAP.dst)
return lanAP.dst return lanAP.dst
} }
log.Printf("XXX NAT: doNatIn: port mapping EXPIRED for %v=>%v", dst, lanAP.dst) n.logf("XXX NAT: doNatIn: port mapping EXPIRED for %v=>%v", dst, lanAP.dst)
delete(n.portMap, dst) delete(n.portMap, dst)
return netip.AddrPort{} return netip.AddrPort{}
} }
if len(n.portMap) > 0 { if len(n.portMap) > 0 {
log.Printf("XXX NAT: doNatIn: no port mapping for %v; have %v", dst, n.portMap) n.logf("XXX NAT: doNatIn: no port mapping for %v; have %v", dst, n.portMap)
} }
return n.natTable.PickIncomingDst(src, dst, now) return n.natTable.PickIncomingDst(src, dst, now)
@ -1273,7 +1274,7 @@ func (n *network) doPortMap(src netip.Addr, dstLANPort, wantExtPort uint16, sec
dst: dst, dst: dst,
expiry: time.Now().Add(time.Duration(sec) * time.Second), expiry: time.Now().Add(time.Duration(sec) * time.Second),
}) })
log.Printf("XXX allocated NAT mapping from %v to %v", wanAP, dst) n.logf("XXX allocated NAT mapping from %v to %v", wanAP, dst)
return wanAP.Port(), true return wanAP.Port(), true
} }
wantExtPort = rand.N(uint16(32<<10)) + 32<<10 wantExtPort = rand.N(uint16(32<<10)) + 32<<10
@ -1370,7 +1371,7 @@ func (n *network) handleNATPMPRequest(req UDPPacket) {
lifetimeSec := binary.BigEndian.Uint32(req.Payload[8:12]) lifetimeSec := binary.BigEndian.Uint32(req.Payload[8:12])
gotPort, ok := n.doPortMap(req.Src.Addr(), internalPort, wantExtPort, int(lifetimeSec)) gotPort, ok := n.doPortMap(req.Src.Addr(), internalPort, wantExtPort, int(lifetimeSec))
if !ok { if !ok {
log.Printf("NAT-PMP map request for %v:%d failed", req.Src.Addr(), internalPort) n.logf("NAT-PMP map request for %v:%d failed", req.Src.Addr(), internalPort)
return return
} }
res := make([]byte, 0, 16) res := make([]byte, 0, 16)
@ -1390,8 +1391,8 @@ func (n *network) handleNATPMPRequest(req UDPPacket) {
}) })
return return
} }
log.Printf("TODO: handle NAT-PMP packet % 02x", req.Payload)
n.logf("TODO: handle NAT-PMP packet % 02x", req.Payload)
} }
// UDPPacket is a UDP packet. // UDPPacket is a UDP packet.
@ -1419,7 +1420,7 @@ type agentConn struct {
} }
func (s *Server) addIdleAgentConn(ac *agentConn) { func (s *Server) addIdleAgentConn(ac *agentConn) {
log.Printf("got agent conn from %v", ac.node.mac) //log.Printf("got agent conn from %v", ac.node.mac)
s.mu.Lock() s.mu.Lock()
defer s.mu.Unlock() defer s.mu.Unlock()
@ -1438,7 +1439,7 @@ func (s *Server) takeAgentConn(ctx context.Context, n *node) (_ *agentConn, ok b
for { for {
ac, ok := s.takeAgentConnOne(n) ac, ok := s.takeAgentConnOne(n)
if ok { if ok {
log.Printf("got agent conn for %v", n.mac) //log.Printf("got agent conn for %v", n.mac)
return ac, true return ac, true
} }
s.mu.Lock() s.mu.Lock()
@ -1446,7 +1447,7 @@ func (s *Server) takeAgentConn(ctx context.Context, n *node) (_ *agentConn, ok b
mak.Set(&s.agentConnWaiter, n, ready) mak.Set(&s.agentConnWaiter, n, ready)
s.mu.Unlock() s.mu.Unlock()
log.Printf("waiting for agent conn for %v", n.mac) //log.Printf("waiting for agent conn for %v", n.mac)
select { select {
case <-ctx.Done(): case <-ctx.Done():
return nil, false return nil, false

Write Preview
Loading…
Cancel
Save