qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 17:40:03 -07:00
Code Releases Activity

net: don't export netFD readFrom, writeTo, readMsg, writeMsg methods

Browse Source 
There is no way to call them from outside the net package.
They are used to implement UCPConn.ReadMsgUDP and similar.

LGTM=mikioh.mikioh
R=golang-codereviews, mikioh.mikioh
CC=golang-codereviews
https://golang.org/cl/83730044
This commit is contained in:
Ian Lance Taylor 2014-04-02 17:06:51 -07:00
parent 1aaea50c76
commit 7d299d031d
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkg/net/fd_unix.go
View File

@ -243,7 +243,7 @@ func (fd *netFD) Read(p []byte) (n int, err error) {
return return
} }
func (fd *netFD) ReadFrom(p []byte) (n int, sa syscall.Sockaddr, err error) { func (fd *netFD) readFrom(p []byte) (n int, sa syscall.Sockaddr, err error) {
if err := fd.readLock(); err != nil { if err := fd.readLock(); err != nil {
return 0, nil, err return 0, nil, err
} }
@ -270,7 +270,7 @@ func (fd *netFD) ReadFrom(p []byte) (n int, sa syscall.Sockaddr, err error) {
return return
} }
func (fd *netFD) ReadMsg(p []byte, oob []byte) (n, oobn, flags int, sa syscall.Sockaddr, err error) { func (fd *netFD) readMsg(p []byte, oob []byte) (n, oobn, flags int, sa syscall.Sockaddr, err error) {
if err := fd.readLock(); err != nil { if err := fd.readLock(); err != nil {
return 0, 0, 0, nil, err return 0, 0, 0, nil, err
} }
@ -341,7 +341,7 @@ func (fd *netFD) Write(p []byte) (nn int, err error) {
return nn, err return nn, err
} }
func (fd *netFD) WriteTo(p []byte, sa syscall.Sockaddr) (n int, err error) { func (fd *netFD) writeTo(p []byte, sa syscall.Sockaddr) (n int, err error) {
if err := fd.writeLock(); err != nil { if err := fd.writeLock(); err != nil {
return 0, err return 0, err
} }
@ -366,7 +366,7 @@ func (fd *netFD) WriteTo(p []byte, sa syscall.Sockaddr) (n int, err error) {
return return
} }
func (fd *netFD) WriteMsg(p []byte, oob []byte, sa syscall.Sockaddr) (n int, oobn int, err error) { func (fd *netFD) writeMsg(p []byte, oob []byte, sa syscall.Sockaddr) (n int, oobn int, err error) {
if err := fd.writeLock(); err != nil { if err := fd.writeLock(); err != nil {
return 0, 0, err return 0, 0, err
} }

8
src/pkg/net/fd_windows.go
View File

@ -458,7 +458,7 @@ func (fd *netFD) Read(buf []byte) (int, error) {
return n, err return n, err
} }
func (fd *netFD) ReadFrom(buf []byte) (n int, sa syscall.Sockaddr, err error) { func (fd *netFD) readFrom(buf []byte) (n int, sa syscall.Sockaddr, err error) {
if len(buf) == 0 { if len(buf) == 0 {
return 0, nil, nil return 0, nil, nil
} }
@ -497,7 +497,7 @@ func (fd *netFD) Write(buf []byte) (int, error) {
}) })
} }
func (fd *netFD) WriteTo(buf []byte, sa syscall.Sockaddr) (int, error) { func (fd *netFD) writeTo(buf []byte, sa syscall.Sockaddr) (int, error) {
if len(buf) == 0 { if len(buf) == 0 {
return 0, nil return 0, nil
} }
@ -628,10 +628,10 @@ func (fd *netFD) dup() (*os.File, error) {
var errNoSupport = errors.New("address family not supported") var errNoSupport = errors.New("address family not supported")
func (fd *netFD) ReadMsg(p []byte, oob []byte) (n, oobn, flags int, sa syscall.Sockaddr, err error) { func (fd *netFD) readMsg(p []byte, oob []byte) (n, oobn, flags int, sa syscall.Sockaddr, err error) {
return 0, 0, 0, nil, errNoSupport return 0, 0, 0, nil, errNoSupport
} }
func (fd *netFD) WriteMsg(p []byte, oob []byte, sa syscall.Sockaddr) (n int, oobn int, err error) { func (fd *netFD) writeMsg(p []byte, oob []byte, sa syscall.Sockaddr) (n int, oobn int, err error) {
return 0, 0, errNoSupport return 0, 0, errNoSupport
} }

8
src/pkg/net/iprawsock_posix.go
View File

@ -79,7 +79,7 @@ func (c *IPConn) ReadFromIP(b []byte) (int, *IPAddr, error) {
// TODO(cw,rsc): consider using readv if we know the family // TODO(cw,rsc): consider using readv if we know the family
// type to avoid the header trim/copy // type to avoid the header trim/copy
var addr *IPAddr var addr *IPAddr
n, sa, err := c.fd.ReadFrom(b) n, sa, err := c.fd.readFrom(b)
switch sa := sa.(type) { switch sa := sa.(type) {
case *syscall.SockaddrInet4: case *syscall.SockaddrInet4:
addr = &IPAddr{IP: sa.Addr[0:]} addr = &IPAddr{IP: sa.Addr[0:]}
@ -112,7 +112,7 @@ func (c *IPConn) ReadMsgIP(b, oob []byte) (n, oobn, flags int, addr *IPAddr, err
return 0, 0, 0, nil, syscall.EINVAL return 0, 0, 0, nil, syscall.EINVAL
} }
var sa syscall.Sockaddr var sa syscall.Sockaddr
n, oobn, flags, sa, err = c.fd.ReadMsg(b, oob) n, oobn, flags, sa, err = c.fd.readMsg(b, oob)
switch sa := sa.(type) { switch sa := sa.(type) {
case *syscall.SockaddrInet4: case *syscall.SockaddrInet4:
addr = &IPAddr{IP: sa.Addr[0:]} addr = &IPAddr{IP: sa.Addr[0:]}
@ -140,7 +140,7 @@ func (c *IPConn) WriteToIP(b []byte, addr *IPAddr) (int, error) {
if err != nil { if err != nil {
return 0, &OpError{"write", c.fd.net, addr, err} return 0, &OpError{"write", c.fd.net, addr, err}
} }
return c.fd.WriteTo(b, sa) return c.fd.writeTo(b, sa)
} }
// WriteTo implements the PacketConn WriteTo method. // WriteTo implements the PacketConn WriteTo method.
@ -169,7 +169,7 @@ func (c *IPConn) WriteMsgIP(b, oob []byte, addr *IPAddr) (n, oobn int, err error
if err != nil { if err != nil {
return 0, 0, &OpError{"write", c.fd.net, addr, err} return 0, 0, &OpError{"write", c.fd.net, addr, err}
} }
return c.fd.WriteMsg(b, oob, sa) return c.fd.writeMsg(b, oob, sa)
} }
// DialIP connects to the remote address raddr on the network protocol // DialIP connects to the remote address raddr on the network protocol

8
src/pkg/net/udpsock_posix.go
View File

@ -64,7 +64,7 @@ func (c *UDPConn) ReadFromUDP(b []byte) (n int, addr *UDPAddr, err error) {
if !c.ok() { if !c.ok() {
return 0, nil, syscall.EINVAL return 0, nil, syscall.EINVAL
} }
n, sa, err := c.fd.ReadFrom(b) n, sa, err := c.fd.readFrom(b)
switch sa := sa.(type) { switch sa := sa.(type) {
case *syscall.SockaddrInet4: case *syscall.SockaddrInet4:
addr = &UDPAddr{IP: sa.Addr[0:], Port: sa.Port} addr = &UDPAddr{IP: sa.Addr[0:], Port: sa.Port}
@ -93,7 +93,7 @@ func (c *UDPConn) ReadMsgUDP(b, oob []byte) (n, oobn, flags int, addr *UDPAddr,
return 0, 0, 0, nil, syscall.EINVAL return 0, 0, 0, nil, syscall.EINVAL
} }
var sa syscall.Sockaddr var sa syscall.Sockaddr
n, oobn, flags, sa, err = c.fd.ReadMsg(b, oob) n, oobn, flags, sa, err = c.fd.readMsg(b, oob)
switch sa := sa.(type) { switch sa := sa.(type) {
case *syscall.SockaddrInet4: case *syscall.SockaddrInet4:
addr = &UDPAddr{IP: sa.Addr[0:], Port: sa.Port} addr = &UDPAddr{IP: sa.Addr[0:], Port: sa.Port}
@ -124,7 +124,7 @@ func (c *UDPConn) WriteToUDP(b []byte, addr *UDPAddr) (int, error) {
if err != nil { if err != nil {
return 0, &OpError{"write", c.fd.net, addr, err} return 0, &OpError{"write", c.fd.net, addr, err}
} }
return c.fd.WriteTo(b, sa) return c.fd.writeTo(b, sa)
} }
// WriteTo implements the PacketConn WriteTo method. // WriteTo implements the PacketConn WriteTo method.
@ -156,7 +156,7 @@ func (c *UDPConn) WriteMsgUDP(b, oob []byte, addr *UDPAddr) (n, oobn int, err er
if err != nil { if err != nil {
return 0, 0, &OpError{"write", c.fd.net, addr, err} return 0, 0, &OpError{"write", c.fd.net, addr, err}
} }
return c.fd.WriteMsg(b, oob, sa) return c.fd.writeMsg(b, oob, sa)
} }
// DialUDP connects to the remote address raddr on the network net, // DialUDP connects to the remote address raddr on the network net,

10
src/pkg/net/unixsock_posix.go
View File

@ -124,7 +124,7 @@ func (c *UnixConn) ReadFromUnix(b []byte) (n int, addr *UnixAddr, err error) {
if !c.ok() { if !c.ok() {
return 0, nil, syscall.EINVAL return 0, nil, syscall.EINVAL
} }
n, sa, err := c.fd.ReadFrom(b) n, sa, err := c.fd.readFrom(b)
switch sa := sa.(type) { switch sa := sa.(type) {
case *syscall.SockaddrUnix: case *syscall.SockaddrUnix:
if sa.Name != "" { if sa.Name != "" {
@ -151,7 +151,7 @@ func (c *UnixConn) ReadMsgUnix(b, oob []byte) (n, oobn, flags int, addr *UnixAdd
if !c.ok() { if !c.ok() {
return 0, 0, 0, nil, syscall.EINVAL return 0, 0, 0, nil, syscall.EINVAL
} }
n, oobn, flags, sa, err := c.fd.ReadMsg(b, oob) n, oobn, flags, sa, err := c.fd.readMsg(b, oob)
switch sa := sa.(type) { switch sa := sa.(type) {
case *syscall.SockaddrUnix: case *syscall.SockaddrUnix:
if sa.Name != "" { if sa.Name != "" {
@ -181,7 +181,7 @@ func (c *UnixConn) WriteToUnix(b []byte, addr *UnixAddr) (n int, err error) {
return 0, syscall.EAFNOSUPPORT return 0, syscall.EAFNOSUPPORT
} }
sa := &syscall.SockaddrUnix{Name: addr.Name} sa := &syscall.SockaddrUnix{Name: addr.Name}
return c.fd.WriteTo(b, sa) return c.fd.writeTo(b, sa)
} }
// WriteTo implements the PacketConn WriteTo method. // WriteTo implements the PacketConn WriteTo method.
@ -211,9 +211,9 @@ func (c *UnixConn) WriteMsgUnix(b, oob []byte, addr *UnixAddr) (n, oobn int, err
return 0, 0, syscall.EAFNOSUPPORT return 0, 0, syscall.EAFNOSUPPORT
} }
sa := &syscall.SockaddrUnix{Name: addr.Name} sa := &syscall.SockaddrUnix{Name: addr.Name}
return c.fd.WriteMsg(b, oob, sa) return c.fd.writeMsg(b, oob, sa)
} }
return c.fd.WriteMsg(b, oob, nil) return c.fd.writeMsg(b, oob, nil)
} }
// CloseRead shuts down the reading side of the Unix domain connection. // CloseRead shuts down the reading side of the Unix domain connection.