- NI_WITHSCOPEID was deprecated
- use strlcpy() and snprintf() - use err() - style Obtained from: KAME
This commit is contained in:
Hajimu UMEMOTO
parent
2f4c5de968
commit
a96bd7843f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=121156
@ -113,10 +113,6 @@
|
||||
#include <unistd.h>
|
||||
#include "gmt2local.h"
|
||||
|
||||
#ifndef NI_WITHSCOPEID
|
||||
#define NI_WITHSCOPEID 0
|
||||
#endif
|
||||
|
||||
/* packing rule for routing socket */
|
||||
#define ROUNDUP(a) \
|
||||
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
|
||||
@ -181,7 +177,7 @@ main(argc, argv)
|
||||
pid = getpid();
|
||||
thiszone = gmt2local(0);
|
||||
while ((ch = getopt(argc, argv, "acndfIilprstA:HPR")) != -1)
|
||||
switch ((char)ch) {
|
||||
switch (ch) {
|
||||
case 'a':
|
||||
aflag = 1;
|
||||
break;
|
||||
@ -337,8 +333,8 @@ getsocket()
|
||||
if (s < 0) {
|
||||
s = socket(PF_ROUTE, SOCK_RAW, 0);
|
||||
if (s < 0) {
|
||||
perror("ndp: socket");
|
||||
exit(1);
|
||||
err(1, "socket");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -396,6 +392,7 @@ set(argc, argv)
|
||||
while (argc-- > 0) {
|
||||
if (strncmp(argv[0], "temp", 4) == 0) {
|
||||
struct timeval time;
|
||||
|
||||
gettimeofday(&time, 0);
|
||||
expire_time = time.tv_sec + 20 * 60;
|
||||
} else if (strncmp(argv[0], "proxy", 5) == 0)
|
||||
@ -403,8 +400,8 @@ set(argc, argv)
|
||||
argv++;
|
||||
}
|
||||
if (rtmsg(RTM_GET) < 0) {
|
||||
perror(host);
|
||||
return (1);
|
||||
errx(1, "RTM_GET(%s) failed", host);
|
||||
/* NOTREACHED */
|
||||
}
|
||||
sin = (struct sockaddr_in6 *)(rtm + 1);
|
||||
sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
|
||||
@ -464,7 +461,7 @@ get(host)
|
||||
if (found_entry == 0) {
|
||||
getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
|
||||
sizeof(host_buf), NULL ,0,
|
||||
NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
|
||||
(nflag ? NI_NUMERICHOST : 0));
|
||||
printf("%s (%s) -- no entry\n", host, host_buf);
|
||||
exit(1);
|
||||
}
|
||||
@ -502,8 +499,8 @@ delete(host)
|
||||
}
|
||||
#endif
|
||||
if (rtmsg(RTM_GET) < 0) {
|
||||
perror(host);
|
||||
return (1);
|
||||
errx(1, "RTM_GET(%s) failed", host);
|
||||
/* NOTREACHED */
|
||||
}
|
||||
sin = (struct sockaddr_in6 *)(rtm + 1);
|
||||
sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
|
||||
@ -537,7 +534,7 @@ delete(host)
|
||||
getnameinfo((struct sockaddr *)&s6,
|
||||
s6.sin6_len, host_buf,
|
||||
sizeof(host_buf), NULL, 0,
|
||||
NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
|
||||
(nflag ? NI_NUMERICHOST : 0));
|
||||
printf("%s (%s) deleted\n", host, host_buf);
|
||||
}
|
||||
|
||||
@ -587,7 +584,7 @@ again:;
|
||||
err(1, "sysctl(PF_ROUTE estimate)");
|
||||
if (needed > 0) {
|
||||
if ((buf = malloc(needed)) == NULL)
|
||||
errx(1, "malloc");
|
||||
err(1, "malloc");
|
||||
if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
|
||||
err(1, "sysctl(PF_ROUTE, NET_RT_FLAGS)");
|
||||
lim = buf + needed;
|
||||
@ -608,7 +605,7 @@ again:;
|
||||
* lo0). Such routes entry would annoy getnbrinfo() below,
|
||||
* so we skip them.
|
||||
* XXX: such routes should have the GATEWAY flag, not the
|
||||
* LINK flag. However, there are rotten routing software
|
||||
* LINK flag. However, there is rotten routing software
|
||||
* that advertises all routes that have the GATEWAY flag.
|
||||
* Thus, KAME kernel intentionally does not set the LINK flag.
|
||||
* What is to be fixed is not ndp, but such routing software
|
||||
@ -634,8 +631,7 @@ again:;
|
||||
#endif
|
||||
}
|
||||
getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
|
||||
sizeof(host_buf), NULL, 0,
|
||||
NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
|
||||
sizeof(host_buf), NULL, 0, (nflag ? NI_NUMERICHOST : 0));
|
||||
if (cflag == 1) {
|
||||
#ifdef RTF_WASCLONED
|
||||
if (rtm->rtm_flags & RTF_WASCLONED)
|
||||
@ -725,10 +721,8 @@ again:;
|
||||
(sdl->sdl_len + (char *)sdl);
|
||||
snprintf(flgbuf, sizeof(flgbuf), "%s%s%s%s",
|
||||
isrouter ? "R" : "",
|
||||
!IN6_IS_ADDR_UNSPECIFIED(&sin->sin6_addr)
|
||||
? "P" : "",
|
||||
(sin->sin6_len != sizeof(struct sockaddr_in6))
|
||||
? "W" : "",
|
||||
!IN6_IS_ADDR_UNSPECIFIED(&sin->sin6_addr) ? "P" : "",
|
||||
(sin->sin6_len != sizeof(struct sockaddr_in6)) ? "W" : "",
|
||||
(rtm->rtm_flags & RTF_ANNOUNCE) ? "p" : "");
|
||||
}
|
||||
printf(" %-4.4s", flgbuf);
|
||||
@ -778,18 +772,17 @@ static char *
|
||||
ether_str(sdl)
|
||||
struct sockaddr_dl *sdl;
|
||||
{
|
||||
static char ebuf[32];
|
||||
static char hbuf[NI_MAXHOST];
|
||||
u_char *cp;
|
||||
|
||||
if (sdl->sdl_alen) {
|
||||
cp = (u_char *)LLADDR(sdl);
|
||||
sprintf(ebuf, "%x:%x:%x:%x:%x:%x",
|
||||
snprintf(hbuf, sizeof(hbuf), "%x:%x:%x:%x:%x:%x",
|
||||
cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
|
||||
} else {
|
||||
sprintf(ebuf, "(incomplete)");
|
||||
}
|
||||
} else
|
||||
snprintf(hbuf, sizeof(hbuf), "(incomplete)");
|
||||
|
||||
return(ebuf);
|
||||
return(hbuf);
|
||||
}
|
||||
|
||||
int
|
||||
@ -882,8 +875,8 @@ rtmsg(cmd)
|
||||
rtm->rtm_type = cmd;
|
||||
if ((rlen = write(s, (char *)&m_rtmsg, l)) < 0) {
|
||||
if (errno != ESRCH || cmd != RTM_DELETE) {
|
||||
perror("writing to routing socket");
|
||||
return (-1);
|
||||
err(1, "writing to routing socket");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
}
|
||||
do {
|
||||
@ -909,14 +902,14 @@ ifinfo(argc, argv)
|
||||
#endif
|
||||
|
||||
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
|
||||
perror("ndp: socket");
|
||||
exit(1);
|
||||
err(1, "socket");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
bzero(&nd, sizeof(nd));
|
||||
strcpy(nd.ifname, ifname);
|
||||
strlcpy(nd.ifname, ifname, sizeof(nd.ifname));
|
||||
if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&nd) < 0) {
|
||||
perror("ioctl (SIOCGIFINFO_IN6)");
|
||||
exit(1);
|
||||
err(1, "ioctl(SIOCGIFINFO_IN6)");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
#define ND nd.ndi
|
||||
newflags = ND.flags;
|
||||
@ -945,8 +938,8 @@ ifinfo(argc, argv)
|
||||
|
||||
ND.flags = newflags;
|
||||
if (ioctl(s, SIOCSIFINFO_FLAGS, (caddr_t)&nd) < 0) {
|
||||
perror("ioctl(SIOCSIFINFO_FLAGS)");
|
||||
exit(1);
|
||||
err(1, "ioctl(SIOCSIFINFO_FLAGS)");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
#undef SETFLAG
|
||||
}
|
||||
@ -1018,7 +1011,7 @@ rtrlist()
|
||||
}
|
||||
buf = malloc(l);
|
||||
if (!buf) {
|
||||
errx(1, "not enough core");
|
||||
err(1, "malloc");
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
|
||||
@ -1032,7 +1025,7 @@ rtrlist()
|
||||
|
||||
if (getnameinfo((struct sockaddr *)&p->rtaddr,
|
||||
p->rtaddr.sin6_len, host_buf, sizeof(host_buf), NULL, 0,
|
||||
NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0)) != 0)
|
||||
(nflag ? NI_NUMERICHOST : 0)) != 0)
|
||||
strlcpy(host_buf, "?", sizeof(host_buf));
|
||||
|
||||
printf("%s if=%s", host_buf,
|
||||
@ -1057,14 +1050,14 @@ rtrlist()
|
||||
struct timeval time;
|
||||
|
||||
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
|
||||
perror("ndp: socket");
|
||||
exit(1);
|
||||
err(1, "socket");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
bzero(&dr, sizeof(dr));
|
||||
strcpy(dr.ifname, "lo0"); /* dummy */
|
||||
strlcpy(dr.ifname, "lo0", sizeof(dr.ifname)); /* dummy */
|
||||
if (ioctl(s, SIOCGDRLST_IN6, (caddr_t)&dr) < 0) {
|
||||
perror("ioctl (SIOCGDRLST_IN6)");
|
||||
exit(1);
|
||||
err(1, "ioctl(SIOCGDRLST_IN6)");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
#define DR dr.defrouter[i]
|
||||
for (i = 0 ; DR.if_index && i < DRLSTSIZ ; i++) {
|
||||
@ -1076,7 +1069,7 @@ rtrlist()
|
||||
sin6.sin6_addr = DR.rtaddr;
|
||||
getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len, host_buf,
|
||||
sizeof(host_buf), NULL, 0,
|
||||
NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
|
||||
(nflag ? NI_NUMERICHOST : 0));
|
||||
|
||||
printf("%s if=%s", host_buf,
|
||||
if_indextoname(DR.if_index, ifix_buf));
|
||||
@ -1105,13 +1098,8 @@ plist()
|
||||
struct sockaddr_in6 *advrtr;
|
||||
size_t l;
|
||||
struct timeval time;
|
||||
#ifdef NI_WITHSCOPEID
|
||||
const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
|
||||
int ninflags = (nflag ? NI_NUMERICHOST : 0) | NI_WITHSCOPEID;
|
||||
#else
|
||||
const int niflags = NI_NUMERICHOST;
|
||||
int ninflags = nflag ? NI_NUMERICHOST : 0;
|
||||
#endif
|
||||
char namebuf[NI_MAXHOST];
|
||||
|
||||
if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) {
|
||||
@ -1120,7 +1108,7 @@ plist()
|
||||
}
|
||||
buf = malloc(l);
|
||||
if (!buf) {
|
||||
errx(1, "not enough core");
|
||||
err(1, "malloc");
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
|
||||
@ -1192,8 +1180,8 @@ plist()
|
||||
strlcpy(namebuf, "?", sizeof(namebuf));
|
||||
printf(" %s", namebuf);
|
||||
|
||||
nbi = getnbrinfo(&sin6->sin6_addr, p->if_index,
|
||||
0);
|
||||
nbi = getnbrinfo(&sin6->sin6_addr,
|
||||
p->if_index, 0);
|
||||
if (nbi) {
|
||||
switch (nbi->state) {
|
||||
case ND6_LLINFO_REACHABLE:
|
||||
@ -1221,14 +1209,14 @@ plist()
|
||||
gettimeofday(&time, 0);
|
||||
|
||||
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
|
||||
perror("ndp: socket");
|
||||
exit(1);
|
||||
err(1, "socket");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
bzero(&pr, sizeof(pr));
|
||||
strcpy(pr.ifname, "lo0"); /* dummy */
|
||||
strlcpy(pr.ifname, "lo0", sizeof(pr.ifname)); /* dummy */
|
||||
if (ioctl(s, SIOCGPRLST_IN6, (caddr_t)&pr) < 0) {
|
||||
perror("ioctl (SIOCGPRLST_IN6)");
|
||||
exit(1);
|
||||
err(1, "ioctl(SIOCGPRLST_IN6)");
|
||||
/* NOTREACHED */
|
||||
}
|
||||
#define PR pr.prefix[i]
|
||||
for (i = 0; PR.if_index && i < PRLSTSIZ ; i++) {
|
||||
@ -1261,9 +1249,6 @@ plist()
|
||||
}
|
||||
|
||||
niflags = NI_NUMERICHOST;
|
||||
#ifdef __KAME__
|
||||
niflags |= NI_WITHSCOPEID;
|
||||
#endif
|
||||
if (getnameinfo((struct sockaddr *)&p6,
|
||||
sizeof(p6), namebuf, sizeof(namebuf),
|
||||
NULL, 0, niflags)) {
|
||||
@ -1359,11 +1344,11 @@ plist()
|
||||
getnameinfo((struct sockaddr *)&sin6,
|
||||
sin6.sin6_len, host_buf,
|
||||
sizeof(host_buf), NULL, 0,
|
||||
NI_WITHSCOPEID | (nflag ? NI_NUMERICHOST : 0));
|
||||
(nflag ? NI_NUMERICHOST : 0));
|
||||
printf(" %s", host_buf);
|
||||
|
||||
nbi = getnbrinfo(&sin6.sin6_addr, PR.if_index,
|
||||
0);
|
||||
nbi = getnbrinfo(&sin6.sin6_addr,
|
||||
PR.if_index, 0);
|
||||
if (nbi) {
|
||||
switch (nbi->state) {
|
||||
case ND6_LLINFO_REACHABLE:
|
||||
@ -1397,7 +1382,7 @@ pfx_flush()
|
||||
|
||||
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
|
||||
err(1, "socket");
|
||||
strcpy(dummyif, "lo0"); /* dummy */
|
||||
strlcpy(dummyif, "lo0", sizeof(dummyif)); /* dummy */
|
||||
if (ioctl(s, SIOCSPFXFLUSH_IN6, (caddr_t)&dummyif) < 0)
|
||||
err(1, "ioctl(SIOCSPFXFLUSH_IN6)");
|
||||
}
|
||||
@ -1410,7 +1395,7 @@ rtr_flush()
|
||||
|
||||
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
|
||||
err(1, "socket");
|
||||
strcpy(dummyif, "lo0"); /* dummy */
|
||||
strlcpy(dummyif, "lo0", sizeof(dummyif)); /* dummy */
|
||||
if (ioctl(s, SIOCSRTRFLUSH_IN6, (caddr_t)&dummyif) < 0)
|
||||
err(1, "ioctl(SIOCSRTRFLUSH_IN6)");
|
||||
|
||||
@ -1425,7 +1410,7 @@ harmonize_rtr()
|
||||
|
||||
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
|
||||
err(1, "socket");
|
||||
strcpy(dummyif, "lo0"); /* dummy */
|
||||
strlcpy(dummyif, "lo0", sizeof(dummyif)); /* dummy */
|
||||
if (ioctl(s, SIOCSNDFLUSH_IN6, (caddr_t)&dummyif) < 0)
|
||||
err(1, "ioctl(SIOCSNDFLUSH_IN6)");
|
||||
|
||||
@ -1450,7 +1435,7 @@ setdefif(ifname)
|
||||
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
|
||||
err(1, "socket");
|
||||
|
||||
strcpy(ndifreq.ifname, "lo0"); /* dummy */
|
||||
strlcpy(ndifreq.ifname, "lo0", sizeof(ndifreq.ifname)); /* dummy */
|
||||
ndifreq.ifindex = ifindex;
|
||||
|
||||
if (ioctl(s, SIOCSDEFIFACE_IN6, (caddr_t)&ndifreq) < 0)
|
||||
@ -1469,7 +1454,7 @@ getdefif()
|
||||
err(1, "socket");
|
||||
|
||||
memset(&ndifreq, 0, sizeof(ndifreq));
|
||||
strcpy(ndifreq.ifname, "lo0"); /* dummy */
|
||||
strlcpy(ndifreq.ifname, "lo0", sizeof(ndifreq.ifname)); /* dummy */
|
||||
|
||||
if (ioctl(s, SIOCGDEFIFACE_IN6, (caddr_t)&ndifreq) < 0)
|
||||
err(1, "ioctl(SIOCGDEFIFACE_IN6)");
|
||||
@ -1495,6 +1480,8 @@ sec2str(total)
|
||||
int days, hours, mins, secs;
|
||||
int first = 1;
|
||||
char *p = result;
|
||||
char *ep = &result[sizeof(result)];
|
||||
int n;
|
||||
|
||||
days = total / 3600 / 24;
|
||||
hours = (total / 3600) % 24;
|
||||
@ -1503,17 +1490,26 @@ sec2str(total)
|
||||
|
||||
if (days) {
|
||||
first = 0;
|
||||
p += sprintf(p, "%dd", days);
|
||||
n = snprintf(p, ep - p, "%dd", days);
|
||||
if (n < 0 || n >= ep - p)
|
||||
return "?";
|
||||
p += n;
|
||||
}
|
||||
if (!first || hours) {
|
||||
first = 0;
|
||||
p += sprintf(p, "%dh", hours);
|
||||
n = snprintf(p, ep - p, "%dh", hours);
|
||||
if (n < 0 || n >= ep - p)
|
||||
return "?";
|
||||
p += n;
|
||||
}
|
||||
if (!first || mins) {
|
||||
first = 0;
|
||||
p += sprintf(p, "%dm", mins);
|
||||
n = snprintf(p, ep - p, "%dm", mins);
|
||||
if (n < 0 || n >= ep - p)
|
||||
return "?";
|
||||
p += n;
|
||||
}
|
||||
sprintf(p, "%ds", secs);
|
||||
snprintf(p, ep - p, "%ds", secs);
|
||||
|
||||
return(result);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user