lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tstest/natlab: use common helper for conn registration. 

Signed-off-by: David Anderson <danderson@tailscale.com>
reviewable/pr519/r2
David Anderson 2020-07-03 02:26:54 +00:00
parent 80a14c49c6
commit d7bc4ec029
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tstest/natlab/natlab.go
View File

@ -371,14 +371,7 @@ func (m *Machine) registerConn4(c *conn) error {
if c.ipp.IP.Is6() && c.ipp.IP != v6unspec {
return fmt.Errorf("registerConn4 got IPv6 %s", c.ipp)
}
if _, ok := m.conns4[c.ipp]; ok {
return fmt.Errorf("duplicate conn listening on %v", c.ipp)
}
if m.conns4 == nil {
m.conns4 = map[netaddr.IPPort]*conn{}
}
m.conns4[c.ipp] = c
return nil
return registerConn(&m.conns4, c)
}
func (m *Machine) unregisterConn4(c *conn) {
@ -393,14 +386,7 @@ func (m *Machine) registerConn6(c *conn) error {
if c.ipp.IP.Is4() {
return fmt.Errorf("registerConn6 got IPv4 %s", c.ipp)
}
if _, ok := m.conns6[c.ipp]; ok {
return fmt.Errorf("duplicate conn listening on %v", c.ipp)
}
if m.conns6 == nil {
m.conns6 = map[netaddr.IPPort]*conn{}
}
m.conns6[c.ipp] = c
return nil
return registerConn(&m.conns6, c)
}
func (m *Machine) unregisterConn6(c *conn) {
@ -409,6 +395,17 @@ func (m *Machine) unregisterConn6(c *conn) {
delete(m.conns6, c.ipp)
}
func registerConn(conns *map[netaddr.IPPort]*conn, c *conn) error {
if _, ok := (*conns)[c.ipp]; ok {
return fmt.Errorf("duplicate conn listening on %v", c.ipp)
}
if *conns == nil {
*conns = map[netaddr.IPPort]*conn{}
}
(*conns)[c.ipp] = c
return nil
}
func (m *Machine) AddNetwork(n *Network) {}
func (m *Machine) ListenPacket(network, address string) (net.PacketConn, error) {