summaryrefslogtreecommitdiffstats
path: root/ipv6.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2016-02-14 09:05:46 +0000
committerRoy Marples <roy@marples.name>2016-02-14 09:05:46 +0000
commita20f950d2ddc619f94bfd59d32076a2280677fe5 (patch)
tree763f54f9e6ac8eae8440a3087afbc876db60dd1a /ipv6.c
parent438cfdcdd1ebbf618b061a0ad55109dc2cf1f1c9 (diff)
downloaddhcpcd-a20f950d2ddc619f94bfd59d32076a2280677fe5.tar.xz
Make ipv6_newaddr static
Diffstat (limited to 'ipv6.c')
-rw-r--r--ipv6.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ipv6.c b/ipv6.c
index 09c25525..492f4b2e 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -1299,13 +1299,12 @@ ipv6_tryaddlinklocal(struct interface *ifp)
return ipv6_addlinklocal(ifp);
}
-struct ipv6_addr *
+static struct ipv6_addr *
ipv6_newaddr(struct interface *ifp, struct in6_addr *addr, uint8_t prefix_len)
{
struct ipv6_addr *ia;
char buf[INET6_ADDRSTRLEN];
const char *cbp;
- struct ipv6_state *state;
if ((ia = calloc(1, sizeof(*ia))) == NULL)
return NULL;
@@ -1324,9 +1323,6 @@ ipv6_newaddr(struct interface *ifp, struct in6_addr *addr, uint8_t prefix_len)
cbp, ia->prefix_len);
else
ia->saddr[0] = '\0';
-
- state = IPV6_STATE(ifp);
- TAILQ_INSERT_TAIL(&state->addrs, ia, next);
return ia;
}
@@ -1404,10 +1400,14 @@ ipv6_startstatic(struct interface *ifp)
ia = NULL;
}
if (ia == NULL) {
+ struct ipv6_state *state;
+
ia = ipv6_newaddr(ifp, &ifp->options->req_addr6,
ifp->options->req_prefix_len);
if (ia == NULL)
return -1;
+ state = IPV6_STATE(ifp);
+ TAILQ_INSERT_TAIL(&state->addrs, ia, next);
run_script = 0;
} else
run_script = 1;