Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/dist/src Sync with dhcpcd-9.3.2



details:   https://anonhg.NetBSD.org/src/rev/9c48a60c2d9b
branches:  trunk
changeset: 977773:9c48a60c2d9b
user:      roy <roy%NetBSD.org@localhost>
date:      Sun Nov 01 14:24:01 2020 +0000

description:
Sync with dhcpcd-9.3.2

diffstat:

 external/bsd/dhcpcd/dist/src/dhcp.c      |   89 ++++++++++++++++++++-----
 external/bsd/dhcpcd/dist/src/dhcpcd.8.in |   10 +--
 external/bsd/dhcpcd/dist/src/dhcpcd.c    |   14 ++-
 external/bsd/dhcpcd/dist/src/logerr.c    |  110 ++++++++++++++++++++++++++----
 external/bsd/dhcpcd/dist/src/privsep.c   |   13 +++
 5 files changed, 190 insertions(+), 46 deletions(-)

diffs (truncated from 452 to 300 lines):

diff -r 0d30954ffe85 -r 9c48a60c2d9b external/bsd/dhcpcd/dist/src/dhcp.c
--- a/external/bsd/dhcpcd/dist/src/dhcp.c       Sun Nov 01 14:23:02 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp.c       Sun Nov 01 14:24:01 2020 +0000
@@ -1520,21 +1520,15 @@
 #endif
 }
 
-void
-dhcp_close(struct interface *ifp)
+static void
+dhcp_closebpf(struct interface *ifp)
 {
        struct dhcpcd_ctx *ctx = ifp->ctx;
        struct dhcp_state *state = D_STATE(ifp);
 
-       if (state == NULL)
-               return;
-
 #ifdef PRIVSEP
-       if (IN_PRIVSEP_SE(ctx)) {
+       if (IN_PRIVSEP_SE(ctx))
                ps_bpf_closebootp(ifp);
-               if (state->addr != NULL)
-                       ps_inet_closebootp(state->addr);
-       }
 #endif
 
        if (state->bpf != NULL) {
@@ -1542,11 +1536,38 @@
                bpf_close(state->bpf);
                state->bpf = NULL;
        }
+}
+
+static void
+dhcp_closeinet(struct interface *ifp)
+{
+       struct dhcpcd_ctx *ctx = ifp->ctx;
+       struct dhcp_state *state = D_STATE(ifp);
+
+#ifdef PRIVSEP
+       if (IN_PRIVSEP_SE(ctx)) {
+               if (state->addr != NULL)
+                       ps_inet_closebootp(state->addr);
+       }
+#endif
+
        if (state->udp_rfd != -1) {
                eloop_event_delete(ctx->eloop, state->udp_rfd);
                close(state->udp_rfd);
                state->udp_rfd = -1;
        }
+}
+
+void
+dhcp_close(struct interface *ifp)
+{
+       struct dhcp_state *state = D_STATE(ifp);
+
+       if (state == NULL)
+               return;
+
+       dhcp_closebpf(ifp);
+       dhcp_closeinet(ifp);
 
        state->interval = 0;
 }
@@ -2061,12 +2082,14 @@
 
 #ifdef ARP
 #ifdef KERNEL_RFC5227
+#ifdef ARPING
 static void
 dhcp_arp_announced(struct arp_state *state)
 {
 
        arp_free(state);
 }
+#endif
 #else
 static void
 dhcp_arp_defend_failed(struct arp_state *astate)
@@ -2321,23 +2344,24 @@
                        logerr("dhcp_writefile: %s", state->leasefile);
        }
 
+       old_state = state->added;
+
        /* Close the BPF filter as we can now receive DHCP messages
         * on a UDP socket. */
-       old_state = state->added;
-       if (ctx->options & DHCPCD_MASTER ||
-           state->old == NULL ||
-           state->old->yiaddr != state->new->yiaddr || old_state & STATE_FAKE)
-               dhcp_close(ifp);
-
+       dhcp_closebpf(ifp);
+
+       /* Add the address */
        ipv4_applyaddr(ifp);
 
        /* If not in master mode, open an address specific socket. */
        if (ctx->options & DHCPCD_MASTER ||
            (state->old != NULL &&
-           state->old->yiaddr == state->new->yiaddr &&
-           old_state & STATE_ADDED && !(old_state & STATE_FAKE)))
+            state->old->yiaddr == state->new->yiaddr &&
+            old_state & STATE_ADDED && !(old_state & STATE_FAKE)))
                return;
 
+       dhcp_closeinet(ifp);
+
 #ifdef PRIVSEP
        if (IN_PRIVSEP_SE(ctx)) {
                if (ps_inet_openbootp(state->addr) == -1)
@@ -2926,6 +2950,8 @@
        unsigned int i;
        char *msg;
        bool bootp_copied;
+       uint32_t v6only_time = 0;
+       bool use_v6only = false;
 #ifdef AUTH
        const uint8_t *auth;
        size_t auth_len;
@@ -3143,6 +3169,23 @@
                }
        }
 
+       if (has_option_mask(ifo->requestmask, DHO_IPV6_PREFERRED_ONLY)) {
+               if (get_option_uint32(ifp->ctx, &v6only_time, bootp, bootp_len,
+                   DHO_IPV6_PREFERRED_ONLY) == 0 &&
+                   (state->state == DHS_DISCOVER || state->state == DHS_REBOOT))
+               {
+                       char v6msg[128];
+
+                       use_v6only = true;
+                       if (v6only_time < MIN_V6ONLY_WAIT)
+                               v6only_time = MIN_V6ONLY_WAIT;
+                       snprintf(v6msg, sizeof(v6msg),
+                           "IPv6-Only Preferred received (%u seconds)",
+                           v6only_time);
+                       LOGDHCP(LOG_INFO, v6msg);
+               }
+       }
+
        /* DHCP Auto-Configure, RFC 2563 */
        if (type == DHCP_OFFER && bootp->yiaddr == 0) {
                LOGDHCP(LOG_WARNING, "no address given");
@@ -3177,12 +3220,22 @@
                        }
                        eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
                        eloop_timeout_add_sec(ifp->ctx->eloop,
-                           DHCP_MAX, dhcp_discover, ifp);
+                           use_v6only ? v6only_time : DHCP_MAX,
+                           dhcp_discover, ifp);
                }
 #endif
                return;
        }
 
+       if (use_v6only) {
+               dhcp_drop(ifp, "EXPIRE");
+               dhcp_unlink(ifp->ctx, state->leasefile);
+               eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
+               eloop_timeout_add_sec(ifp->ctx->eloop, v6only_time,
+                   dhcp_discover, ifp);
+               return;
+       }
+
        /* Ensure that the address offered is valid */
        if ((type == 0 || type == DHCP_OFFER || type == DHCP_ACK) &&
            (bootp->ciaddr == INADDR_ANY || bootp->ciaddr == INADDR_BROADCAST)
diff -r 0d30954ffe85 -r 9c48a60c2d9b external/bsd/dhcpcd/dist/src/dhcpcd.8.in
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.8.in  Sun Nov 01 14:23:02 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.8.in  Sun Nov 01 14:24:01 2020 +0000
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 2, 2020
+.Dd October 30, 2020
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -846,13 +846,5 @@
 .Sh AUTHORS
 .An Roy Marples Aq Mt roy%marples.name@localhost
 .Sh BUGS
-If
-.Nm
-is running in a
-.Xr chroot 2
-then re-opening the
-.Fl Fl logfile
-from SIGUSR2 may not work.
-.Pp
 Please report them to
 .Lk http://roy.marples.name/projects/dhcpcd
diff -r 0d30954ffe85 -r 9c48a60c2d9b external/bsd/dhcpcd/dist/src/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.c     Sun Nov 01 14:23:02 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.c     Sun Nov 01 14:24:01 2020 +0000
@@ -1422,10 +1422,15 @@
                return;
        case SIGUSR2:
                loginfox(sigmsg, "SIGUSR2", "reopening log");
-               /* XXX This may not work that well in a chroot */
-               logclose();
+#ifdef PRIVSEP
+               if (IN_PRIVSEP(ctx)) {
+                       if (ps_root_logreopen(ctx) == -1)
+                               logerr("ps_root_logreopen");
+                       return;
+               }
+#endif
                if (logopen(ctx->logfile) == -1)
-                       logerr(__func__);
+                       logerr("logopen");
                return;
        case SIGCHLD:
                while (waitpid(-1, NULL, WNOHANG) > 0)
@@ -1860,7 +1865,7 @@
        ctx.dhcp6_wfd = -1;
 #endif
 #ifdef PRIVSEP
-       ctx.ps_root_fd = ctx.ps_data_fd = -1;
+       ctx.ps_root_fd = ctx.ps_log_fd = ctx.ps_data_fd = -1;
        ctx.ps_inet_fd = ctx.ps_control_fd = -1;
        TAILQ_INIT(&ctx.ps_processes);
 #endif
@@ -2328,6 +2333,7 @@
        /* We have now forked, setsid, forked once more.
         * From this point on, we are the controlling daemon. */
        ctx.options |= DHCPCD_STARTED;
+       logdebugx("spawned master process on PID %d", getpid());
        if ((pid = pidfile_lock(ctx.pidfile)) != 0) {
                logerr("%s: pidfile_lock %d", __func__, pid);
 #ifdef PRIVSEP
diff -r 0d30954ffe85 -r 9c48a60c2d9b external/bsd/dhcpcd/dist/src/logerr.c
--- a/external/bsd/dhcpcd/dist/src/logerr.c     Sun Nov 01 14:23:02 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/logerr.c     Sun Nov 01 14:24:01 2020 +0000
@@ -47,11 +47,16 @@
 #undef LOGERR_TAG
 #endif
 
+/* syslog protocol is 1k message max, RFC 3164 section 4.1 */
+#define LOGERR_SYSLOGBUF       1024 + sizeof(int) + sizeof(pid_t)
+
 #define UNUSED(a)              (void)(a)
 
 struct logctx {
        char             log_buf[BUFSIZ];
        unsigned int     log_opts;
+       int              log_fd;
+       pid_t            log_pid;
 #ifndef SMALL
        FILE            *log_file;
 #ifdef LOGERR_TAG
@@ -63,9 +68,11 @@
 static struct logctx _logctx = {
        /* syslog style, but without the hostname or tag. */
        .log_opts = LOGERR_LOG | LOGERR_LOG_DATE | LOGERR_LOG_PID,
+       .log_fd = -1,
+       .log_pid = 0,
 };
 
-#if defined(LOGERR_TAG) && defined(__linux__)
+#if defined(__linux__)
 /* Poor man's getprogname(3). */
 static char *_logprog;
 static const char *
@@ -79,9 +86,12 @@
                 * so zero the buffer. */
                if ((_logprog = calloc(1, PATH_MAX + 1)) == NULL)
                        return NULL;
+               if (readlink("/proc/self/exe", _logprog, PATH_MAX + 1) == -1) {
+                       free(_logprog);
+                       _logprog = NULL;
+                       return NULL;
+               }
        }
-       if (readlink("/proc/self/exe", _logprog, PATH_MAX + 1) == -1)
-               return NULL;
        if (_logprog[0] == '[')
                return NULL;
        p = strrchr(_logprog, '/');
@@ -147,7 +157,13 @@
        log_pid = ((stream == stderr && ctx->log_opts & LOGERR_ERR_PID) ||
            (stream != stderr && ctx->log_opts & LOGERR_LOG_PID));
        if (log_pid) {
-               if ((e = fprintf(stream, "[%d]", getpid())) == -1)
+               pid_t pid;
+
+               if (ctx->log_pid == 0)
+                       pid = getpid();
+               else
+                       pid = ctx->log_pid;
+               if ((e = fprintf(stream, "[%d]", pid)) == -1)
                        return -1;
                len += e;
        }



Home | Main Index | Thread Index | Old Index