netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow SLAAC to work without requiring an NDP dispatcher.

Browse Source 
Before this change, a non-nil NDPDisp was required to make AutoGenLinkLocal
(i.e. SLAAC) work in netstack.

PiperOrigin-RevId: 546128157
This commit is contained in:
Christopher Koch
2023-07-06 16:59:06 -07:00
committed by gVisor bot
parent 887fc5ef82
commit e91eeea83f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tcpip/network/ipv6/ndp.go
+5 -8
View File
@@ -1140,12 +1140,6 @@ func (ndp *ndpState) doSLAAC(prefix tcpip.Subnet, pl, vl time.Duration) {
//
// The IPv6 endpoint that ndp belongs to MUST be locked.
func (ndp *ndpState) addAndAcquireSLAACAddr(addr tcpip.AddressWithPrefix, temporary bool, lifetimes stack.AddressLifetimes) stack.AddressEndpoint {
// Inform the integrator that we have a new SLAAC address.
ndpDisp := ndp.ep.protocol.options.NDPDisp
if ndpDisp == nil {
return nil
}
addressEndpoint, err := ndp.ep.addAndAcquirePermanentAddressLocked(addr, stack.AddressProperties{
PEB: stack.FirstPrimaryEndpoint,
ConfigType: stack.AddressConfigSlaac,
@@ -1156,8 +1150,11 @@ func (ndp *ndpState) addAndAcquireSLAACAddr(addr tcpip.AddressWithPrefix, tempor
panic(fmt.Sprintf("ndp: error when adding SLAAC address %+v: %s", addr, err))
}
if disp := ndpDisp.OnAutoGenAddress(ndp.ep.nic.ID(), addr); disp != nil {
addressEndpoint.RegisterDispatcher(disp)
// Inform the integrator that we have a new SLAAC address.
if ndpDisp := ndp.ep.protocol.options.NDPDisp; ndpDisp != nil {
if disp := ndpDisp.OnAutoGenAddress(ndp.ep.nic.ID(), addr); disp != nil {
addressEndpoint.RegisterDispatcher(disp)
}
}
return addressEndpoint