diff options
| author |   jca <jca@openbsd.org> | 2016-02-26 12:31:48 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2016-02-26 12:31:48 +0000 |
| commit | c821c6c83ba62045fee90e01afea2b9881ab57fe (patch) | |
| tree | bb36fcafc561f7ddca71d5b117aa59b5d942f5df | |
| parent | - Convert atoi(3) to strtonum(3) (diff) | |
| download | wireguard-openbsd-c821c6c83ba62045fee90e01afea2b9881ab57fe.tar.xz wireguard-openbsd-c821c6c83ba62045fee90e01afea2b9881ab57fe.zip | |
Kill some useless members of struct rainfo; ok florian@
| -rw-r--r-- | usr.sbin/rtadvd/config.c | 8 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.h | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index c80ce1a0b73..16bc1554dc4 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.50 2016/02/09 00:39:13 jca Exp $ */ +/* $OpenBSD: config.c,v 1.51 2016/02/26 12:31:48 jca Exp $ */ /* $KAME: config.c,v 1.62 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -323,7 +323,6 @@ getconfig(char *intface) if (tmp->pfxs == 0 && !agetflag("noifprefix")) get_prefix(tmp); - tmp->rtinfocnt = 0; for (i = -1; i < MAXRTINFO; i++) { struct rtinfo *rti; char entbuf[256]; @@ -391,10 +390,8 @@ getconfig(char *intface) rti->lifetime = (uint32_t)val64; TAILQ_INSERT_TAIL(&tmp->rtinfos, rti, entry); - tmp->rtinfocnt++; } - tmp->rdnsscnt = 0; for (i = -1; i < MAXRDNSS; ++i) { struct rdnss *rds; char entbuf[256]; @@ -417,7 +414,6 @@ getconfig(char *intface) fatal("malloc"); TAILQ_INSERT_TAIL(&tmp->rdnsss, rds, entry); - tmp->rdnsscnt++; rds->servercnt = val; @@ -441,7 +437,6 @@ getconfig(char *intface) } } - tmp->dnsslcnt = 0; for (i = -1; i < MAXDNSSL; ++i) { struct dnssl *dsl; char entbuf[256]; @@ -481,7 +476,6 @@ getconfig(char *intface) } TAILQ_INSERT_TAIL(&tmp->dnssls, dsl, entry); - tmp->dnsslcnt++; makeentry(entbuf, sizeof(entbuf), i, "dnsslltime"); MAYHAVE(val, entbuf, (tmp->maxinterval * 3) / 2); diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h index 69fb5e48866..6fd91a00974 100644 --- a/usr.sbin/rtadvd/rtadvd.h +++ b/usr.sbin/rtadvd/rtadvd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.h,v 1.21 2016/02/09 00:39:13 jca Exp $ */ +/* $OpenBSD: rtadvd.h,v 1.22 2016/02/26 12:31:48 jca Exp $ */ /* $KAME: rtadvd.h,v 1.20 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -148,11 +148,8 @@ struct rainfo { TAILQ_HEAD(prefixlist, prefix) prefixes; /* AdvPrefixList(link head) */ int pfxs; /* number of prefixes */ TAILQ_HEAD(rtinfolist, rtinfo) rtinfos; - int rtinfocnt; TAILQ_HEAD(rdnsslist, rdnss) rdnsss; /* advertised recursive dns servers */ - int rdnsscnt; /* number of rdnss entries */ TAILQ_HEAD(dnssllist, dnssl) dnssls; - int dnsslcnt; long clockskew; /* used for consistency check of lifetimes */ |