rbb 99/04/14 09:38:24
Modified: apr/network_io/unix Makefile Added: apr/network_io/unix sockopt.c Log: First pass at setsockopt for apr. Revision Changes Path 1.3 +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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 1999/04/14 14:03:58 1.2 +++ Makefile 1999/04/14 16:38:23 1.3 @@ -47,7 +47,7 @@ LIB= libnetwork.a -OBJS= sockets.o sendrecv.o +OBJS= sockets.o sendrecv.o sockopt.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $< @@ -84,3 +84,4 @@ # DO NOT REMOVE sockets.o: sockets.c sendrecv.o: sendrecv.c +sockopt.o: sockopt.c 1.1 apache-apr/apr/network_io/unix/sockopt.c Index: sockopt.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 <string.h> #include <sys/socket.h> #include <netinet/tcp.h> #include <netinet/in.h> #include <unistd.h> #include <fcntl.h> int soblock(int sd) { int fd_flags; fd_flags = fcntl(sd, F_GETFL, 0); #if defined(O_NONBLOCK) fd_flags &= ~O_NONBLOCK; #elif defined(O_NDELAY) fd_flags &= ~O_NDELAY; #elif defined(FNDELAY) fd_flags &= ~O_FNDELAY; #else /* XXXX: this breaks things, but an alternative isn't obvious...*/ return -1; #endif return fcntl(sd, F_SETFL, fd_flags); } int sononblock(int sd) { int fd_flags; fd_flags = fcntl(sd, F_GETFL, 0); #if defined(O_NONBLOCK) fd_flags |= O_NONBLOCK; #elif defined(O_NDELAY) fd_flags |= O_NDELAY; #eli f defined(FNDELAY) fd_flags |= O_FNDELAY; #else /* XXXX: this breaks things, but an alternative isn't obvious...*/ return -1; #endif return fcntl(sd, F_SETFL, fd_flags); } apr_status_t apr_setsocketopt(apr_socket_t *sock, apr_int32_t opt, apr_int32_t on) { int one; struct linger li; if (on) one = 1; else one = 0; if (opt & APR_SO_KEEPALIVE) { if (setsockopt(sock->socketdes, SOL_SOCKET, SO_KEEPALIVE, (char *) one, sizeof(int)) == -1) { return APR_FAILURE; } } if (opt & APR_SO_DEBUG) { if (setsockopt(sock->socketdes, SOL_SOCKET, SO_DEBUG, (char *) one, sizeof(int)) == -1) { return APR_FAILURE; } } if (opt & APR_SO_REUSEADDR) { if (setsockopt(sock->socketdes, SOL_SOCKET, SO_REUSEADDR, (char *) one, sizeof(int)) == -1) { return APR_FAILURE; } } if (opt & APR_SO_NONBLOCK) { if (on) { if (soblock(sock->socketdes) == -1) return APR_FAILURE; } else { if (sononblock(sock->socketdes) == -1) return APR_FAILURE; } } if (opt & APR_SO_LINGER) { li.l_onoff = on; li.l_linger = MAX_SECS_TO_LINGER; if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(struct linger)) == -1) { return APR_FAILURE; } } return APR_SUCCESS; }