/* ====================================================================
- * Copyright (c) 1998-1999 The Apache Group. All rights reserved.
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2003 The Apache Software Foundation. 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.
+ * 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
- * apache@apache.org.
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
*
- * 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.
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
*
- * 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/)."
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
*
- * 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
+ * THIS SOFTWARE IS PROVIDED ``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 SOFTWARE FOUNDATION 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.
+ * 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/>.
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
*
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
*/
#include "apr_network_io.h"
+#include "apr_strings.h"
+
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+
+#define CORE_PRIVATE
+#include "ap_config.h"
#include "httpd.h"
#include "http_config.h"
#include "ap_listen.h"
#include "http_log.h"
+#include "mpm.h"
+#include "mpm_common.h"
+
+ap_listen_rec *ap_listeners = NULL;
-ap_listen_rec *ap_listeners;
static ap_listen_rec *old_listeners;
static int ap_listenbacklog;
static int send_buffer_size;
/* TODO: make_sock is just begging and screaming for APR abstraction */
-static ap_status_t make_sock(ap_context_t *p, ap_listen_rec *server)
+static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server)
{
- ap_socket_t *s = server->sd;
+ apr_socket_t *s = server->sd;
int one = 1;
- char addr[512];
- ap_status_t stat;
-
- ap_cpystrn(addr, "[@main/listen.c:make_sock(): inet_ntoa(server->sin_addr)]", sizeof addr);
-
- stat = ap_setsocketopt(s, APR_SO_REUSEADDR, one);
+#if APR_HAVE_IPV6
+#ifdef AP_ENABLE_V4_MAPPED
+ int v6only_setting = 0;
+#else
+ int v6only_setting = 1;
+#endif
+#endif
+ apr_status_t stat;
+
+#ifndef WIN32
+ stat = apr_socket_opt_set(s, APR_SO_REUSEADDR, one);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, NULL,
- "make_sock: for %s, setsockopt: (SO_REUSEADDR)", addr);
- ap_close_socket(s);
- return stat;
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ "make_sock: for address %pI, apr_socket_opt_set: (SO_REUSEADDR)",
+ server->bind_addr);
+ apr_socket_close(s);
+ return stat;
}
-
- stat = ap_setsocketopt(s, APR_SO_KEEPALIVE, one);
+#endif
+
+ stat = apr_socket_opt_set(s, APR_SO_KEEPALIVE, one);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, NULL,
- "make_sock: for %s, setsockopt: (SO_KEEPALIVE)", addr);
- ap_close_socket(s);
- return stat;
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ "make_sock: for address %pI, apr_socket_opt_set: (SO_KEEPALIVE)",
+ server->bind_addr);
+ apr_socket_close(s);
+ return stat;
}
+#if APR_HAVE_IPV6
+ if (server->bind_addr->family == APR_INET6) {
+ stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
+ if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ "make_sock: for address %pI, apr_socket_opt_set: "
+ "(IPV6_V6ONLY)",
+ server->bind_addr);
+ apr_socket_close(s);
+ return stat;
+ }
+ }
+#endif
+
/*
* To send data over high bandwidth-delay connections at full
* speed we must force the TCP window to open wide enough to keep the
* If no size is specified, use the kernel default.
*/
if (send_buffer_size) {
- stat = ap_setsocketopt(s, APR_SO_SNDBUF, send_buffer_size);
+ stat = apr_socket_opt_set(s, APR_SO_SNDBUF, send_buffer_size);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, NULL,
- "make_sock: failed to set SendBufferSize for %s, "
- "using default", addr);
- /* not a fatal error */
- }
+ ap_log_perror(APLOG_MARK, APLOG_WARNING, stat, p,
+ "make_sock: failed to set SendBufferSize for "
+ "address %pI, using default",
+ server->bind_addr);
+ /* not a fatal error */
+ }
}
- if ((stat = ap_bind(s)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, NULL,
- "make_sock: could not bind to %s", addr);
- ap_close_socket(s);
- return stat;
+#if APR_TCP_NODELAY_INHERITED
+ ap_sock_disable_nagle(s);
+#endif
+
+ if ((stat = apr_socket_bind(s, server->bind_addr)) != APR_SUCCESS) {
+ ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, stat, p,
+ "make_sock: could not bind to address %pI",
+ server->bind_addr);
+ apr_socket_close(s);
+ return stat;
}
- if ((stat = ap_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, NULL,
- "make_sock: unable to listen for connections on %s", addr);
- ap_close_socket(s);
- return stat;
+ if ((stat = apr_socket_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
+ ap_log_perror(APLOG_MARK, APLOG_STARTUP|APLOG_ERR, stat, p,
+ "make_sock: unable to listen for connections "
+ "on address %pI",
+ server->bind_addr);
+ apr_socket_close(s);
+ return stat;
}
+#ifdef WIN32
+ /* I seriously doubt that this would work on Unix; I have doubts that
+ * it entirely solves the problem on Win32. However, since setting
+ * reuseaddr on the listener -prior- to binding the socket has allowed
+ * us to attach to the same port as an already running instance of
+ * Apache, or even another web server, we cannot identify that this
+ * port was exclusively granted to this instance of Apache.
+ *
+ * So set reuseaddr, but do not attempt to do so until we have the
+ * parent listeners successfully bound.
+ */
+ stat = apr_socket_opt_set(s, APR_SO_REUSEADDR, one);
+ if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ "make_sock: for address %pI, apr_socket_opt_set: (SO_REUSEADDR)",
+ server->bind_addr);
+ apr_socket_close(s);
+ return stat;
+ }
+#endif
+
+#if APR_HAS_SO_ACCEPTFILTER
+#ifndef ACCEPT_FILTER_NAME
+#define ACCEPT_FILTER_NAME "dataready"
+#endif
+ apr_socket_accept_filter(s, ACCEPT_FILTER_NAME, "");
+#endif
+
server->sd = s;
server->active = 1;
+
+#ifdef MPM_ACCEPT_FUNC
+ server->accept_func = MPM_ACCEPT_FUNC;
+#else
+ server->accept_func = NULL;
+#endif
+
return APR_SUCCESS;
}
-
-static ap_status_t close_listeners_on_exec(void *v)
+static apr_status_t close_listeners_on_exec(void *v)
{
ap_listen_rec *lr;
for (lr = ap_listeners; lr; lr = lr->next) {
- ap_close_socket(lr->sd);
- lr->active = 0;
+ apr_socket_close(lr->sd);
+ lr->active = 0;
}
+
return APR_SUCCESS;
}
-static void alloc_listener(process_rec *process, char *addr, unsigned int port)
+static const char *alloc_listener(process_rec *process, char *addr, apr_port_t port)
{
- ap_listen_rec **walk;
- ap_listen_rec *new;
- char oldaddr[17];
- unsigned int oldport;
+ ap_listen_rec **walk, *last;
+ apr_status_t status;
+ apr_sockaddr_t *sa;
+ int found_listener = 0;
/* see if we've got an old listener for this address:port */
- for (walk = &old_listeners; *walk; walk = &(*walk)->next) {
- ap_getport(&oldport, (*walk)->sd);
- ap_getipaddr(oldaddr,sizeof oldaddr,(*walk)->sd);
- if (!strcmp(oldaddr, addr) && port == oldport) {
- /* re-use existing record */
- new = *walk;
- *walk = new->next;
- new->next = ap_listeners;
- ap_listeners = new;
- return;
- }
+ for (walk = &old_listeners; *walk;) {
+ sa = (*walk)->bind_addr;
+ /* Some listeners are not real so they will not have a bind_addr. */
+ if (sa) {
+ ap_listen_rec *new;
+ apr_port_t oldport;
+
+ apr_sockaddr_port_get(&oldport, sa);
+ /* If both ports are equivalent, then if their names are equivalent,
+ * then we will re-use the existing record.
+ */
+ if (port == oldport &&
+ ((!addr && !sa->hostname) ||
+ ((addr && sa->hostname) && !strcmp(sa->hostname, addr)))) {
+ new = *walk;
+ *walk = new->next;
+ new->next = ap_listeners;
+ ap_listeners = new;
+ found_listener = 1;
+ continue;
+ }
+ }
+
+ walk = &(*walk)->next;
}
- /* this has to survive restarts */
- /* XXX - We need to deal with freeing this structure properly. */
- new = ap_palloc(process->pool, sizeof(ap_listen_rec));
- new->active = 0;
- if (ap_create_tcp_socket(&new->sd, NULL) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, NULL,
- "make_sock: failed to get a socket for %s", addr);
- return;
+ if (found_listener) {
+ return NULL;
+ }
+
+ if ((status = apr_sockaddr_info_get(&sa, addr, APR_UNSPEC, port, 0,
+ process->pool))
+ != APR_SUCCESS) {
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool,
+ "alloc_listener: failed to set up sockaddr for %s",
+ addr);
+ return "Listen setup failed";
+ }
+
+ /* Initialize to our last configured ap_listener. */
+ last = ap_listeners;
+ while (last && last->next) {
+ last = last->next;
+ }
+
+ while (sa) {
+ ap_listen_rec *new;
+
+ /* this has to survive restarts */
+ new = apr_palloc(process->pool, sizeof(ap_listen_rec));
+ new->active = 0;
+ new->next = 0;
+ new->bind_addr = sa;
+
+ /* Go to the next sockaddr. */
+ sa = sa->next;
+
+ status = apr_socket_create(&new->sd, new->bind_addr->family,
+ SOCK_STREAM, 0, process->pool);
+
+#if APR_HAVE_IPV6
+ /* What could happen is that we got an IPv6 address, but this system
+ * doesn't actually support IPv6. Try the next address.
+ */
+ if (status != APR_SUCCESS && !addr &&
+ new->bind_addr->family == APR_INET6) {
+ continue;
+ }
+#endif
+ if (status != APR_SUCCESS) {
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool,
+ "alloc_listener: failed to get a socket for %s",
+ addr);
+ return "Listen setup failed";
+ }
+
+ /* We need to preserve the order returned by getaddrinfo() */
+ if (last == NULL) {
+ ap_listeners = last = new;
+ } else {
+ last->next = new;
+ last = new;
+ }
}
- ap_setport(new->sd, port);
- ap_setipaddr(new->sd, addr);
- new->next = ap_listeners;
- ap_listeners = new;
-}
+ return NULL;
+}
-int ap_listen_open(process_rec *process, unsigned port)
+static int ap_listen_open(apr_pool_t *pool, apr_port_t port)
{
- ap_context_t *pconf = process->pconf;
ap_listen_rec *lr;
ap_listen_rec *next;
+ ap_listen_rec *previous;
int num_open;
+ const char *userdata_key = "ap_listen_open";
+ void *data;
- /* allocate a default listener if necessary */
- if (ap_listeners == NULL) {
- alloc_listener(process, APR_ANYADDR, port ? port : DEFAULT_HTTP_PORT);
- }
-
+ /* Don't allocate a default listener. If we need to listen to a
+ * port, then the user needs to have a Listen directive in their
+ * config file.
+ */
num_open = 0;
- for (lr = ap_listeners; lr; lr = lr->next) {
- if (lr->active) {
- ++num_open;
- }
- else {
- if (make_sock(pconf, lr) == APR_SUCCESS) {
- ++num_open;
- lr->active = 1;
- }
- }
+ previous = NULL;
+ for (lr = ap_listeners; lr; previous = lr, lr = lr->next) {
+ if (lr->active) {
+ ++num_open;
+ }
+ else {
+#if APR_HAVE_IPV6
+ int v6only_setting;
+ /* If we are trying to bind to 0.0.0.0 and the previous listener
+ * was :: on the same port and in turn that socket does not have
+ * the IPV6_V6ONLY flag set; we must skip the current attempt to
+ * listen (which would generate an error). IPv4 will be handled
+ * on the established IPv6 socket.
+ */
+ if (previous != NULL &&
+ lr->bind_addr->family == APR_INET &&
+ lr->bind_addr->sa.sin.sin_addr.s_addr == INADDR_ANY &&
+ lr->bind_addr->port == previous->bind_addr->port &&
+ previous->bind_addr->family == APR_INET6 &&
+ IN6_IS_ADDR_UNSPECIFIED(
+ &previous->bind_addr->sa.sin6.sin6_addr) &&
+ apr_socket_opt_get(previous->sd, APR_IPV6_V6ONLY,
+ &v6only_setting) == APR_SUCCESS &&
+ v6only_setting == 0) {
+
+ /* Remove the current listener from the list */
+ previous->next = lr->next;
+ continue;
+ }
+#endif
+ if (make_sock(pool, lr) == APR_SUCCESS) {
+ ++num_open;
+ lr->active = 1;
+ }
+ else {
+#if APR_HAVE_IPV6
+ /* If we tried to bind to ::, and the next listener is
+ * on 0.0.0.0 with the same port, don't give a fatal
+ * error. The user will still get a warning from make_sock
+ * though.
+ */
+ if (lr->next != NULL && lr->bind_addr->family == APR_INET6 &&
+ IN6_IS_ADDR_UNSPECIFIED(
+ &lr->bind_addr->sa.sin6.sin6_addr) &&
+ lr->bind_addr->port == lr->next->bind_addr->port &&
+ lr->next->bind_addr->family == APR_INET &&
+ lr->next->bind_addr->sa.sin.sin_addr.s_addr == INADDR_ANY) {
+
+ /* Remove the current listener from the list */
+ if (previous) {
+ previous->next = lr->next;
+ }
+ else {
+ ap_listeners = lr->next;
+ }
+
+ /* So that previous becomes NULL in the next iteration */
+ lr = NULL;
+
+ continue;
+ }
+#endif
+ /* fatal error */
+ return -1;
+ }
+ }
}
/* close the old listeners */
for (lr = old_listeners; lr; lr = next) {
- ap_close_socket(lr->sd);
- lr->active = 0;
- next = lr->next;
-/* free(lr);*/
+ apr_socket_close(lr->sd);
+ lr->active = 0;
+ next = lr->next;
}
old_listeners = NULL;
- ap_register_cleanup(pconf, NULL, ap_null_cleanup, close_listeners_on_exec);
+ /* we come through here on both passes of the open logs phase
+ * only register the cleanup once... otherwise we try to close
+ * listening sockets twice when cleaning up prior to exec
+ */
+ apr_pool_userdata_get(&data, userdata_key, pool);
+ if (!data) {
+ apr_pool_userdata_set((const void *)1, userdata_key,
+ apr_pool_cleanup_null, pool);
+ apr_pool_cleanup_register(pool, NULL, apr_pool_cleanup_null,
+ close_listeners_on_exec);
+ }
return num_open ? 0 : -1;
}
+int ap_setup_listeners(server_rec *s)
+{
+ ap_listen_rec *lr;
+ int num_listeners = 0;
+
+ if (ap_listen_open(s->process->pool, s->port)) {
+ return 0;
+ }
+
+ for (lr = ap_listeners; lr; lr = lr->next) {
+ num_listeners++;
+ }
+
+ return num_listeners;
+}
void ap_listen_pre_config(void)
{
}
-const char *ap_set_listener(cmd_parms *cmd, void *dummy, char *ips)
+const char *ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips)
{
- char *ports;
- unsigned short port;
-
+ char *host, *scope_id;
+ apr_port_t port;
+ apr_status_t rv;
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
if (err != NULL) {
return err;
}
- ports = strchr(ips, ':');
- if (ports != NULL) {
- if (ports == ips) {
- return "Missing IP address";
- }
- else if (ports[1] == '\0') {
- return "Address must end in :<port-number>";
- }
- *(ports++) = '\0';
- }
- else {
- ports = ips;
+ rv = apr_parse_addr_port(&host, &scope_id, &port, ips, cmd->pool);
+ if (rv != APR_SUCCESS) {
+ return "Invalid address or port";
}
- port = atoi(ports);
- if (!port) {
- return "Port must be numeric";
+ if (host && !strcmp(host, "*")) {
+ host = NULL;
}
- if (ports == ips) { /* no address */
- alloc_listener(cmd->server->process, APR_ANYADDR, port);
+ if (scope_id) {
+ /* XXX scope id support is useful with link-local IPv6 addresses */
+ return "Scope id is not supported";
}
- else {
- ips[(ports - ips) - 1] = '\0';
- alloc_listener(cmd->server->process, ips, port);
+
+ if (!port) {
+ return "Port must be specified";
}
- return NULL;
+ return alloc_listener(cmd->server->process, host, port);
}
-const char *ap_set_listenbacklog(cmd_parms *cmd, void *dummy, char *arg)
+const char *ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg)
{
int b;
-
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
if (err != NULL) {
return err;
}
if (b < 1) {
return "ListenBacklog must be > 0";
}
+
ap_listenbacklog = b;
return NULL;
}
-const char *ap_set_send_buffer_size(cmd_parms *cmd, void *dummy, char *arg)
+const char *ap_set_send_buffer_size(cmd_parms *cmd, void *dummy,
+ const char *arg)
{
int s = atoi(arg);
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+
if (err != NULL) {
return err;
}
if (s < 512 && s != 0) {
return "SendBufferSize must be >= 512 bytes, or 0 for system default.";
}
+
send_buffer_size = s;
return NULL;
}
projects / apache / blobdiff