Skip to content

Commit

Permalink
windows: allow calling WSASendto with nil Sockaddr
Browse files Browse the repository at this point in the history
Same as CL 434535 did for the syscall package.

For golang/go#55845

Change-Id: I17f30152ae973b64ac65e08cefd5442e9bf19e2c
Reviewed-on: https://go-review.googlesource.com/c/sys/+/435777
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Benny Siegert <bsiegert@gmail.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Benny Siegert <bsiegert@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
  • Loading branch information
tklauser authored and gopherbot committed Sep 28, 2022
1 parent c57c793 commit 6fa7a7c
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions windows/syscall_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -1115,9 +1115,13 @@ func Shutdown(fd Handle, how int) (err error) {
}

func WSASendto(s Handle, bufs *WSABuf, bufcnt uint32, sent *uint32, flags uint32, to Sockaddr, overlapped *Overlapped, croutine *byte) (err error) {
rsa, l, err := to.sockaddr()
if err != nil {
return err
var rsa unsafe.Pointer
var l int32
if to != nil {
rsa, l, err = to.sockaddr()
if err != nil {
return err
}
}
return WSASendTo(s, bufs, bufcnt, sent, flags, (*RawSockaddrAny)(unsafe.Pointer(rsa)), l, overlapped, croutine)
}
Expand Down

0 comments on commit 6fa7a7c

Please sign in to comment.