diff options
| author | ume <ume@FreeBSD.org> | 2001-06-11 12:39:29 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2001-06-11 12:39:29 +0000 |
| commit | 832f8d224926758a9ae0b23a6b45353e44fbc87a (patch) | |
| tree | a79fc7ad2b97862c4a404f352f0211ad93a7b5f1 /usr.sbin/rip6query | |
| parent | 2693854b01a52b0395a91322aa3edf926bddff38 (diff) | |
| download | FreeBSD-src-832f8d224926758a9ae0b23a6b45353e44fbc87a.zip FreeBSD-src-832f8d224926758a9ae0b23a6b45353e44fbc87a.tar.gz | |
Sync with recent KAME.
This work was based on kame-20010528-freebsd43-snap.tgz and some
critical problem after the snap was out were fixed.
There are many many changes since last KAME merge.
TODO:
- The definitions of SADB_* in sys/net/pfkeyv2.h are still different
from RFC2407/IANA assignment because of binary compatibility
issue. It should be fixed under 5-CURRENT.
- ip6po_m member of struct ip6_pktopts is no longer used. But, it
is still there because of binary compatibility issue. It should
be removed under 5-CURRENT.
Reviewed by: itojun
Obtained from: KAME
MFC after: 3 weeks
Diffstat (limited to 'usr.sbin/rip6query')
| -rw-r--r-- | usr.sbin/rip6query/rip6query.8 | 3 | ||||
| -rw-r--r-- | usr.sbin/rip6query/rip6query.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/usr.sbin/rip6query/rip6query.8 b/usr.sbin/rip6query/rip6query.8 index dab1bbb..e16df23 100644 --- a/usr.sbin/rip6query/rip6query.8 +++ b/usr.sbin/rip6query/rip6query.8 @@ -1,3 +1,4 @@ +.\" $KAME: rip6query.8,v 1.4 2001/03/15 12:35:24 itojun Exp $ .\" .\" Copyright (C) 1998 and 1999 WIDE Project. .\" All rights reserved. @@ -44,7 +45,7 @@ .Sh DESCRIPTION .Nm requests remote RIPng daemon on -.Ar destionation +.Ar destination to dump RIPng routing information. .Fl I lets you specify outgoing diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c index ed0f6f9..bc8efe7 100644 --- a/usr.sbin/rip6query/rip6query.c +++ b/usr.sbin/rip6query/rip6query.c @@ -1,3 +1,5 @@ +/* $KAME: rip6query.c,v 1.11 2001/05/08 04:36:37 itojun Exp $ */ + /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -41,6 +43,8 @@ #include <sys/types.h> #include <sys/socket.h> +#include <sys/queue.h> + #include <net/if.h> #if defined(__FreeBSD__) && __FreeBSD__ >= 3 #include <net/if_var.h> @@ -82,7 +86,7 @@ main(argc, argv) char pbuf[10]; struct addrinfo hints, *res; - while ((c = getopt(argc, argv, "I:")) != EOF) { + while ((c = getopt(argc, argv, "I:")) != -1) { switch (c) { case 'I': ifidx = if_nametoindex(optarg); @@ -102,7 +106,7 @@ main(argc, argv) if (argc != 1) { usage(); - exit(-1); + exit(1); } if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { |
