summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2019-02-26 16:41:15 -0800
committerShentubot <shentubot@google.com>2019-02-26 16:42:06 -0800
commitcff2c57192ccd5ccf4cec6280afcd724dc1135d1 (patch)
tree4304a0758cb2e4f6fa598ae144b550c2adcd5d03
parentaeb7283a9106319db598a908708e80875fcb5c3d (diff)
Fix bad merge
PiperOrigin-RevId: 235818534 Change-Id: I99f7e3fd1dc808b35f7a08b96b7c3226603ab808
-rw-r--r--pkg/sentry/socket/epsocket/epsocket.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkg/sentry/socket/epsocket/epsocket.go b/pkg/sentry/socket/epsocket/epsocket.go
index e24e58aed..8aec97e72 100644
--- a/pkg/sentry/socket/epsocket/epsocket.go
+++ b/pkg/sentry/socket/epsocket/epsocket.go
@@ -1230,10 +1230,7 @@ func setSockOptIP(t *kernel.Task, ep commonEndpoint, name int, optVal []byte) *s
}))
case linux.MCAST_JOIN_GROUP:
- // FIXME: Disallow IP-level multicast group options by
- // default. These will need to be supported by appropriately plumbing
- // the level through to the network stack (if at all). However, we
- // still allow setting TTL, and multicast-enable/disable type options.
+ // FIXME: Implement MCAST_JOIN_GROUP.
t.Kernel().EmitUnimplementedEvent(t)
return syserr.ErrInvalidArgument