Move Unix transport out of netstack

PiperOrigin-RevId: 217557656
Change-Id: I63d27635b1a6c12877279995d2d9847b6a19da9b

1 files changed, 23 insertions, 23 deletions

diff --git a/pkg/sentry/socket/control/control.go b/pkg/sentry/socket/control/control.go
index c31182e69..db97e95f2 100644
--- a/pkg/sentry/socket/control/control.go
+++ b/pkg/sentry/socket/control/control.go
@@ -24,16 +24,16 @@ import (
 	"gvisor.googlesource.com/gvisor/pkg/sentry/kernel"
 	"gvisor.googlesource.com/gvisor/pkg/sentry/kernel/auth"
 	"gvisor.googlesource.com/gvisor/pkg/sentry/kernel/kdefs"
+	"gvisor.googlesource.com/gvisor/pkg/sentry/socket/unix/transport"
 	"gvisor.googlesource.com/gvisor/pkg/sentry/usermem"
 	"gvisor.googlesource.com/gvisor/pkg/syserror"
-	"gvisor.googlesource.com/gvisor/pkg/tcpip/transport/unix"
 )
 
 const maxInt = int(^uint(0) >> 1)
 
 // SCMCredentials represents a SCM_CREDENTIALS socket control message.
 type SCMCredentials interface {
-	unix.CredentialsControlMessage
+	transport.CredentialsControlMessage
 
 	// Credentials returns properly namespaced values for the sender's pid, uid
 	// and gid.
@@ -42,7 +42,7 @@ type SCMCredentials interface {
 
 // SCMRights represents a SCM_RIGHTS socket control message.
 type SCMRights interface {
-	unix.RightsControlMessage
+	transport.RightsControlMessage
 
 	// Files returns up to max RightsFiles.
 	Files(ctx context.Context, max int) RightsFiles
@@ -81,8 +81,8 @@ func (fs *RightsFiles) Files(ctx context.Context, max int) RightsFiles {
 	return rf
 }
 
-// Clone implements unix.RightsControlMessage.Clone.
-func (fs *RightsFiles) Clone() unix.RightsControlMessage {
+// Clone implements transport.RightsControlMessage.Clone.
+func (fs *RightsFiles) Clone() transport.RightsControlMessage {
 	nfs := append(RightsFiles(nil), *fs...)
 	for _, nf := range nfs {
 		nf.IncRef()
@@ -90,7 +90,7 @@ func (fs *RightsFiles) Clone() unix.RightsControlMessage {
 	return &nfs
 }
 
-// Release implements unix.RightsControlMessage.Release.
+// Release implements transport.RightsControlMessage.Release.
 func (fs *RightsFiles) Release() {
 	for _, f := range *fs {
 		f.DecRef()
@@ -156,8 +156,8 @@ func NewSCMCredentials(t *kernel.Task, cred linux.ControlMessageCredentials) (SC
 	return &scmCredentials{t, kuid, kgid}, nil
 }
 
-// Equals implements unix.CredentialsControlMessage.Equals.
-func (c *scmCredentials) Equals(oc unix.CredentialsControlMessage) bool {
+// Equals implements transport.CredentialsControlMessage.Equals.
+func (c *scmCredentials) Equals(oc transport.CredentialsControlMessage) bool {
 	if oc, _ := oc.(*scmCredentials); oc != nil && *c == *oc {
 		return true
 	}
@@ -301,7 +301,7 @@ func PackTimestamp(t *kernel.Task, timestamp int64, buf []byte) []byte {
 }
 
 // Parse parses a raw socket control message into portable objects.
-func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (unix.ControlMessages, error) {
+func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (transport.ControlMessages, error) {
 	var (
 		fds linux.ControlMessageRights
 
@@ -311,20 +311,20 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (unix.Contr
 
 	for i := 0; i < len(buf); {
 		if i+linux.SizeOfControlMessageHeader > len(buf) {
-			return unix.ControlMessages{}, syserror.EINVAL
+			return transport.ControlMessages{}, syserror.EINVAL
 		}
 
 		var h linux.ControlMessageHeader
 		binary.Unmarshal(buf[i:i+linux.SizeOfControlMessageHeader], usermem.ByteOrder, &h)
 
 		if h.Length < uint64(linux.SizeOfControlMessageHeader) {
-			return unix.ControlMessages{}, syserror.EINVAL
+			return transport.ControlMessages{}, syserror.EINVAL
 		}
 		if h.Length > uint64(len(buf)-i) {
-			return unix.ControlMessages{}, syserror.EINVAL
+			return transport.ControlMessages{}, syserror.EINVAL
 		}
 		if h.Level != linux.SOL_SOCKET {
-			return unix.ControlMessages{}, syserror.EINVAL
+			return transport.ControlMessages{}, syserror.EINVAL
 		}
 
 		i += linux.SizeOfControlMessageHeader
@@ -340,7 +340,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (unix.Contr
 			numRights := rightsSize / linux.SizeOfControlMessageRight
 
 			if len(fds)+numRights > linux.SCM_MAX_FD {
-				return unix.ControlMessages{}, syserror.EINVAL
+				return transport.ControlMessages{}, syserror.EINVAL
 			}
 
 			for j := i; j < i+rightsSize; j += linux.SizeOfControlMessageRight {
@@ -351,7 +351,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (unix.Contr
 
 		case linux.SCM_CREDENTIALS:
 			if length < linux.SizeOfControlMessageCredentials {
-				return unix.ControlMessages{}, syserror.EINVAL
+				return transport.ControlMessages{}, syserror.EINVAL
 			}
 
 			binary.Unmarshal(buf[i:i+linux.SizeOfControlMessageCredentials], usermem.ByteOrder, &creds)
@@ -360,7 +360,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (unix.Contr
 
 		default:
 			// Unknown message type.
-			return unix.ControlMessages{}, syserror.EINVAL
+			return transport.ControlMessages{}, syserror.EINVAL
 		}
 	}
 
@@ -368,7 +368,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (unix.Contr
 	if haveCreds {
 		var err error
 		if credentials, err = NewSCMCredentials(t, creds); err != nil {
-			return unix.ControlMessages{}, err
+			return transport.ControlMessages{}, err
 		}
 	} else {
 		credentials = makeCreds(t, socketOrEndpoint)
@@ -378,22 +378,22 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte) (unix.Contr
 	if len(fds) > 0 {
 		var err error
 		if rights, err = NewSCMRights(t, fds); err != nil {
-			return unix.ControlMessages{}, err
+			return transport.ControlMessages{}, err
 		}
 	}
 
 	if credentials == nil && rights == nil {
-		return unix.ControlMessages{}, nil
+		return transport.ControlMessages{}, nil
 	}
 
-	return unix.ControlMessages{Credentials: credentials, Rights: rights}, nil
+	return transport.ControlMessages{Credentials: credentials, Rights: rights}, nil
 }
 
 func makeCreds(t *kernel.Task, socketOrEndpoint interface{}) SCMCredentials {
 	if t == nil || socketOrEndpoint == nil {
 		return nil
 	}
-	if cr, ok := socketOrEndpoint.(unix.Credentialer); ok && (cr.Passcred() || cr.ConnectedPasscred()) {
+	if cr, ok := socketOrEndpoint.(transport.Credentialer); ok && (cr.Passcred() || cr.ConnectedPasscred()) {
 		tcred := t.Credentials()
 		return &scmCredentials{t, tcred.EffectiveKUID, tcred.EffectiveKGID}
 	}
@@ -401,8 +401,8 @@ func makeCreds(t *kernel.Task, socketOrEndpoint interface{}) SCMCredentials {
 }
 
 // New creates default control messages if needed.
-func New(t *kernel.Task, socketOrEndpoint interface{}, rights SCMRights) unix.ControlMessages {
-	return unix.ControlMessages{
+func New(t *kernel.Task, socketOrEndpoint interface{}, rights SCMRights) transport.ControlMessages {
+	return transport.ControlMessages{
 		Credentials: makeCreds(t, socketOrEndpoint),
 		Rights:      rights,
 	}