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

add flag to demo hard-vs-easy quickly

Browse Source 
Change-Id: I48945c0b84e7e863b71dd6bdf97cd41b3b1e81bb
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2024-07-28 19:53:25 -07:00
parent 38aa2687ac
commit ba5ada52ad
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
natlab/natlabd/nat.go
View File

@ -159,12 +159,13 @@ func (n *easyNAT) PickOutgoingSrc(src, dst netip.AddrPort, at time.Time) (wanSrc
// position and looping back around to the start. // position and looping back around to the start.
start := rand.N(uint16(32 << 10)) start := rand.N(uint16(32 << 10))
for off := range uint16(32 << 10) { for off := range uint16(32 << 10) {
port := 32<<10 + (start + off) port := 32<<10 + (start+off)%(32<<10)
if _, ok := n.in[port]; !ok { if _, ok := n.in[port]; !ok {
wanAddr := netip.AddrPortFrom(n.wanIP, port)
// Found a free port. // Found a free port.
mak.Set(&n.out, src, portMappingAndTime{port: port, at: at}) mak.Set(&n.out, src, portMappingAndTime{port: port, at: at})
mak.Set(&n.in, port, lanAddrAndTime{lanAddr: src, at: at}) mak.Set(&n.in, port, lanAddrAndTime{lanAddr: src, at: at})
return netip.AddrPortFrom(n.wanIP, port) return wanAddr
} }
} }
return netip.AddrPort{} // failed to allocate a mapping; TODO: fire an alert? return netip.AddrPort{} // failed to allocate a mapping; TODO: fire an alert?

16
natlab/natlabd/natlabd.go
View File

@ -45,6 +45,7 @@ import (
var ( var (
listen = flag.String("listen", "/tmp/qemu.sock", "path to listen on") listen = flag.String("listen", "/tmp/qemu.sock", "path to listen on")
hard = flag.Bool("hard", false, "use hard NAT")
) )
const nicID = 1 const nicID = 1
@ -68,6 +69,7 @@ func main() {
} }
// Hard-coded world shape for me. // Hard-coded world shape for me.
net1 := &network{ net1 := &network{
s: s, s: s,
mac: MAC{0x52, 0x54, 0x00, 0x01, 0x01, 0x01}, mac: MAC{0x52, 0x54, 0x00, 0x01, 0x01, 0x01},
@ -81,7 +83,7 @@ func main() {
} }
s.nodes[node1.mac] = node1 s.nodes[node1.mac] = node1
net1.SetNATTable(&hardNAT{wanIP: net1.wanIP}) net1.InitNAT(*hard)
net2 := &network{ net2 := &network{
s: s, s: s,
mac: MAC{0x52, 0x54, 0x00, 0x01, 0x01, 0x2}, mac: MAC{0x52, 0x54, 0x00, 0x01, 0x01, 0x2},
@ -94,7 +96,7 @@ func main() {
lanIP: netip.MustParseAddr("10.2.0.102"), lanIP: netip.MustParseAddr("10.2.0.102"),
} }
s.nodes[node2.mac] = node2 s.nodes[node2.mac] = node2
net2.SetNATTable(&oneToOneNAT{wanIP: net2.wanIP, lanIP: node2.lanIP}) net2.InitNAT(*hard)
if err := s.checkWorld(); err != nil { if err := s.checkWorld(); err != nil {
log.Fatalf("checkWorld: %v", err) log.Fatalf("checkWorld: %v", err)
@ -197,6 +199,14 @@ func (s *Server) checkWorld() error {
return nil return nil
} }
func (n *network) InitNAT(useHardNAT bool) {
if useHardNAT {
n.SetNATTable(&hardNAT{wanIP: n.wanIP})
} else {
n.SetNATTable(&easyNAT{wanIP: n.wanIP})
}
}
func (n *network) SetNATTable(nt NATTable) { func (n *network) SetNATTable(nt NATTable) {
n.natMu.Lock() n.natMu.Lock()
defer n.natMu.Unlock() defer n.natMu.Unlock()
@ -676,7 +686,7 @@ func (n *network) HandleUDPPacket(p UDPPacket) {
} }
node, ok := n.nodesByIP[dst.Addr()] node, ok := n.nodesByIP[dst.Addr()]
if !ok { if !ok {
log.Printf("no node for dest IP %v", dst.Addr()) log.Printf("no node for dest IP %v in UDP packet %v=>%v", dst.Addr(), p.Src, p.Dst)
return return
} }