summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-28 23:09:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-09-28 23:09:59 +0000
commit190b9bd93e9e482b76c39160dfc0cae2ff450568 (patch)
treee92dbf89db13beaee64200137bfad99e892a7d22 /sys
parentf63706bd1cf47e17c8e7342d056f58913a793f93 (diff)
more \n in log()
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/if_atm.c7
-rw-r--r--sys/netinet/if_ether.c6
-rw-r--r--sys/netinet/ip_ip4.c6
-rw-r--r--sys/netinet/ip_mroute.c45
4 files changed, 33 insertions, 31 deletions
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 262bf60e6ca..2250042ee94 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_atm.c,v 1.5 1996/07/03 17:14:31 chuck Exp $ */
+/* $OpenBSD: if_atm.c,v 1.6 1997/09/28 23:09:55 deraadt Exp $ */
/*
*
@@ -122,7 +122,7 @@ atm_rtrequest(req, rt, sa)
}
if (gate->sa_family != AF_LINK ||
gate->sa_len < sizeof(null_sdl)) {
- log(LOG_DEBUG, "atm_rtrequest: bad gateway value");
+ log(LOG_DEBUG, "atm_rtrequest: bad gateway value\n");
break;
}
@@ -232,7 +232,8 @@ register struct atm_pseudohdr *desten; /* OUT */
struct sockaddr_dl *sdl;
if (m->m_flags & (M_BCAST|M_MCAST)) {
- log(LOG_INFO, "atmresolve: BCAST/MCAST packet detected/dumped");
+ log(LOG_INFO,
+ "atmresolve: BCAST/MCAST packet detected/dumped\n");
goto bad;
}
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 1f64069aea7..64689e64ff3 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.c,v 1.11 1997/08/01 03:53:01 flipk Exp $ */
+/* $OpenBSD: if_ether.c,v 1.12 1997/09/28 23:09:56 deraadt Exp $ */
/* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */
/*
@@ -205,7 +205,7 @@ arp_rtrequest(req, rt, sa)
case RTM_RESOLVE:
if (gate->sa_family != AF_LINK ||
gate->sa_len < sizeof(null_sdl)) {
- log(LOG_DEBUG, "arp_rtrequest: bad gateway value");
+ log(LOG_DEBUG, "arp_rtrequest: bad gateway value\n");
break;
}
SDL(gate)->sdl_type = rt->rt_ifp->if_type;
@@ -342,7 +342,7 @@ arpresolve(ac, rt, m, dst, desten)
rt = la->la_rt;
}
if (la == 0 || rt == 0) {
- log(LOG_DEBUG, "arpresolve: can't allocate llinfo");
+ log(LOG_DEBUG, "arpresolve: can't allocate llinfo\n");
m_freem(m);
return (0);
}
diff --git a/sys/netinet/ip_ip4.c b/sys/netinet/ip_ip4.c
index ac9331a7439..e0254e17172 100644
--- a/sys/netinet/ip_ip4.c
+++ b/sys/netinet/ip_ip4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ip4.c,v 1.12 1997/07/14 08:48:47 provos Exp $ */
+/* $OpenBSD: ip_ip4.c,v 1.13 1997/09/28 23:09:57 deraadt Exp $ */
/*
* The author of this code is John Ioannidis, ji@tla.org,
@@ -132,7 +132,7 @@ ip4_input(register struct mbuf *m, int iphlen)
if (ipi->ip_v != IPVERSION)
{
log(LOG_WARNING,
- "ip4_input(): wrong version %d on IP packet from %x to %x (%x->%x)",
+ "ip4_input(): wrong version %d on IP packet from %x to %x (%x->%x)\n",
ipi->ip_v, ipo->ip_src, ipo->ip_dst, ipi->ip_src, ipi->ip_dst);
ip4stat.ip4s_notip4++;
return;
@@ -281,7 +281,7 @@ ipe4_zeroize(struct tdb *tdbp)
void
ipe4_input(struct mbuf *m, ...)
{
- log(LOG_ALERT, "ipe4_input(): should never be called");
+ log(LOG_ALERT, "ipe4_input(): should never be called\n");
if (m)
m_freem(m);
}
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index a98309a2a5f..247a89077a2 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_mroute.c,v 1.6 1997/02/21 09:17:33 angelos Exp $ */
+/* $OpenBSD: ip_mroute.c,v 1.7 1997/09/28 23:09:58 deraadt Exp $ */
/* $NetBSD: ip_mroute.c,v 1.27 1996/05/07 02:40:50 thorpej Exp $ */
/*
@@ -393,7 +393,7 @@ ip_mrouter_init(so, m)
if (mrtdebug)
log(LOG_DEBUG,
- "ip_mrouter_init: so_type = %d, pr_protocol = %d",
+ "ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
so->so_type, so->so_proto->pr_protocol);
if (so->so_type != SOCK_RAW ||
@@ -420,7 +420,7 @@ ip_mrouter_init(so, m)
timeout(expire_upcalls, (caddr_t)0, EXPIRE_TIMEOUT);
if (mrtdebug)
- log(LOG_DEBUG, "ip_mrouter_init");
+ log(LOG_DEBUG, "ip_mrouter_init\n");
return (0);
}
@@ -473,7 +473,7 @@ ip_mrouter_done()
splx(s);
if (mrtdebug)
- log(LOG_DEBUG, "ip_mrouter_done");
+ log(LOG_DEBUG, "ip_mrouter_done\n");
return (0);
}
@@ -555,7 +555,7 @@ add_vif(m)
if (vifcp->vifc_flags & VIFF_TUNNEL) {
if (vifcp->vifc_flags & VIFF_SRCRT) {
- log(LOG_ERR, "Source routed tunnels not supported.");
+ log(LOG_ERR, "Source routed tunnels not supported.\n");
return (EOPNOTSUPP);
}
@@ -614,7 +614,7 @@ add_vif(m)
numvifs = vifcp->vifc_vifi + 1;
if (mrtdebug)
- log(LOG_DEBUG, "add_vif #%d, lcladdr %x, %s %x, thresh %x, rate %d",
+ log(LOG_DEBUG, "add_vif #%d, lcladdr %x, %s %x, thresh %x, rate %d\n",
vifcp->vifc_vifi,
ntohl(vifcp->vifc_lcl_addr.s_addr),
(vifcp->vifc_flags & VIFF_TUNNEL) ? "rmtaddr" : "mask",
@@ -686,7 +686,7 @@ del_vif(m)
splx(s);
if (mrtdebug)
- log(LOG_DEBUG, "del_vif %d, numvifs %d", *vifip, numvifs);
+ log(LOG_DEBUG, "del_vif %d, numvifs %d\n", *vifip, numvifs);
return (0);
}
@@ -746,7 +746,7 @@ add_mfc(m)
/* If an entry already exists, just update the fields */
if (rt) {
if (mrtdebug & DEBUG_MFC)
- log(LOG_DEBUG,"add_mfc update o %x g %x p %x",
+ log(LOG_DEBUG,"add_mfc update o %x g %x p %x\n",
ntohl(mfccp->mfcc_origin.s_addr),
ntohl(mfccp->mfcc_mcastgrp.s_addr),
mfccp->mfcc_parent);
@@ -770,14 +770,14 @@ add_mfc(m)
rt->mfc_mcastgrp.s_addr == mfccp->mfcc_mcastgrp.s_addr &&
rt->mfc_stall != NULL) {
if (nstl++)
- log(LOG_ERR, "add_mfc %s o %x g %x p %x dbx %p",
+ log(LOG_ERR, "add_mfc %s o %x g %x p %x dbx %p\n",
"multiple kernel entries",
ntohl(mfccp->mfcc_origin.s_addr),
ntohl(mfccp->mfcc_mcastgrp.s_addr),
mfccp->mfcc_parent, rt->mfc_stall);
if (mrtdebug & DEBUG_MFC)
- log(LOG_DEBUG,"add_mfc o %x g %x p %x dbg %p",
+ log(LOG_DEBUG,"add_mfc o %x g %x p %x dbg %p\n",
ntohl(mfccp->mfcc_origin.s_addr),
ntohl(mfccp->mfcc_mcastgrp.s_addr),
mfccp->mfcc_parent, rt->mfc_stall);
@@ -809,7 +809,7 @@ add_mfc(m)
* No mfc; make a new one
*/
if (mrtdebug & DEBUG_MFC)
- log(LOG_DEBUG,"add_mfc no upcall o %x g %x p %x",
+ log(LOG_DEBUG,"add_mfc no upcall o %x g %x p %x\n",
ntohl(mfccp->mfcc_origin.s_addr),
ntohl(mfccp->mfcc_mcastgrp.s_addr),
mfccp->mfcc_parent);
@@ -879,7 +879,7 @@ del_mfc(m)
mfccp = mtod(m, struct mfcctl *);
if (mrtdebug & DEBUG_MFC)
- log(LOG_DEBUG, "del_mfc origin %x mcastgrp %x",
+ log(LOG_DEBUG, "del_mfc origin %x mcastgrp %x\n",
ntohl(mfccp->mfcc_origin.s_addr), ntohl(mfccp->mfcc_mcastgrp.s_addr));
s = splsoftnet();
@@ -951,7 +951,7 @@ ip_mforward(m, ifp)
#endif /* RSVP_ISI */
if (mrtdebug & DEBUG_FORWARD)
- log(LOG_DEBUG, "ip_mforward: src %x, dst %x, ifp %p",
+ log(LOG_DEBUG, "ip_mforward: src %x, dst %x, ifp %p\n",
ntohl(ip->ip_src.s_addr), ntohl(ip->ip_dst.s_addr), ifp);
if (ip->ip_hl < (IP_HDR_LEN + TUNNEL_LEN) >> 2 ||
@@ -966,7 +966,7 @@ ip_mforward(m, ifp)
* Source-route tunnels are no longer supported.
*/
if ((srctun++ % 1000) == 0)
- log(LOG_ERR, "ip_mforward: received source-routed packet from %x",
+ log(LOG_ERR, "ip_mforward: received source-routed packet from %x\n",
ntohl(ip->ip_src.s_addr));
return (1);
@@ -1031,7 +1031,7 @@ ip_mforward(m, ifp)
mrtstat.mrts_no_route++;
if (mrtdebug & (DEBUG_FORWARD | DEBUG_MFC))
- log(LOG_DEBUG, "ip_mforward: no rte s %x g %x",
+ log(LOG_DEBUG, "ip_mforward: no rte s %x g %x\n",
ntohl(ip->ip_src.s_addr),
ntohl(ip->ip_dst.s_addr));
@@ -1097,7 +1097,7 @@ ip_mforward(m, ifp)
mrtstat.mrts_upcalls++;
if (socket_send(ip_mrouter, mm, &sin) < 0) {
- log(LOG_WARNING, "ip_mforward: ip_mrouter socket queue full");
+ log(LOG_WARNING, "ip_mforward: ip_mrouter socket queue full\n");
++mrtstat.mrts_upq_sockfull;
free(rte, M_MRTABLE);
m_free(mb0);
@@ -1182,7 +1182,7 @@ expire_upcalls(v)
++mrtstat.mrts_cache_cleanups;
if (mrtdebug & DEBUG_EXPIRE)
log(LOG_DEBUG,
- "expire_upcalls: expiring (%x %x)",
+ "expire_upcalls: expiring (%x %x)\n",
ntohl(rt->mfc_origin.s_addr),
ntohl(rt->mfc_mcastgrp.s_addr));
@@ -1246,7 +1246,7 @@ ip_mdq(m, ifp, rt)
if ((vifi >= numvifs) || (viftable[vifi].v_ifp != ifp)) {
/* came in the wrong interface */
if (mrtdebug & DEBUG_FORWARD)
- log(LOG_DEBUG, "wrong if: ifp %p vifi %d vififp %p",
+ log(LOG_DEBUG, "wrong if: ifp %p vifi %d vififp %p\n",
ifp, vifi, viftable[vifi].v_ifp);
++mrtstat.mrts_wrong_if;
++rt->mfc_wrong_if;
@@ -1493,7 +1493,8 @@ ipip_input(m, va_alist)
mrtstat.mrts_cant_tunnel++; /*XXX*/
m_freem(m);
if (mrtdebug)
- log(LOG_DEBUG, "ip_mforward: no tunnel with %x",
+ log(LOG_DEBUG,
+ "ip_mforward: no tunnel with %x\n",
ntohl(ip->ip_src.s_addr));
return;
}
@@ -1655,7 +1656,7 @@ tbf_dequeue(vifp, j)
vifp->v_tbf.q_len--;
if (tbfdebug > 1)
- log(LOG_DEBUG, "tbf_dequeue: vif# %d qlen %d",vifp-viftable, i-1);
+ log(LOG_DEBUG, "tbf_dequeue: vif# %d qlen %d\n",vifp-viftable, i-1);
}
static void
@@ -1728,7 +1729,7 @@ tbf_send_packet(vifp,m)
error = ip_output(m, (struct mbuf *)0, (struct route *)0,
IP_FORWARDING|IP_MULTICASTOPTS, &imo);
if (mrtdebug & DEBUG_XMIT)
- log(LOG_DEBUG, "phyint_send on vif %d err %d", vifp-viftable, error);
+ log(LOG_DEBUG, "phyint_send on vif %d err %d\n", vifp-viftable, error);
}
splx(s);
}
@@ -1794,7 +1795,7 @@ priority(vifp, ip)
break;
}
- if (tbfdebug > 1) log(LOG_DEBUG, "port %x prio %d", ntohs(udp->uh_dport), prio);
+ if (tbfdebug > 1) log(LOG_DEBUG, "port %x prio %d\n", ntohs(udp->uh_dport), prio);
} else
prio = 50;