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 Import dhcpcd-7.0.5 with the fo...
details: https://anonhg.NetBSD.org/src/rev/8a1c1aee6f31
branches: trunk
changeset: 319526:8a1c1aee6f31
user: roy <roy%NetBSD.org@localhost>
date: Sat Jun 02 09:42:48 2018 +0000
description:
Import dhcpcd-7.0.5 with the following changes:
* dhcp: Clarified some checksumming code, style and commentary
(thanks to Maxime Villard)
* dhcp6: IAID is now unique per IA type rather than global
* ip6: if an IA callback causes a fork, exit earlier
diffstat:
external/bsd/dhcpcd/dist/src/arp.c | 9 ++-
external/bsd/dhcpcd/dist/src/defs.h | 2 +-
external/bsd/dhcpcd/dist/src/dhcp6.c | 75 +++++++++++++++++---------
external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in | 5 +-
external/bsd/dhcpcd/dist/src/ipv6.c | 23 +++++--
5 files changed, 73 insertions(+), 41 deletions(-)
diffs (294 lines):
diff -r 0a983523308c -r 8a1c1aee6f31 external/bsd/dhcpcd/dist/src/arp.c
--- a/external/bsd/dhcpcd/dist/src/arp.c Sat Jun 02 05:55:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/arp.c Sat Jun 02 09:42:48 2018 +0000
@@ -128,13 +128,16 @@
/* Protocol must be IP. */
if (ar.ar_pro != htons(ETHERTYPE_IP))
continue;
+ /* lladdr length matches */
+ if (ar.ar_hln != ifp->hwlen)
+ continue;
+ /* Protocol length must match in_addr_t */
+ if (ar.ar_pln != sizeof(arm.sip.s_addr))
+ return;
/* Only these types are recognised */
if (ar.ar_op != htons(ARPOP_REPLY) &&
ar.ar_op != htons(ARPOP_REQUEST))
continue;
- /* Protocol length must match in_addr_t */
- if (ar.ar_pln != sizeof(arm.sip.s_addr))
- return;
#endif
/* Get pointers to the hardware addresses */
diff -r 0a983523308c -r 8a1c1aee6f31 external/bsd/dhcpcd/dist/src/defs.h
--- a/external/bsd/dhcpcd/dist/src/defs.h Sat Jun 02 05:55:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/defs.h Sat Jun 02 09:42:48 2018 +0000
@@ -28,7 +28,7 @@
#define CONFIG_H
#define PACKAGE "dhcpcd"
-#define VERSION "7.0.4"
+#define VERSION "7.0.5"
#ifndef CONFIG
# define CONFIG SYSCONFDIR "/" PACKAGE ".conf"
diff -r 0a983523308c -r 8a1c1aee6f31 external/bsd/dhcpcd/dist/src/dhcp6.c
--- a/external/bsd/dhcpcd/dist/src/dhcp6.c Sat Jun 02 05:55:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.c Sat Jun 02 09:42:48 2018 +0000
@@ -98,6 +98,11 @@
};
__CTASSERT(sizeof(struct dhcp6_ia_na) == 12);
+struct dhcp6_ia_ta {
+ uint8_t iaid[4];
+};
+__CTASSERT(sizeof(struct dhcp6_ia_ta) == 4);
+
struct dhcp6_ia_addr {
struct in6_addr addr;
uint32_t pltime;
@@ -479,20 +484,18 @@
#ifndef SMALL
static const struct if_sla *
-dhcp6_findselfsla(struct interface *ifp, const uint8_t *iaid)
+dhcp6_findselfsla(struct interface *ifp)
{
size_t i, j;
+ struct if_ia *ia;
for (i = 0; i < ifp->options->ia_len; i++) {
- if (iaid == NULL ||
- memcmp(&ifp->options->ia[i].iaid, iaid,
- sizeof(ifp->options->ia[i].iaid)) == 0)
- {
- for (j = 0; j < ifp->options->ia[i].sla_len; j++) {
- if (strcmp(ifp->options->ia[i].sla[j].ifname,
- ifp->name) == 0)
- return &ifp->options->ia[i].sla[j];
- }
+ ia = &ifp->options->ia[i];
+ if (ia->ia_type != D6_OPTION_IA_PD)
+ continue;
+ for (j = 0; j < ia->sla_len; j++) {
+ if (strcmp(ia->sla[j].ifname, ifp->name) == 0)
+ return &ia->sla[j];
}
}
return NULL;
@@ -629,6 +632,7 @@
int fqdn;
struct dhcp6_ia_na ia_na;
uint16_t ia_na_len;
+ struct if_ia *ifia;
#ifdef AUTH
uint16_t auth_len;
#endif
@@ -693,7 +697,7 @@
len += sizeof(o.len);
}
}
- if (dhcp6_findselfsla(ifp, NULL)) {
+ if (dhcp6_findselfsla(ifp)) {
n_options++;
len += sizeof(o.len);
}
@@ -772,7 +776,13 @@
}
/* FALLTHROUGH */
case DH6S_INIT:
- len += ifo->ia_len * (sizeof(o) + (sizeof(uint32_t) * 3));
+ for (l = 0; l < ifo->ia_len; l++) {
+ ifia = &ifo->ia[l];
+ len += sizeof(o) + sizeof(uint32_t); /* IAID */
+ /* IA_TA does not have T1 or T2 timers */
+ if (ifo->ia[l].ia_type != D6_OPTION_IA_TA)
+ len += sizeof(uint32_t) + sizeof(uint32_t);
+ }
IA = 1;
break;
default:
@@ -899,19 +909,29 @@
COPYIN1(D6_OPTION_RAPID_COMMIT, 0);
for (l = 0; IA && l < ifo->ia_len; l++) {
+ ifia = &ifo->ia[l];
o_lenp = NEXTLEN;
- ia_na_len = sizeof(ia_na);
- memcpy(ia_na.iaid, ifo->ia[l].iaid, sizeof(ia_na.iaid));
+ /* TA structure is the same as the others,
+ * it just lacks the T1 and T2 timers.
+ * These happen to be at the end of the struct,
+ * so we just don't copy them in. */
+ if (ifia->ia_type == D6_OPTION_IA_TA)
+ ia_na_len = sizeof(struct dhcp6_ia_ta);
+ else
+ ia_na_len = sizeof(ia_na);
+ memcpy(ia_na.iaid, ifia->iaid, sizeof(ia_na.iaid));
ia_na.t1 = 0;
ia_na.t2 = 0;
- COPYIN(ifo->ia[l].ia_type, &ia_na, sizeof(ia_na));
+ COPYIN(ifia->ia_type, &ia_na, ia_na_len);
TAILQ_FOREACH(ap, &state->addrs, next) {
if (ap->flags & IPV6_AF_STALE)
continue;
if (ap->prefix_vltime == 0 &&
!(ap->flags & IPV6_AF_REQUEST))
continue;
- if (memcmp(ifo->ia[l].iaid, ap->iaid, sizeof(uint32_t)))
+ if (ap->ia_type != ifia->ia_type)
+ continue;
+ if (memcmp(ap->iaid, ifia->iaid, sizeof(ap->iaid)))
continue;
if (ap->ia_type == D6_OPTION_IA_PD) {
#ifndef SMALL
@@ -1054,7 +1074,7 @@
(o.len + sizeof(o.code));
}
}
- if (dhcp6_findselfsla(ifp, NULL)) {
+ if (dhcp6_findselfsla(ifp)) {
o.code = htons(D6_OPTION_PD_EXCLUDE);
memcpy(p, &o.code, sizeof(o.code));
p += sizeof(o.code);
@@ -2195,6 +2215,7 @@
uint8_t iaid[4];
char buf[sizeof(iaid) * 3];
struct ipv6_addr *ap;
+ struct if_ia *ifia;
if (l < sizeof(*m)) {
/* Should be impossible with guards at packet in
@@ -2248,8 +2269,9 @@
o.len = (uint16_t)(o.len - nl);
for (j = 0; j < ifo->ia_len; j++) {
- if (memcmp(&ifo->ia[j].iaid, ia.iaid,
- sizeof(ia.iaid)) == 0)
+ ifia = &ifo->ia[j];
+ if (ifia->ia_type == o.code &&
+ memcmp(ifia->iaid, ia.iaid, sizeof(ia.iaid)) == 0)
break;
}
if (j == ifo->ia_len &&
@@ -2261,13 +2283,6 @@
buf, sizeof(buf)));
continue;
}
- if ( j < ifo->ia_len && ifo->ia[j].ia_type != o.code) {
- logerrx("%s: IAID %s: option type mismatch",
- ifp->name,
- hwaddr_ntoa(ia.iaid, sizeof(ia.iaid),
- buf, sizeof(buf)));
- continue;
- }
if (o.code != D6_OPTION_IA_TA) {
ia.t1 = ntohl(ia.t1);
@@ -2773,6 +2788,8 @@
}
for (i = 0; i < ifo->ia_len; i++) {
ia = &ifo->ia[i];
+ if (ia->ia_type != D6_OPTION_IA_PD)
+ continue;
if (memcmp(ia->iaid, ap->iaid,
sizeof(ia->iaid)))
continue;
@@ -2869,6 +2886,8 @@
continue;
for (i = 0; i < ifo->ia_len; i++) {
ia = &ifo->ia[i];
+ if (ia->ia_type != D6_OPTION_IA_PD)
+ continue;
if (memcmp(ia->iaid, ap->iaid,
sizeof(ia->iaid)))
continue;
@@ -3646,6 +3665,8 @@
for (i = 0; i < ifp->options->ia_len; i++) {
ia = &ifp->options->ia[i];
+ if (ia->ia_type != D6_OPTION_IA_PD)
+ continue;
for (j = 0; j < ia->sla_len; j++) {
sla = &ia->sla[j];
ifd = if_find(ifp->ctx->ifaces, sla->ifname);
@@ -3702,7 +3723,7 @@
#ifndef SMALL
/* Rapid commit won't work with Prefix Delegation Exclusion */
- if (dhcp6_findselfsla(ifp, NULL))
+ if (dhcp6_findselfsla(ifp))
del_option_mask(ifo->requestmask6, D6_OPTION_RAPID_COMMIT);
#endif
diff -r 0a983523308c -r 8a1c1aee6f31 external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in Sat Jun 02 05:55:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in Sat Jun 02 09:42:48 2018 +0000
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd April 29, 2018
+.Dd May 3, 2018
.Dt DHCPCD.CONF 5
.Os
.Sh NAME
@@ -385,7 +385,8 @@
Only configure IPv4.
.It Ic ipv6only
Only configure IPv6.
-.It Ic fqdn Op disable | ptr | both
+.It Ic fqdn Op disable | none | ptr | both
+none will not ask the DHCP server to update DNS.
ptr just asks the DHCP server to update the PTR
record of the host in DNS whereas both also updates the A record.
disable will disable the FQDN option.
diff -r 0a983523308c -r 8a1c1aee6f31 external/bsd/dhcpcd/dist/src/ipv6.c
--- a/external/bsd/dhcpcd/dist/src/ipv6.c Sat Jun 02 05:55:47 2018 +0000
+++ b/external/bsd/dhcpcd/dist/src/ipv6.c Sat Jun 02 09:42:48 2018 +0000
@@ -1152,8 +1152,11 @@
}
#endif
- if (ia->dadcallback)
+ if (ia->dadcallback) {
ia->dadcallback(ia);
+ if (ctx->options & DHCPCD_FORKED)
+ goto out;
+ }
if (IN6_IS_ADDR_LINKLOCAL(&ia->addr) &&
!(ia->addr_flags & IN6_IFF_NOTUSEABLE))
@@ -1168,20 +1171,24 @@
cb, next);
cb->callback(cb->arg);
free(cb);
+ if (ctx->options & DHCPCD_FORKED)
+ goto out;
}
}
}
break;
}
- if (ia != NULL) {
- ipv6nd_handleifa(cmd, ia, pid);
- dhcp6_handleifa(cmd, ia, pid);
+ if (ia == NULL)
+ return;
- /* Done with the ia now, so free it. */
- if (cmd == RTM_DELADDR)
- ipv6_freeaddr(ia);
- }
+ ipv6nd_handleifa(cmd, ia, pid);
+ dhcp6_handleifa(cmd, ia, pid);
+
+out:
+ /* Done with the ia now, so free it. */
+ if (cmd == RTM_DELADDR)
+ ipv6_freeaddr(ia);
}
int
Home |
Main Index |
Thread Index |
Old Index