diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-17 22:36:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-17 22:36:15 +0000 |
| commit | 1439d34dca23d0f4af7356e8f14876e89d19d017 (patch) | |
| tree | 80bb4e96d5ee6dae5b1ee29878c2e8b0a39623fe /pkg | |
| parent | 4dedf67521fd0931c47bcdd7186150eb58dd1185 (diff) | |
| parent | bc27a991851fdffa59f028eecfc22bdd17ccaa55 (diff) | |
Merge release-20210607.0-55-gbc27a9918 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/abi/linux/netfilter_ipv6.go | 1 | ||||
| -rw-r--r-- | pkg/sentry/socket/netfilter/targets.go | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/pkg/abi/linux/netfilter_ipv6.go b/pkg/abi/linux/netfilter_ipv6.go index b088b207c..f8c0e891e 100644 --- a/pkg/abi/linux/netfilter_ipv6.go +++ b/pkg/abi/linux/netfilter_ipv6.go @@ -41,7 +41,6 @@ const ( // IP6T_ORIGINAL_DST is the ip6tables SOL_IPV6 socket option. Corresponds to // the value in include/uapi/linux/netfilter_ipv6/ip6_tables.h. -// TODO(gvisor.dev/issue/3549): Support IPv6 original destination. const IP6T_ORIGINAL_DST = 80 // IP6TReplace is the argument for the IP6T_SO_SET_REPLACE sockopt. It diff --git a/pkg/sentry/socket/netfilter/targets.go b/pkg/sentry/socket/netfilter/targets.go index 7d83e708f..ea56f39c1 100644 --- a/pkg/sentry/socket/netfilter/targets.go +++ b/pkg/sentry/socket/netfilter/targets.go @@ -418,7 +418,6 @@ func (*nfNATTargetMaker) unmarshal(buf []byte, filter stack.IPHeaderFilter) (tar return nil, syserr.ErrInvalidArgument } - // TODO(gvisor.dev/issue/3549): Check for other flags. // For now, redirect target only supports destination change. if natRange.Flags != linux.NF_NAT_RANGE_PROTO_SPECIFIED { nflog("nfNATTargetMaker: invalid range flags %d", natRange.Flags) |