Author: ru
Date: Fri Jan 8 16:14:41 2010
New Revision: 201801
URL: http://svn.freebsd.org/changeset/base/201801
Log:
Complete the swap of carp(4) log levels and document the change.
MFC after: 3 days
Modified:
head/share/man/man4/carp.4
head/sys/netinet/ip_carp.c
Modified: head/share/man/man4/carp.4
==============================================================================
--- head/share/man/man4/carp.4 Fri Jan 8 16:07:39 2010 (r201800)
+++ head/share/man/man4/carp.4 Fri Jan 8 16:14:41 2010 (r201801)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 6, 2006
+.Dd January 5, 2010
.Dt CARP 4
.Os
.Sh NAME
@@ -118,12 +118,12 @@ See also the first example.
Disabled by default.
.It Va net.inet.carp.log
Value of 0 disables any logging.
-Value of 1 enables logging of bad
-.Nm
-packets.
-Values above 1 enable logging state changes of
+Value of 1 enables logging state changes of
.Nm
interfaces.
+Values above 1 enable logging of bad
+.Nm
+packets.
Default value is 1.
.It Va net.inet.carp.arpbalance
Balance local traffic using ARP (see below).
Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c Fri Jan 8 16:07:39 2010 (r201800)
+++ head/sys/netinet/ip_carp.c Fri Jan 8 16:14:41 2010 (r201801)
@@ -560,7 +560,7 @@ carp_input(struct mbuf *m, int hlen)
/* verify that the IP TTL is 255. */
if (ip->ip_ttl != CARP_DFLTTL) {
CARPSTATS_INC(carps_badttl);
- CARP_LOG("carp_input: received ttl %d != 255i on %s\n",
+ CARP_DEBUG("carp_input: received ttl %d != 255 on %s\n",
ip->ip_ttl,
m->m_pkthdr.rcvif->if_xname);
m_freem(m);
@@ -739,7 +739,7 @@ carp_input_c(struct mbuf *m, struct carp
CARPSTATS_INC(carps_badauth);
SC2IFP(sc)->if_ierrors++;
CARP_UNLOCK(ifp->if_carp);
- CARP_LOG("%s: incorrect hash\n", SC2IFP(sc)->if_xname);
+ CARP_DEBUG("%s: incorrect hash\n", SC2IFP(sc)->if_xname);
m_freem(m);
return;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
