diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-03-22 19:36:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-03-22 19:36:16 +0000 |
| commit | 16def91ab48d4fc98b447e059de4fe72e549f68b (patch) | |
| tree | 89d94bcb5f08f532df9d5e582bb80aadcc990b40 /pkg/tcpip/network/ipv4 | |
| parent | 1da1290bfb13fa2f2c9409ec5bd88693ceedc2cc (diff) | |
| parent | a073d76979d1950a52462823c10b495f4f8c3728 (diff) | |
Merge release-20210315.0-7-ga073d7697 (automated)
Diffstat (limited to 'pkg/tcpip/network/ipv4')
| -rw-r--r-- | pkg/tcpip/network/ipv4/ipv4.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/tcpip/network/ipv4/ipv4.go b/pkg/tcpip/network/ipv4/ipv4.go index 74270f5f1..a43107d30 100644 --- a/pkg/tcpip/network/ipv4/ipv4.go +++ b/pkg/tcpip/network/ipv4/ipv4.go @@ -1619,9 +1619,8 @@ func (e *endpoint) processIPOptions(pkt *stack.PacketBuffer, orig header.IPv4Opt // TODO(https://gvisor.dev/issue/4586): This will need tweaking when we start // really forwarding packets as we may need to get two addresses, for rx and // tx interfaces. We will also have to take usage into account. - prefixedAddress, ok := e.protocol.stack.GetMainNICAddress(e.nic.ID(), ProtocolNumber) - localAddress := prefixedAddress.Address - if !ok { + localAddress := e.MainAddress().Address + if len(localAddress) == 0 { h := header.IPv4(pkt.NetworkHeader().View()) dstAddr := h.DestinationAddress() if pkt.NetworkPacketInfo.LocalAddressBroadcast || header.IsV4MulticastAddress(dstAddr) { |