diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-07-20 05:26:07 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2010-07-20 05:26:07 +0000 |
| commit | 858c4da6fc2a4057b97f205edeb8467296126848 (patch) | |
| tree | 09ed4db67a74e8489cd5ee6edb8ba6a9a5801e6f /usr.sbin/ospf6ctl | |
| parent | 015d7e6521fdc5229a5008fd6cf93792b29423d1 (diff) | |
Another hand rolled offsetof(), replace with mask2prefixlen from kroute.c
which was copied from bgpd. Found by deraadt@
Diffstat (limited to 'usr.sbin/ospf6ctl')
| -rw-r--r-- | usr.sbin/ospf6ctl/parser.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/ospf6ctl/parser.c b/usr.sbin/ospf6ctl/parser.c index ef1d0e3cc6f..7d076ea7c2e 100644 --- a/usr.sbin/ospf6ctl/parser.c +++ b/usr.sbin/ospf6ctl/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.8 2010/01/13 11:33:12 jsg Exp $ */ +/* $OpenBSD: parser.c,v 1.9 2010/07/20 05:26:06 claudio Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -343,17 +343,17 @@ parse_prefix(const char *word, struct in6_addr *addr, u_int8_t *prefixlen) u_int8_t mask2prefixlen(struct sockaddr_in6 *sa_in6) { - u_int8_t l = 0, i, len; + u_int8_t l = 0, *ap, *ep; /* * sin6_len is the size of the sockaddr so substract the offset of * the possibly truncated sin6_addr struct. */ - len = sa_in6->sin6_len - - (u_int8_t)(&((struct sockaddr_in6 *)NULL)->sin6_addr); - for (i = 0; i < len; i++) { + ap = (u_int8_t *)&sa_in6->sin6_addr; + ep = (u_int8_t *)sa_in6 + sa_in6->sin6_len; + for (; ap < ep; ap++) { /* this "beauty" is adopted from sbin/route/show.c ... */ - switch (sa_in6->sin6_addr.s6_addr[i]) { + switch (*ap) { case 0xff: l += 8; break; |