diff options
Diffstat (limited to 'src/pkg/net')
-rw-r--r-- | src/pkg/net/iprawsock.go | 8 | ||||
-rw-r--r-- | src/pkg/net/tcpsock.go | 4 | ||||
-rw-r--r-- | src/pkg/net/udpsock.go | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/pkg/net/iprawsock.go b/src/pkg/net/iprawsock.go index e7eee1a4b..bd8f8080a 100644 --- a/src/pkg/net/iprawsock.go +++ b/src/pkg/net/iprawsock.go @@ -15,9 +15,9 @@ import ( func sockaddrToIP(sa syscall.Sockaddr) Addr { switch sa := sa.(type) { case *syscall.SockaddrInet4: - return &IPAddr{&sa.Addr} + return &IPAddr{sa.Addr[0:]} case *syscall.SockaddrInet6: - return &IPAddr{&sa.Addr} + return &IPAddr{sa.Addr[0:]} } return nil } @@ -176,14 +176,14 @@ func (c *IPConn) ReadFromIP(b []byte) (n int, addr *IPAddr, err os.Error) { n, sa, err := c.fd.ReadFrom(b) switch sa := sa.(type) { case *syscall.SockaddrInet4: - addr = &IPAddr{&sa.Addr} + addr = &IPAddr{sa.Addr[0:]} if len(b) >= 4 { // discard ipv4 header hsize := (int(b[0]) & 0xf) * 4 copy(b, b[hsize:]) n -= hsize } case *syscall.SockaddrInet6: - addr = &IPAddr{&sa.Addr} + addr = &IPAddr{sa.Addr[0:]} } return } diff --git a/src/pkg/net/tcpsock.go b/src/pkg/net/tcpsock.go index 222192232..d40035291 100644 --- a/src/pkg/net/tcpsock.go +++ b/src/pkg/net/tcpsock.go @@ -14,9 +14,9 @@ import ( func sockaddrToTCP(sa syscall.Sockaddr) Addr { switch sa := sa.(type) { case *syscall.SockaddrInet4: - return &TCPAddr{&sa.Addr, sa.Port} + return &TCPAddr{sa.Addr[0:], sa.Port} case *syscall.SockaddrInet6: - return &TCPAddr{&sa.Addr, sa.Port} + return &TCPAddr{sa.Addr[0:], sa.Port} } return nil } diff --git a/src/pkg/net/udpsock.go b/src/pkg/net/udpsock.go index 5e22c778d..6ea0f2753 100644 --- a/src/pkg/net/udpsock.go +++ b/src/pkg/net/udpsock.go @@ -14,9 +14,9 @@ import ( func sockaddrToUDP(sa syscall.Sockaddr) Addr { switch sa := sa.(type) { case *syscall.SockaddrInet4: - return &UDPAddr{&sa.Addr, sa.Port} + return &UDPAddr{sa.Addr[0:], sa.Port} case *syscall.SockaddrInet6: - return &UDPAddr{&sa.Addr, sa.Port} + return &UDPAddr{sa.Addr[0:], sa.Port} } return nil } @@ -176,9 +176,9 @@ func (c *UDPConn) ReadFromUDP(b []byte) (n int, addr *UDPAddr, err os.Error) { n, sa, err := c.fd.ReadFrom(b) switch sa := sa.(type) { case *syscall.SockaddrInet4: - addr = &UDPAddr{&sa.Addr, sa.Port} + addr = &UDPAddr{sa.Addr[0:], sa.Port} case *syscall.SockaddrInet6: - addr = &UDPAddr{&sa.Addr, sa.Port} + addr = &UDPAddr{sa.Addr[0:], sa.Port} } return } |