Skip to content

Add Listen options inc FREEBIND support #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
notroj wants to merge 1 commit into from
Closed

Add Listen options inc FREEBIND support #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions include/ap_listen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ typedef struct ap_slave_t ap_slave_t;
typedef struct ap_listen_rec ap_listen_rec;
typedef apr_status_t (*accept_function)(void **csd, ap_listen_rec *lr, apr_pool_t *ptrans);

/* Flags for ap_listen_rec.flags */
#define AP_LISTEN_SPECIFIC_ERRORS (0x0001)
#define AP_LISTEN_FREEBIND (0x0002)
#define AP_LISTEN_REUSEPORT (0x0004)

/**
* @brief Apache's listeners record.
*
Expand Down Expand Up @@ -73,10 +78,9 @@ struct ap_listen_rec {
ap_slave_t *slave;

/**
* Allow the accept_func to return a wider set of return codes
* Various AP_LISTEN_* flags.
*/
int use_specific_errors;

apr_uint32_t flags;
};

/**
Expand Down
5 changes: 3 additions & 2 deletions include/ap_mmn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,14 +628,15 @@
* 20200331.2 (2.5.1-dev) Add ap_proxy_should_override to mod_proxy.h
* 20200331.3 (2.5.1-dev) Add ap_parse_request_line() and
* ap_check_request_header()
* 20200420.0 (2.5.1-dev) Add flags to listen_rec in place of use_specific_errors
*/

#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */

#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20200331
#define MODULE_MAGIC_NUMBER_MAJOR 20200420
#endif
#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */
#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */

/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Expand Down
2 changes: 1 addition & 1 deletion os/unix/unixd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ AP_DECLARE(apr_status_t) ap_unixd_accept(void **accepted, ap_listen_rec *lr,
}

/* Let the caller handle slightly more varied return values */
if (lr->use_specific_errors && ap_accept_error_is_nonfatal(status)) {
if ((lr->flags & AP_LISTEN_SPECIFIC_ERRORS) && ap_accept_error_is_nonfatal(status)) {
return status;
}

Expand Down
100 changes: 88 additions & 12 deletions server/listen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server, int do_bind_
#endif

#if defined(SO_REUSEPORT)
if (ap_have_so_reuseport && ap_listencbratio > 0) {
if (server->flags & AP_LISTEN_REUSEPORT
|| (ap_have_so_reuseport && ap_listencbratio > 0)) {
int thesock;
apr_os_sock_get(&thesock, s);
if (setsockopt(thesock, SOL_SOCKET, SO_REUSEPORT,
Expand All @@ -166,6 +167,21 @@ static apr_status_t make_sock(apr_pool_t *p, ap_listen_rec *server, int do_bind_
}
#endif


#if defined(APR_SO_FREEBIND)
if (server->flags & AP_LISTEN_FREEBIND) {
if (apr_socket_opt_set(s, APR_SO_FREEBIND, one) < 0) {
stat = apr_get_netos_error();
ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p, APLOGNO()
"make_sock: apr_socket_opt_set: "
"error setting APR_SO_FREEBIND");
apr_socket_close(s);
return stat;
}
}
#endif


if (do_bind_listen) {
#if APR_HAVE_IPV6
if (server->bind_addr->family == APR_INET6) {
Expand Down Expand Up @@ -467,7 +483,7 @@ static int find_listeners(ap_listen_rec **from, ap_listen_rec **to,
static const char *alloc_listener(process_rec *process, const char *addr,
apr_port_t port, const char* proto,
const char *scope_id, void *slave,
apr_pool_t *temp_pool)
apr_pool_t *temp_pool, apr_uint32_t flags)
{
ap_listen_rec *last;
apr_status_t status;
Expand Down Expand Up @@ -511,6 +527,7 @@ static const char *alloc_listener(process_rec *process, const char *addr,
new->next = 0;
new->bind_addr = sa;
new->protocol = apr_pstrdup(process->pool, proto);
new->flags = flags;

/* Go to the next sockaddr. */
sa = sa->next;
Expand Down Expand Up @@ -795,7 +812,7 @@ AP_DECLARE(int) ap_setup_listeners(server_rec *s)
}

for (lr = ap_listeners; lr; lr = lr->next) {
lr->use_specific_errors = ap_accept_errors_nonfatal;
if (ap_accept_errors_nonfatal) lr->flags |= AP_LISTEN_SPECIFIC_ERRORS;
num_listeners++;
found = 0;
for (ls = s; ls && !found; ls = ls->next) {
Expand Down Expand Up @@ -885,6 +902,7 @@ AP_DECLARE(apr_status_t) ap_duplicate_listeners(apr_pool_t *p, server_rec *s,
apr_sockaddr_info_get(&sa, hostname, APR_UNSPEC, port, 0, p);
duplr->bind_addr = sa;
duplr->next = NULL;
duplr->flags = lr->flags;
stat = apr_socket_create(&duplr->sd, duplr->bind_addr->family,
SOCK_STREAM, 0, p);
if (stat != APR_SUCCESS) {
Expand Down Expand Up @@ -1015,20 +1033,48 @@ AP_DECLARE(int) ap_accept_error_is_nonfatal(apr_status_t status)
|| APR_STATUS_IS_ECONNRESET(status);
}

/* Parse optional flags argument for Listen. Currently just boolean
* flags handled; would need to be extended to incorporate
* ListenBacklog */
static const char *parse_listen_flags(apr_pool_t *temp_pool, const char *arg,
apr_uint32_t *flags_out)
{
apr_uint32_t flags = 0;
char *str = apr_pstrdup(temp_pool, arg), *token, *state = NULL;

token = apr_strtok(str, ",", &state);
while (token) {
if (ap_cstr_casecmp(token, "freebind") == 0)
flags |= AP_LISTEN_FREEBIND;
else if (ap_cstr_casecmp(token, "reuseport") == 0)
flags |= AP_LISTEN_REUSEPORT;
else
return apr_psprintf(temp_pool, "Unknown Listen option '%s' in '%s'",
token, arg);

token = apr_strtok(NULL, ",", &state);
}

*flags_out = flags;

return NULL;
}

AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
int argc, char *const argv[])
{
char *host, *scope_id, *proto;
char *host, *scope_id, *proto = NULL;
apr_port_t port;
apr_status_t rv;
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
apr_uint32_t flags = 0;

if (err != NULL) {
return err;
}

if (argc < 1 || argc > 2) {
return "Listen requires 1 or 2 arguments.";
if (argc < 1 || argc > 3) {
return "Listen requires 1-3 arguments.";
}
#ifdef HAVE_SYSTEMD
if (use_systemd == -1) {
Expand Down Expand Up @@ -1058,17 +1104,47 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
return "Port must be specified";
}

if (argc != 2) {
if (argc == 3) {
if (strncasecmp(argv[2], "options=", 8)) {
return "Third argument to Listen must be options=...";
}

err = parse_listen_flags(cmd->temp_pool, argv[2] + 8, &flags);
if (err) {
return err;
}

proto = argv[1];
}

if (argc == 2) {
/* 2-arg form is either 'Listen host:port options=...' or
* 'Listen host:port protocol' */
if (strncasecmp(argv[1], "options=", 8) == 0) {
err = parse_listen_flags(cmd->temp_pool, argv[1] + 8, &flags);
if (err) {
return err;
}
}
else {
proto = argv[1];
}
}

if (proto && ap_strchr_c(proto, '=') != NULL) {
return apr_psprintf(cmd->pool, "Invalid protocol name '%s'", proto);
}
else if (proto) {
proto = apr_pstrdup(cmd->pool, proto);
ap_str_tolower(proto);
}
else {
if (port == 443) {
proto = "https";
} else {
proto = "http";
}
}
else {
proto = apr_pstrdup(cmd->pool, argv[1]);
ap_str_tolower(proto);
}

#ifdef HAVE_SYSTEMD
if (use_systemd) {
Expand All @@ -1077,7 +1153,7 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
#endif

return alloc_listener(cmd->server->process, host, port, proto,
scope_id, NULL, cmd->temp_pool);
scope_id, NULL, cmd->temp_pool, flags);
}

AP_DECLARE_NONSTD(const char *) ap_set_listenbacklog(cmd_parms *cmd,
Expand Down