diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-07-30 14:28:58 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-08-12 20:23:07 -0700 |
| commit | c5b21c3f4c17b0649155035d2f9aa97b2da8a813 (patch) | |
| tree | c6d3a68b503ba5b16182acbb958e3e5dbc95a43b /libgo/go/net/udpsock_plan9.go | |
| parent | 72be20e20299ec57b4bc9ba03d5b7d6bf10e97cc (diff) | |
| download | gcc-c5b21c3f4c17b0649155035d2f9aa97b2da8a813.tar.gz | |
libgo: update to Go1.17rc2
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/341629
Diffstat (limited to 'libgo/go/net/udpsock_plan9.go')
| -rw-r--r-- | libgo/go/net/udpsock_plan9.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libgo/go/net/udpsock_plan9.go b/libgo/go/net/udpsock_plan9.go index 79986ce4da2..1df293d1db9 100644 --- a/libgo/go/net/udpsock_plan9.go +++ b/libgo/go/net/udpsock_plan9.go @@ -11,7 +11,7 @@ import ( "syscall" ) -func (c *UDPConn) readFrom(b []byte) (n int, addr *UDPAddr, err error) { +func (c *UDPConn) readFrom(b []byte, addr *UDPAddr) (int, *UDPAddr, error) { buf := make([]byte, udpHeaderSize+len(b)) m, err := c.fd.Read(buf) if err != nil { @@ -23,8 +23,9 @@ func (c *UDPConn) readFrom(b []byte) (n int, addr *UDPAddr, err error) { buf = buf[:m] h, buf := unmarshalUDPHeader(buf) - n = copy(b, buf) - return n, &UDPAddr{IP: h.raddr, Port: int(h.rport)}, nil + n := copy(b, buf) + *addr = UDPAddr{IP: h.raddr, Port: int(h.rport)} + return n, addr, nil } func (c *UDPConn) readMsg(b, oob []byte) (n, oobn, flags int, addr *UDPAddr, err error) { |