diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-31 16:39:06 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-31 16:39:06 +0000 |
| commit | 57cfaad2f5cb97a66c3353cf11f62c39dd0b5ea9 (patch) | |
| tree | 4cd6e89ca949ddcda7c0438f4860abfefca8bc7a /cpukit/librpc/src/rpc/svc_tcp.c | |
| parent | 2000-10-30 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-57cfaad2f5cb97a66c3353cf11f62c39dd0b5ea9.tar.bz2 | |
2000-10-30 Joel Sherrill <joel@OARcorp.com>
* POSIX include files merged into newlib. This resulted in
some definitions moving to other files and thus some secondary
effects in RTEMS source code.
* src/rpc/Makefile.am, src/rpc/auth_time.c, src/rpc/clnt_simple.c,
src/rpc/clnt_tcp.c, src/rpc/clnt_udp.c, src/rpc/clnt_unix.c,
src/rpc/get_myaddress.c, src/rpc/pmap_clnt.c, src/rpc/pmap_getmaps.c,
src/rpc/pmap_getport.c, src/rpc/pmap_rmt.c, src/rpc/rtime.c,
src/rpc/svc_tcp.c, src/rpc/svc_udp.c, src/rpc/svc_unix.c:
Use of _read, _write, and _close as macros conflicted with
newlib's use of these as routine names. They were renamed to
include "_RPC_" prefix.
Diffstat (limited to 'cpukit/librpc/src/rpc/svc_tcp.c')
| -rw-r--r-- | cpukit/librpc/src/rpc/svc_tcp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpukit/librpc/src/rpc/svc_tcp.c b/cpukit/librpc/src/rpc/svc_tcp.c index 81ae27bead..0c2133a049 100644 --- a/cpukit/librpc/src/rpc/svc_tcp.c +++ b/cpukit/librpc/src/rpc/svc_tcp.c @@ -145,7 +145,7 @@ svctcp_create(sock, sendsize, recvsize) if (ioctl(sock, FIONBIO, &on) < 0) { perror("svc_tcp.c - cannot turn on non-blocking mode"); if (madesock) - (void)_close(sock); + (void)_RPC_close(sock); return ((SVCXPRT *)NULL); } memset(&addr, 0, sizeof (addr)); @@ -159,7 +159,7 @@ svctcp_create(sock, sendsize, recvsize) (listen(sock, 2) != 0)) { perror("svctcp_.c - cannot getsockname or listen"); if (madesock) - (void)_close(sock); + (void)_RPC_close(sock); return ((SVCXPRT *)NULL); } r = (struct tcp_rendezvous *)mem_alloc(sizeof(*r)); @@ -257,7 +257,7 @@ rendezvous_request(xprt) * Guard against FTP bounce attacks. */ if (addr.sin_port == htons(20)) { - _close(sock); + _RPC_close(sock); return (FALSE); } /* @@ -265,7 +265,7 @@ rendezvous_request(xprt) */ off = 0; if (ioctl(sock, FIONBIO, &off) < 0) { - _close(sock); + _RPC_close(sock); return (FALSE); } /* @@ -291,7 +291,7 @@ svctcp_destroy(xprt) register struct tcp_conn *cd = (struct tcp_conn *)xprt->xp_p1; xprt_unregister(xprt); - (void)_close(xprt->xp_sock); + (void)_RPC_close(xprt->xp_sock); if (xprt->xp_port != 0) { /* a rendezvouser socket */ xprt->xp_port = 0; @@ -373,7 +373,7 @@ readtcp(xprt, buf, len) } } } while (!FD_ISSET(sock, fds)); - if ((len = _read(sock, buf, len)) > 0) { + if ((len = _RPC_read(sock, buf, len)) > 0) { if (fds != NULL) free(fds); return (len); @@ -398,7 +398,7 @@ writetcp(xprt, buf, len) register int i, cnt; for (cnt = len; cnt > 0; cnt -= i, buf += i) { - if ((i = _write(xprt->xp_sock, buf, cnt)) < 0) { + if ((i = _RPC_write(xprt->xp_sock, buf, cnt)) < 0) { ((struct tcp_conn *)(xprt->xp_p1))->strm_stat = XPRT_DIED; return (-1); |