diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-28 14:42:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-28 14:42:15 +0000 |
| commit | 8226803c10705473fbe5bd31865a0775c9e1f171 (patch) | |
| tree | f2583a682203bc35bab3462f7d872689876ffe72 /pkg | |
| parent | d34fe8d385b0a28df5c7e6ccd8bb74c10c0c3dac (diff) | |
| parent | 6012fe9b5965a2f285f2f99312e6cb7ae84b5fa8 (diff) | |
Merge release-20210125.0-12-g6012fe9b5 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/tcpip/tcpip.go | 2 | ||||
| -rw-r--r-- | pkg/tcpip/transport/udp/endpoint.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkg/tcpip/tcpip.go b/pkg/tcpip/tcpip.go index e70ae69ef..c023152f1 100644 --- a/pkg/tcpip/tcpip.go +++ b/pkg/tcpip/tcpip.go @@ -662,7 +662,7 @@ type Endpoint interface { // connected returns nil. Calling connect again results in ErrAlreadyConnected. // Anything else -- the attempt to connect failed. // - // If address.Addr is empty, this means that Enpoint has to be + // If address.Addr is empty, this means that Endpoint has to be // disconnected if this is supported, otherwise // ErrAddressFamilyNotSupported must be returned. Connect(address FullAddress) *Error diff --git a/pkg/tcpip/transport/udp/endpoint.go b/pkg/tcpip/transport/udp/endpoint.go index 4988ba29b..d2f7b6e85 100644 --- a/pkg/tcpip/transport/udp/endpoint.go +++ b/pkg/tcpip/transport/udp/endpoint.go @@ -480,6 +480,9 @@ func (e *endpoint) write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, *tc // Reject destination address if it goes through a different // NIC than the endpoint was bound to. nicID := to.NIC + if nicID == 0 { + nicID = tcpip.NICID(e.ops.GetBindToDevice()) + } if e.BindNICID != 0 { if nicID != 0 && nicID != e.BindNICID { return 0, tcpip.ErrNoRoute |