[Midnightbsd-cvs] src [10376] trunk/usr.sbin/ndp: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 3 19:21:03 EDT 2018
Revision: 10376
http://svnweb.midnightbsd.org/src/?rev=10376
Author: laffer1
Date: 2018-06-03 19:21:02 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/usr.sbin/ndp/Makefile
trunk/usr.sbin/ndp/gnuc.h
trunk/usr.sbin/ndp/ndp.8
trunk/usr.sbin/ndp/ndp.c
Modified: trunk/usr.sbin/ndp/Makefile
===================================================================
--- trunk/usr.sbin/ndp/Makefile 2018-06-03 23:20:50 UTC (rev 10375)
+++ trunk/usr.sbin/ndp/Makefile 2018-06-03 23:21:02 UTC (rev 10376)
@@ -1,3 +1,4 @@
+# $MidnightBSD$
# Copyright (c) 1996 WIDE Project. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -11,7 +12,7 @@
# AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
# LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE.
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/ndp/Makefile 201390 2010-01-02 11:07:44Z ed $
.PATH: ${.CURDIR}/../../contrib/tcpdump
Modified: trunk/usr.sbin/ndp/gnuc.h
===================================================================
--- trunk/usr.sbin/ndp/gnuc.h 2018-06-03 23:20:50 UTC (rev 10375)
+++ trunk/usr.sbin/ndp/gnuc.h 2018-06-03 23:21:02 UTC (rev 10376)
@@ -1,2 +1,3 @@
+/* $MidnightBSD$ */
/* $FreeBSD: src/usr.sbin/ndp/gnuc.h,v 1.1 2000/01/06 12:40:40 shin Exp $ */
/* this is dummy to pacify gmt2local.c. */
Modified: trunk/usr.sbin/ndp/ndp.8
===================================================================
--- trunk/usr.sbin/ndp/ndp.8 2018-06-03 23:20:50 UTC (rev 10375)
+++ trunk/usr.sbin/ndp/ndp.8 2018-06-03 23:21:02 UTC (rev 10376)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" $KAME: ndp.8,v 1.28 2002/07/17 08:46:33 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -27,9 +28,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/ndp/ndp.8 270655 2014-08-26 10:32:08Z ae $
.\"
-.Dd Jan 10, 2013
+.Dd May 9, 2014
.Dt NDP 8
.Os
.\"
@@ -136,9 +137,26 @@
Erase all the NDP entries.
.It Fl d
Delete specified NDP entry.
-.It Fl f
-Parse the file specified by
-.Ar filename .
+.It Fl f Ar filename
+Cause the file
+.Ar filename
+to be read and multiple entries to be set in the
+.Tn NDP
+table.
+Entries
+in the file should be of the form
+.Pp
+.Bd -ragged -offset indent -compact
+.Ar hostname ether_addr
+.Op Cm temp
+.Op Cm proxy
+.Ed
+.Pp
+with argument meanings as given above.
+Leading whitespace and empty lines are ignored.
+A
+.Ql #
+character will mark the rest of the line as a comment.
.It Fl H
Harmonize consistency between the routing table and the default router
list; install the top entry of the list into the kernel routing table.
@@ -192,15 +210,6 @@
This flag is set by
.Va net.inet6.ip6.auto_linklocal
sysctl variable.
-.It Ic prefer_source
-Prefer addresses on the
-.Ar interface
-as candidates of the source address for outgoing packets.
-The default value of this flag is off.
-For more details about the entire algorithm of source address
-selection, see the
-.Pa IMPLEMENTATION
-file supplied with the KAME kit.
.It Ic no_prefer_iface
The address on the outgoing interface is preferred by source addess
selection rule.
Modified: trunk/usr.sbin/ndp/ndp.c
===================================================================
--- trunk/usr.sbin/ndp/ndp.c 2018-06-03 23:20:50 UTC (rev 10375)
+++ trunk/usr.sbin/ndp/ndp.c 2018-06-03 23:21:02 UTC (rev 10376)
@@ -1,4 +1,5 @@
-/* $MidnightBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/usr.sbin/ndp/ndp.c 294203 2016-01-17 06:02:59Z melifaro $ */
/* $KAME: ndp.c,v 1.104 2003/06/27 07:48:39 itojun Exp $ */
/*
@@ -97,6 +98,7 @@
#include <arpa/inet.h>
+#include <ctype.h>
#include <netdb.h>
#include <errno.h>
#include <nlist.h>
@@ -126,28 +128,26 @@
static int s = -1;
static int repeat = 0;
-char ntop_buf[INET6_ADDRSTRLEN]; /* inet_ntop() */
-char host_buf[NI_MAXHOST]; /* getnameinfo() */
-char ifix_buf[IFNAMSIZ]; /* if_indextoname() */
+static char host_buf[NI_MAXHOST]; /* getnameinfo() */
+static char ifix_buf[IFNAMSIZ]; /* if_indextoname() */
-int main(int, char **);
-int file(char *);
-void getsocket(void);
-int set(int, char **);
-void get(char *);
-int delete(char *);
-void dump(struct in6_addr *, int);
+static int file(char *);
+static void getsocket(void);
+static int set(int, char **);
+static void get(char *);
+static int delete(char *);
+static void dump(struct sockaddr_in6 *, int);
static struct in6_nbrinfo *getnbrinfo(struct in6_addr *, int, int);
static char *ether_str(struct sockaddr_dl *);
-int ndp_ether_aton(char *, u_char *);
-void usage(void);
-int rtmsg(int);
-void ifinfo(char *, int, char **);
-void rtrlist(void);
-void plist(void);
-void pfx_flush(void);
-void rtr_flush(void);
-void harmonize_rtr(void);
+static int ndp_ether_aton(char *, u_char *);
+static void usage(void);
+static int rtmsg(int);
+static void ifinfo(char *, int, char **);
+static void rtrlist(void);
+static void plist(void);
+static void pfx_flush(void);
+static void rtr_flush(void);
+static void harmonize_rtr(void);
#ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */
static void getdefif(void);
static void setdefif(char *);
@@ -155,7 +155,6 @@
static char *sec2str(time_t);
static void ts_print(const struct timeval *);
-#ifdef ICMPV6CTL_ND6_DRLIST
static char *rtpref_str[] = {
"medium", /* 00 */
"high", /* 01 */
@@ -162,17 +161,12 @@
"rsv", /* 10 */
"low" /* 11 */
};
-#endif
-int mode = 0;
-char *arg = NULL;
-
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
- int ch;
+ int ch, mode = 0;
+ char *arg = NULL;
pid = getpid();
thiszone = gmt2local(0);
@@ -194,9 +188,10 @@
mode = ch;
arg = NULL;
break;
+ case 'f':
+ exit(file(optarg) ? 1 : 0);
case 'd':
- case 'f':
- case 'i' :
+ case 'i':
if (mode) {
usage();
/*NOTREACHED*/
@@ -319,18 +314,15 @@
/*
* Process a file to set standard ndp entries
*/
-int
-file(name)
- char *name;
+static int
+file(char *name)
{
FILE *fp;
int i, retval;
- char line[100], arg[5][50], *args[5];
+ char line[100], arg[5][50], *args[5], *p;
- if ((fp = fopen(name, "r")) == NULL) {
- fprintf(stderr, "ndp: cannot open %s\n", name);
- exit(1);
- }
+ if ((fp = fopen(name, "r")) == NULL)
+ err(1, "cannot open %s", name);
args[0] = &arg[0][0];
args[1] = &arg[1][0];
args[2] = &arg[2][0];
@@ -338,10 +330,15 @@
args[4] = &arg[4][0];
retval = 0;
while (fgets(line, sizeof(line), fp) != NULL) {
+ if ((p = strchr(line, '#')) != NULL)
+ *p = '\0';
+ for (p = line; isblank(*p); p++);
+ if (*p == '\n' || *p == '\0')
+ continue;
i = sscanf(line, "%49s %49s %49s %49s %49s",
arg[0], arg[1], arg[2], arg[3], arg[4]);
if (i < 2) {
- fprintf(stderr, "ndp: bad line: %s\n", line);
+ warnx("bad line: %s", line);
retval = 1;
continue;
}
@@ -352,7 +349,7 @@
return (retval);
}
-void
+static void
getsocket()
{
if (s < 0) {
@@ -364,22 +361,32 @@
}
}
-struct sockaddr_in6 so_mask = {sizeof(so_mask), AF_INET6 };
-struct sockaddr_in6 blank_sin = {sizeof(blank_sin), AF_INET6 }, sin_m;
-struct sockaddr_dl blank_sdl = {sizeof(blank_sdl), AF_LINK }, sdl_m;
-int expire_time, flags, found_entry;
-struct {
+static struct sockaddr_in6 so_mask = {
+ .sin6_len = sizeof(so_mask),
+ .sin6_family = AF_INET6
+};
+static struct sockaddr_in6 blank_sin = {
+ .sin6_len = sizeof(blank_sin),
+ .sin6_family = AF_INET6
+};
+static struct sockaddr_in6 sin_m;
+static struct sockaddr_dl blank_sdl = {
+ .sdl_len = sizeof(blank_sdl),
+ .sdl_family = AF_LINK
+};
+static struct sockaddr_dl sdl_m;
+static time_t expire_time;
+static int flags, found_entry;
+static struct {
struct rt_msghdr m_rtm;
char m_space[512];
-} m_rtmsg;
+} m_rtmsg;
/*
* Set an individual neighbor cache entry
*/
-int
-set(argc, argv)
- int argc;
- char **argv;
+static int
+set(int argc, char **argv)
{
register struct sockaddr_in6 *sin = &sin_m;
register struct sockaddr_dl *sdl;
@@ -404,12 +411,8 @@
return 1;
}
sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-#ifdef __KAME__
- if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
- *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
- htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
- }
-#endif
+ sin->sin6_scope_id =
+ ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id;
ea = (u_char *)LLADDR(&sdl_m);
if (ndp_ether_aton(eaddr, ea) == 0)
sdl_m.sdl_alen = 6;
@@ -416,10 +419,10 @@
flags = expire_time = 0;
while (argc-- > 0) {
if (strncmp(argv[0], "temp", 4) == 0) {
- struct timeval time;
+ struct timeval now;
- gettimeofday(&time, 0);
- expire_time = time.tv_sec + 20 * 60;
+ gettimeofday(&now, 0);
+ expire_time = now.tv_sec + 20 * 60;
} else if (strncmp(argv[0], "proxy", 5) == 0)
flags |= RTF_ANNOUNCE;
argv++;
@@ -440,9 +443,6 @@
goto overwrite;
}
}
- /*
- * IPv4 arp command retries with sin_other = SIN_PROXY here.
- */
fprintf(stderr, "set: cannot configure a new entry\n");
return 1;
}
@@ -460,9 +460,8 @@
/*
* Display an individual neighbor cache entry
*/
-void
-get(host)
- char *host;
+static void
+get(char *host)
{
struct sockaddr_in6 *sin = &sin_m;
struct addrinfo hints, *res;
@@ -478,13 +477,9 @@
return;
}
sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-#ifdef __KAME__
- if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
- *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
- htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
- }
-#endif
- dump(&sin->sin6_addr, 0);
+ sin->sin6_scope_id =
+ ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id;
+ dump(sin, 0);
if (found_entry == 0) {
getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
sizeof(host_buf), NULL ,0,
@@ -497,9 +492,8 @@
/*
* Delete a neighbor cache entry
*/
-int
-delete(host)
- char *host;
+static int
+delete(char *host)
{
struct sockaddr_in6 *sin = &sin_m;
register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
@@ -520,12 +514,8 @@
return 1;
}
sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-#ifdef __KAME__
- if (IN6_IS_ADDR_LINKLOCAL(&sin->sin6_addr)) {
- *(u_int16_t *)&sin->sin6_addr.s6_addr[2] =
- htons(((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id);
- }
-#endif
+ sin->sin6_scope_id =
+ ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id;
if (rtmsg(RTM_GET) < 0) {
errx(1, "RTM_GET(%s) failed", host);
/* NOTREACHED */
@@ -537,9 +527,6 @@
!(rtm->rtm_flags & RTF_GATEWAY)) {
goto delete;
}
- /*
- * IPv4 arp command retries with sin_other = SIN_PROXY here.
- */
fprintf(stderr, "delete: cannot delete non-NDP entry\n");
return 1;
}
@@ -556,16 +543,8 @@
NEXTADDR(RTA_DST, sin_m);
rtm->rtm_flags |= RTF_LLDATA;
if (rtmsg(RTM_DELETE) == 0) {
- struct sockaddr_in6 s6 = *sin; /* XXX: for safety */
-
-#ifdef __KAME__
- if (IN6_IS_ADDR_LINKLOCAL(&s6.sin6_addr)) {
- s6.sin6_scope_id = ntohs(*(u_int16_t *)&s6.sin6_addr.s6_addr[2]);
- *(u_int16_t *)&s6.sin6_addr.s6_addr[2] = 0;
- }
-#endif
- getnameinfo((struct sockaddr *)&s6,
- s6.sin6_len, host_buf,
+ getnameinfo((struct sockaddr *)sin,
+ sin->sin6_len, host_buf,
sizeof(host_buf), NULL, 0,
(nflag ? NI_NUMERICHOST : 0));
printf("%s (%s) deleted\n", host, host_buf);
@@ -581,10 +560,8 @@
/*
* Dump the entire neighbor cache
*/
-void
-dump(addr, cflag)
- struct in6_addr *addr;
- int cflag;
+static void
+dump(struct sockaddr_in6 *addr, int cflag)
{
int mib[6];
size_t needed;
@@ -594,7 +571,7 @@
struct sockaddr_dl *sdl;
extern int h_errno;
struct in6_nbrinfo *nbi;
- struct timeval time;
+ struct timeval now;
int addrwidth;
int llwidth;
int ifwidth;
@@ -656,7 +633,9 @@
continue;
if (addr) {
- if (!IN6_ARE_ADDR_EQUAL(addr, &sin->sin6_addr))
+ if (IN6_ARE_ADDR_EQUAL(&addr->sin6_addr,
+ &sin->sin6_addr) == 0 ||
+ addr->sin6_scope_id != sin->sin6_scope_id)
continue;
found_entry = 1;
} else if (IN6_IS_ADDR_MULTICAST(&sin->sin6_addr))
@@ -666,10 +645,6 @@
/* XXX: should scope id be filled in the kernel? */
if (sin->sin6_scope_id == 0)
sin->sin6_scope_id = sdl->sdl_index;
-#ifdef __KAME__
- /* KAME specific hack; removed the embedded id */
- *(u_int16_t *)&sin->sin6_addr.s6_addr[2] = 0;
-#endif
}
getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
sizeof(host_buf), NULL, 0, (nflag ? NI_NUMERICHOST : 0));
@@ -681,13 +656,15 @@
if (rtm->rtm_flags & RTF_CLONED)
delete(host_buf);
#else
+ if (rtm->rtm_flags & RTF_PINNED)
+ continue;
delete(host_buf);
#endif
continue;
}
- gettimeofday(&time, 0);
+ gettimeofday(&now, 0);
if (tflag)
- ts_print(&time);
+ ts_print(&now);
addrwidth = strlen(host_buf);
if (addrwidth < W_ADDR)
@@ -705,12 +682,12 @@
printf("%-*.*s %-*.*s %*.*s", addrwidth, addrwidth, host_buf,
llwidth, llwidth, ether_str(sdl), ifwidth, ifwidth, ifname);
- /* Print neighbor discovery specific informations */
+ /* Print neighbor discovery specific information */
nbi = getnbrinfo(&sin->sin6_addr, sdl->sdl_index, 1);
if (nbi) {
- if (nbi->expire > time.tv_sec) {
+ if (nbi->expire > now.tv_sec) {
printf(" %-9.9s",
- sec2str(nbi->expire - time.tv_sec));
+ sec2str(nbi->expire - now.tv_sec));
} else if (nbi->expire == 0)
printf(" %-9.9s", "permanent");
else
@@ -793,10 +770,7 @@
}
static struct in6_nbrinfo *
-getnbrinfo(addr, ifindex, warning)
- struct in6_addr *addr;
- int ifindex;
- int warning;
+getnbrinfo(struct in6_addr *addr, int ifindex, int warning)
{
static struct in6_nbrinfo nbi;
int s;
@@ -822,7 +796,6 @@
ether_str(struct sockaddr_dl *sdl)
{
static char hbuf[NI_MAXHOST];
- char *cp;
if (sdl->sdl_alen == ETHER_ADDR_LEN) {
strlcpy(hbuf, ether_ntoa((struct ether_addr *)LLADDR(sdl)),
@@ -836,10 +809,8 @@
return(hbuf);
}
-int
-ndp_ether_aton(a, n)
- char *a;
- u_char *n;
+static int
+ndp_ether_aton(char *a, u_char *n)
{
int i, o[6];
@@ -854,7 +825,7 @@
return (0);
}
-void
+static void
usage()
{
printf("usage: ndp [-nt] hostname\n");
@@ -870,9 +841,8 @@
exit(1);
}
-int
-rtmsg(cmd)
- int cmd;
+static int
+rtmsg(int cmd)
{
static int seq;
int rlen;
@@ -936,11 +906,8 @@
return (0);
}
-void
-ifinfo(ifname, argc, argv)
- char *ifname;
- int argc;
- char **argv;
+static void
+ifinfo(char *ifname, int argc, char **argv)
{
struct in6_ndireq nd;
int i, s;
@@ -1008,9 +975,6 @@
#ifdef ND6_IFF_AUTO_LINKLOCAL
SETFLAG("auto_linklocal", ND6_IFF_AUTO_LINKLOCAL);
#endif
-#ifdef ND6_IFF_PREFER_SOURCE
- SETFLAG("prefer_source", ND6_IFF_PREFER_SOURCE);
-#endif
#ifdef ND6_IFF_NO_PREFER_IFACE
SETFLAG("no_prefer_iface", ND6_IFF_NO_PREFER_IFACE);
#endif
@@ -1087,10 +1051,6 @@
if ((ND.flags & ND6_IFF_AUTO_LINKLOCAL))
printf("auto_linklocal ");
#endif
-#ifdef ND6_IFF_PREFER_SOURCE
- if ((ND.flags & ND6_IFF_PREFER_SOURCE))
- printf("prefer_source ");
-#endif
#ifdef ND6_IFF_NO_PREFER_IFACE
if ((ND.flags & ND6_IFF_NO_PREFER_IFACE))
printf("no_prefer_iface ");
@@ -1106,15 +1066,14 @@
#define ND_RA_FLAG_RTPREF_MASK 0x18 /* 00011000 */
#endif
-void
+static void
rtrlist()
{
-#ifdef ICMPV6CTL_ND6_DRLIST
int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_DRLIST };
char *buf;
struct in6_defrouter *p, *ep;
size_t l;
- struct timeval time;
+ struct timeval now;
if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0) {
err(1, "sysctl(ICMPV6CTL_ND6_DRLIST)");
@@ -1149,68 +1108,25 @@
rtpref = ((p->flags & ND_RA_FLAG_RTPREF_MASK) >> 3) & 0xff;
printf(", pref=%s", rtpref_str[rtpref]);
- gettimeofday(&time, 0);
+ gettimeofday(&now, 0);
if (p->expire == 0)
printf(", expire=Never\n");
else
printf(", expire=%s\n",
- sec2str(p->expire - time.tv_sec));
+ sec2str(p->expire - now.tv_sec));
}
free(buf);
-#else
- struct in6_drlist dr;
- int s, i;
- struct timeval time;
-
- if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
- err(1, "socket");
- /* NOTREACHED */
- }
- bzero(&dr, sizeof(dr));
- strlcpy(dr.ifname, "lo0", sizeof(dr.ifname)); /* dummy */
- if (ioctl(s, SIOCGDRLST_IN6, (caddr_t)&dr) < 0) {
- err(1, "ioctl(SIOCGDRLST_IN6)");
- /* NOTREACHED */
- }
-#define DR dr.defrouter[i]
- for (i = 0 ; DR.if_index && i < DRLSTSIZ ; i++) {
- struct sockaddr_in6 sin6;
-
- bzero(&sin6, sizeof(sin6));
- sin6.sin6_family = AF_INET6;
- sin6.sin6_len = sizeof(sin6);
- sin6.sin6_addr = DR.rtaddr;
- getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len, host_buf,
- sizeof(host_buf), NULL, 0,
- (nflag ? NI_NUMERICHOST : 0));
-
- printf("%s if=%s", host_buf,
- if_indextoname(DR.if_index, ifix_buf));
- printf(", flags=%s%s",
- DR.flags & ND_RA_FLAG_MANAGED ? "M" : "",
- DR.flags & ND_RA_FLAG_OTHER ? "O" : "");
- gettimeofday(&time, 0);
- if (DR.expire == 0)
- printf(", expire=Never\n");
- else
- printf(", expire=%s\n",
- sec2str(DR.expire - time.tv_sec));
- }
-#undef DR
- close(s);
-#endif
}
-void
+static void
plist()
{
-#ifdef ICMPV6CTL_ND6_PRLIST
int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRLIST };
char *buf;
struct in6_prefix *p, *ep, *n;
struct sockaddr_in6 *advrtr;
size_t l;
- struct timeval time;
+ struct timeval now;
const int niflags = NI_NUMERICHOST;
int ninflags = nflag ? NI_NUMERICHOST : 0;
char namebuf[NI_MAXHOST];
@@ -1241,7 +1157,7 @@
printf("%s/%d if=%s\n", namebuf, p->prefixlen,
if_indextoname(p->if_index, ifix_buf));
- gettimeofday(&time, 0);
+ gettimeofday(&now, 0);
/*
* meaning of fields, especially flags, is very different
* by origin. notify the difference to the users.
@@ -1267,9 +1183,9 @@
printf(", pltime=%lu", (unsigned long)p->pltime);
if (p->expire == 0)
printf(", expire=Never");
- else if (p->expire >= time.tv_sec)
+ else if (p->expire >= now.tv_sec)
printf(", expire=%s",
- sec2str(p->expire - time.tv_sec));
+ sec2str(p->expire - now.tv_sec));
else
printf(", expired");
printf(", ref=%d", p->refcnt);
@@ -1314,180 +1230,9 @@
printf(" No advertising router\n");
}
free(buf);
-#else
- struct in6_prlist pr;
- int s, i;
- struct timeval time;
-
- gettimeofday(&time, 0);
-
- if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
- err(1, "socket");
- /* NOTREACHED */
- }
- bzero(&pr, sizeof(pr));
- strlcpy(pr.ifname, "lo0", sizeof(pr.ifname)); /* dummy */
- if (ioctl(s, SIOCGPRLST_IN6, (caddr_t)&pr) < 0) {
- err(1, "ioctl(SIOCGPRLST_IN6)");
- /* NOTREACHED */
- }
-#define PR pr.prefix[i]
- for (i = 0; PR.if_index && i < PRLSTSIZ ; i++) {
- struct sockaddr_in6 p6;
- char namebuf[NI_MAXHOST];
- int niflags;
-
-#ifdef NDPRF_ONLINK
- p6 = PR.prefix;
-#else
- memset(&p6, 0, sizeof(p6));
- p6.sin6_family = AF_INET6;
- p6.sin6_len = sizeof(p6);
- p6.sin6_addr = PR.prefix;
-#endif
-
- /*
- * copy link index to sin6_scope_id field.
- * XXX: KAME specific.
- */
- if (IN6_IS_ADDR_LINKLOCAL(&p6.sin6_addr)) {
- u_int16_t linkid;
-
- memcpy(&linkid, &p6.sin6_addr.s6_addr[2],
- sizeof(linkid));
- linkid = ntohs(linkid);
- p6.sin6_scope_id = linkid;
- p6.sin6_addr.s6_addr[2] = 0;
- p6.sin6_addr.s6_addr[3] = 0;
- }
-
- niflags = NI_NUMERICHOST;
- if (getnameinfo((struct sockaddr *)&p6,
- sizeof(p6), namebuf, sizeof(namebuf),
- NULL, 0, niflags)) {
- warnx("getnameinfo failed");
- continue;
- }
- printf("%s/%d if=%s\n", namebuf, PR.prefixlen,
- if_indextoname(PR.if_index, ifix_buf));
-
- gettimeofday(&time, 0);
- /*
- * meaning of fields, especially flags, is very different
- * by origin. notify the difference to the users.
- */
-#if 0
- printf(" %s",
- PR.origin == PR_ORIG_RA ? "" : "advertise: ");
-#endif
-#ifdef NDPRF_ONLINK
- printf("flags=%s%s%s%s%s",
- PR.raflags.onlink ? "L" : "",
- PR.raflags.autonomous ? "A" : "",
- (PR.flags & NDPRF_ONLINK) != 0 ? "O" : "",
- (PR.flags & NDPRF_DETACHED) != 0 ? "D" : "",
-#ifdef NDPRF_HOME
- (PR.flags & NDPRF_HOME) != 0 ? "H" : ""
-#else
- ""
-#endif
- );
-#else
- printf("flags=%s%s",
- PR.raflags.onlink ? "L" : "",
- PR.raflags.autonomous ? "A" : "");
-#endif
- if (PR.vltime == ND6_INFINITE_LIFETIME)
- printf(" vltime=infinity");
- else
- printf(" vltime=%lu", PR.vltime);
- if (PR.pltime == ND6_INFINITE_LIFETIME)
- printf(", pltime=infinity");
- else
- printf(", pltime=%lu", PR.pltime);
- if (PR.expire == 0)
- printf(", expire=Never");
- else if (PR.expire >= time.tv_sec)
- printf(", expire=%s",
- sec2str(PR.expire - time.tv_sec));
- else
- printf(", expired");
-#ifdef NDPRF_ONLINK
- printf(", ref=%d", PR.refcnt);
-#endif
-#if 0
- switch (PR.origin) {
- case PR_ORIG_RA:
- printf(", origin=RA");
- break;
- case PR_ORIG_RR:
- printf(", origin=RR");
- break;
- case PR_ORIG_STATIC:
- printf(", origin=static");
- break;
- case PR_ORIG_KERNEL:
- printf(", origin=kernel");
- break;
- default:
- printf(", origin=?");
- break;
- }
-#endif
- printf("\n");
- /*
- * "advertising router" list is meaningful only if the prefix
- * information is from RA.
- */
- if (0 && /* prefix origin is almost obsolted */
- PR.origin != PR_ORIG_RA)
- ;
- else if (PR.advrtrs) {
- int j;
- printf(" advertised by\n");
- for (j = 0; j < PR.advrtrs; j++) {
- struct sockaddr_in6 sin6;
- struct in6_nbrinfo *nbi;
-
- bzero(&sin6, sizeof(sin6));
- sin6.sin6_family = AF_INET6;
- sin6.sin6_len = sizeof(sin6);
- sin6.sin6_addr = PR.advrtr[j];
- sin6.sin6_scope_id = PR.if_index; /* XXX */
- getnameinfo((struct sockaddr *)&sin6,
- sin6.sin6_len, host_buf,
- sizeof(host_buf), NULL, 0,
- (nflag ? NI_NUMERICHOST : 0));
- printf(" %s", host_buf);
-
- nbi = getnbrinfo(&sin6.sin6_addr,
- PR.if_index, 0);
- if (nbi) {
- switch (nbi->state) {
- case ND6_LLINFO_REACHABLE:
- case ND6_LLINFO_STALE:
- case ND6_LLINFO_DELAY:
- case ND6_LLINFO_PROBE:
- printf(" (reachable)\n");
- break;
- default:
- printf(" (unreachable)\n");
- }
- } else
- printf(" (no neighbor state)\n");
- }
- if (PR.advrtrs > DRLSTSIZ)
- printf(" and %d routers\n",
- PR.advrtrs - DRLSTSIZ);
- } else
- printf(" No advertising router\n");
- }
-#undef PR
- close(s);
-#endif
}
-void
+static void
pfx_flush()
{
char dummyif[IFNAMSIZ+8];
@@ -1500,7 +1245,7 @@
err(1, "ioctl(SIOCSPFXFLUSH_IN6)");
}
-void
+static void
rtr_flush()
{
char dummyif[IFNAMSIZ+8];
@@ -1515,7 +1260,7 @@
close(s);
}
-void
+static void
harmonize_rtr()
{
char dummyif[IFNAMSIZ+8];
@@ -1532,8 +1277,7 @@
#ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */
static void
-setdefif(ifname)
- char *ifname;
+setdefif(char *ifname)
{
struct in6_ndifreq ndifreq;
unsigned int ifindex;
@@ -1586,8 +1330,7 @@
#endif
static char *
-sec2str(total)
- time_t total;
+sec2str(time_t total)
{
static char result[256];
int days, hours, mins, secs;
@@ -1632,8 +1375,7 @@
* from tcpdump/util.c
*/
static void
-ts_print(tvp)
- const struct timeval *tvp;
+ts_print(const struct timeval *tvp)
{
int s;
More information about the Midnightbsd-cvs
mailing list