[src/trunk]: src/external/bsd/dhcpcd/dist/src Import dhcpcd-8.1.1 with the fo...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e52845e22224
branches:  trunk
changeset: 464670:e52845e22224
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Oct 16 14:50:27 2019 +0000

description:
Import dhcpcd-8.1.1 with the following changes:

 * IPv6: Fix a potential crash when learning interface addresses.
 * DHCP: Fix fallout from dhcpcd-8.1.0 for checksum calculation.

diffstat:

 external/bsd/dhcpcd/dist/src/defs.h       |  4 ++++
 external/bsd/dhcpcd/dist/src/dhcp.h       |  2 ++
 external/bsd/dhcpcd/dist/src/dhcp6.h      |  2 ++
 external/bsd/dhcpcd/dist/src/dhcpcd.h     |  7 +++++++
 external/bsd/dhcpcd/dist/src/if-options.h |  2 +-
 external/bsd/dhcpcd/dist/src/ipv6nd.h     |  2 ++
 6 files changed, 18 insertions(+), 1 deletions(-)

diffs (86 lines):

diff -r 96da7d558044 -r e52845e22224 external/bsd/dhcpcd/dist/src/defs.h
--- a/external/bsd/dhcpcd/dist/src/defs.h       Wed Oct 16 13:11:16 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/defs.h       Wed Oct 16 14:50:27 2019 +0000
@@ -31,6 +31,10 @@
 #define PACKAGE                        "dhcpcd"
 #define VERSION                        "8.1.0"
 
+#ifndef DHCPCD_USER
+# define DHCPCD_USER           "_dhcpcd"
+#endif
+
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
 #endif
diff -r 96da7d558044 -r e52845e22224 external/bsd/dhcpcd/dist/src/dhcp.h
--- a/external/bsd/dhcpcd/dist/src/dhcp.h       Wed Oct 16 13:11:16 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp.h       Wed Oct 16 14:50:27 2019 +0000
@@ -253,6 +253,8 @@
 ssize_t print_rfc3361(FILE *, const uint8_t *, size_t);
 ssize_t print_rfc3442(FILE *, const uint8_t *, size_t);
 
+int dhcp_open(struct dhcpcd_ctx *);
+void dhcp_recvmsg(struct dhcpcd_ctx *, struct msghdr *);
 void dhcp_printoptions(const struct dhcpcd_ctx *,
     const struct dhcp_opt *, size_t);
 uint16_t dhcp_get_mtu(const struct interface *);
diff -r 96da7d558044 -r e52845e22224 external/bsd/dhcpcd/dist/src/dhcp6.h
--- a/external/bsd/dhcpcd/dist/src/dhcp6.h      Wed Oct 16 13:11:16 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.h      Wed Oct 16 14:50:27 2019 +0000
@@ -220,6 +220,8 @@
        (D6_CSTATE((ifp)) &&                                                   \
        D6_CSTATE((ifp))->reason && dhcp6_dadcompleted((ifp)))
 
+int dhcp6_open(struct dhcpcd_ctx *);
+void dhcp6_recvmsg(struct dhcpcd_ctx *, struct msghdr *, struct ipv6_addr *);
 void dhcp6_printoptions(const struct dhcpcd_ctx *,
     const struct dhcp_opt *, size_t);
 const struct ipv6_addr *dhcp6_iffindaddr(const struct interface *ifp,
diff -r 96da7d558044 -r e52845e22224 external/bsd/dhcpcd/dist/src/dhcpcd.h
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.h     Wed Oct 16 13:11:16 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.h     Wed Oct 16 14:50:27 2019 +0000
@@ -32,6 +32,8 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
+#include <stdio.h>
+
 #include "config.h"
 #ifdef HAVE_SYS_QUEUE_H
 #include <sys/queue.h>
@@ -177,6 +179,11 @@
 
        char *randomstate; /* original state */
 
+#ifdef PRIVSEP
+       char *priv_user;
+       int priv_fd;
+#endif
+
 #ifdef INET
        struct dhcp_opt *dhcp_opts;
        size_t dhcp_opts_len;
diff -r 96da7d558044 -r e52845e22224 external/bsd/dhcpcd/dist/src/if-options.h
--- a/external/bsd/dhcpcd/dist/src/if-options.h Wed Oct 16 13:11:16 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/if-options.h Wed Oct 16 14:50:27 2019 +0000
@@ -78,7 +78,7 @@
 #define DHCPCD_HOSTNAME                        (1ULL << 18)
 #define DHCPCD_CLIENTID                        (1ULL << 19)
 #define DHCPCD_LINK                    (1ULL << 20)
-// unused                              (1ULL << 21)
+#define DHCPCD_PRIVSEP                 (1ULL << 21)
 #define DHCPCD_BACKGROUND              (1ULL << 22)
 #define DHCPCD_VENDORRAW               (1ULL << 23)
 #define DHCPCD_NOWAITIP                        (1ULL << 24) /* To force daemonise */
diff -r 96da7d558044 -r e52845e22224 external/bsd/dhcpcd/dist/src/ipv6nd.h
--- a/external/bsd/dhcpcd/dist/src/ipv6nd.h     Wed Oct 16 13:11:16 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6nd.h     Wed Oct 16 14:50:27 2019 +0000
@@ -91,6 +91,8 @@
 #define        RETRANS_TIMER                   1000    /* milliseconds */
 #define        DELAY_FIRST_PROBE_TIME          5       /* seconds */
 
+int ipv6nd_open(struct dhcpcd_ctx *);
+void ipv6nd_recvmsg(struct dhcpcd_ctx *, struct msghdr *);
 void ipv6nd_printoptions(const struct dhcpcd_ctx *,
     const struct dhcp_opt *, size_t);
 void ipv6nd_startrs(struct interface *);