/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
*/
#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 "http_config.h"
#include "ap_listen.h"
#include "http_log.h"
-#include <string.h>
+#include "mpm.h"
+#include "mpm_common.h"
+
ap_listen_rec *ap_listeners;
+#if APR_HAVE_IPV6
+static int default_family = APR_UNSPEC;
+#else
+static int default_family = APR_INET;
+#endif
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_pool_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_uint32_t port;
- char *ipaddr;
+ apr_status_t stat;
- ap_get_local_port(&port,s);
- ap_get_local_ipaddr(&ipaddr,s);
- ap_snprintf(addr, sizeof(addr), "address %s port %u", ipaddr,
- (unsigned) port);
-
- stat = ap_setsocketopt(s, APR_SO_REUSEADDR, one);
+ stat = apr_setsocketopt(s, APR_SO_REUSEADDR, one);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
- "make_sock: for %s, setsockopt: (SO_REUSEADDR)", addr);
- ap_close_socket(s);
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ "make_sock: for address %pI, setsockopt: (SO_REUSEADDR)",
+ server->bind_addr);
+ apr_socket_close(s);
return stat;
}
- stat = ap_setsocketopt(s, APR_SO_KEEPALIVE, one);
+ stat = apr_setsocketopt(s, APR_SO_KEEPALIVE, one);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, stat, NULL,
- "make_sock: for %s, setsockopt: (SO_KEEPALIVE)", addr);
- ap_close_socket(s);
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
+ "make_sock: for address %pI, setsockopt: (SO_KEEPALIVE)",
+ server->bind_addr);
+ apr_socket_close(s);
return stat;
}
* 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_setsocketopt(s, APR_SO_SNDBUF, send_buffer_size);
if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, stat, NULL,
- "make_sock: failed to set SendBufferSize for %s, "
- "using default", addr);
+ 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, stat, NULL,
- "make_sock: could not bind to %s", addr);
- ap_close_socket(s);
+#if APR_TCP_NODELAY_INHERITED
+ ap_sock_disable_nagle(s);
+#endif
+
+ if ((stat = apr_bind(s, server->bind_addr)) != APR_SUCCESS) {
+ ap_log_perror(APLOG_MARK, 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, stat, NULL,
- "make_sock: unable to listen for connections on %s", addr);
- ap_close_socket(s);
+ if ((stat = apr_listen(s, ap_listenbacklog)) != APR_SUCCESS) {
+ ap_log_perror(APLOG_MARK, APLOG_ERR, stat, p,
+ "make_sock: unable to listen for connections on address %pI",
+ server->bind_addr);
+ apr_socket_close(s);
return stat;
}
+#ifdef 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;
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);
+ apr_socket_close(lr->sd);
lr->active = 0;
}
return APR_SUCCESS;
}
-static void alloc_listener(process_rec *process, char *addr, unsigned int port)
+static void find_default_family(apr_pool_t *p)
+{
+#if APR_HAVE_IPV6
+ /* We know the platform supports IPv6, but this particular
+ * system may not have IPv6 enabled. See if we can get an
+ * AF_INET6 socket.
+ */
+ if (default_family == APR_UNSPEC) {
+ apr_socket_t *tmp_sock;
+
+ if (apr_socket_create(&tmp_sock, APR_INET6, SOCK_STREAM,
+ p) == APR_SUCCESS) {
+ apr_socket_close(tmp_sock);
+ default_family = APR_INET6;
+ }
+ else {
+ default_family = APR_INET;
+ }
+ }
+#endif
+}
+
+
+static void alloc_listener(process_rec *process, char *addr, apr_port_t port)
{
ap_listen_rec **walk;
ap_listen_rec *new;
- ap_status_t status;
+ apr_status_t status;
char *oldaddr;
- unsigned int oldport;
+ apr_port_t oldport;
+ apr_sockaddr_t *sa;
+
+ if (!addr) { /* don't bind to specific interface */
+ find_default_family(process->pool);
+ switch(default_family) {
+ case APR_INET:
+ addr = "0.0.0.0";
+ break;
+#if APR_HAVE_IPV6
+ case APR_INET6:
+ addr = "::";
+ break;
+#endif
+ default:
+ ap_assert(1 != 1); /* should not occur */
+ }
+ }
/* see if we've got an old listener for this address:port */
for (walk = &old_listeners; *walk; walk = &(*walk)->next) {
- ap_get_local_port(&oldport, (*walk)->sd);
- ap_get_local_ipaddr(&oldaddr,(*walk)->sd);
+ sa = (*walk)->bind_addr;
+ apr_sockaddr_port_get(&oldport, sa);
+ apr_sockaddr_ip_get(&oldaddr, sa);
if (!strcmp(oldaddr, addr) && port == oldport) {
/* re-use existing record */
new = *walk;
}
/* this has to survive restarts */
- new = ap_palloc(process->pool, sizeof(ap_listen_rec));
+ new = apr_palloc(process->pool, sizeof(ap_listen_rec));
new->active = 0;
- if ((status = ap_create_tcp_socket(&new->sd, process->pool)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, status, NULL,
- "make_sock: failed to get a socket for %s", addr);
+ if ((status = apr_sockaddr_info_get(&new->bind_addr, 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;
+ }
+ if ((status = apr_socket_create(&new->sd, new->bind_addr->sa.sin.sin_family,
+ SOCK_STREAM, process->pool)) != APR_SUCCESS) {
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool,
+ "alloc_listener: failed to get a socket for %s", addr);
return;
}
- ap_set_local_port(new->sd, port);
- ap_set_local_ipaddr(new->sd, addr);
+ apr_socket_set_inherit(new->sd);
new->next = ap_listeners;
ap_listeners = new;
}
-
-int ap_listen_open(process_rec *process, unsigned port)
+#if !defined(SPMT_OS2_MPM)
+static
+#endif
+int ap_listen_open(process_rec *process, apr_port_t port)
{
- ap_pool_t *pconf = process->pconf;
+ apr_pool_t *pconf = process->pconf;
ap_listen_rec *lr;
ap_listen_rec *next;
int num_open;
/* allocate a default listener if necessary */
if (ap_listeners == NULL) {
- alloc_listener(process, APR_ANYADDR, port ? port : DEFAULT_HTTP_PORT);
+ alloc_listener(process, NULL, port ? port : DEFAULT_HTTP_PORT);
}
num_open = 0;
/* close the old listeners */
for (lr = old_listeners; lr; lr = next) {
- ap_close_socket(lr->sd);
+ apr_socket_close(lr->sd);
lr->active = 0;
next = lr->next;
/* free(lr);*/
}
old_listeners = NULL;
- ap_register_cleanup(pconf, NULL, ap_null_cleanup, close_listeners_on_exec);
+ apr_pool_cleanup_register(pconf, 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, 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';
+ rv = apr_parse_addr_port(&host, &scope_id, &port, ips, cmd->pool);
+ if (rv != APR_SUCCESS) {
+ return "Invalid address or port";
}
- else {
- ports = ips;
+ if (host && !strcmp(host, "*")) {
+ host = NULL;
+ }
+ if (scope_id) {
+ /* XXX scope id support is useful with link-local IPv6 addresses */
+ return "Scope id is not supported";
}
-
- port = atoi(ports);
if (!port) {
- return "Port must be numeric";
+ return "Port must be specified";
}
- if (ports == ips) { /* no address */
- alloc_listener(cmd->server->process, APR_ANYADDR, port);
- }
- else {
- ips[(ports - ips) - 1] = '\0';
- alloc_listener(cmd->server->process, ips, port);
- }
+ alloc_listener(cmd->server->process, host, port);
return NULL;
}
-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;
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);
projects / apache / blobdiff