Merge release-20201030.0-83-g5bb64ce1b (automated)

1 files changed, 5 insertions, 6 deletions

diff --git a/pkg/tcpip/tcpip.go b/pkg/tcpip/tcpip.go
index 9a0c63ae4..f9e83dd1c 100644
--- a/pkg/tcpip/tcpip.go
+++ b/pkg/tcpip/tcpip.go
@@ -634,6 +634,10 @@ type Endpoint interface {
 
 	// LastError clears and returns the last error reported by the endpoint.
 	LastError() *Error
+
+	// SocketOptions returns the structure which contains all the socket
+	// level options.
+	SocketOptions() *SocketOptions
 }
 
 // LinkPacketInfo holds Link layer information for a received packet.
@@ -694,15 +698,10 @@ type WriteOptions struct {
 type SockOptBool int
 
 const (
-	// BroadcastOption is used by SetSockOptBool/GetSockOptBool to specify
-	// whether datagram sockets are allowed to send packets to a broadcast
-	// address.
-	BroadcastOption SockOptBool = iota
-
 	// CorkOption is used by SetSockOptBool/GetSockOptBool to specify if
 	// data should be held until segments are full by the TCP transport
 	// protocol.
-	CorkOption
+	CorkOption SockOptBool = iota
 
 	// DelayOption is used by SetSockOptBool/GetSockOptBool to specify if
 	// data should be sent out immediately by the transport protocol. For