rbb 99/04/14 12:17:28
Modified: apr/network_io/unix Makefile networkio.h
Added: apr/network_io/unix select.c
Log:
Adding select functions for use with apr_socket_t.
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 1999/04/14 16:38:23 1.3
+++ Makefile 1999/04/14 19:17:18 1.4
@@ -47,7 +47,7 @@
LIB= libnetwork.a
-OBJS= sockets.o sendrecv.o sockopt.o
+OBJS= sockets.o sendrecv.o sockopt.o select.o
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $<
@@ -85,3 +85,4 @@
sockets.o: sockets.c
sendrecv.o: sendrecv.c
sockopt.o: sockopt.c
+select.o: select.c
1.2 +2 -0 apache-apr/apr/network_io/unix/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/unix/networkio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- networkio.h 1999/04/13 11:49:53 1.1
+++ networkio.h 1999/04/14 19:17:20 1.2
@@ -62,5 +62,7 @@
char *hostname;
};
+typedef fd_set sd_set_t;
+
#endif /* ! NETWORK_IO_H */
1.1 apache-apr/apr/network_io/unix/select.c
Index: select.c
===================================================================
/* ====================================================================
* Copyright (c) 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.
* For more information on the Apache Group and the Apache HTTP server
* project, please see <http://www.apache.org/>.
*
*/
#include "apr_network_io.h"
#include "apr_general.h"
#include <errno.h>
#include <sys/time.h>
#include <sys/types.h>
void apr_sd_set(apr_socket_t *sock, apr_sd_set_t *sd_set)
{
FDSET(sock->socketdes, sd_set);
}
void apr_sd_clr(apr_socket_t *sock, apr_sd_set_t *sd_set)
{
FD_CLR(sock->socketdes, sd_set);
}
apr_status_t apr_sd_isset(apr_socket_t *sock, apr_sd_set_t *sd_set)
{
if (FD_ISSET(sock->socketdes, sd_set))
return APR_SUCCESS;
return APR_FAILURE;
}
void apr_sd_zero(apr_sd_set_t *sd_set)
{
FD_ZERO(sd_set);
}
apr_int32_t apr_select(apr_int32_t nsd, apr_sd_set_t *readset, apr_sd_set_t
*writeset, apr_sd_set_t *exceptset, struct timeval *timeout)
{
return select(nsd, readset, writeset, exceptset, timeout);
}
