commit 6fcdb8c9e9b5406c86665fa2814b78d179f2cdbc
author Tamir Duberstein <tamird@gmail.com> Tue Jan 29 18:10:05 2019 -0500
committer Tamir Duberstein <tamird@google.com> Thu Jan 31 17:32:02 2019 +0000
tree 9c6a76073db3864761ee8dee176af9e8f999adae
parent 0bfe38d792dc91a1a9a0d79befb8d1bf2d617798

[netstack] reuse constants from mxnet

Test: None
Change-Id: I8001f11dcdb3db55bec1c02e316912ca321516e5

go/src/netstack/socket_server.go

diff --git a/go/src/netstack/socket_server.go b/go/src/netstack/socket_server.go
index e6b7979..bfd3aac 100644
--- a/go/src/netstack/socket_server.go
+++ b/go/src/netstack/socket_server.go
@@ -15,6 +15,7 @@
 	"syscall/zx/fdio"
 	"syscall/zx/fidl"
 	"syscall/zx/mxerror"
+	"syscall/zx/mxnet"
 	"syscall/zx/zxsocket"
 	"syscall/zx/zxwait"
 
@@ -47,12 +48,7 @@
 const logListen = false
 const logAccept = false
 
-const (
-	ZXSIO_SIGNAL_INCOMING  = zx.SignalUser0
-	ZXSIO_SIGNAL_OUTGOING  = zx.SignalUser1
-	ZXSIO_SIGNAL_CONNECTED = zx.SignalUser3
-	LOCAL_SIGNAL_CLOSING   = zx.SignalUser5
-)
+const LOCAL_SIGNAL_CLOSING = zx.SignalUser5
 
 type iostate struct {
 	wq *waiter.Queue
@@ -218,13 +214,13 @@
 				}
 				notifyCh = outCh
 			} else if !connected {
-				var signals zx.Signals = ZXSIO_SIGNAL_OUTGOING
+				var signals zx.Signals = mxnet.MXSIO_SIGNAL_OUTGOING
 				switch err {
 				case nil, tcpip.ErrWouldBlock:
 					connected = true
 					ios.wq.EventUnregister(&outEntry)
 
-					signals |= ZXSIO_SIGNAL_CONNECTED
+					signals |= mxnet.MXSIO_SIGNAL_CONNECTED
 				default:
 					notifyCh = outCh
 				}
@@ -408,7 +404,7 @@
 					ios.wq.EventUnregister(&outEntry)
 
 					ios.incomingAssertedMu.Lock()
-					switch err := ios.dataHandle.Handle().SignalPeer(0, ZXSIO_SIGNAL_INCOMING); mxerror.Status(err) {
+					switch err := ios.dataHandle.Handle().SignalPeer(0, mxnet.MXSIO_SIGNAL_INCOMING); mxerror.Status(err) {
 					case zx.ErrOk, zx.ErrPeerClosed:
 					default:
 						panic(err)
@@ -420,13 +416,13 @@
 					continue
 				}
 			} else if !connected {
-				var signals zx.Signals = ZXSIO_SIGNAL_OUTGOING
+				var signals zx.Signals = mxnet.MXSIO_SIGNAL_OUTGOING
 				switch err {
 				case nil, tcpip.ErrWouldBlock:
 					connected = true
 					ios.wq.EventUnregister(&outEntry)
 
-					signals |= ZXSIO_SIGNAL_CONNECTED
+					signals |= mxnet.MXSIO_SIGNAL_CONNECTED
 				}
 
 				switch err := ios.dataHandle.Handle().SignalPeer(0, signals); mxerror.Status(err) {
@@ -1123,7 +1119,7 @@
 
 	if err := ios.ep.Connect(addr); err != nil {
 		if err == tcpip.ErrConnectStarted {
-			switch err := ios.dataHandle.Handle().SignalPeer(ZXSIO_SIGNAL_OUTGOING, 0); mxerror.Status(err) {
+			switch err := ios.dataHandle.Handle().SignalPeer(mxnet.MXSIO_SIGNAL_OUTGOING, 0); mxerror.Status(err) {
 			case zx.ErrOk, zx.ErrPeerClosed:
 			default:
 				panic(err)
@@ -1316,7 +1312,7 @@
 	// while we clear the signal.
 	ios.incomingAssertedMu.Lock()
 	if ios.ep.Readiness(waiter.EventIn) == 0 {
-		if err := ios.dataHandle.Handle().SignalPeer(ZXSIO_SIGNAL_INCOMING, 0); err != nil {
+		if err := ios.dataHandle.Handle().SignalPeer(mxnet.MXSIO_SIGNAL_INCOMING, 0); err != nil {
 			panic(err)
 		}
 	}