X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fdaemon.c;h=a4b1e2685451633f8480c928a59c1977d037648b;hb=fd5ad03aa7da47965ce3e23294661c8f3c602d33;hp=7decc72233a913f7023a9cf4e62cdff2bc308fe5;hpb=5fd673807d3cbe09b68c7e2631184d929905949b;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/daemon.c b/src/src/daemon.c index 7decc7223..a4b1e2685 100644 --- a/src/src/daemon.c +++ b/src/src/daemon.c @@ -275,7 +275,7 @@ subprocess because it might take time. */ if (smtp_load_reserve >= 0) { load_average = OS_GETLOADAVG(); - if (smtp_reserve_hosts == NULL && load_average > smtp_load_reserve) + if (!smtp_reserve_hosts && load_average > smtp_load_reserve) { DEBUG(D_any) debug_printf("rejecting SMTP connection: load average = %.2f\n", (double)load_average/1000.0); @@ -374,7 +374,7 @@ if (LOGGING(smtp_connection)) { uschar *list = hosts_connection_nolog; memset(sender_host_cache, 0, sizeof(sender_host_cache)); - if (list != NULL && verify_check_host(&list) == OK) + 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 " @@ -396,12 +396,18 @@ if (pid == 0) int save_debug_selector = debug_selector; BOOL local_queue_only; BOOL session_local_queue_only; - #ifdef SA_NOCLDWAIT +#ifdef SA_NOCLDWAIT struct sigaction act; - #endif +#endif smtp_accept_count++; /* So that it includes this process */ + /* If the listen backlog was over the monitoring level, log it. */ + + if (smtp_listen_backlog > smtp_backlog_monitor) + log_write(0, LOG_MAIN, "listen backlog %d I=[%s]:%d", + smtp_listen_backlog, interface_address, interface_port); + /* May have been modified for the subprocess */ *log_selector = save_log_selector; @@ -685,6 +691,7 @@ if (pid == 0) (void)fclose(smtp_in); (void)close(fileno(smtp_out)); (void)fclose(smtp_out); + smtp_in = smtp_out = NULL; /* Don't ever molest the parent's SSL connection, but do clean up the data structures if necessary. */ @@ -966,7 +973,7 @@ const int dir_flags = O_RDONLY | O_NONBLOCK; const int base_flags = O_NOFOLLOW | O_NONBLOCK; const mode_t base_mode = 0644; struct stat sb; -int cwd_fd, dir_fd, base_fd; +int cwd_fd = -1, dir_fd = -1, base_fd = -1; BOOL success = FALSE; errno = EACCES; @@ -1806,8 +1813,7 @@ if (f.daemon_listen && !f.inetd_wait_mode) #ifdef IPV6_V6ONLY if (af == AF_INET6 && wildcard && - setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, CS (&on), - sizeof(on)) < 0) + setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) log_write(0, LOG_MAIN, "Setting IPV6_V6ONLY on daemon's IPv6 wildcard " "socket failed (%s): carrying on without it", strerror(errno)); #endif /* IPV6_V6ONLY */ @@ -1816,16 +1822,14 @@ if (f.daemon_listen && !f.inetd_wait_mode) is being handled. Without this, a connection will prevent reuse of the smtp port for listening. */ - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, - US (&on), sizeof(on)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "setting SO_REUSEADDR on socket " "failed when starting daemon: %s", strerror(errno)); /* Set TCP_NODELAY; Exim does its own buffering. There is a switch to disable this because it breaks some broken clients. */ - if (tcp_nodelay) setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, - US (&on), sizeof(on)); + if (tcp_nodelay) setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); /* Now bind the socket to the required port; if Exim is being restarted it may not always be possible to bind immediately, even with SO_REUSEADDR @@ -1966,17 +1970,6 @@ if (f.running_in_test_harness || write_pid) DEBUG(D_any) debug_printf("%s pid file %s: %s\n", (operation == PID_WRITE) ? "write" : "check", pid_file_path, strerror(errno)); } -/* Add ancillary sockets to the set for select */ - -#ifndef DISABLE_TLS -if (tls_watch_fd >= 0) - add_listener_socket(tls_watch_fd, &select_listen, &listen_fd_max); -#endif -if (daemon_notifier_fd >= 0) - add_listener_socket(daemon_notifier_fd, &select_listen, &listen_fd_max); - -listen_fd_max++; - /* Set up the handler for SIGHUP, which causes a restart of the daemon. */ sighup_seen = FALSE; @@ -2192,6 +2185,17 @@ spf_init(); tls_daemon_init(); #endif +/* Add ancillary sockets to the set for select */ + +#ifndef DISABLE_TLS +if (tls_watch_fd >= 0) + add_listener_socket(tls_watch_fd, &select_listen, &listen_fd_max); +#endif +if (daemon_notifier_fd >= 0) + add_listener_socket(daemon_notifier_fd, &select_listen, &listen_fd_max); + +listen_fd_max++; + /* 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 closes the log afterwards, for the same reason. */ @@ -2212,13 +2216,6 @@ report_time_since(×tamp_startup, US"daemon loop start"); /* testcase 0022 * for (;;) { - #if HAVE_IPV6 - struct sockaddr_in6 accepted; - #else - struct sockaddr_in accepted; - #endif - - EXIM_SOCKLEN_T len; pid_t pid; if (sigterm_seen) @@ -2424,7 +2421,7 @@ for (;;) if (f.daemon_listen) { - int lcount; + int check_lsk = 0, lcount; BOOL select_failed = FALSE; fd_set fds = select_listen; @@ -2465,7 +2462,14 @@ for (;;) #ifndef DISABLE_TLS /* Create or rotate any required keys; handle (delayed) filewatch event */ - tls_daemon_tick(); + 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; + } #endif errno = select_errno; } @@ -2477,13 +2481,17 @@ for (;;) while (lcount-- > 0) { int accept_socket = -1; +#if HAVE_IPV6 + struct sockaddr_in6 accepted; +#else + struct sockaddr_in accepted; +#endif 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)) { - FD_CLR(tls_watch_fd, &fds); tls_watch_trigger_time = time(NULL); /* Set up delayed event */ tls_watch_discard_event(tls_watch_fd); break; /* to top of daemon loop */ @@ -2491,19 +2499,40 @@ for (;;) #endif if (daemon_notifier_fd >= 0 && FD_ISSET(daemon_notifier_fd, &fds)) { - FD_CLR(daemon_notifier_fd, &fds); sigalrm_seen = daemon_notification(); break; /* to top of daemon loop */ } - for (int sk = 0; sk < listen_socket_count; sk++) - if (FD_ISSET(listen_sockets[sk], &fds)) + while (check_lsk < listen_socket_count) + { + int lfd = listen_sockets[check_lsk++]; + if (FD_ISSET(lfd, &fds)) { - len = sizeof(accepted); - accept_socket = accept(listen_sockets[sk], - (struct sockaddr *)&accepted, &len); - FD_CLR(listen_sockets[sk], &fds); + EXIM_SOCKLEN_T alen = sizeof(accepted); +#ifdef TCP_INFO + struct tcp_info ti; + socklen_t tlen = sizeof(ti); + + /* If monitoring the backlog is wanted, grab for later logging */ + + smtp_listen_backlog = 0; + if ( smtp_backlog_monitor > 0 + && getsockopt(lfd, 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); + 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); break; } + } } /* If select or accept has failed and this was not caused by an @@ -2526,18 +2555,18 @@ for (;;) else if ( errno != accept_retry_errno || select_failed != accept_retry_select_failed || accept_retry_count >= 50) - { - log_write(0, LOG_MAIN | (accept_retry_count >= 50 ? LOG_PANIC : 0), - "%d %s() failure%s: %s", - accept_retry_count, - accept_retry_select_failed ? "select" : "accept", - accept_retry_count == 1 ? "" : "s", - strerror(accept_retry_errno)); - log_close_all(); - accept_retry_count = 0; - accept_retry_errno = errno; - accept_retry_select_failed = select_failed; - } + { + log_write(0, LOG_MAIN | (accept_retry_count >= 50 ? LOG_PANIC : 0), + "%d %s() failure%s: %s", + accept_retry_count, + accept_retry_select_failed ? "select" : "accept", + accept_retry_count == 1 ? "" : "s", + strerror(accept_retry_errno)); + log_close_all(); + accept_retry_count = 0; + accept_retry_errno = errno; + accept_retry_select_failed = select_failed; + } accept_retry_count++; } else if (accept_retry_count > 0)