rbb 99/04/14 07:03:58
Modified: apr/network_io/unix Makefile
Added: apr/network_io/unix sendrecv.c
Log:
Add the apr_send and apr_recv functions, and the changes to the Makefile.
Revision Changes Path
1.2 +2 -1 apache-apr/apr/network_io/unix/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/unix/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 1999/04/13 11:49:53 1.1
+++ Makefile 1999/04/14 14:03:58 1.2
@@ -47,7 +47,7 @@
LIB= libnetwork.a
-OBJS= sockets.o
+OBJS= sockets.o sendrecv.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
@@ -83,3 +83,4 @@
# DO NOT REMOVE
sockets.o: sockets.c
+sendrecv.o: sendrecv.c
1.1 apache-apr/apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===================================================================
/* ====================================================================
* Copyright (c) 1996-1999 The Apache Group. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by the Apache Group
* for use in the Apache HTTP server project (http://www.apache.org/)."
*
* 4. The names "Apache Server" and "Apache Group" must not be used to
* endorse or promote products derived from this software without
* prior written permission. For written permission, please contact
* [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by the Apache Group
* for use in the Apache HTTP server project (http://www.apache.org/)."
*
* THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Group and was originally based
* on public domain software written at the National Center for
* Supercomputing Applications, University of Illinois, Urbana-Champaign.
* For more information on the Apache Group and the Apache HTTP server
* project, please see <http://www.apache.org/>.
*
*/
#include "apr_errno.h"
#include "apr_general.h"
#include "apr_network_io.h"
#include <sys/time.h>
apr_int32_t apr_send(apr_socket_t *sock, const char *buf, int len, time_t
sec)
{
fd_set fdset;
struct timeval tv;
int err = EAGAIN;
apr_int32_t rv;
tv.tv_sec = sec;
if (tv.tv_sec == 0) {
return (write(sock->socketdes, buf, len));
}
rv = write(sock->socketdes, buf, len);
if (rv == -1) {
err = errno;
if (err == EAGAIN || errno == EINTR) {
FD_ZERO(&fdset);
FD_SET(sock->socketdes, &fdset);
tv.tv_usec = 0;
do {
rv = select(FD_SETSIZE, NULL, &fdset, NULL, &tv);
} while (rv == -1 && errno == EINTR);
if (rv == -1 || rv == 0) {
err = errno;
return APR_FAILURE;
}
else {
return write(sock->socketdes, buf, len);
}
}
}
}
static int recvwithtimeout(apr_socket_t *sock, char *buf, int len, time_t sec)
{
fd_set fdset;
struct timeval tv;
int err = EAGAIN;
int rv;
tv.tv_sec = sec;
if (tv.tv_sec == 0) {
return (read(sock->socketdes, buf, len));
}
rv = read(sock->socketdes, buf, len);
if (rv == -1) {
err = errno;
if (err == EAGAIN || errno == EINTR) {
FD_ZERO(&fdset);
FD_SET(sock->socketdes, &fdset);
tv.tv_usec = 0;
do {
rv = select(FD_SETSIZE, &fdset, NULL, NULL, &tv);
} while (rv == -1 && errno == EINTR);
if (rv == -1 || rv == 0) {
err = errno;
return APR_FAILURE;
}
else {
return read(sock->socketdes, buf, len);
}
}
}
}
