diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-06 23:04:04 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-06 23:04:04 +0000 |
| commit | 21cc7785b9ac904eed09b4cd905302374add4177 (patch) | |
| tree | 0a8fd83ac0e24b91479bc2e21d1f79e9429a45f9 /pkg/tcpip/stack/ndp.go | |
| parent | 1d4eb42012215a5f52b41cd10c008292afb13fd1 (diff) | |
| parent | 485ca36adf18fbb587df9f34a2deea730882fb36 (diff) | |
Merge release-20200422.0-38-g485ca36 (automated)
Diffstat (limited to 'pkg/tcpip/stack/ndp.go')
| -rwxr-xr-x | pkg/tcpip/stack/ndp.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkg/tcpip/stack/ndp.go b/pkg/tcpip/stack/ndp.go index 15343acbc..526c7d6ff 100755 --- a/pkg/tcpip/stack/ndp.go +++ b/pkg/tcpip/stack/ndp.go @@ -199,9 +199,11 @@ var ( type DHCPv6ConfigurationFromNDPRA int const ( + _ DHCPv6ConfigurationFromNDPRA = iota + // DHCPv6NoConfiguration indicates that no configurations are available via // DHCPv6. - DHCPv6NoConfiguration DHCPv6ConfigurationFromNDPRA = iota + DHCPv6NoConfiguration // DHCPv6ManagedAddress indicates that addresses are available via DHCPv6. // @@ -315,9 +317,6 @@ type NDPDispatcher interface { // OnDHCPv6Configuration will be called with an updated configuration that is // available via DHCPv6 for a specified NIC. // - // NDPDispatcher assumes that the initial configuration available by DHCPv6 is - // DHCPv6NoConfiguration. - // // This function is not permitted to block indefinitely. It must not // call functions on the stack itself. OnDHCPv6Configuration(tcpip.NICID, DHCPv6ConfigurationFromNDPRA) @@ -1808,6 +1807,8 @@ func (ndp *ndpState) cleanupState(hostOnly bool) { if got := len(ndp.defaultRouters); got != 0 { panic(fmt.Sprintf("ndp: still have discovered default routers after cleaning up; found = %d", got)) } + + ndp.dhcpv6Configuration = 0 } // startSolicitingRouters starts soliciting routers, as per RFC 4861 section |