diff options
author | kris <kris@FreeBSD.org> | 2000-10-08 07:36:35 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-10-08 07:36:35 +0000 |
commit | 9556d172f6abe5a39f3ce5143469adcc0e32fd92 (patch) | |
tree | 2a71a2c6c973a930208732fc30ffc4d06c6a7d40 /usr.sbin/pim6dd | |
parent | 7633d05307eb01bbef0e91da6724b73d1a25f8c5 (diff) | |
download | FreeBSD-src-9556d172f6abe5a39f3ce5143469adcc0e32fd92.zip FreeBSD-src-9556d172f6abe5a39f3ce5143469adcc0e32fd92.tar.gz |
Sync with KAME. Format string auditing and manpage cleanups.
Obtained from: KAME
Submitted by: Bill Sommerfeld <sommerfeld@netbsd.org>
Diffstat (limited to 'usr.sbin/pim6dd')
-rw-r--r-- | usr.sbin/pim6dd/debug.c | 2 | ||||
-rw-r--r-- | usr.sbin/pim6dd/defs.h | 6 | ||||
-rw-r--r-- | usr.sbin/pim6dd/main.c | 4 | ||||
-rw-r--r-- | usr.sbin/pim6dd/mld6.c | 4 | ||||
-rw-r--r-- | usr.sbin/pim6dd/mld6_proto.c | 10 | ||||
-rw-r--r-- | usr.sbin/pim6dd/pim6_proto.c | 4 | ||||
-rw-r--r-- | usr.sbin/pim6dd/pim6dd.8 | 10 | ||||
-rw-r--r-- | usr.sbin/pim6dd/pim6dd.conf.5 | 22 | ||||
-rw-r--r-- | usr.sbin/pim6dd/timer.c | 4 |
9 files changed, 42 insertions, 24 deletions
diff --git a/usr.sbin/pim6dd/debug.c b/usr.sbin/pim6dd/debug.c index 392beaa..740d999 100644 --- a/usr.sbin/pim6dd/debug.c +++ b/usr.sbin/pim6dd/debug.c @@ -34,7 +34,7 @@ * Questions concerning this software should be directed to * Pavlin Ivanov Radoslavov (pavlin@catarina.usc.edu) * - * $Id: debug.c,v 1.8 2000/05/18 12:47:59 itojun Exp $ + * $Id: debug.c,v 1.10 2000/10/05 22:27:07 itojun Exp $ */ /* * Part of this program has been derived from mrouted. diff --git a/usr.sbin/pim6dd/defs.h b/usr.sbin/pim6dd/defs.h index 24e0d24..f5c2d31 100644 --- a/usr.sbin/pim6dd/defs.h +++ b/usr.sbin/pim6dd/defs.h @@ -33,7 +33,7 @@ * Questions concerning this software should be directed to * Kurt Windisch (kurtw@antc.uoregon.edu) * - * $Id: defs.h,v 1.7 2000/04/30 13:01:36 itojun Exp $ + * $Id: defs.h,v 1.9 2000/10/05 22:20:38 itojun Exp $ */ /* * Part of this program has been derived from PIM sparse-mode pimd. @@ -64,6 +64,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> +#include <sys/queue.h> #include <fcntl.h> #if ((defined(SYSV)) || (defined(__bsdi__)) || ((defined SunOS) && (SunOS < 50))) #include <sys/sockio.h> @@ -322,7 +323,8 @@ extern void config_vifs_from_file __P((void)); /* debug.c */ extern char *packet_kind __P((u_int proto, u_int type, u_int code)); extern int debug_kind __P((u_int proto, u_int type, u_int code)); -extern void log __P((int, int, char *, ...)); +extern void log __P((int, int, char *, ...)) + __attribute__((__format__(__printf__, 3, 4))); extern void dump_mldqueriers __P((FILE *)); extern int log_level __P((u_int proto, u_int type, u_int code)); extern void dump __P((int i)); diff --git a/usr.sbin/pim6dd/main.c b/usr.sbin/pim6dd/main.c index 99f7086..2cf17f5 100644 --- a/usr.sbin/pim6dd/main.c +++ b/usr.sbin/pim6dd/main.c @@ -33,7 +33,7 @@ * Questions concerning this software should be directed to * Kurt Windisch (kurtw@antc.uoregon.edu) * - * $Id: main.c,v 1.3 2000/03/26 19:11:41 sumikawa Exp $ + * $Id: main.c,v 1.4 2000/10/05 22:20:38 itojun Exp $ */ /* * Part of this program has been derived from PIM sparse-mode pimd. @@ -658,7 +658,7 @@ restart(i) int s; #endif /* SNMP */ - log(LOG_NOTICE, 0, "% restart", versionstring); + log(LOG_NOTICE, 0, "%s restart", versionstring); /* * reset all the entries diff --git a/usr.sbin/pim6dd/mld6.c b/usr.sbin/pim6dd/mld6.c index f3861c2..1b0fe8e 100644 --- a/usr.sbin/pim6dd/mld6.c +++ b/usr.sbin/pim6dd/mld6.c @@ -63,7 +63,7 @@ * Questions concerning this software should be directed to * Pavlin Ivanov Radoslavov (pavlin@catarina.usc.edu) * - * $Id: mld6.c,v 1.13 2000/04/12 07:34:38 jinmei Exp $ + * $Id: mld6.c,v 1.14 2000/10/05 22:20:38 itojun Exp $ */ /* * Part of this program has been derived from mrouted. @@ -342,6 +342,8 @@ int recvlen; { log(LOG_INFO, 0, "RECV %s with an invalid scope: %s from %s", + packet_kind(IPPROTO_ICMPV6, mldh->mld6_type, + mldh->mld6_code), inet6_fmt(&mldh->mld6_addr), inet6_fmt(&src->sin6_addr)); return; /* discard */ diff --git a/usr.sbin/pim6dd/mld6_proto.c b/usr.sbin/pim6dd/mld6_proto.c index 26d8952..a87973d 100644 --- a/usr.sbin/pim6dd/mld6_proto.c +++ b/usr.sbin/pim6dd/mld6_proto.c @@ -62,7 +62,7 @@ * Questions concerning this software should be directed to * Kurt Windisch (kurtw@antc.uoregon.edu) * - * $Id: mld6_proto.c,v 1.4 2000/05/05 12:38:30 jinmei Exp $ + * $Id: mld6_proto.c,v 1.5 2000/10/05 22:20:38 itojun Exp $ */ /* * Part of this program has been derived from PIM sparse-mode pimd. @@ -227,7 +227,7 @@ accept_listener_query(src, dst, group, tmo) IF_DEBUG(DEBUG_MLD) log(LOG_DEBUG, 0, "timer for grp %s on mif %d " - "set to %d", + "set to %ld", inet6_fmt(group), mifi, g->al_timer); break; @@ -268,7 +268,7 @@ accept_listener_report(src, dst, group) IF_DEBUG(DEBUG_MLD) log(LOG_INFO, 0, "accepting multicast listener report: " - "src %s, dst% s, grp %s", + "src %s, dst %s, grp %s", inet6_fmt(&src->sin6_addr), inet6_fmt(dst), inet6_fmt(group)); @@ -340,7 +340,7 @@ accept_listener_done(src, dst, group) IF_DEBUG(DEBUG_MLD) log(LOG_INFO, 0, - "accepting listener done message: src %s, dst% s, grp %s", + "accepting listener done message: src %s, dst %s, grp %s", inet6_fmt(&src->sin6_addr), inet6_fmt(dst), inet6_fmt(group)); @@ -359,7 +359,7 @@ accept_listener_done(src, dst, group) if (inet6_equal(&group_sa, &g->al_addr)) { IF_DEBUG(DEBUG_MLD) log(LOG_DEBUG, 0, - "[accept_done_message] %d %d \n", + "[accept_done_message] %d %ld\n", g->al_old, g->al_query); /* diff --git a/usr.sbin/pim6dd/pim6_proto.c b/usr.sbin/pim6dd/pim6_proto.c index f4460ba..8a39a5e 100644 --- a/usr.sbin/pim6dd/pim6_proto.c +++ b/usr.sbin/pim6dd/pim6_proto.c @@ -61,7 +61,7 @@ * Questions concerning this software should be directed to * Kurt Windisch (kurtw@antc.uoregon.edu) * - * $Id: pim6_proto.c,v 1.5 2000/04/30 10:50:31 jinmei Exp $ + * $Id: pim6_proto.c,v 1.6 2000/10/05 22:20:38 itojun Exp $ */ /* * Part of this program has been derived from PIM sparse-mode pimd. @@ -489,7 +489,7 @@ schedule_delayed_join(mrtentry_ptr, target) #endif IF_DEBUG(DEBUG_PIM_JOIN_PRUNE) - log(LOG_DEBUG, 0, "Scheduling join for src %s, grp %s, delay %d", + log(LOG_DEBUG, 0, "Scheduling join for src %s, grp %s, delay %ld", inet6_fmt(&mrtentry_ptr->source->address.sin6_addr), inet6_fmt(&mrtentry_ptr->group->group.sin6_addr), random_delay); diff --git a/usr.sbin/pim6dd/pim6dd.8 b/usr.sbin/pim6dd/pim6dd.8 index 409f5f9..6003f2a 100644 --- a/usr.sbin/pim6dd/pim6dd.8 +++ b/usr.sbin/pim6dd/pim6dd.8 @@ -1,3 +1,5 @@ +.\" $KAME: pim6dd.8,v 1.6 2000/07/10 08:52:59 itojun Exp $ +.\" .\" Copyright (C) 1998 WIDE Project. .\" All rights reserved. .\" @@ -25,7 +27,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: pim6dd.8,v 1.5 2000/05/18 16:11:46 itojun Exp $ .\" $FreeBSD$ .\" .Dd Nov 17, 1998 @@ -113,4 +114,11 @@ daemon needs to run on the system. The kernel unicast routing table is periodically polled by .Nm in order to follow changes of existing unicast routes. +.Pp +.Nm +must be used on an IPv6 router. +Be sure to set +.Li net.inet6.ip6.forwarding +variable to 1 with +.Xr sysctl 8 . .\" diff --git a/usr.sbin/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5 index 7636354..e91e718 100644 --- a/usr.sbin/pim6dd/pim6dd.conf.5 +++ b/usr.sbin/pim6dd/pim6dd.conf.5 @@ -1,3 +1,5 @@ +.\" $KAME: pim6dd.conf.5,v 1.6 2000/07/10 08:52:59 itojun Exp $ +.\" .\" Copyright (C) 1998 WIDE Project. .\" All rights reserved. .\" @@ -25,7 +27,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" KAME Id: pim6dd.conf.5,v 1.4 2000/07/09 17:26:52 itojun Exp .\" $FreeBSD$ .\" .Dd Nov 17, 1998 @@ -46,7 +47,8 @@ Lines beginning with .Ql # are comments. .Pp -There are four types of configuration commands: +The following configuration directives are availble: +.Pp .Bl -tag -width Ds -compact .It Xo .Ic default_source_preference Ar preference @@ -55,14 +57,17 @@ Specifies a default preference value when sending a PIM assert message. Preferences are used by assert elections to determine upstream routers. Currently .Xr pim6dd 8 -cannot reliably obtain preferences and metrics from the -unicast routing protocols, so a default value may be configured. +does not have an effective method to obtain preferences and metrics from the +unicast routing protocols, so you may want to set a default value by hand. .\" .It Ic default_source_metric Ar metric Specifies a default metric value when sending a PIM assert message. -It is recommended that preferences be set such that metrics are never -consulted. However, default metrics may also be set and will default to -1024. +Since +.Xr pim6dd 8 +cannot get an effective metric of unicast routing, +it is recommended that preferences is set such that metrics are never +consulted. However, default metrics may also be set, and +its default value is 1024. .\" .It Xo .Ic phyint Ar interface @@ -87,7 +92,8 @@ assert message on the interface. .It Xo .Ic filter Ar groupaddrs Ar interfaces... .Xc -Specifies an output filter. If an incoming multicast packet's destination +Specifies an output filter by defining an administrative scope. +If an incoming multicast packet's destination matches the specified .Ar groupaddrs , the packet is not sent on the diff --git a/usr.sbin/pim6dd/timer.c b/usr.sbin/pim6dd/timer.c index c1ebf32..a27b9d4 100644 --- a/usr.sbin/pim6dd/timer.c +++ b/usr.sbin/pim6dd/timer.c @@ -33,7 +33,7 @@ * Questions concerning this software should be directed to * Kurt Windisch (kurtw@antc.uoregon.edu) * - * $Id: timer.c,v 1.5 2000/05/18 16:09:39 itojun Exp $ + * $Id: timer.c,v 1.6 2000/10/05 22:20:38 itojun Exp $ */ /* * Part of this program has been derived from PIM sparse-mode pimd. @@ -237,7 +237,7 @@ age_routes() */ IF_DEBUG(DEBUG_MFC) log(LOG_DEBUG, 0, - "Refreshing src %s, dst %s after %d bytes forwarded", + "Refreshing src %s, dst %s after %ld bytes forwarded", inet6_fmt(&mrtentry_ptr->source->address.sin6_addr), inet6_fmt(&mrtentry_ptr->group->group.sin6_addr), mrtentry_ptr->sg_count.bytecnt); |