diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-22 05:20:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-22 05:20:20 +0000 |
| commit | c87261dd5219f66762e52f8af3c99db7bfccb154 (patch) | |
| tree | 777c5130389a860cbf5ecade344acee7e02a2754 /pkg/sentry | |
| parent | ba68a2715c7c764dbf3a013875254d9445d32c26 (diff) | |
| parent | c6da1b0022484561cf1a37b240b670120936393b (diff) | |
Merge release-20210614.0-9-gc6da1b002 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/socket/socket.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg/sentry/socket/socket.go b/pkg/sentry/socket/socket.go index 353f4ade0..f5da3c509 100644 --- a/pkg/sentry/socket/socket.go +++ b/pkg/sentry/socket/socket.go @@ -659,7 +659,6 @@ func ConvertAddress(family int, addr tcpip.FullAddress) (linux.SockAddr, uint32) return &out, uint32(sockAddrInet6Size) case linux.AF_PACKET: - // TODO(gvisor.dev/issue/173): Return protocol too. var out linux.SockAddrLink out.Family = linux.AF_PACKET out.InterfaceIndex = int32(addr.NIC) @@ -749,7 +748,6 @@ func AddressAndFamily(addr []byte) (tcpip.FullAddress, uint16, *syserr.Error) { return tcpip.FullAddress{}, family, syserr.ErrInvalidArgument } - // TODO(gvisor.dev/issue/173): Return protocol too. return tcpip.FullAddress{ NIC: tcpip.NICID(a.InterfaceIndex), Addr: tcpip.Address(a.HardwareAddr[:header.EthernetAddressSize]), |