@ -276,7 +276,6 @@ type Conn struct {
mu sync . Mutex
mu sync . Mutex
muCond * sync . Cond
muCond * sync . Cond
started bool // Start was called
closed bool // Close was called
closed bool // Close was called
// derpCleanupTimer is the timer that fires to occasionally clean
// derpCleanupTimer is the timer that fires to occasionally clean
@ -546,17 +545,6 @@ func NewConn(opts Options) (*Conn, error) {
return c , nil
return c , nil
}
}
func ( c * Conn ) Start ( ) {
c . mu . Lock ( )
if c . started {
panic ( "duplicate Start call" )
}
c . started = true
c . mu . Unlock ( )
c . ReSTUN ( "initial" )
}
// ignoreSTUNPackets sets a STUN packet processing func that does nothing.
// ignoreSTUNPackets sets a STUN packet processing func that does nothing.
func ( c * Conn ) ignoreSTUNPackets ( ) {
func ( c * Conn ) ignoreSTUNPackets ( ) {
c . stunReceiveFunc . Store ( func ( [ ] byte , netaddr . IPPort ) { } )
c . stunReceiveFunc . Store ( func ( [ ] byte , netaddr . IPPort ) { } )
@ -1981,9 +1969,7 @@ func (c *Conn) SetPrivateKey(privateKey wgkey.Private) error {
if oldKey . IsZero ( ) {
if oldKey . IsZero ( ) {
c . everHadKey = true
c . everHadKey = true
c . logf ( "magicsock: SetPrivateKey called (init)" )
c . logf ( "magicsock: SetPrivateKey called (init)" )
if c . started {
go c . ReSTUN ( "set-private-key" )
go c . ReSTUN ( "set-private-key" )
}
} else if newKey . IsZero ( ) {
} else if newKey . IsZero ( ) {
c . logf ( "magicsock: SetPrivateKey called (zeroed)" )
c . logf ( "magicsock: SetPrivateKey called (zeroed)" )
c . closeAllDerpLocked ( "zero-private-key" )
c . closeAllDerpLocked ( "zero-private-key" )
@ -2050,9 +2036,7 @@ func (c *Conn) SetDERPMap(dm *tailcfg.DERPMap) {
return
return
}
}
if c . started {
go c . ReSTUN ( "derp-map-update" )
go c . ReSTUN ( "derp-map-update" )
}
}
}
func nodesEqual ( x , y [ ] * tailcfg . Node ) bool {
func nodesEqual ( x , y [ ] * tailcfg . Node ) bool {
@ -2476,9 +2460,6 @@ func (c *Conn) onPortMapChanged() { c.ReSTUN("portmap-changed") }
func ( c * Conn ) ReSTUN ( why string ) {
func ( c * Conn ) ReSTUN ( why string ) {
c . mu . Lock ( )
c . mu . Lock ( )
defer c . mu . Unlock ( )
defer c . mu . Unlock ( )
if ! c . started {
panic ( "call to ReSTUN before Start" )
}
if c . closed {
if c . closed {
// raced with a shutdown.
// raced with a shutdown.
return
return