* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2024 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Functions concerned with running Exim as a daemon */
/* Structure for holding data for each SMTP connection */
typedef struct smtp_slot {
- pid_t pid; /* pid of the spawned reception process */
- uschar *host_address; /* address of the client host */
+ pid_t pid; /* pid of the spawned reception process */
+ uschar * host_address; /* address of the client host */
} smtp_slot;
+typedef struct runner_slot {
+ pid_t pid; /* pid of spawned queue-runner process */
+ const uschar *queue_name; /* pointer to the name in the qrunner struct */
+} runner_slot;
+
/* An empty slot for initializing (Standard C does not allow constructor
expressions in assignments except as initializers in declarations). */
static smtp_slot empty_smtp_slot = { .pid = 0, .host_address = NULL };
-
-
/*************************************************
* Local static variables *
*************************************************/
static int accept_retry_errno;
static BOOL accept_retry_select_failed;
-static int queue_run_count = 0;
-static pid_t *queue_pid_slots = NULL;
-static smtp_slot *smtp_slots = NULL;
+static int queue_run_count = 0; /* current runners */
+
+static unsigned queue_runner_slot_count = 0;
+static runner_slot * queue_runner_slots = NULL;
+static smtp_slot * smtp_slots = NULL;
static BOOL write_pid = TRUE;
+#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+static uschar * notifier_socket_name;
+#endif
/*************************************************
}
-/* SIGTERM handler. Try to get the damon pif file removed
+/* SIGTERM handler. Try to get the daemon pid file removed
before exiting. */
static void
uschar *emsg = was_errno <= 0
? US"" : string_sprintf(": %s", strerror(was_errno));
log_write(0, LOG_MAIN|LOG_PANIC, "%s%s", log_msg, emsg);
-if (smtp_out) smtp_printf("421 %s\r\n", FALSE, smtp_msg);
+if (smtp_out) smtp_printf("421 %s\r\n", SP_NO_MORE, smtp_msg);
}
/*************************************************
*************************************************/
-#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
static void
unlink_notifier_socket(void)
{
-uschar * s = expand_string(notifier_socket);
-DEBUG(D_any) debug_printf("unlinking notifier socket %s\n", s);
-Uunlink(s);
-}
+#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+DEBUG(D_any) debug_printf("unlinking notifier socket %s\n", notifier_socket_name);
+Uunlink(notifier_socket_name);
#endif
+}
static void
close_daemon_sockets(int daemon_notifier_fd,
- int * listen_sockets, int listen_socket_count)
+ struct pollfd * fd_polls, int listen_socket_count)
{
if (daemon_notifier_fd >= 0)
{
(void) close(daemon_notifier_fd);
daemon_notifier_fd = -1;
-#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
- unlink_notifier_socket();
-#endif
}
-for (int i = 0; i < listen_socket_count; i++) (void) close(listen_sockets[i]);
+for (int i = 0; i < listen_socket_count; i++) (void) close(fd_polls[i].fd);
}
leak store in this process - reset the stacking pool at the end.
Arguments:
- listen_sockets sockets which are listening for incoming calls
+ fd_polls sockets which are listening for incoming calls
listen_socket_count count of listening sockets
accept_socket socket of the current accepted call
accepted socket information about the current call
*/
static void
-handle_smtp_call(int *listen_sockets, int listen_socket_count,
+handle_smtp_call(struct pollfd * fd_polls, int listen_socket_count,
int accept_socket, struct sockaddr *accepted)
{
pid_t pid;
{
log_write(0, LOG_MAIN | ((errno == ECONNRESET)? 0 : LOG_PANIC),
"getsockname() failed: %s", strerror(errno));
- smtp_printf("421 Local problem: getsockname() failed; please try again later\r\n", FALSE);
+ smtp_printf("421 Local problem: getsockname() failed; please try again later\r\n", SP_NO_MORE);
goto ERROR_RETURN;
}
whofrom = string_fmt_append(whofrom, " I=[%s]:%d",
interface_address, interface_port);
-(void) string_from_gstring(whofrom); /* Terminate the newly-built string */
-
/* Check maximum number of connections. We do not check for reserved
connections or unacceptable hosts here. That is done in the subprocess because
it might take some time. */
DEBUG(D_any) debug_printf("rejecting SMTP connection: count=%d max=%d\n",
smtp_accept_count, smtp_accept_max);
smtp_printf("421 Too many concurrent SMTP connections; "
- "please try again later.\r\n", FALSE);
+ "please try again later.\r\n", SP_NO_MORE);
log_write(L_connection_reject,
- LOG_MAIN, "Connection from %s refused: too many connections",
- whofrom->s);
+ LOG_MAIN, "Connection from %Y refused: too many connections",
+ whofrom);
goto ERROR_RETURN;
}
{
DEBUG(D_any) debug_printf("rejecting SMTP connection: load average = %.2f\n",
(double)load_average/1000.0);
- smtp_printf("421 Too much load; please try again later.\r\n", FALSE);
+ smtp_printf("421 Too much load; please try again later.\r\n", SP_NO_MORE);
log_write(L_connection_reject,
- LOG_MAIN, "Connection from %s refused: load average = %.2f",
- whofrom->s, (double)load_average/1000.0);
+ LOG_MAIN, "Connection from %Y refused: load average = %.2f",
+ whofrom, (double)load_average/1000.0);
goto ERROR_RETURN;
}
}
this is in the daemon mainline, only fast expansions (such as inline address
checks) should be used. The documentation is full of warnings. */
+GET_OPTION("smtp_accept_max_per_host");
if (smtp_accept_max_per_host)
{
- uschar *expanded = expand_string(smtp_accept_max_per_host);
+ uschar * expanded = expand_string(smtp_accept_max_per_host);
if (!expanded)
{
if (!f.expand_string_forcedfail)
log_write(0, LOG_MAIN|LOG_PANIC, "expansion of smtp_accept_max_per_host "
- "failed for %s: %s", whofrom->s, expand_string_message);
+ "failed for %Y: %s", whofrom, expand_string_message);
}
/* For speed, interpret a decimal number inline here */
else
{
- uschar *s = expanded;
+ uschar * s = expanded;
while (isdigit(*s))
max_for_this_host = max_for_this_host * 10 + *s++ - '0';
if (*s)
log_write(0, LOG_MAIN|LOG_PANIC, "expansion of smtp_accept_max_per_host "
- "for %s contains non-digit: %s", whofrom->s, expanded);
+ "for %Y contains non-digit: %s", whofrom, expanded);
}
}
-/* If we have fewer connections than max_for_this_host, we can skip the tedious
-per host_address checks. Note that at this stage smtp_accept_count contains the
-count of *other* connections, not including this one. */
+/* If we have fewer total connections than max_for_this_host, we can skip the
+tedious per host_address checks. Note that at this stage smtp_accept_count
+contains the count of *other* connections, not including this one. */
-if (max_for_this_host > 0 && smtp_accept_count >= max_for_this_host)
+if ( smtp_slots
+ && max_for_this_host > 0 && smtp_accept_count >= max_for_this_host)
{
int host_accept_count = 0;
int other_host_count = 0; /* keep a count of non matches to optimise */
"IP address: count=%d max=%d\n",
host_accept_count, max_for_this_host);
smtp_printf("421 Too many concurrent SMTP connections "
- "from this IP address; please try again later.\r\n", FALSE);
+ "from this IP address; please try again later.\r\n", SP_NO_MORE);
log_write(L_connection_reject,
- LOG_MAIN, "Connection from %s refused: too many connections "
- "from that IP address", whofrom->s);
+ LOG_MAIN, "Connection from %Y refused: too many connections "
+ "from that IP address", whofrom);
search_tidyup();
goto ERROR_RETURN;
}
}
-/* OK, the connection count checks have been passed. Before we can fork the
-accepting process, we must first log the connection if requested. This logging
-used to happen in the subprocess, but doing that means that the value of
-smtp_accept_count can be out of step by the time it is logged. So we have to do
-the logging here and accept the performance cost. Note that smtp_accept_count
-hasn't yet been incremented to take account of this connection.
-
-In order to minimize the cost (because this is going to happen for every
-connection), do a preliminary selector test here. This saves ploughing through
-the generalized logging code each time when the selector is false. If the
-selector is set, check whether the host is on the list for logging. If not,
-arrange to unset the selector in the subprocess. */
-
-if (LOGGING(smtp_connection))
- {
- uschar *list = hosts_connection_nolog;
- memset(sender_host_cache, 0, sizeof(sender_host_cache));
- if (list && verify_check_host(&list) == OK)
- save_log_selector &= ~L_smtp_connection;
- else
- log_write(L_smtp_connection, LOG_MAIN, "SMTP connection from %s "
- "(TCP/IP connection count = %d)", whofrom->s, smtp_accept_count + 1);
- }
-
-/* Now we can fork the accepting process; do a lookup tidy, just in case any
+/* OK, the connection count checks have been passed.
+Now we can fork the accepting process; do a lookup tidy, just in case any
expansion above did a lookup. */
search_tidyup();
#endif
smtp_accept_count++; /* So that it includes this process */
+ set_connection_id();
+
+ /* Log the connection if requested.
+ In order to minimize the cost (because this is going to happen for every
+ connection), do a preliminary selector test here. This saves ploughing through
+ the generalized logging code each time when the selector is false. If the
+ selector is set, check whether the host is on the list for logging. If not,
+ arrange to unset the selector in the subprocess.
+
+ jgh 2023/08/08 :- moved this logging in from the parent process, just
+ pre-fork. There was a claim back from 4.21 (when it was moved from
+ smtp_start_session()) that smtp_accept_count could have become out-of-date by
+ the time the child could log it, and I can't see how that could happen. */
+
+ if (LOGGING(smtp_connection))
+ {
+ uschar * list = hosts_connection_nolog;
+ memset(sender_host_cache, 0, sizeof(sender_host_cache));
+ if (list && verify_check_host(&list) == OK)
+ save_log_selector &= ~L_smtp_connection;
+ else if (LOGGING(connection_id))
+ log_write(L_smtp_connection, LOG_MAIN, "SMTP connection from %Y "
+ "Ci=%s (TCP/IP connection count = %d)",
+ whofrom, connection_id, smtp_accept_count);
+ else
+ log_write(L_smtp_connection, LOG_MAIN, "SMTP connection from %Y "
+ "(TCP/IP connection count = %d)", whofrom, smtp_accept_count);
+ }
/* If the listen backlog was over the monitoring level, log it. */
likely what it depends on.) */
smtp_active_hostname = primary_hostname;
+ GET_OPTION("smtp_active_hostname");
if (raw_active_hostname)
{
uschar * nah = expand_string(raw_active_hostname);
"(smtp_active_hostname): %s", raw_active_hostname,
expand_string_message);
smtp_printf("421 Local configuration error; "
- "please try again later.\r\n", FALSE);
+ "please try again later.\r\n", SP_NO_MORE);
mac_smtp_fflush();
search_tidyup();
exim_underbar_exit(EXIT_FAILURE);
extensive comment before the reception loop in exim.c for a fuller
explanation of this logic. */
- close_daemon_sockets(daemon_notifier_fd, listen_sockets, listen_socket_count);
+ close_daemon_sockets(daemon_notifier_fd, fd_polls, listen_socket_count);
/* Set FD_CLOEXEC on the SMTP socket. We don't want any rogue child processes
to be able to communicate with them, under any circumstances. */
smtp_log_no_mail(); /* Log no mail if configured */
exim_underbar_exit(EXIT_SUCCESS);
}
- if (message_id[0] == 0) continue; /* No message was accepted */
+ if (!message_id[0]) continue; /* No message was accepted */
}
else /* bad smtp_setup_msg() */
{
if (pid < 0)
never_error(US"daemon: accept process fork failed", US"Fork failed", errno);
-else
+else if (smtp_slots)
{
for (int i = 0; i < smtp_accept_max; ++i)
if (smtp_slots[i].pid <= 0)
the incoming host address and an expanded active_hostname. */
log_close_all();
-interface_address =
-sender_host_address = NULL;
+interface_address = sender_host_name = sender_host_address = NULL;
store_reset(reset_point);
-sender_host_address = NULL;
}
{
DEBUG(D_any)
{
- debug_printf("child %d ended: status=0x%x\n", (int)pid, status);
+ debug_printf("child %ld ended: status=0x%x\n", (long)pid, status);
#ifdef WCOREDUMP
if (WIFEXITED(status))
debug_printf(" normal exit, %d\n", WEXITSTATUS(status));
if (smtp_slots)
{
int i;
- for (i = 0; i < smtp_accept_max; i++)
- if (smtp_slots[i].pid == pid)
+ smtp_slot * sp;
+ for (i = 0, sp = smtp_slots; i < smtp_accept_max; i++, sp++)
+ if (sp->pid == pid)
{
- if (smtp_slots[i].host_address)
- store_free(smtp_slots[i].host_address);
- smtp_slots[i] = empty_smtp_slot;
+ if (sp->host_address)
+ store_free(sp->host_address);
+ *sp = empty_smtp_slot;
if (--smtp_accept_count < 0) smtp_accept_count = 0;
DEBUG(D_any) debug_printf("%d SMTP accept process%s now running\n",
- smtp_accept_count, (smtp_accept_count == 1)? "" : "es");
+ smtp_accept_count, smtp_accept_count == 1 ? "" : "es");
break;
}
if (i < smtp_accept_max) continue; /* Found an accepting process */
/* If it wasn't an accepting process, see if it was a queue-runner
process that we are tracking. */
- if (queue_pid_slots)
- {
- int max = atoi(CS expand_string(queue_run_max));
- for (int i = 0; i < max; i++)
- if (queue_pid_slots[i] == pid)
+ if (queue_runner_slots)
+ for (unsigned i = 0; i < queue_runner_slot_count; i++)
+ {
+ runner_slot * r = queue_runner_slots + i;
+ if (r->pid == pid)
{
- queue_pid_slots[i] = 0;
+ r->pid = 0; /* free up the slot */
+
if (--queue_run_count < 0) queue_run_count = 0;
DEBUG(D_any) debug_printf("%d queue-runner process%s now running\n",
- queue_run_count, (queue_run_count == 1)? "" : "es");
+ queue_run_count, queue_run_count == 1 ? "" : "es");
+
+ for (qrunner ** p = &qrunners, * q = qrunners; q; p = &q->next, q = *p)
+ if (q->name == r->queue_name)
+ {
+ if (q->interval) /* a periodic queue run */
+ q->run_count--;
+ else /* a one-time run */
+ *p = q->next; /* drop this qrunner */
+ break;
+ }
break;
}
- }
+ }
}
}
operate_on_pid_file(const enum pid_op operation, const pid_t pid)
{
char pid_line[sizeof(int) * 3 + 2];
-const int pid_len = snprintf(pid_line, sizeof(pid_line), "%d\n", (int)pid);
+const int pid_len = snprintf(pid_line, sizeof(pid_line), "%ld\n", (long)pid);
BOOL lines_match = FALSE;
uschar * path, * base, * dir;
static void
daemon_die(void)
{
-int pid;
+pid_t pid;
DEBUG(D_any) debug_printf("SIGTERM/SIGINT seen\n");
#if !defined(DISABLE_TLS) && (defined(EXIM_HAVE_INOTIFY) || defined(EXIM_HAVE_KEVENT))
{
close(daemon_notifier_fd);
daemon_notifier_fd = -1;
-#ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
unlink_notifier_socket();
-#endif
}
if (f.running_in_test_harness || write_pid)
* Listener socket for local work prompts *
*************************************************/
+ssize_t
+daemon_client_sockname(struct sockaddr_un * sup, uschar ** sname)
+{
+#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+sup->sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
+return offsetof(struct sockaddr_un, sun_path) + 1
+ + snprintf(sup->sun_path+1, sizeof(sup->sun_path)-1, "exim_%d", getpid());
+#else
+*sname = string_sprintf("%s/p_%d", spool_directory, getpid());
+return offsetof(struct sockaddr_un, sun_path)
+ + snprintf(sup->sun_path, sizeof(sup->sun_path), "%s", CS *sname);
+#endif
+}
+
+ssize_t
+daemon_notifier_sockname(struct sockaddr_un * sup)
+{
+GET_OPTION("notifier_socket");
+#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
+sup->sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
+return offsetof(struct sockaddr_un, sun_path) + 1
+ + snprintf(sup->sun_path+1, sizeof(sup->sun_path)-1, "%s",
+ CS expand_string(notifier_socket));
+#else
+notifier_socket_name = expand_string(notifier_socket);
+return offsetof(struct sockaddr_un, sun_path)
+ + snprintf(sup->sun_path, sizeof(sup->sun_path), "%s",
+ CS notifier_socket_name);
+#endif
+}
+
+
static void
daemon_notifier_socket(void)
{
int fd;
const uschar * where;
struct sockaddr_un sa_un = {.sun_family = AF_UNIX};
-int len;
+ssize_t len;
-if (!notifier_socket || !*notifier_socket)
+if (!f.notifier_socket_en)
{
DEBUG(D_any) debug_printf("-oY used so not creating notifier socket\n");
return;
debug_printf("-oX used without -oP so not creating notifier socket\n");
return;
}
+if (!notifier_socket || !*notifier_socket)
+ {
+ DEBUG(D_any) debug_printf("no name for notifier socket\n");
+ return;
+ }
DEBUG(D_any) debug_printf("creating notifier socket\n");
(void)fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
#endif
+len = daemon_notifier_sockname(&sa_un);
+
#ifdef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS
-sa_un.sun_path[0] = 0; /* Abstract local socket addr - Linux-specific? */
-len = offsetof(struct sockaddr_un, sun_path) + 1
- + snprintf(sa_un.sun_path+1, sizeof(sa_un.sun_path)-1, "%s",
- expand_string(notifier_socket));
DEBUG(D_any) debug_printf(" @%s\n", sa_un.sun_path+1);
#else /* filesystem-visible and persistent; will neeed removal */
-len = offsetof(struct sockaddr_un, sun_path)
- + snprintf(sa_un.sun_path, sizeof(sa_un.sun_path), "%s",
- expand_string(notifier_socket));
DEBUG(D_any) debug_printf(" %s\n", sa_un.sun_path);
#endif
-if (bind(fd, (const struct sockaddr *)&sa_un, len) < 0)
+if (bind(fd, (const struct sockaddr *)&sa_un, (socklen_t)len) < 0)
{ where = US"bind"; goto bad; }
#ifdef SO_PASSCRED /* Linux */
}
+/* Data for notifier-triggered queue runs */
+
static uschar queuerun_msgid[MESSAGE_ID_LENGTH+1];
+static const uschar * queuerun_msg_qname;
-/* Return TRUE if a sigalrm should be emulated */
-static BOOL
+
+/* The notifier socket has something to read. Pull the message from it, decode
+and do the action.
+*/
+
+static void
daemon_notification(void)
{
uschar buf[256], cbuf[256];
ssize_t sz;
buf[sizeof(buf)-1] = 0;
-if ((sz = recvmsg(daemon_notifier_fd, &msg, 0)) <= 0) return FALSE;
-if (sz >= sizeof(buf)) return FALSE;
+if ((sz = recvmsg(daemon_notifier_fd, &msg, 0)) <= 0) return;
+if (sz >= sizeof(buf)) return;
#ifdef notdef
debug_printf("addrlen %d\n", msg.msg_namelen);
#endif
-DEBUG(D_queue_run) debug_printf("%s from addr '%s%.*s'\n", __FUNCTION__,
- *sa_un.sun_path ? "" : "@",
- (int)msg.msg_namelen - (*sa_un.sun_path ? 0 : 1),
- sa_un.sun_path + (*sa_un.sun_path ? 0 : 1));
+DEBUG(D_queue_run)
+ if (msg.msg_namelen > 0)
+ {
+ BOOL abstract = !*sa_un.sun_path;
+ char * name = sa_un.sun_path + (abstract ? 1 : 0);
+ int namelen = (int)msg.msg_namelen - abstract ? 1 : 0;
+ if (*name)
+ debug_printf("%s from addr '%s%.*s'\n", __FUNCTION__,
+ abstract ? "@" : "",
+ namelen, name);
+ else
+ debug_printf("%s (from unknown addr)\n", __FUNCTION__);
+ }
+ else
+ debug_printf("%s (from unknown addr)\n", __FUNCTION__);
/* Refuse to handle the item unless the peer has good credentials */
#ifdef SCM_CREDENTIALS
struct ucred * cr = (struct ucred *) CMSG_DATA(cp);
if (cr->uid && cr->uid != exim_uid)
{
- DEBUG(D_queue_run) debug_printf("%s: sender creds pid %d uid %d gid %d\n",
- __FUNCTION__, (int)cr->pid, (int)cr->uid, (int)cr->gid);
- return FALSE;
+ DEBUG(D_queue_run) debug_printf("%s: sender creds pid %ld uid %d gid %d\n",
+ __FUNCTION__, (long)cr->pid, (int)cr->uid, (int)cr->gid);
}
# elif defined(LOCAL_CREDS) /* BSD-ish */
struct sockcred * cr = (struct sockcred *) CMSG_DATA(cp);
{
DEBUG(D_queue_run) debug_printf("%s: sender creds pid ??? uid %d gid %d\n",
__FUNCTION__, (int)cr->sc_uid, (int)cr->sc_gid);
- return FALSE;
}
# endif
break;
/* this should be a message_id */
DEBUG(D_queue_run)
debug_printf("%s: qrunner trigger: %s\n", __FUNCTION__, buf+1);
+
memcpy(queuerun_msgid, buf+1, MESSAGE_ID_LENGTH+1);
- return TRUE;
+
+ for (qrunner * q = qrunners; q; q = q->next)
+ if (q->name
+ ? Ustrcmp(q->name, buf+1+MESSAGE_ID_LENGTH+1) == 0
+ : !buf[1+MESSAGE_ID_LENGTH+1]
+ )
+ { queuerun_msg_qname = q->name; break; }
+ return;
#endif
case NOTIFY_QUEUE_SIZE_REQ:
(const struct sockaddr *)&sa_un, msg.msg_namelen) < 0)
log_write(0, LOG_MAIN|LOG_PANIC,
"%s: sendto: %s\n", __FUNCTION__, strerror(errno));
- return FALSE;
+ break;
}
+
+ case NOTIFY_REGEX:
+ regex_at_daemon(buf);
+ break;
}
-return FALSE;
+return;
}
-
static void
-add_listener_socket(int fd, fd_set * fds, int * fd_max)
+daemon_inetd_wtimeout(time_t last_connection_time)
+{
+time_t resignal_interval = inetd_wait_timeout;
+
+if (last_connection_time == (time_t)0)
+ {
+ DEBUG(D_any)
+ debug_printf("inetd wait timeout expired, but still not seen first message, ignoring\n");
+ }
+else
+ {
+ time_t now = time(NULL);
+ if (now == (time_t)-1)
+ {
+ DEBUG(D_any) debug_printf("failed to get time: %s\n", strerror(errno));
+ }
+ else if ((now - last_connection_time) >= inetd_wait_timeout)
+ {
+ DEBUG(D_any)
+ debug_printf("inetd wait timeout %d expired, ending daemon\n",
+ inetd_wait_timeout);
+ log_write(0, LOG_MAIN, "exim %s daemon terminating, inetd wait timeout reached.\n",
+ version_string);
+ daemon_die(); /* Does not return */
+ }
+ else
+ resignal_interval -= (now - last_connection_time);
+ }
+
+sigalrm_seen = FALSE;
+ALARM(resignal_interval);
+}
+
+
+/* Re-sort the qrunners list, and return the shortest interval.
+That could be negatime.
+The next-tick times should have been updated by any runs initiated,
+though will not be when the global limit on runners was reached.
+
+Unlikely to have many queues, so insertion-sort.
+*/
+
+static int
+next_qrunner_interval(void)
+{
+qrunner * sorted = NULL;
+for (qrunner * q = qrunners, * next; q; q = next)
+ {
+ next = q->next;
+ q->next = NULL;
+ if (sorted)
+ {
+ qrunner ** p = &sorted;
+ for (qrunner * qq; qq = *p; p = &qq->next)
+ if ( q->next_tick < qq->next_tick
+ || q->next_tick == qq->next_tick && q->interval < qq->interval
+ )
+ {
+ *p = q;
+ q->next = qq;
+ goto INSERTED;
+ }
+ *p = q;
+ INSERTED: ;
+ }
+ else
+ sorted = q;
+ }
+qrunners = sorted;
+return qrunners ? qrunners->next_tick - time(NULL) : 0;
+}
+
+/* See if we can do a queue run. If policy limit permit, kick one off.
+If both notification and timer events are present, handle the former
+and leave the timer outstanding.
+
+Return the number of seconds until the next due runner.
+*/
+
+static int
+daemon_qrun(int local_queue_run_max, struct pollfd * fd_polls, int listen_socket_count)
+{
+DEBUG(D_any) debug_printf("%s received\n",
+#ifndef DISABLE_QUEUE_RAMP
+ *queuerun_msgid ? "qrun notification" :
+#endif
+ "SIGALRM");
+
+/* Do a full queue run in a child process, if required, unless we already have
+enough queue runners on the go. If we are not running as root, a re-exec is
+required. In the calling process, restart the alamr timer for the next run. */
+
+if (is_multiple_qrun()) /* we are managing periodic runs */
+ if (local_queue_run_max <= 0 || queue_run_count < local_queue_run_max)
+ {
+ qrunner * q = NULL;
+
+#ifndef DISABLE_QUEUE_RAMP
+ /* If this is a triggered run for a specific message, see if we can start
+ another runner for this queue. */
+
+ if (*queuerun_msgid)
+ {
+ for (qrunner * qq = qrunners; qq; qq = qq->next)
+ if (qq->name == queuerun_msg_qname)
+ {
+ q = qq->run_count < qq->run_max ? qq : NULL;
+ break;
+ }
+ }
+ else
+#endif
+ /* Normal periodic run: in order of run priority, find the first queue
+ for which we can start a runner */
+
+ for (q = qrunners; q; q = q->next)
+ if (q->run_count < q->run_max) break;
+
+ if (q) /* found a queue to run */
+ {
+ pid_t pid;
+
+ /* Bump this queue's next-tick by it's interval */
+
+ if (q->interval)
+ {
+ time_t now = time(NULL);
+ do ; while ((q->next_tick += q->interval) <= now);
+ }
+
+ if ((pid = exim_fork(US"queue-runner")) == 0)
+ {
+ /* Disable debugging if it's required only for the daemon process. We
+ leave the above message, because it ties up with the "child ended"
+ debugging messages. */
+
+ if (f.debug_daemon) debug_selector = 0;
+
+ /* Close any open listening sockets in the child */
+
+ close_daemon_sockets(daemon_notifier_fd,
+ fd_polls, listen_socket_count);
+
+ /* Reset SIGHUP and SIGCHLD in the child in both cases. */
+
+ signal(SIGHUP, SIG_DFL);
+ signal(SIGCHLD, SIG_DFL);
+ signal(SIGTERM, SIG_DFL);
+ signal(SIGINT, SIG_DFL);
+
+ /* Re-exec if privilege has been given up, unless deliver_drop_
+ privilege is set. Reset SIGALRM before exec(). */
+
+ if (geteuid() != root_uid && !deliver_drop_privilege)
+ {
+ uschar opt[8];
+ uschar *p = opt;
+ uschar *extra[7];
+ int extracount = 1;
+
+ signal(SIGALRM, SIG_DFL);
+ queue_name = US"";
+
+ *p++ = '-';
+ *p++ = 'q';
+ if ( q->queue_2stage
+#ifndef DISABLE_QUEUE_RAMP
+ && !*queuerun_msgid
+#endif
+ ) *p++ = 'q';
+ if (q->queue_run_first_delivery) *p++ = 'i';
+ if (q->queue_run_force) *p++ = 'f';
+ if (q->deliver_force_thaw) *p++ = 'f';
+ if (q->queue_run_local) *p++ = 'l';
+ *p = 0;
+
+ extra[0] = q->name
+ ? string_sprintf("%sG%s", opt, q->name) : opt;
+
+#ifndef DISABLE_QUEUE_RAMP
+ if (*queuerun_msgid)
+ {
+ log_write(0, LOG_MAIN, "notify triggered queue run");
+ extra[extracount++] = queuerun_msgid; /* Trigger only the */
+ extra[extracount++] = queuerun_msgid; /* one message */
+ }
+#endif
+
+ /* If -R or -S were on the original command line, ensure they get
+ passed on. */
+
+ if (deliver_selectstring)
+ {
+ extra[extracount++] = f.deliver_selectstring_regex ? US"-Rr" : US"-R";
+ extra[extracount++] = deliver_selectstring;
+ }
+
+ if (deliver_selectstring_sender)
+ {
+ extra[extracount++] = f.deliver_selectstring_sender_regex
+ ? US"-Sr" : US"-S";
+ extra[extracount++] = deliver_selectstring_sender;
+ }
+
+ /* Overlay this process with a new execution. */
+
+ (void)child_exec_exim(CEE_EXEC_PANIC, FALSE, NULL, FALSE, extracount,
+ extra[0], extra[1], extra[2], extra[3], extra[4], extra[5], extra[6]);
+
+ /* Control never returns here. */
+ }
+
+ /* No need to re-exec; SIGALRM remains set to the default handler */
+
+#ifndef DISABLE_QUEUE_RAMP
+ if (*queuerun_msgid)
+ {
+ log_write(0, LOG_MAIN, "notify triggered queue run");
+ f.queue_2stage = FALSE;
+ queue_run(q, queuerun_msgid, queuerun_msgid, FALSE);
+ }
+ else
+#endif
+ queue_run(q, NULL, NULL, FALSE);
+ exim_underbar_exit(EXIT_SUCCESS);
+ }
+
+ if (pid < 0)
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC, "daemon: fork of queue-runner "
+ "process failed: %s", strerror(errno));
+ log_close_all();
+ }
+ else
+ {
+ for (int i = 0; i < local_queue_run_max; ++i)
+ if (queue_runner_slots[i].pid <= 0)
+ {
+ queue_runner_slots[i].pid = pid;
+ queue_runner_slots[i].queue_name = q->name;
+ q->run_count++;
+ queue_run_count++;
+ break;
+ }
+ DEBUG(D_any) debug_printf("%d queue-runner process%s running\n",
+ queue_run_count, queue_run_count == 1 ? "" : "es");
+ }
+ }
+ }
+
+/* The queue run has been initiated (unless we were already running enough) */
+
+#ifndef DISABLE_QUEUE_RAMP
+if (*queuerun_msgid) /* it was a fast-ramp kick; dealt with */
+ *queuerun_msgid = 0;
+else /* periodic or one-time queue run */
+#endif
+ /* Set up next timer callback. Impose a minimum 1s tick,
+ even when a run was outstanding */
+ {
+ int interval = next_qrunner_interval();
+ if (interval <= 0) interval = 1;
+
+ sigalrm_seen = FALSE;
+ if (qrunners) /* there are still periodic qrunners */
+ {
+ ALARM(interval); /* set up next qrun tick */
+ return interval;
+ }
+ }
+return 0;
+}
+
+
+
+
+static const uschar *
+describe_queue_runners(void)
{
-FD_SET(fd, fds);
-if (fd > *fd_max) *fd_max = fd;
+gstring * g = NULL;
+
+if (!is_multiple_qrun()) return US"no queue runs";
+
+for (qrunner * q = qrunners; q; q = q->next)
+ {
+ g = string_catn(g, US"-q", 2);
+ if (q->queue_2stage) g = string_catn(g, US"q", 1);
+ if (q->name) g = string_append(g, 3, US"G", q->name, US"/");
+ g = string_cat(g, readconf_printtime(q->interval));
+ g = string_catn(g, US" ", 1);
+ }
+gstring_trim(g, 1);
+gstring_release_unused(g);
+return string_from_gstring(g);
}
+
/*************************************************
* Exim Daemon Mainline *
*************************************************/
daemon_go(void)
{
struct passwd * pw;
-int * listen_sockets = NULL;
-int listen_socket_count = 0, listen_fd_max = 0;
-fd_set select_listen;
+struct pollfd * fd_polls, * tls_watch_poll = NULL, * dnotify_poll = NULL;
+int listen_socket_count = 0, poll_fd_count;
ip_address_item * addresses = NULL;
time_t last_connection_time = (time_t)0;
-int local_queue_run_max = atoi(CS expand_string(queue_run_max));
+int local_queue_run_max = 0;
+
+if (is_multiple_qrun())
+ {
+ /* Nuber of runner-tracking structs needed: If the option queue_run_max has
+ no expandable elements then it is the overall maximum; else we assume it
+ depends on the queue name, and add them up to get the maximum.
+ Evaluate both that and the individual limits. */
+
+ GET_OPTION("queue_run_max");
+ if (Ustrchr(queue_run_max, '$') != NULL)
+ {
+ for (qrunner * q = qrunners; q; q = q->next)
+ {
+ queue_name = q->name;
+ local_queue_run_max +=
+ (q->run_max = atoi(CS expand_string(queue_run_max)));
+ }
+ queue_name = US"";
+ }
+ else
+ {
+ local_queue_run_max = atoi(CS expand_string(queue_run_max));
+ for (qrunner * q = qrunners; q; q = q->next)
+ q->run_max = local_queue_run_max;
+ }
+ }
process_purpose = US"daemon";
DEBUG(D_any|D_v) debug_selector |= D_pid;
-FD_ZERO(&select_listen);
+/* Allocate enough pollstructs for inetd mode plus the ancillary sockets;
+also used when there are no listen sockets. */
+
+fd_polls = store_get(sizeof(struct pollfd) * 3, GET_UNTAINTED);
+
if (f.inetd_wait_mode)
{
listen_socket_count = 1;
- listen_sockets = store_get(sizeof(int), FALSE);
(void) close(3);
if (dup2(0, 3) == -1)
log_write(0, LOG_MAIN|LOG_PANIC_DIE,
"failed to dup inetd socket safely away: %s", strerror(errno));
- listen_sockets[0] = 3;
+ fd_polls[0].fd = 3;
+ fd_polls[0].events = POLLIN;
(void) close(0);
(void) close(1);
(void) close(2);
if (setsockopt(3, IPPROTO_TCP, TCP_NODELAY, US &on, sizeof(on)))
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to set socket NODELAY: %s",
strerror(errno));
-
- FD_SET(3, &select_listen);
- listen_fd_max = 3;
}
sep = 0;
while ((s = string_nextinlist(&list, &sep, NULL, 0)))
pct++;
- default_smtp_port = store_get((pct+1) * sizeof(int), FALSE);
+ default_smtp_port = store_get((pct+1) * sizeof(int), GET_UNTAINTED);
list = daemon_smtp_port;
sep = 0;
for (pct = 0;
ipa->port = default_smtp_port[0];
for (int i = 1; default_smtp_port[i] > 0; i++)
{
- ip_address_item *new = store_get(sizeof(ip_address_item), FALSE);
+ ip_address_item * new = store_get(sizeof(ip_address_item), GET_UNTAINTED);
memcpy(new->address, ipa->address, Ustrlen(ipa->address) + 1);
new->port = default_smtp_port[i];
}
}
- /* Get a vector to remember all the sockets in */
+ /* Get a vector to remember all the sockets in.
+ Two extra elements for the ancillary sockets */
for (ipa = addresses; ipa; ipa = ipa->next)
listen_socket_count++;
- listen_sockets = store_get(sizeof(int) * listen_socket_count, FALSE);
+ fd_polls = store_get(sizeof(struct pollfd) * (listen_socket_count + 2),
+ GET_UNTAINTED);
+ for (struct pollfd * p = fd_polls; p < fd_polls + listen_socket_count + 2;
+ p++)
+ { p->fd = -1; p->events = POLLIN; }
} /* daemon_listen but not inetd_wait_mode */
if (smtp_accept_max > 0)
{
- smtp_slots = store_get(smtp_accept_max * sizeof(smtp_slot), FALSE);
+ smtp_slots = store_get(smtp_accept_max * sizeof(smtp_slot), GET_UNTAINTED);
for (int i = 0; i < smtp_accept_max; i++) smtp_slots[i] = empty_smtp_slot;
}
}
daemon as the result of a SIGHUP. In this case, there is no need to do
anything, because the controlling terminal has long gone. Otherwise, fork, in
case current process is a process group leader (see 'man setsid' for an
- explanation) before calling setsid(). */
+ explanation) before calling setsid().
+ All other forks want daemon_listen cleared. Rather than blow a register, jsut
+ restore it here. */
if (getppid() != 1)
{
+ BOOL daemon_listen = f.daemon_listen;
pid_t pid = exim_fork(US"daemon");
if (pid < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE,
"fork() failed when starting daemon: %s", strerror(errno));
- if (pid > 0) exit(EXIT_SUCCESS); /* in parent process, just exit */
+ if (pid > 0) exim_exit(EXIT_SUCCESS); /* in parent process, just exit */
(void)setsid(); /* release controlling terminal */
+ f.daemon_listen = daemon_listen;
}
}
wildcard = ipa->address[0] == 0;
}
- if ((listen_sockets[sk] = fd = ip_socket(SOCK_STREAM, af)) < 0)
+ if ((fd_polls[sk].fd = fd = ip_socket(SOCK_STREAM, af)) < 0)
{
if (check_special_case(0, addresses, ipa, FALSE))
{
goto SKIP_SOCKET;
}
log_write(0, LOG_PANIC_DIE, "IPv%c socket creation failed: %s",
- (af == AF_INET6)? '6' : '4', strerror(errno));
+ af == AF_INET6 ? '6' : '4', strerror(errno));
}
/* If this is an IPv6 wildcard socket, set IPV6_V6ONLY if that option is
f.tcp_fastopen_ok = FALSE;
}
#endif
-
- add_listener_socket(fd, &select_listen, &listen_fd_max);
+ fd_polls[sk].fd = fd;
continue;
}
/* Get somewhere to keep the list of queue-runner pids if we are keeping track
of them (and also if we are doing queue runs). */
-if (queue_interval > 0 && local_queue_run_max > 0)
+if (is_multiple_qrun() && local_queue_run_max > 0)
{
- queue_pid_slots = store_get(local_queue_run_max * sizeof(pid_t), FALSE);
- for (int i = 0; i < local_queue_run_max; i++) queue_pid_slots[i] = 0;
+ queue_runner_slot_count = local_queue_run_max;
+ queue_runner_slots = store_get(local_queue_run_max * sizeof(runner_slot), GET_UNTAINTED);
+ memset(queue_runner_slots, 0, local_queue_run_max * sizeof(runner_slot));
}
/* Set up the handler for termination of child processes, and the one
os_non_restarting_signal(SIGINT, main_sigterm_handler);
/* If we are to run the queue periodically, pretend the alarm has just gone
-off. This will cause the first queue-runner to get kicked off straight away. */
+off. This will cause the first queue-runner to get kicked off straight away.
+Get an initial sort of the list of queues, to prioritize the initial q-runs */
+
-sigalrm_seen = (queue_interval > 0);
+if ((sigalrm_seen = is_multiple_qrun()))
+ (void) next_qrunner_interval();
/* Log the start up of a daemon - at least one of listening or queue running
must be set up. */
sprintf(CS p, "with no wait timeout");
log_write(0, LOG_MAIN,
- "exim %s daemon started: pid=%d, launched with listening socket, %s",
+ "exim %s daemon started: pid=%ld, launched with listening socket, %s",
version_string, getpid(), big_buffer);
set_process_info("daemon(%s): pre-listening socket", version_string);
int smtps_ports = 0;
ip_address_item * ipa;
uschar * p;
- uschar * qinfo = queue_interval > 0
- ? string_sprintf("-q%s%s",
- f.queue_2stage ? "q" : "", readconf_printtime(queue_interval))
- : US"no queue runs";
+ const uschar * qinfo = describe_queue_runners();
/* Build a list of listening addresses in big_buffer, but limit it to 10
items. The style is for backwards compatibility.
- It is now possible to have some ports listening for SMTPS (the old,
- deprecated protocol that starts TLS without using STARTTLS), and others
- listening for standard SMTP. Keep their listings separate. */
+ It is possible to have some ports listening for SMTPS (as opposed to TLS
+ startted by STARTTLS), and others listening for standard SMTP. Keep their
+ listings separate. */
for (int j = 0, i; j < 2; j++)
- {
for (i = 0, ipa = addresses; i < 10 && ipa; i++, ipa = ipa->next)
{
/* First time round, look for SMTP ports; second time round, look for
&& Ustrcmp(ipa->address, i2->address) == 0
)
{ /* found; append port to list */
- for (p = i2->log; *p; ) p++; /* end of existing string */
+ for (p = i2->log; *p; ) p++; /* end of existing string { */
if (*--p == '}') *p = '\0'; /* drop EOL */
while (isdigit(*--p)) ; /* char before port */
- i2->log = *p == ':' /* no list yet? */
+ i2->log = *p == ':' /* no list yet? { */
? string_sprintf("%.*s{%s,%d}",
(int)(p - i2->log + 1), i2->log, p+1, ipa->port)
: string_sprintf("%s,%d}", i2->log, ipa->port);
}
}
}
- }
p = big_buffer;
for (int j = 0, i; j < 2; j++)
}
log_write(0, LOG_MAIN,
- "exim %s daemon started: pid=%d, %s, listening for %s",
+ "exim %s daemon started: pid=%ld, %s, listening for %s",
version_string, getpid(), qinfo, big_buffer);
set_process_info("daemon(%s): %s, listening for %s",
version_string, qinfo, big_buffer);
}
-else
+else /* no listening sockets, only queue-runs */
{
- uschar * s = *queue_name
- ? string_sprintf("-qG%s/%s", queue_name, readconf_printtime(queue_interval))
- : string_sprintf("-q%s", readconf_printtime(queue_interval));
+ const uschar * s = describe_queue_runners();
log_write(0, LOG_MAIN,
- "exim %s daemon started: pid=%d, %s, not listening for SMTP",
+ "exim %s daemon started: pid=%ld, %s, not listening for SMTP",
version_string, getpid(), s);
set_process_info("daemon(%s): %s, not listening", version_string, s);
}
/* Add ancillary sockets to the set for select */
+poll_fd_count = listen_socket_count;
#ifndef DISABLE_TLS
if (tls_watch_fd >= 0)
- add_listener_socket(tls_watch_fd, &select_listen, &listen_fd_max);
+ {
+ tls_watch_poll = &fd_polls[poll_fd_count++];
+ tls_watch_poll->fd = tls_watch_fd;
+ tls_watch_poll->events = POLLIN;
+ }
#endif
if (daemon_notifier_fd >= 0)
- add_listener_socket(daemon_notifier_fd, &select_listen, &listen_fd_max);
-
-listen_fd_max++;
+ {
+ dnotify_poll = &fd_polls[poll_fd_count++];
+ dnotify_poll->fd = daemon_notifier_fd;
+ dnotify_poll->events = POLLIN;
+ }
/* Close the log so it can be renamed and moved. In the few cases below where
this long-running process writes to the log (always exceptional conditions), it
for (;;)
{
- pid_t pid;
+ int nolisten_sleep = 60;
if (sigterm_seen)
daemon_die(); /* Does not return */
The other option is that we have an inetd wait timeout specified to -bw. */
- if (sigalrm_seen)
- {
+ if (sigalrm_seen || *queuerun_msgid)
if (inetd_wait_timeout > 0)
- {
- time_t resignal_interval = inetd_wait_timeout;
-
- if (last_connection_time == (time_t)0)
- {
- DEBUG(D_any)
- debug_printf("inetd wait timeout expired, but still not seen first message, ignoring\n");
- }
- else
- {
- time_t now = time(NULL);
- if (now == (time_t)-1)
- {
- DEBUG(D_any) debug_printf("failed to get time: %s\n", strerror(errno));
- }
- else
- {
- if ((now - last_connection_time) >= inetd_wait_timeout)
- {
- DEBUG(D_any)
- debug_printf("inetd wait timeout %d expired, ending daemon\n",
- inetd_wait_timeout);
- log_write(0, LOG_MAIN, "exim %s daemon terminating, inetd wait timeout reached.\n",
- version_string);
- exit(EXIT_SUCCESS);
- }
- else
- {
- resignal_interval -= (now - last_connection_time);
- }
- }
- }
-
- sigalrm_seen = FALSE;
- ALARM(resignal_interval);
- }
-
+ daemon_inetd_wtimeout(last_connection_time); /* Might not return */
else
- {
- DEBUG(D_any) debug_printf("%s received\n",
-#ifndef DISABLE_QUEUE_RAMP
- *queuerun_msgid ? "qrun notification" :
-#endif
- "SIGALRM");
-
- /* Do a full queue run in a child process, if required, unless we already
- have enough queue runners on the go. If we are not running as root, a
- re-exec is required. */
-
- if ( queue_interval > 0
- && (local_queue_run_max <= 0 || queue_run_count < local_queue_run_max))
- {
- if ((pid = exim_fork(US"queue-runner")) == 0)
- {
- /* Disable debugging if it's required only for the daemon process. We
- leave the above message, because it ties up with the "child ended"
- debugging messages. */
-
- if (f.debug_daemon) debug_selector = 0;
-
- /* Close any open listening sockets in the child */
-
- close_daemon_sockets(daemon_notifier_fd,
- listen_sockets, listen_socket_count);
-
- /* Reset SIGHUP and SIGCHLD in the child in both cases. */
-
- signal(SIGHUP, SIG_DFL);
- signal(SIGCHLD, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
- signal(SIGINT, SIG_DFL);
-
- /* Re-exec if privilege has been given up, unless deliver_drop_
- privilege is set. Reset SIGALRM before exec(). */
-
- if (geteuid() != root_uid && !deliver_drop_privilege)
- {
- uschar opt[8];
- uschar *p = opt;
- uschar *extra[7];
- int extracount = 1;
-
- signal(SIGALRM, SIG_DFL);
- *p++ = '-';
- *p++ = 'q';
- if ( f.queue_2stage
-#ifndef DISABLE_QUEUE_RAMP
- && !*queuerun_msgid
-#endif
- ) *p++ = 'q';
- if (f.queue_run_first_delivery) *p++ = 'i';
- if (f.queue_run_force) *p++ = 'f';
- if (f.deliver_force_thaw) *p++ = 'f';
- if (f.queue_run_local) *p++ = 'l';
- *p = 0;
- extra[0] = *queue_name
- ? string_sprintf("%sG%s", opt, queue_name) : opt;
-
-#ifndef DISABLE_QUEUE_RAMP
- if (*queuerun_msgid)
- {
- log_write(0, LOG_MAIN, "notify triggered queue run");
- extra[extracount++] = queuerun_msgid; /* Trigger only the */
- extra[extracount++] = queuerun_msgid; /* one message */
- }
-#endif
-
- /* If -R or -S were on the original command line, ensure they get
- passed on. */
-
- if (deliver_selectstring)
- {
- extra[extracount++] = f.deliver_selectstring_regex ? US"-Rr" : US"-R";
- extra[extracount++] = deliver_selectstring;
- }
-
- if (deliver_selectstring_sender)
- {
- extra[extracount++] = f.deliver_selectstring_sender_regex
- ? US"-Sr" : US"-S";
- extra[extracount++] = deliver_selectstring_sender;
- }
-
- /* Overlay this process with a new execution. */
-
- (void)child_exec_exim(CEE_EXEC_PANIC, FALSE, NULL, FALSE, extracount,
- extra[0], extra[1], extra[2], extra[3], extra[4], extra[5], extra[6]);
-
- /* Control never returns here. */
- }
-
- /* No need to re-exec; SIGALRM remains set to the default handler */
-
-#ifndef DISABLE_QUEUE_RAMP
- if (*queuerun_msgid)
- {
- log_write(0, LOG_MAIN, "notify triggered queue run");
- f.queue_2stage = FALSE;
- queue_run(queuerun_msgid, queuerun_msgid, FALSE);
- }
- else
-#endif
- queue_run(NULL, NULL, FALSE);
- exim_underbar_exit(EXIT_SUCCESS);
- }
-
- if (pid < 0)
- {
- log_write(0, LOG_MAIN|LOG_PANIC, "daemon: fork of queue-runner "
- "process failed: %s", strerror(errno));
- log_close_all();
- }
- else
- {
- for (int i = 0; i < local_queue_run_max; ++i)
- if (queue_pid_slots[i] <= 0)
- {
- queue_pid_slots[i] = pid;
- queue_run_count++;
- break;
- }
- DEBUG(D_any) debug_printf("%d queue-runner process%s running\n",
- queue_run_count, queue_run_count == 1 ? "" : "es");
- }
- }
-
- /* Reset the alarm clock */
-
- sigalrm_seen = FALSE;
-#ifndef DISABLE_QUEUE_RAMP
- if (*queuerun_msgid)
- *queuerun_msgid = 0;
- else
-#endif
- ALARM(queue_interval);
- }
-
- } /* sigalrm_seen */
+ nolisten_sleep =
+ daemon_qrun(local_queue_run_max, fd_polls, listen_socket_count);
/* Sleep till a connection happens if listening, and handle the connection if
if (f.daemon_listen)
{
- int check_lsk = 0, lcount;
+ int lcount;
BOOL select_failed = FALSE;
- fd_set fds = select_listen;
DEBUG(D_any) debug_printf("Listening...\n");
select() was interrupted so that we reap the child. This might still leave
a small window when a SIGCHLD could get lost. However, since we use SIGCHLD
only to do the reaping more quickly, it shouldn't result in anything other
- than a delay until something else causes a wake-up. */
+ than a delay until something else causes a wake-up.
+ For the normal case, wait for either a pollable fd (eg. new connection) or
+ or a SIGALRM (for a periodic queue run) */
if (sigchld_seen)
{
errno = EINTR;
}
else
- lcount = select(listen_fd_max, (SELECT_ARG2_TYPE *)&fds,
- NULL, NULL, NULL);
+ lcount = poll(fd_polls, poll_fd_count, -1);
if (lcount < 0)
{
handle_ending_processes();
#ifndef DISABLE_TLS
+ {
+ int old_tfd;
/* Create or rotate any required keys; handle (delayed) filewatch event */
- for (int old_tfd = tls_daemon_tick(); old_tfd >= 0; )
- {
- FD_CLR(old_tfd, &select_listen);
- if (old_tfd == listen_fd_max - 1) listen_fd_max = old_tfd;
- if (tls_watch_fd >= 0)
- add_listener_socket(tls_watch_fd, &select_listen, &listen_fd_max);
- break;
- }
+
+ if ((old_tfd = tls_daemon_tick()) >= 0)
+ for (struct pollfd * p = &fd_polls[listen_socket_count];
+ p < fd_polls + poll_fd_count; p++)
+ if (p->fd == old_tfd) { p->fd = tls_watch_fd ; break; }
+ }
#endif
errno = select_errno;
}
if (!select_failed)
{
#if !defined(DISABLE_TLS) && (defined(EXIM_HAVE_INOTIFY) || defined(EXIM_HAVE_KEVENT))
- if (tls_watch_fd >= 0 && FD_ISSET(tls_watch_fd, &fds))
+ if (tls_watch_poll && tls_watch_poll->revents & POLLIN)
{
+ tls_watch_poll->revents = 0;
tls_watch_trigger_time = time(NULL); /* Set up delayed event */
tls_watch_discard_event(tls_watch_fd);
break; /* to top of daemon loop */
}
#endif
- if (daemon_notifier_fd >= 0 && FD_ISSET(daemon_notifier_fd, &fds))
+ /* Handle the daemon-notifier socket. If it was a fast-ramp
+ notification then queuerun_msgid will have a nonzerolength string. */
+
+ if (dnotify_poll && dnotify_poll->revents & POLLIN)
{
- sigalrm_seen = daemon_notification();
+ dnotify_poll->revents = 0;
+ daemon_notification();
break; /* to top of daemon loop */
}
- while (check_lsk < listen_socket_count)
- {
- int lfd = listen_sockets[check_lsk++];
- if (FD_ISSET(lfd, &fds))
+ for (struct pollfd * p = fd_polls; p < fd_polls + listen_socket_count;
+ p++)
+ if (p->revents & POLLIN)
{
EXIM_SOCKLEN_T alen = sizeof(accepted);
-#ifdef TCP_INFO
+#if defined(__FreeBSD__) && defined(SO_LISTENQLEN)
+ int backlog;
+ socklen_t blen = sizeof(backlog);
+
+ if ( smtp_backlog_monitor > 0
+ && getsockopt(p->fd, SOL_SOCKET, SO_LISTENQLEN, &backlog, &blen) == 0)
+ {
+ DEBUG(D_interface)
+ debug_printf("listen fd %d queue curr %d\n", p->fd, backlog);
+ smtp_listen_backlog = backlog;
+ }
+
+#elif defined(TCP_INFO) && defined(EXIM_HAVE_TCPI_UNACKED)
struct tcp_info ti;
socklen_t tlen = sizeof(ti);
smtp_listen_backlog = 0;
if ( smtp_backlog_monitor > 0
- && getsockopt(lfd, IPPROTO_TCP, TCP_INFO, &ti, &tlen) == 0)
+ && getsockopt(p->fd, IPPROTO_TCP, TCP_INFO, &ti, &tlen) == 0)
{
-# ifdef EXIM_HAVE_TCPI_UNACKED
DEBUG(D_interface) debug_printf("listen fd %d queue max %u curr %u\n",
- lfd, ti.tcpi_sacked, ti.tcpi_unacked);
+ p->fd, ti.tcpi_sacked, ti.tcpi_unacked);
smtp_listen_backlog = ti.tcpi_unacked;
-# elif defined(__FreeBSD__) /* This does not work. Investigate kernel sourcecode. */
- DEBUG(D_interface) debug_printf("listen fd %d queue max %u curr %u\n",
- lfd, ti.__tcpi_sacked, ti.__tcpi_unacked);
- smtp_listen_backlog = ti.__tcpi_unacked;
-# endif
}
#endif
- accept_socket = accept(lfd, (struct sockaddr *)&accepted, &alen);
+ p->revents = 0;
+ accept_socket = accept(p->fd, (struct sockaddr *)&accepted, &alen);
break;
}
- }
}
/* If select or accept has failed and this was not caused by an
#endif
if (inetd_wait_timeout)
last_connection_time = time(NULL);
- handle_smtp_call(listen_sockets, listen_socket_count, accept_socket,
+ handle_smtp_call(fd_polls, listen_socket_count, accept_socket,
(struct sockaddr *)&accepted);
}
}
else
{
- struct timeval tv;
- tv.tv_sec = queue_interval;
- tv.tv_usec = 0;
- select(0, NULL, NULL, NULL, &tv);
+ struct pollfd p;
+ poll(&p, 0, nolisten_sleep * 1000);
handle_ending_processes();
}
if (sighup_seen)
{
- log_write(0, LOG_MAIN, "pid %d: SIGHUP received: re-exec daemon",
+ log_write(0, LOG_MAIN, "pid %ld: SIGHUP received: re-exec daemon",
getpid());
- close_daemon_sockets(daemon_notifier_fd,
- listen_sockets, listen_socket_count);
+ close_daemon_sockets(daemon_notifier_fd, fd_polls, listen_socket_count);
+ unlink_notifier_socket();
ALARM_CLR(0);
signal(SIGHUP, SIG_IGN);
sighup_argv[0] = exim_path;
exim_nullstd();
execv(CS exim_path, (char *const *)sighup_argv);
- log_write(0, LOG_MAIN|LOG_PANIC_DIE, "pid %d: exec of %s failed: %s",
+ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "pid %ld: exec of %s failed: %s",
getpid(), exim_path, strerror(errno));
log_close_all();
}
git://git.exim.org / exim.git / blobdiff