backout previous kprintf change
This commit is contained in:
christos
parent
bcf4552fb1
commit
cb32007a8b
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: natm.c,v 1.3 1996/10/10 23:18:38 christos Exp $ */
|
||||
/* $NetBSD: natm.c,v 1.4 1996/10/13 02:00:00 christos Exp $ */
|
||||
|
||||
/*
|
||||
*
|
||||
@ -207,7 +207,7 @@ struct proc *p;
|
||||
case PRU_DISCONNECT: /* disconnect from peer */
|
||||
|
||||
if ((npcb->npcb_flags & NPCB_CONNECTED) == 0) {
|
||||
kprintf("natm: disconnected check\n");
|
||||
printf("natm: disconnected check\n");
|
||||
error = EIO;
|
||||
break;
|
||||
}
|
||||
@ -273,7 +273,7 @@ struct proc *p;
|
||||
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
bcopy(npcb->npcb_ifp->if_xname, snatm->snatm_if, sizeof(snatm->snatm_if));
|
||||
#elif defined(__FreeBSD__)
|
||||
ksprintf(snatm->snatm_if, "%s%d", npcb->npcb_ifp->if_name,
|
||||
sprintf(snatm->snatm_if, "%s%d", npcb->npcb_ifp->if_name,
|
||||
npcb->npcb_ifp->if_unit);
|
||||
#endif
|
||||
snatm->snatm_vci = npcb->npcb_vci;
|
||||
@ -322,7 +322,7 @@ struct proc *p;
|
||||
case PRU_PROTOSEND: /* send to below */
|
||||
case PRU_SOCKADDR: /* fetch socket's address */
|
||||
#ifdef DIAGNOSTIC
|
||||
kprintf("natm: PRU #%d unsupported\n", req);
|
||||
printf("natm: PRU #%d unsupported\n", req);
|
||||
#endif
|
||||
error = EOPNOTSUPP;
|
||||
break;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: natm_pcb.c,v 1.2 1996/10/10 23:18:39 christos Exp $ */
|
||||
/* $NetBSD: natm_pcb.c,v 1.3 1996/10/13 02:00:02 christos Exp $ */
|
||||
|
||||
/*
|
||||
*
|
||||
@ -177,15 +177,15 @@ int npcb_dump()
|
||||
{
|
||||
struct natmpcb *cpcb;
|
||||
|
||||
kprintf("npcb dump:\n");
|
||||
printf("npcb dump:\n");
|
||||
for (cpcb = natm_pcbs.lh_first ; cpcb != NULL ;
|
||||
cpcb = cpcb->pcblist.le_next) {
|
||||
kprintf("if=%s, vci=%d, vpi=%d, IP=0x%x, sock=0x%x, flags=0x%x, inq=%d\n",
|
||||
printf("if=%s, vci=%d, vpi=%d, IP=0x%x, sock=0x%x, flags=0x%x, inq=%d\n",
|
||||
cpcb->npcb_ifp->if_xname, cpcb->npcb_vci, cpcb->npcb_vpi,
|
||||
cpcb->ipaddr.s_addr, cpcb->npcb_socket,
|
||||
cpcb->npcb_flags, cpcb->npcb_inq);
|
||||
}
|
||||
kprintf("done\n");
|
||||
printf("done\n");
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ns_error.c,v 1.7 1996/10/10 23:25:52 christos Exp $ */
|
||||
/* $NetBSD: ns_error.c,v 1.8 1996/10/13 01:59:55 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1984, 1988, 1993
|
||||
@ -121,7 +121,7 @@ ns_error(om, type, param)
|
||||
|
||||
#ifdef NS_ERRPRINTFS
|
||||
if (ns_errprintfs)
|
||||
kprintf("ns_err_error(%x, %d, %d)\n", oip, type, param);
|
||||
printf("ns_err_error(%x, %d, %d)\n", oip, type, param);
|
||||
#endif
|
||||
/*
|
||||
* Don't Generate error packets in response to multicasts.
|
||||
@ -182,7 +182,7 @@ ns_printhost(p)
|
||||
register struct ns_addr *p;
|
||||
{
|
||||
|
||||
kprintf("<net:%x%x,host:%x%x%x,port:%x>",
|
||||
printf("<net:%x%x,host:%x%x%x,port:%x>",
|
||||
p->x_net.s_net[0],
|
||||
p->x_net.s_net[1],
|
||||
p->x_host.s_host[0],
|
||||
@ -212,9 +212,9 @@ ns_err_input(m)
|
||||
*/
|
||||
#ifdef NS_ERRPRINTFS
|
||||
if (ns_errprintfs) {
|
||||
kprintf("ns_err_input from ");
|
||||
printf("ns_err_input from ");
|
||||
ns_printhost(&epidp->ns_ep_idp.idp_sna);
|
||||
kprintf("len %d\n", ntohs(epidp->ns_ep_idp.idp_len));
|
||||
printf("len %d\n", ntohs(epidp->ns_ep_idp.idp_len));
|
||||
}
|
||||
#endif
|
||||
i = sizeof (struct ns_epidp);
|
||||
@ -233,7 +233,7 @@ ns_err_input(m)
|
||||
* Message type specific processing.
|
||||
*/
|
||||
if (ns_errprintfs)
|
||||
kprintf("ns_err_input, type %d param %d\n", type, param);
|
||||
printf("ns_err_input, type %d param %d\n", type, param);
|
||||
#endif
|
||||
if (type >= NS_ERR_TOO_BIG) {
|
||||
goto badcode;
|
||||
@ -274,7 +274,7 @@ ns_err_input(m)
|
||||
*/
|
||||
#ifdef NS_ERRPRINTFS
|
||||
if (ns_errprintfs)
|
||||
kprintf("deliver to protocol %d\n",
|
||||
printf("deliver to protocol %d\n",
|
||||
ep->ns_err_idp.idp_pt);
|
||||
#endif
|
||||
switch(ep->ns_err_idp.idp_pt) {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ns_input.c,v 1.11 1996/10/10 23:25:53 christos Exp $ */
|
||||
/* $NetBSD: ns_input.c,v 1.12 1996/10/13 01:59:55 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1984, 1985, 1986, 1987, 1993
|
||||
@ -326,11 +326,11 @@ struct mbuf *m;
|
||||
int ok_back = 0;
|
||||
|
||||
if (idpprintfs) {
|
||||
kprintf("forward: src ");
|
||||
printf("forward: src ");
|
||||
ns_printhost(&idp->idp_sna);
|
||||
kprintf(", dst ");
|
||||
printf(", dst ");
|
||||
ns_printhost(&idp->idp_dna);
|
||||
kprintf("hop count %d\n", idp->idp_tc);
|
||||
printf("hop count %d\n", idp->idp_tc);
|
||||
}
|
||||
if (idpforwarding == 0) {
|
||||
/* can't tell difference between net and host */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ns_ip.c,v 1.18 1996/10/10 23:22:59 christos Exp $ */
|
||||
/* $NetBSD: ns_ip.c,v 1.19 1996/10/13 01:59:56 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1984, 1985, 1986, 1987, 1993
|
||||
@ -97,7 +97,7 @@ nsipattach()
|
||||
|
||||
if (nsipif.if_mtu == 0) {
|
||||
ifp = &nsipif;
|
||||
ksprintf(ifp->if_xname, "nsip%d", nsipif_unit);
|
||||
sprintf(ifp->if_xname, "nsip%d", nsipif_unit);
|
||||
ifp->if_mtu = LOMTU;
|
||||
ifp->if_ioctl = nsipioctl;
|
||||
ifp->if_output = nsipoutput;
|
||||
@ -111,7 +111,7 @@ nsipattach()
|
||||
nsip_list = m;
|
||||
ifp = &m->ifen_ifnet;
|
||||
|
||||
ksprintf(ifp->if_xname, "nsip%d", nsipif_unit++);
|
||||
sprintf(ifp->if_xname, "nsip%d", nsipif_unit++);
|
||||
ifp->if_mtu = LOMTU;
|
||||
ifp->if_ioctl = nsipioctl;
|
||||
ifp->if_output = nsipoutput;
|
||||
@ -124,7 +124,7 @@ nsipattach()
|
||||
* XXX in the days before if_xname.
|
||||
*/
|
||||
bzero(nsipif.if_xname, sizeof(nsipif.if_xname));
|
||||
ksprintf(nsipif.if_xname, "nsip%d", nsipif_unit);
|
||||
sprintf(nsipif.if_xname, "nsip%d", nsipif_unit);
|
||||
|
||||
return (m);
|
||||
}
|
||||
@ -409,7 +409,7 @@ nsip_route(m)
|
||||
* now configure this as a point to point link
|
||||
*/
|
||||
bzero(ifr.ifr_name, sizeof(ifr.ifr_name));
|
||||
ksprintf(ifr.ifr_name, "nsip%d", nsipif_unit - 1);
|
||||
sprintf(ifr.ifr_name, "nsip%d", nsipif_unit - 1);
|
||||
ifr.ifr_dstaddr = *snstosa(ns_dst);
|
||||
(void)ns_control((struct socket *)0, SIOCSIFDSTADDR, (caddr_t)&ifr,
|
||||
(struct ifnet *)ifn, NULL);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: spp_debug.c,v 1.7 1996/10/10 23:25:54 christos Exp $ */
|
||||
/* $NetBSD: spp_debug.c,v 1.8 1996/10/13 01:59:57 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1984, 1985, 1986, 1987, 1993
|
||||
@ -102,10 +102,10 @@ spp_trace(act, ostate, sp, si, req)
|
||||
if (ostate >= TCP_NSTATES) ostate = 0;
|
||||
if (act >= SA_DROP) act = SA_DROP;
|
||||
if (sp)
|
||||
kprintf("%x %s:", sp, tcpstates[ostate]);
|
||||
printf("%x %s:", sp, tcpstates[ostate]);
|
||||
else
|
||||
kprintf("???????? ");
|
||||
kprintf("%s ", sanames[act]);
|
||||
printf("???????? ");
|
||||
printf("%s ", sanames[act]);
|
||||
switch (act) {
|
||||
|
||||
case SA_RESPOND:
|
||||
@ -125,48 +125,48 @@ spp_trace(act, ostate, sp, si, req)
|
||||
len = ntohs(len);
|
||||
}
|
||||
#ifndef lint
|
||||
#define p1(f) { kprintf("%s = %x, ", "f", f); }
|
||||
#define p1(f) { printf("%s = %x, ", "f", f); }
|
||||
p1(seq); p1(ack); p1(alo); p1(len);
|
||||
#endif
|
||||
flags = si->si_cc;
|
||||
if (flags) {
|
||||
char *cp = "<";
|
||||
#ifndef lint
|
||||
#define pf(f) { if (flags&SP_/**/f) { kprintf("%s%s", cp, "f"); cp = ","; } }
|
||||
#define pf(f) { if (flags&SP_/**/f) { printf("%s%s", cp, "f"); cp = ","; } }
|
||||
pf(SP); pf(SA); pf(OB); pf(EM);
|
||||
#else
|
||||
cp = cp;
|
||||
#endif
|
||||
kprintf(">");
|
||||
printf(">");
|
||||
}
|
||||
#ifndef lint
|
||||
#define p2(f) { kprintf("%s = %x, ", "f", si->si_/**/f); }
|
||||
#define p2(f) { printf("%s = %x, ", "f", si->si_/**/f); }
|
||||
p2(sid);p2(did);p2(dt);p2(pt);
|
||||
#endif
|
||||
ns_printhost(&si->si_sna);
|
||||
ns_printhost(&si->si_dna);
|
||||
|
||||
if (act==SA_RESPOND) {
|
||||
kprintf("idp_len = %x, ",
|
||||
printf("idp_len = %x, ",
|
||||
((struct idp *)si)->idp_len);
|
||||
}
|
||||
break;
|
||||
|
||||
case SA_USER:
|
||||
kprintf("%s", prurequests[req&0xff]);
|
||||
printf("%s", prurequests[req&0xff]);
|
||||
if ((req & 0xff) == PRU_SLOWTIMO)
|
||||
kprintf("<%s>", spptimers[req>>8]);
|
||||
printf("<%s>", spptimers[req>>8]);
|
||||
break;
|
||||
}
|
||||
if (sp)
|
||||
kprintf(" -> %s", tcpstates[sp->s_state]);
|
||||
printf(" -> %s", tcpstates[sp->s_state]);
|
||||
/* print out internal state of sp !?! */
|
||||
kprintf("\n");
|
||||
printf("\n");
|
||||
if (sp == 0)
|
||||
return;
|
||||
#ifndef lint
|
||||
#define p3(f) { kprintf("%s = %x, ", "f", sp->s_/**/f); }
|
||||
kprintf("\t"); p3(rack);p3(ralo);p3(smax);p3(flags); kprintf("\n");
|
||||
#define p3(f) { printf("%s = %x, ", "f", sp->s_/**/f); }
|
||||
printf("\t"); p3(rack);p3(ralo);p3(smax);p3(flags); printf("\n");
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: spp_usrreq.c,v 1.14 1996/10/10 23:25:55 christos Exp $ */
|
||||
/* $NetBSD: spp_usrreq.c,v 1.15 1996/10/13 01:59:58 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1984, 1985, 1986, 1987, 1993
|
||||
@ -1741,7 +1741,7 @@ spp_timers(cb, timer)
|
||||
* control block.
|
||||
*/
|
||||
case SPPT_2MSL:
|
||||
kprintf("spp: SPPT_2MSL went off for no reason\n");
|
||||
printf("spp: SPPT_2MSL went off for no reason\n");
|
||||
cb->s_timer[timer] = 0;
|
||||
break;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user