[net] Move to final posix.fidl method names
Bug: 44347
Change-Id: Ifb4c1a3c26d2571833a1972928c972df7c954d17
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/go/+/430716
Reviewed-by: Tamir Duberstein <tamird@google.com>
Commit-Queue: Bruno Dal Bo <brunodalbo@google.com>
diff --git a/src/syscall/zx/zxsocket/socket.go b/src/syscall/zx/zxsocket/socket.go
index d37fe83..5e24827 100644
--- a/src/syscall/zx/zxsocket/socket.go
+++ b/src/syscall/zx/zxsocket/socket.go
@@ -132,14 +132,14 @@
}
func bind(client socket.BaseSocketWithCtx, addr net.SocketAddress) error {
- result, err := client.Bind2(context.Background(), addr)
+ result, err := client.Bind(context.Background(), addr)
if err != nil {
return err
}
switch result.Which() {
- case socket.BaseSocketBind2ResultErr:
+ case socket.BaseSocketBindResultErr:
return syscall.Errno(result.Err)
- case socket.BaseSocketBind2ResultResponse:
+ case socket.BaseSocketBindResultResponse:
return nil
default:
panic("unreachable")
@@ -147,14 +147,14 @@
}
func connect(client socket.BaseSocketWithCtx, addr net.SocketAddress) error {
- result, err := client.Connect2(context.Background(), addr)
+ result, err := client.Connect(context.Background(), addr)
if err != nil {
return err
}
switch result.Which() {
- case socket.BaseSocketConnect2ResultErr:
+ case socket.BaseSocketConnectResultErr:
return syscall.Errno(result.Err)
- case socket.BaseSocketConnect2ResultResponse:
+ case socket.BaseSocketConnectResultResponse:
return nil
default:
panic("unreachable")
@@ -162,14 +162,14 @@
}
func getPeerName(client socket.BaseSocketWithCtx) (net.SocketAddress, error) {
- result, err := client.GetPeerName2(context.Background())
+ result, err := client.GetPeerName(context.Background())
if err != nil {
return net.SocketAddress{}, err
}
switch result.Which() {
- case socket.BaseSocketGetPeerName2ResultErr:
+ case socket.BaseSocketGetPeerNameResultErr:
return net.SocketAddress{}, syscall.Errno(result.Err)
- case socket.BaseSocketGetPeerName2ResultResponse:
+ case socket.BaseSocketGetPeerNameResultResponse:
return result.Response.Addr, nil
default:
panic("unreachable")
@@ -177,14 +177,14 @@
}
func getSockName(client socket.BaseSocketWithCtx) (net.SocketAddress, error) {
- result, err := client.GetSockName2(context.Background())
+ result, err := client.GetSockName(context.Background())
if err != nil {
return net.SocketAddress{}, err
}
switch result.Which() {
- case socket.BaseSocketGetSockName2ResultErr:
+ case socket.BaseSocketGetSockNameResultErr:
return net.SocketAddress{}, syscall.Errno(result.Err)
- case socket.BaseSocketGetSockName2ResultResponse:
+ case socket.BaseSocketGetSockNameResultResponse:
return result.Response.Addr, nil
default:
panic("unreachable")
@@ -309,12 +309,12 @@
func (s *DatagramSocket) recvMsg(dataLen uint32) (net.SocketAddress, []byte, error) {
for {
- result, err := s.client.RecvMsg2(context.Background() /* wantAddr */, true, dataLen /* wantControl */, false, 0)
+ result, err := s.client.RecvMsg(context.Background() /* wantAddr */, true, dataLen /* wantControl */, false, 0)
if err != nil {
return net.SocketAddress{}, nil, err
}
switch result.Which() {
- case socket.DatagramSocketRecvMsg2ResultErr:
+ case socket.DatagramSocketRecvMsgResultErr:
if err := syscall.Errno(result.Err); err != syscall.EAGAIN {
return net.SocketAddress{}, nil, err
}
@@ -331,7 +331,7 @@
}
panic("unreachable")
- case socket.DatagramSocketRecvMsg2ResultResponse:
+ case socket.DatagramSocketRecvMsgResultResponse:
return *result.Response.Addr, result.Response.Data, nil
default:
panic("unreachable")
