summaryrefslogtreecommitdiffstats
path: root/ipv6nd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2015-05-15 19:41:33 +0000
committerRoy Marples <roy@marples.name>2015-05-15 19:41:33 +0000
commit81af258947770c89f8505a0c905e79ce58a265d9 (patch)
treed69bafac8b4cd3c172001537b8d73540603b0625 /ipv6nd.c
parent3af283f66243be1d7c49ba72b581efc74f54895c (diff)
downloaddhcpcd-81af258947770c89f8505a0c905e79ce58a265d9.tar.xz
OpenBSD fixes.
Diffstat (limited to 'ipv6nd.c')
-rw-r--r--ipv6nd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipv6nd.c b/ipv6nd.c
index 6bb9b0fe..5580bdfa 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -445,14 +445,14 @@ ipv6nd_findaddr(struct dhcpcd_ctx *ctx, const struct in6_addr *addr,
}
static void
-ipv6nd_removefreedrop_ra(struct ra *rap, int remove, int drop)
+ipv6nd_removefreedrop_ra(struct ra *rap, int remove_ra, int drop_ra)
{
eloop_timeout_delete(rap->iface->ctx->eloop, NULL, rap->iface);
eloop_timeout_delete(rap->iface->ctx->eloop, NULL, rap);
- if (remove && !drop)
+ if (remove_ra && !drop_ra)
TAILQ_REMOVE(rap->iface->ctx->ipv6->ra_routers, rap, next);
- ipv6_freedrop_addrs(&rap->addrs, drop, NULL);
+ ipv6_freedrop_addrs(&rap->addrs, drop_ra, NULL);
free(rap->data);
free(rap);
}
@@ -1302,7 +1302,7 @@ ipv6nd_env(char **env, const char *prefix, const struct interface *ifp)
len >= (ssize_t)sizeof(*o);
o = ND_CNEXT_OPTION(o))
{
- if (o->nd_opt_len * 8 > len) {
+ if ((size_t)o->nd_opt_len * 8 > len) {
errno = EINVAL;
break;
}