net: simplify ipToSockaddr

Change-Id: I5dbcdf0ee0b46b760b2a7decb1d937aac2a6fa8d
Reviewed-on: https://go-review.googlesource.com/20585
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/ipsock_posix.go b/src/net/ipsock_posix.go
index a42ca9c3e83df7b9174e31114ac4333aa0af0436..28cdb210aed6e506d99bf4a834ceec1e2d43c024 100644 (file)
--- a/src/net/ipsock_posix.go
+++ b/src/net/ipsock_posix.go
@@ -170,11 +170,8 @@ func ipToSockaddr(family int, ip IP, port int, zone string) (syscall.Sockaddr, e
                if ip = ip.To4(); ip == nil {
                        return nil, &AddrError{Err: "non-IPv4 address", Addr: ip.String()}
                }
-               sa := new(syscall.SockaddrInet4)
-               for i := 0; i < IPv4len; i++ {
-                       sa.Addr[i] = ip[i]
-               }
-               sa.Port = port
+               sa := &syscall.SockaddrInet4{Port: port}
+               copy(sa.Addr[:], ip)
                return sa, nil
        case syscall.AF_INET6:
                if len(ip) == 0 {
@@ -189,12 +186,8 @@ func ipToSockaddr(family int, ip IP, port int, zone string) (syscall.Sockaddr, e
                if ip = ip.To16(); ip == nil {
                        return nil, &AddrError{Err: "non-IPv6 address", Addr: ip.String()}
                }
-               sa := new(syscall.SockaddrInet6)
-               for i := 0; i < IPv6len; i++ {
-                       sa.Addr[i] = ip[i]
-               }
-               sa.Port = port
-               sa.ZoneId = uint32(zoneToInt(zone))
+               sa := &syscall.SockaddrInet6{Port: port, ZoneId: uint32(zoneToInt(zone))}
+               copy(sa.Addr[:], ip)
                return sa, nil
        }
        return nil, &AddrError{Err: "invalid address family", Addr: ip.String()}