Date: Fri, 15 Jul 2011 04:49:30 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r224053 - in user/hrs/ipv6/usr.sbin: rtadvctl rtadvd Message-ID: <201107150449.p6F4nUWl061105@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Jul 15 04:49:30 2011 New Revision: 224053 URL: http://svn.freebsd.org/changeset/base/224053 Log: - Use the exact-width integer type for a member that need an exact-width in the data structure. - s/u_int[0-9]*_t/uint$1_t/ Modified: user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c user/hrs/ipv6/usr.sbin/rtadvd/config.c user/hrs/ipv6/usr.sbin/rtadvd/control.c user/hrs/ipv6/usr.sbin/rtadvd/control_server.c user/hrs/ipv6/usr.sbin/rtadvd/if.c user/hrs/ipv6/usr.sbin/rtadvd/if.h user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h user/hrs/ipv6/usr.sbin/rtadvd/timer_subr.c user/hrs/ipv6/usr.sbin/rtadvd/timer_subr.h Modified: user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvctl/rtadvctl.c Fri Jul 15 04:49:30 2011 (r224053) @@ -46,6 +46,7 @@ #include <arpa/inet.h> #include <fcntl.h> #include <errno.h> +#include <inttypes.h> #include <netdb.h> #include <unistd.h> #include <string.h> @@ -538,7 +539,7 @@ action_show(int argc, char **argv) printf("\tAdvIfPrefixes: %s\n", rai->rai_advifprefix ? "yes" : "no"); if (rai->rai_clockskew) - printf("\tClock skew: %ldsec\n", + printf("\tClock skew: %" PRIu16 "sec\n", rai->rai_clockskew); if (vflag < LOG_WARNING) @@ -586,7 +587,7 @@ action_show(int argc, char **argv) if (error) continue; - len = *((u_int16_t *)cp.cp_val); + len = *((uint16_t *)cp.cp_val); if (len > 0) { printf("\tRDNSS entries:\n"); @@ -601,7 +602,7 @@ action_show(int argc, char **argv) if (error) continue; - len = *((u_int16_t *)cp.cp_val); + len = *((uint16_t *)cp.cp_val); if (len > 0) { printf("\tDNSSL entries:\n"); @@ -619,11 +620,12 @@ action_show(int argc, char **argv) printf("\tRA initcounts/waits: %d/%d\n", rai->rai_initcounter, rai->rai_waiting); - printf("\tRA out/in/inconsistent: %llu/%llu/%llu\n", + printf("\tRA out/in/inconsistent: " + "%" PRIu64 "/%" PRIu64 "/%" PRIu64 "\n", ifi_s->ifi_raoutput, ifi_s->ifi_rainput, ifi_s->ifi_rainconsistent); - printf("\tRS in: %llu\n", + printf("\tRS in: %" PRIu64 "\n", ifi_s->ifi_rsinput); printf("\n"); @@ -727,17 +729,17 @@ action_show_rdnss(void *msg) { struct rdnss *rdn; struct rdnss_addr *rda; - u_int16_t *rdn_cnt; - u_int16_t *rda_cnt; + uint16_t *rdn_cnt; + uint16_t *rda_cnt; int i; int j; char *p; - u_int32_t ltime; + uint32_t ltime; char ntopbuf[INET6_ADDRSTRLEN]; char ssbuf[SSBUFLEN]; p = msg; - rdn_cnt = (u_int16_t *)p; + rdn_cnt = (uint16_t *)p; p += sizeof(*rdn_cnt); if (*rdn_cnt > 0) { @@ -746,7 +748,7 @@ action_show_rdnss(void *msg) ltime = rdn->rd_ltime; p += sizeof(*rdn); - rda_cnt = (u_int16_t *)p; + rda_cnt = (uint16_t *)p; p += sizeof(*rda_cnt); if (*rda_cnt > 0) for (j = 0; j < *rda_cnt; j++) { @@ -770,17 +772,17 @@ action_show_dnssl(void *msg) { struct dnssl *dns; struct dnssl_addr *dna; - u_int16_t *dns_cnt; - u_int16_t *dna_cnt; + uint16_t *dns_cnt; + uint16_t *dna_cnt; int i; int j; char *p; - u_int32_t ltime; + uint32_t ltime; char hbuf[NI_MAXHOST]; char ssbuf[SSBUFLEN]; p = msg; - dns_cnt = (u_int16_t *)p; + dns_cnt = (uint16_t *)p; p += sizeof(*dns_cnt); if (*dns_cnt > 0) { @@ -789,7 +791,7 @@ action_show_dnssl(void *msg) ltime = dns->dn_ltime; p += sizeof(*dns); - dna_cnt = (u_int16_t *)p; + dna_cnt = (uint16_t *)p; p += sizeof(*dna_cnt); if (*dna_cnt > 0) for (j = 0; j < *dna_cnt; j++) { Modified: user/hrs/ipv6/usr.sbin/rtadvd/config.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/config.c Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvd/config.c Fri Jul 15 04:49:30 2011 (r224053) @@ -53,6 +53,7 @@ #include <stdio.h> #include <syslog.h> #include <errno.h> +#include <inttypes.h> #include <netdb.h> #include <string.h> #include <search.h> @@ -288,7 +289,7 @@ getconfig(int idx) struct rainfo *rai; struct rainfo *rai_old; struct ifinfo *ifi; - long val; + int32_t val; int64_t val64; char buf[BUFSIZ]; char *bp = buf; @@ -348,24 +349,24 @@ getconfig(int idx) MAYHAVE(val, "maxinterval", DEF_MAXRTRADVINTERVAL); if (val < MIN_MAXINTERVAL || val > MAX_MAXINTERVAL) { syslog(LOG_ERR, - "<%s> maxinterval (%ld) on %s is invalid " + "<%s> maxinterval (%" PRIu32 ") on %s is invalid " "(must be between %u and %u)", __func__, val, ifi->ifi_ifname, MIN_MAXINTERVAL, MAX_MAXINTERVAL); goto getconfig_free_rai; } - rai->rai_maxinterval = (u_int)val; + rai->rai_maxinterval = (uint16_t)val; MAYHAVE(val, "mininterval", rai->rai_maxinterval/3); - if ((u_int)val < MIN_MININTERVAL || - (u_int)val > (rai->rai_maxinterval * 3) / 4) { + if ((uint16_t)val < MIN_MININTERVAL || + (uint16_t)val > (rai->rai_maxinterval * 3) / 4) { syslog(LOG_ERR, - "<%s> mininterval (%ld) on %s is invalid " + "<%s> mininterval (%" PRIu32 ") on %s is invalid " "(must be between %d and %d)", __func__, val, ifi->ifi_ifname, MIN_MININTERVAL, (rai->rai_maxinterval * 3) / 4); goto getconfig_free_rai; } - rai->rai_mininterval = (u_int)val; + rai->rai_mininterval = (uint16_t)val; MAYHAVE(val, "chlim", DEF_ADVCURHOPLIMIT); rai->rai_hoplimit = val & 0xff; @@ -403,10 +404,10 @@ getconfig(int idx) } MAYHAVE(val, "rltime", rai->rai_maxinterval * 3); - if ((u_int)val && ((u_int)val < rai->rai_maxinterval || - (u_int)val > MAXROUTERLIFETIME)) { + if ((uint16_t)val && ((uint16_t)val < rai->rai_maxinterval || + (uint16_t)val > MAXROUTERLIFETIME)) { syslog(LOG_ERR, - "<%s> router lifetime (%ld) on %s is invalid " + "<%s> router lifetime (%" PRIu32 ") on %s is invalid " "(must be 0 or between %d and %d)", __func__, val, ifi->ifi_ifname, rai->rai_maxinterval, MAXROUTERLIFETIME); @@ -417,20 +418,20 @@ getconfig(int idx) MAYHAVE(val, "rtime", DEF_ADVREACHABLETIME); if (val < 0 || val > MAXREACHABLETIME) { syslog(LOG_ERR, - "<%s> reachable time (%ld) on %s is invalid " + "<%s> reachable time (%" PRIu32 ") on %s is invalid " "(must be no greater than %d)", __func__, val, ifi->ifi_ifname, MAXREACHABLETIME); goto getconfig_free_rai; } - rai->rai_reachabletime = (u_int32_t)val; + rai->rai_reachabletime = (uint32_t)val; MAYHAVE(val64, "retrans", DEF_ADVRETRANSTIMER); if (val64 < 0 || val64 > 0xffffffff) { - syslog(LOG_ERR, "<%s> retrans time (%lld) on %s out of range", - __func__, (long long)val64, ifi->ifi_ifname); + syslog(LOG_ERR, "<%s> retrans time (%" PRIu64 ") on %s out of range", + __func__, val64, ifi->ifi_ifname); goto getconfig_free_rai; } - rai->rai_retranstimer = (u_int32_t)val64; + rai->rai_retranstimer = (uint32_t)val64; if (agetnum("hapref") != -1 || agetnum("hatime") != -1) { syslog(LOG_ERR, @@ -484,7 +485,7 @@ getconfig(int idx) makeentry(entbuf, sizeof(entbuf), i, "prefixlen"); MAYHAVE(val, entbuf, 64); if (val < 0 || val > 128) { - syslog(LOG_ERR, "<%s> prefixlen (%ld) for %s " + syslog(LOG_ERR, "<%s> prefixlen (%" PRIu32 ") for %s " "on %s out of range", __func__, val, addr, ifi->ifi_ifname); goto getconfig_free_pfx; @@ -508,13 +509,13 @@ getconfig(int idx) makeentry(entbuf, sizeof(entbuf), i, "vltime"); MAYHAVE(val64, entbuf, DEF_ADVVALIDLIFETIME); if (val64 < 0 || val64 > 0xffffffff) { - syslog(LOG_ERR, "<%s> vltime (%lld) for " + syslog(LOG_ERR, "<%s> vltime (%" PRIu64 ") for " "%s/%d on %s is out of range", - __func__, (long long)val64, + __func__, val64, addr, pfx->pfx_prefixlen, ifi->ifi_ifname); goto getconfig_free_pfx; } - pfx->pfx_validlifetime = (u_int32_t)val64; + pfx->pfx_validlifetime = (uint32_t)val64; makeentry(entbuf, sizeof(entbuf), i, "vltimedecr"); if (agetflag(entbuf)) { @@ -528,13 +529,13 @@ getconfig(int idx) MAYHAVE(val64, entbuf, DEF_ADVPREFERREDLIFETIME); if (val64 < 0 || val64 > 0xffffffff) { syslog(LOG_ERR, - "<%s> pltime (%lld) for %s/%d on %s " + "<%s> pltime (%" PRIu64 ") for %s/%d on %s " "is out of range", - __func__, (long long)val64, + __func__, val64, addr, pfx->pfx_prefixlen, ifi->ifi_ifname); goto getconfig_free_pfx; } - pfx->pfx_preflifetime = (u_int32_t)val64; + pfx->pfx_preflifetime = (uint32_t)val64; makeentry(entbuf, sizeof(entbuf), i, "pltimedecr"); if (agetflag(entbuf)) { @@ -553,14 +554,14 @@ getconfig_free_pfx: if (rai->rai_advifprefix && rai->rai_pfxs == 0) get_prefix(rai); - MAYHAVE(val, "mtu", 0); - if (val < 0 || (u_int)val > 0xffffffff) { + MAYHAVE(val64, "mtu", 0); + if (val < 0 || val64 > 0xffffffff) { syslog(LOG_ERR, - "<%s> mtu (%ld) on %s out of range", - __func__, val, ifi->ifi_ifname); + "<%s> mtu (%" PRIu64 ") on %s out of range", + __func__, val64, ifi->ifi_ifname); goto getconfig_free_rai; } - rai->rai_linkmtu = (u_int32_t)val; + rai->rai_linkmtu = (uint32_t)val64; if (rai->rai_linkmtu == 0) { char *mtustr; @@ -571,9 +572,9 @@ getconfig_free_pfx: else if (rai->rai_linkmtu < IPV6_MMTU || rai->rai_linkmtu > ifi->ifi_phymtu) { syslog(LOG_ERR, - "<%s> advertised link mtu (%lu) on %s is invalid (must " + "<%s> advertised link mtu (%" PRIu32 ") on %s is invalid (must " "be between least MTU (%d) and physical link MTU (%d)", - __func__, (unsigned long)rai->rai_linkmtu, ifi->ifi_ifname, + __func__, rai->rai_linkmtu, ifi->ifi_ifname, IPV6_MMTU, ifi->ifi_phymtu); goto getconfig_free_rai; } @@ -668,7 +669,7 @@ getconfig_free_pfx: val = 64; } if (val < 0 || val > 128) { - syslog(LOG_ERR, "<%s> prefixlen (%ld) for %s on %s " + syslog(LOG_ERR, "<%s> prefixlen (%" PRIu32 ") for %s on %s " "out of range", __func__, val, addr, ifi->ifi_ifname); goto getconfig_free_rti; @@ -732,13 +733,13 @@ getconfig_free_pfx: } } if (val64 < 0 || val64 > 0xffffffff) { - syslog(LOG_ERR, "<%s> route lifetime (%lld) for " + syslog(LOG_ERR, "<%s> route lifetime (%" PRIu64 ") for " "%s/%d on %s out of range", __func__, - (long long)val64, addr, rti->rti_prefixlen, + val64, addr, rti->rti_prefixlen, ifi->ifi_ifname); goto getconfig_free_rti; } - rti->rti_ltime = (u_int32_t)val64; + rti->rti_ltime = (uint32_t)val64; /* link into chain */ TAILQ_INSERT_TAIL(&rai->rai_route, rti, rti_next); @@ -779,9 +780,9 @@ getconfig_free_rti: makeentry(entbuf, sizeof(entbuf), i, "rdnssltime"); MAYHAVE(val, entbuf, (rai->rai_maxinterval * 3 / 2)); - if ((u_int)val < rai->rai_maxinterval || - (u_int)val > rai->rai_maxinterval * 2) { - syslog(LOG_ERR, "%s (%ld) on %s is invalid " + if ((uint16_t)val < rai->rai_maxinterval || + (uint16_t)val > rai->rai_maxinterval * 2) { + syslog(LOG_ERR, "%s (%" PRIu16 ") on %s is invalid " "(must be between %d and %d)", entbuf, val, ifi->ifi_ifname, rai->rai_maxinterval, rai->rai_maxinterval * 2); @@ -828,9 +829,9 @@ getconfig_free_rdn: makeentry(entbuf, sizeof(entbuf), i, "dnsslltime"); MAYHAVE(val, entbuf, (rai->rai_maxinterval * 3 / 2)); - if ((u_int)val < rai->rai_maxinterval || - (u_int)val > rai->rai_maxinterval * 2) { - syslog(LOG_ERR, "%s (%ld) on %s is invalid " + if ((uint16_t)val < rai->rai_maxinterval || + (uint16_t)val > rai->rai_maxinterval * 2) { + syslog(LOG_ERR, "%s (%" PRIu16 ") on %s is invalid " "(must be between %d and %d)", entbuf, val, ifi->ifi_ifname, rai->rai_maxinterval, rai->rai_maxinterval * 2); @@ -891,8 +892,8 @@ get_prefix(struct rainfo *rai) struct prefix *pfx; struct in6_addr *a; struct ifinfo *ifi; - u_char *p, *ep, *m, *lim; - u_char ntopbuf[INET6_ADDRSTRLEN]; + char *p, *ep, *m, *lim; + char ntopbuf[INET6_ADDRSTRLEN]; if (getifaddrs(&ifap) < 0) { syslog(LOG_ERR, @@ -913,8 +914,8 @@ get_prefix(struct rainfo *rai) if (IN6_IS_ADDR_LINKLOCAL(a)) continue; /* get prefix length */ - m = (u_char *)&((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr; - lim = (u_char *)(ifa->ifa_netmask) + ifa->ifa_netmask->sa_len; + m = (char *)&((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr; + lim = (char *)(ifa->ifa_netmask) + ifa->ifa_netmask->sa_len; plen = prefixlen(m, lim); if (plen <= 0 || plen > 128) { syslog(LOG_ERR, "<%s> failed to get prefixlen " @@ -935,8 +936,8 @@ get_prefix(struct rainfo *rai) /* set prefix, sweep bits outside of prefixlen */ pfx->pfx_prefixlen = plen; memcpy(&pfx->pfx_prefix, a, sizeof(*a)); - p = (u_char *)&pfx->pfx_prefix; - ep = (u_char *)(&pfx->pfx_prefix + 1); + p = (char *)&pfx->pfx_prefix; + ep = (char *)(&pfx->pfx_prefix + 1); while (m < lim && p < ep) *p++ &= *m++; while (p < ep) @@ -990,7 +991,7 @@ add_prefix(struct rainfo *rai, struct in { struct prefix *pfx; struct ifinfo *ifi; - u_char ntopbuf[INET6_ADDRSTRLEN]; + char ntopbuf[INET6_ADDRSTRLEN]; ifi = rai->rai_ifinfo; ELM_MALLOC(pfx, return); @@ -1025,7 +1026,7 @@ delete_prefix(struct prefix *pfx) { struct rainfo *rai; struct ifinfo *ifi; - u_char ntopbuf[INET6_ADDRSTRLEN]; + char ntopbuf[INET6_ADDRSTRLEN]; rai = pfx->pfx_rainfo; ifi = rai->rai_ifinfo; @@ -1047,7 +1048,7 @@ invalidate_prefix(struct prefix *pfx) struct timeval timo; struct rainfo *rai; struct ifinfo *ifi; - u_char ntopbuf[INET6_ADDRSTRLEN]; + char ntopbuf[INET6_ADDRSTRLEN]; rai = pfx->pfx_rainfo; ifi = rai->rai_ifinfo; @@ -1089,7 +1090,7 @@ update_prefix(struct prefix *pfx) { struct rainfo *rai; struct ifinfo *ifi; - u_char ntopbuf[INET6_ADDRSTRLEN]; + char ntopbuf[INET6_ADDRSTRLEN]; rai = pfx->pfx_rainfo; ifi = rai->rai_ifinfo; @@ -1137,7 +1138,7 @@ init_prefix(struct in6_prefixreq *ipr) /* omit other field initialization */ } else if (ipr->ipr_origin < PR_ORIG_RR) { - u_char ntopbuf[INET6_ADDRSTRLEN]; + char ntopbuf[INET6_ADDRSTRLEN]; syslog(LOG_WARNING, "<%s> Added prefix(%s)'s origin %d is" "lower than PR_ORIG_RR(router renumbering)." @@ -1263,7 +1264,7 @@ make_packet(struct rainfo *rai) ra->nd_ra_type = ND_ROUTER_ADVERT; ra->nd_ra_code = 0; ra->nd_ra_cksum = 0; - ra->nd_ra_curhoplimit = (u_int8_t)(0xff & rai->rai_hoplimit); + ra->nd_ra_curhoplimit = (uint8_t)(0xff & rai->rai_hoplimit); ra->nd_ra_flags_reserved = 0; /* just in case */ /* * XXX: the router preference field, which is a 2-bit field, should be @@ -1294,7 +1295,7 @@ make_packet(struct rainfo *rai) } TAILQ_FOREACH(pfx, &rai->rai_prefix, pfx_next) { - u_int32_t vltime, pltime; + uint32_t vltime, pltime; struct timeval now; ndopt_pi = (struct nd_opt_prefix_info *)buf; @@ -1316,7 +1317,7 @@ make_packet(struct rainfo *rai) if (pfx->pfx_vltimeexpire == 0) vltime = pfx->pfx_validlifetime; else - vltime = (pfx->pfx_vltimeexpire > now.tv_sec) ? + vltime = ((time_t)pfx->pfx_vltimeexpire > now.tv_sec) ? pfx->pfx_vltimeexpire - now.tv_sec : 0; } if (pfx->pfx_timer) @@ -1325,7 +1326,7 @@ make_packet(struct rainfo *rai) if (pfx->pfx_pltimeexpire == 0) pltime = pfx->pfx_preflifetime; else - pltime = (pfx->pfx_pltimeexpire > now.tv_sec) ? + pltime = ((time_t)pfx->pfx_pltimeexpire > now.tv_sec) ? pfx->pfx_pltimeexpire - now.tv_sec : 0; } if (vltime < pltime) { @@ -1344,7 +1345,7 @@ make_packet(struct rainfo *rai) } TAILQ_FOREACH(rti, &rai->rai_route, rti_next) { - u_int8_t psize = (rti->rti_prefixlen + 0x3f) >> 6; + uint8_t psize = (rti->rti_prefixlen + 0x3f) >> 6; ndopt_rti = (struct nd_opt_route_info *)buf; ndopt_rti->nd_opt_rti_type = ND_OPT_ROUTE_INFO; Modified: user/hrs/ipv6/usr.sbin/rtadvd/control.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/control.c Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvd/control.c Fri Jul 15 04:49:30 2011 (r224053) @@ -157,12 +157,12 @@ cmsg_send(int fd, char *buf) } syslog(LOG_DEBUG, - "<%s> ctrl msg send: type=%d, count=%d, total_len=%d", __func__, + "<%s> ctrl msg send: type=%d, count=%d, total_len=%zd", __func__, cm->cm_type, iovcnt, iov_len_total); len = writev(fd, iov, iovcnt); syslog(LOG_DEBUG, - "<%s> ctrl msg send: length=%d", __func__, len); + "<%s> ctrl msg send: length=%zd", __func__, len); if (len == -1) { syslog(LOG_DEBUG, @@ -173,9 +173,9 @@ cmsg_send(int fd, char *buf) } syslog(LOG_DEBUG, - "<%s> write length = %d (actual)", __func__, len); + "<%s> write length = %zd (actual)", __func__, len); syslog(LOG_DEBUG, - "<%s> write length = %d (expected)", __func__, iov_len_total); + "<%s> write length = %zd (expected)", __func__, iov_len_total); if (len != iov_len_total) { close(fd); @@ -317,7 +317,7 @@ cmsg_bin2pl(char *str, struct ctrl_msg_p lenp = (size_t *)p; len = *lenp++; p = (char *)lenp; - syslog(LOG_DEBUG, "<%s> len(ifname) = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len(ifname) = %zu", __func__, len); if (len > 0) { cp->cp_ifname = malloc(len + 1); if (cp->cp_ifname == NULL) { @@ -332,7 +332,7 @@ cmsg_bin2pl(char *str, struct ctrl_msg_p lenp = (size_t *)p; len = *lenp++; p = (char *)lenp; - syslog(LOG_DEBUG, "<%s> len(key) = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len(key) = %zu", __func__, len); if (len > 0) { cp->cp_key = malloc(len + 1); if (cp->cp_key == NULL) { @@ -347,7 +347,7 @@ cmsg_bin2pl(char *str, struct ctrl_msg_p lenp = (size_t *)p; len = *lenp++; p = (char *)lenp; - syslog(LOG_DEBUG, "<%s> len(val) = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len(val) = %zu", __func__, len); if (len > 0) { cp->cp_val = malloc(len + 1); if (cp->cp_val == NULL) { @@ -382,11 +382,11 @@ cmsg_pl2bin(char *str, struct ctrl_msg_p len += cp->cp_val_len; if (len > CM_MSG_MAXLEN - sizeof(*cm)) { - syslog(LOG_DEBUG, "<%s> msg too long (len=%d)", + syslog(LOG_DEBUG, "<%s> msg too long (len=%zu)", __func__, len); return (0); } - syslog(LOG_DEBUG, "<%s> msglen=%d", __func__, len); + syslog(LOG_DEBUG, "<%s> msglen=%zu", __func__, len); memset(str, 0, len); p = str; lenp = (size_t *)p; @@ -434,11 +434,11 @@ cmsg_str2bin(char *bin, void *str, size_ syslog(LOG_DEBUG, "<%s> enter", __func__); if (len > CM_MSG_MAXLEN - sizeof(*cm)) { - syslog(LOG_DEBUG, "<%s> msg too long (len=%d)", + syslog(LOG_DEBUG, "<%s> msg too long (len=%zu)", __func__, len); return (0); } - syslog(LOG_DEBUG, "<%s> msglen=%d", __func__, len); + syslog(LOG_DEBUG, "<%s> msglen=%zu", __func__, len); memcpy(bin, (char *)str, len); return (len); Modified: user/hrs/ipv6/usr.sbin/rtadvd/control_server.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/control_server.c Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvd/control_server.c Fri Jul 15 04:49:30 2011 (r224053) @@ -131,7 +131,7 @@ cmsg_getprop_ifilist(struct ctrl_msg_pl len += strlen(ifi->ifi_ifname) + 1; } - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); p = malloc(len); if (p == NULL) @@ -175,7 +175,7 @@ cmsg_getprop_ifi(struct ctrl_msg_pl *cp) exit(1); len = cmsg_str2bin(p, ifi, sizeof(*ifi)); - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); if (len == 0) return (1); @@ -216,7 +216,7 @@ cmsg_getprop_rai(struct ctrl_msg_pl *cp) exit(1); len = cmsg_str2bin(p, rai, sizeof(*rai)); - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); if (len == 0) return (1); @@ -262,7 +262,7 @@ cmsg_getprop_rai_timer(struct ctrl_msg_p exit(1); len = cmsg_str2bin(p, rtimer, sizeof(*rtimer)); - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); if (len == 0) return (1); @@ -304,7 +304,7 @@ cmsg_getprop_rti(struct ctrl_msg_pl *cp) len += sizeof(*rti); } - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); p = malloc(len); if (p == NULL) @@ -353,7 +353,7 @@ cmsg_getprop_pfx(struct ctrl_msg_pl *cp) len += sizeof(*pfx); } - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); p = malloc(len); if (p == NULL) @@ -380,8 +380,8 @@ cmsg_getprop_rdnss(struct ctrl_msg_pl *c struct rdnss_addr *rda; char *p; size_t len; - u_int16_t *rdn_cnt; - u_int16_t *rda_cnt; + uint16_t *rdn_cnt; + uint16_t *rda_cnt; syslog(LOG_DEBUG, "<%s> enter", __func__); @@ -411,7 +411,7 @@ cmsg_getprop_rdnss(struct ctrl_msg_pl *c } } - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); p = malloc(len); if (p == NULL) @@ -419,14 +419,14 @@ cmsg_getprop_rdnss(struct ctrl_msg_pl *c memset(p, 0, len); cp->cp_val = p; - rdn_cnt = (u_int16_t *)p; + rdn_cnt = (uint16_t *)p; p += sizeof(*rdn_cnt); TAILQ_FOREACH(rdn, &rai->rai_rdnss, rd_next) { *rdn_cnt += 1; memcpy(p, rdn, sizeof(*rdn)); p += sizeof(*rdn); - rda_cnt = (u_int16_t *)p; + rda_cnt = (uint16_t *)p; p += sizeof(*rda_cnt); TAILQ_FOREACH(rda, &rdn->rd_list, ra_next) { *rda_cnt += 1; @@ -449,8 +449,8 @@ cmsg_getprop_dnssl(struct ctrl_msg_pl *c struct dnssl_addr *dna; char *p; size_t len; - u_int16_t *dns_cnt; - u_int16_t *dna_cnt; + uint16_t *dns_cnt; + uint16_t *dna_cnt; syslog(LOG_DEBUG, "<%s> enter", __func__); @@ -480,7 +480,7 @@ cmsg_getprop_dnssl(struct ctrl_msg_pl *c } } - syslog(LOG_DEBUG, "<%s> len = %d", __func__, len); + syslog(LOG_DEBUG, "<%s> len = %zu", __func__, len); p = malloc(len); if (p == NULL) @@ -488,14 +488,14 @@ cmsg_getprop_dnssl(struct ctrl_msg_pl *c memset(p, 0, len); cp->cp_val = p; - dns_cnt = (u_int16_t *)cp->cp_val; + dns_cnt = (uint16_t *)cp->cp_val; p += sizeof(*dns_cnt); TAILQ_FOREACH(dns, &rai->rai_dnssl, dn_next) { (*dns_cnt)++; memcpy(p, dns, sizeof(*dns)); p += sizeof(*dns); - dna_cnt = (u_int16_t *)p; + dna_cnt = (uint16_t *)p; p += sizeof(*dna_cnt); TAILQ_FOREACH(dna, &dns->dn_list, da_next) { (*dna_cnt)++; @@ -620,7 +620,7 @@ cmsg_handler_server(int fd) syslog(LOG_DEBUG, "<%s> cm->cm_type = %d", __func__, cm->cm_type); syslog(LOG_DEBUG, - "<%s> cm->cm_len = %d", __func__, cm->cm_len); + "<%s> cm->cm_len = %zu", __func__, cm->cm_len); switch (cm->cm_type) { case CM_TYPE_EOM: Modified: user/hrs/ipv6/usr.sbin/rtadvd/if.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/if.c Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvd/if.c Fri Jul 15 04:49:30 2011 (r224053) @@ -281,24 +281,24 @@ get_prefixlen(char *buf) { struct rt_msghdr *rtm = (struct rt_msghdr *)buf; struct sockaddr *sa, *rti_info[RTAX_MAX]; - u_char *p, *lim; + char *p, *lim; sa = (struct sockaddr *)(rtm + 1); get_rtaddrs(rtm->rtm_addrs, sa, rti_info); sa = rti_info[RTAX_NETMASK]; - p = (u_char *)(&SIN6(sa)->sin6_addr); - lim = (u_char *)sa + sa->sa_len; + p = (char *)(&SIN6(sa)->sin6_addr); + lim = (char *)sa + sa->sa_len; return prefixlen(p, lim); } int -prefixlen(u_char *p, u_char *lim) +prefixlen(char *p, char *lim) { int masklen; for (masklen = 0; p < lim; p++) { - switch (*p) { + switch ((int)*p) { case 0xff: masklen += 8; break; @@ -442,7 +442,7 @@ update_ifinfo(struct ifilist_head_t *ifi ifm = get_next_msghdr(ifm,(struct if_msghdr *)lim)) { int ifi_new; - syslog(LOG_DEBUG, "<%s> ifm = %p, lim = %p, diff = %d", + syslog(LOG_DEBUG, "<%s> ifm = %p, lim = %p, diff = %zu", __func__, ifm, lim, (char *)lim - (char *)ifm); if (ifm->ifm_version != RTM_VERSION) { Modified: user/hrs/ipv6/usr.sbin/rtadvd/if.h ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/if.h Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvd/if.h Fri Jul 15 04:49:30 2011 (r224053) @@ -48,7 +48,7 @@ char *get_next_msg(char *, char *, int, struct in6_addr *get_addr(char *); int get_rtm_ifindex(char *); int get_prefixlen(char *); -int prefixlen(u_char *, u_char *); +int prefixlen(char *, char *); struct ifinfo *update_ifinfo(struct ifilist_head_t *, int); int update_ifinfo_nd_flags(struct ifinfo *); Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c Fri Jul 15 04:49:30 2011 (r224053) @@ -61,6 +61,7 @@ #include <stdio.h> #include <err.h> #include <errno.h> +#include <inttypes.h> #include <libutil.h> #include <netdb.h> #include <signal.h> @@ -83,9 +84,9 @@ #define RTADV_TYPE2BITMASK(type) (0x1 << type) struct msghdr rcvmhdr; -static u_char *rcvcmsgbuf; +static char *rcvcmsgbuf; static size_t rcvcmsgbuflen; -static u_char *sndcmsgbuf = NULL; +static char *sndcmsgbuf = NULL; static size_t sndcmsgbuflen; struct msghdr sndmhdr; struct iovec rcviov[2]; @@ -137,7 +138,7 @@ union nd_opt { #define NDOPT_FLAG_RDNSS (1 << 5) #define NDOPT_FLAG_DNSSL (1 << 6) -u_int32_t ndopt_flags[] = { +uint32_t ndopt_flags[] = { [ND_OPT_SOURCE_LINKADDR] = NDOPT_FLAG_SRCLINKADDR, [ND_OPT_TARGET_LINKADDR] = NDOPT_FLAG_TGTLINKADDR, [ND_OPT_PREFIX_INFORMATION] = NDOPT_FLAG_PREFIXINFO, @@ -158,7 +159,7 @@ static void ra_input(int, struct nd_rout static int prefix_check(struct nd_opt_prefix_info *, struct rainfo *, struct sockaddr_in6 *); static int nd6_options(struct nd_opt_hdr *, int, - union nd_opt *, u_int32_t); + union nd_opt *, uint32_t); static void free_ndopts(union nd_opt *); static void rtmsg_input(struct sockinfo *); static void set_short_delay(struct rainfo *); @@ -240,7 +241,7 @@ main(int argc, char *argv[]) #ifdef __FreeBSD__ srandomdev(); #else - srandom((u_long)time(NULL)); + srandom((unsigned long)time(NULL)); #endif #endif pfh = pidfile_open(pidfilename, 0600, &otherpid); @@ -395,7 +396,7 @@ rtmsg_input(struct sockinfo *s) int n, type, ifindex = 0, plen; size_t len; char msg[2048], *next, *lim; - u_char ifname[IFNAMSIZ]; + char ifname[IFNAMSIZ]; struct if_announcemsghdr *ifan; struct rt_msghdr *rtm; struct prefix *pfx; @@ -643,7 +644,7 @@ rtadvd_input(struct sockinfo *s) int ifindex = 0; struct cmsghdr *cm; struct in6_pktinfo *pi = NULL; - u_char ntopbuf[INET6_ADDRSTRLEN], ifnamebuf[IFNAMSIZ]; + char ntopbuf[INET6_ADDRSTRLEN], ifnamebuf[IFNAMSIZ]; struct in6_addr dst = in6addr_any; struct ifinfo *ifi; @@ -839,8 +840,8 @@ static void rs_input(int len, struct nd_router_solicit *rs, struct in6_pktinfo *pi, struct sockaddr_in6 *from) { - u_char ntopbuf[INET6_ADDRSTRLEN]; - u_char ifnamebuf[IFNAMSIZ]; + char ntopbuf[INET6_ADDRSTRLEN]; + char ifnamebuf[IFNAMSIZ]; union nd_opt ndopts; struct rainfo *rai; struct ifinfo *ifi; @@ -986,10 +987,7 @@ check_accept_rtadv(int idx) __func__, idx); return (0); } -#if (__FreeBSD_version < 900000) - return ((getinet6sysctl(IPV6CTL_FORWARDING) == 0) && - (getinet6sysctl(IPV6CTL_ACCEPT_RTADV) == 1)); -#else +#if (__FreeBSD_version > 900000) if (update_ifinfo_nd_flags(ifi) != 0) { syslog(LOG_ERR, "<%s> nd6 flags failed (idx=%d)", @@ -998,6 +996,9 @@ check_accept_rtadv(int idx) } return (ifi->ifi_nd_flags & ND6_IFF_ACCEPT_RTADV); +#else + return ((getinet6sysctl(IPV6CTL_FORWARDING) == 0) && + (getinet6sysctl(IPV6CTL_ACCEPT_RTADV) == 1)); #endif } @@ -1007,11 +1008,11 @@ ra_input(int len, struct nd_router_adver { struct rainfo *rai; struct ifinfo *ifi; - u_char ntopbuf[INET6_ADDRSTRLEN]; - u_char ifnamebuf[IFNAMSIZ]; + char ntopbuf[INET6_ADDRSTRLEN]; + char ifnamebuf[IFNAMSIZ]; union nd_opt ndopts; const char *on_off[] = {"OFF", "ON"}; - u_int32_t reachabletime, retranstimer, mtu; + uint32_t reachabletime, retranstimer, mtu; int inconsistent = 0; int error; @@ -1051,7 +1052,7 @@ ra_input(int len, struct nd_router_adver } rai = ifi->ifi_rainfo; ifi->ifi_rainput++; - syslog(LOG_DEBUG, "<%s> ifi->ifi_rainput = %llu\n", __func__, + syslog(LOG_DEBUG, "<%s> ifi->ifi_rainput = %" PRIu64 "\n", __func__, ifi->ifi_rainput); /* Cur Hop Limit value */ @@ -1152,11 +1153,11 @@ prefix_check(struct nd_opt_prefix_info * struct rainfo *rai, struct sockaddr_in6 *from) { struct ifinfo *ifi; - u_int32_t preferred_time, valid_time; + uint32_t preferred_time, valid_time; struct prefix *pfx; int inconsistent = 0; - u_char ntopbuf[INET6_ADDRSTRLEN]; - u_char prefixbuf[INET6_ADDRSTRLEN]; + char ntopbuf[INET6_ADDRSTRLEN]; + char prefixbuf[INET6_ADDRSTRLEN]; struct timeval now; #if 0 /* impossible */ @@ -1208,7 +1209,7 @@ prefix_check(struct nd_opt_prefix_info * syslog(LOG_INFO, "<%s> preferred lifetime for %s/%d" " (decr. in real time) inconsistent on %s:" - " %d from %s, %ld from us", + " %" PRIu32 " from %s, %" PRIu32 " from us", __func__, inet_ntop(AF_INET6, &pinfo->nd_opt_pi_prefix, prefixbuf, sizeof(prefixbuf)), @@ -1241,7 +1242,7 @@ prefix_check(struct nd_opt_prefix_info * syslog(LOG_INFO, "<%s> valid lifetime for %s/%d" " (decr. in real time) inconsistent on %s:" - " %d from %s, %ld from us", + " %d from %s, %" PRIu32 " from us", __func__, inet_ntop(AF_INET6, &pinfo->nd_opt_pi_prefix, prefixbuf, sizeof(prefixbuf)), @@ -1274,7 +1275,7 @@ find_prefix(struct rainfo *rai, struct i { struct prefix *pfx; int bytelen, bitlen; - u_char bitmask; + char bitmask; TAILQ_FOREACH(pfx, &rai->rai_prefix, pfx_next) { if (plen != pfx->pfx_prefixlen) @@ -1303,7 +1304,7 @@ prefix_match(struct in6_addr *p0, int pl struct in6_addr *p1, int plen1) { int bytelen, bitlen; - u_char bitmask; + char bitmask; if (plen0 < plen1) return (0); @@ -1326,7 +1327,7 @@ prefix_match(struct in6_addr *p0, int pl static int nd6_options(struct nd_opt_hdr *hdr, int limit, - union nd_opt *ndopts, u_int32_t optflags) + union nd_opt *ndopts, uint32_t optflags) { int optlen = 0; @@ -1456,7 +1457,7 @@ sock_open(struct sockinfo *s) struct icmp6_filter filt; int on; /* XXX: should be max MTU attached to the node */ - static u_char answer[1500]; + static char answer[1500]; syslog(LOG_DEBUG, "<%s> enter", __func__); @@ -1466,7 +1467,7 @@ sock_open(struct sockinfo *s) } rcvcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) + CMSG_SPACE(sizeof(int)); - rcvcmsgbuf = (u_char *)malloc(rcvcmsgbuflen); + rcvcmsgbuf = (char *)malloc(rcvcmsgbuflen); if (rcvcmsgbuf == NULL) { syslog(LOG_ERR, "<%s> not enough core", __func__); exit(1); @@ -1474,7 +1475,7 @@ sock_open(struct sockinfo *s) sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) + CMSG_SPACE(sizeof(int)); - sndcmsgbuf = (u_char *)malloc(sndcmsgbuflen); + sndcmsgbuf = (char *)malloc(sndcmsgbuflen); if (sndcmsgbuf == NULL) { syslog(LOG_ERR, "<%s> not enough core", __func__); exit(1); Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h ============================================================================== --- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Fri Jul 15 04:31:50 2011 (r224052) +++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.h Fri Jul 15 04:49:30 2011 (r224053) @@ -113,12 +113,12 @@ struct prefix { */ struct rtadvd_timer *pfx_timer; - u_int32_t pfx_validlifetime; /* AdvValidLifetime */ - long pfx_vltimeexpire; /* Expiration of vltime */ - u_int32_t pfx_preflifetime; /* AdvPreferredLifetime */ - long pfx_pltimeexpire; /* Expiration of pltime */ - u_int pfx_onlinkflg; /* bool: AdvOnLinkFlag */ - u_int pfx_autoconfflg; /* bool: AdvAutonomousFlag */ + uint32_t pfx_validlifetime; /* AdvValidLifetime */ + uint32_t pfx_vltimeexpire; /* Expiration of vltime */ + uint32_t pfx_preflifetime; /* AdvPreferredLifetime */ + uint32_t pfx_pltimeexpire; /* Expiration of pltime */ + int pfx_onlinkflg; /* bool: AdvOnLinkFlag */ + int pfx_autoconfflg; /* bool: AdvAutonomousFlag */ int pfx_prefixlen; int pfx_origin; /* From kernel or config */ @@ -128,8 +128,8 @@ struct prefix { struct rtinfo { TAILQ_ENTRY(rtinfo) rti_next; - u_int32_t rti_ltime; /* route lifetime */ - u_int rti_rtpref; /* route preference */ + uint32_t rti_ltime; /* route lifetime */ + int rti_rtpref; /* route preference */ int rti_prefixlen; struct in6_addr rti_prefix; }; @@ -144,8 +144,7 @@ struct rdnss { TAILQ_ENTRY(rdnss) rd_next; TAILQ_HEAD(, rdnss_addr) rd_list; /* list of DNS servers */ - int rd_cnt; /* number of DNS servers */ - u_int32_t rd_ltime; /* number of seconds valid */ + uint32_t rd_ltime; /* number of seconds valid */ }; /* @@ -170,7 +169,7 @@ struct dnssl { TAILQ_ENTRY(dnssl) dn_next; TAILQ_HEAD(, dnssl_addr) dn_list; /* list of search domains */ - u_int32_t dn_ltime; /* number of seconds valid */ + uint32_t dn_ltime; /* number of seconds valid */ }; struct soliciter { @@ -195,26 +194,26 @@ struct rainfo { /* interface information */ struct ifinfo *rai_ifinfo; - int rai_advlinkopt; /* bool: whether include link-layer addr opt */ + int rai_advlinkopt; /* bool: whether include link-layer addr opt */ int rai_advifprefix; /* bool: gather IF prefixes? */ /* Router configuration variables */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107150449.p6F4nUWl061105>