fix screw-up in the prototyping changes: print pointers with %p, NOT
by casting them to (unsigned int) then printing with %x.
This commit is contained in:
cgd
parent
6397db2ddd
commit
7e4d04910d
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: null_vnops.c,v 1.5 1996/02/09 22:40:34 christos Exp $ */
|
||||
/* $NetBSD: null_vnops.c,v 1.6 1996/04/13 01:34:06 cgd Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -396,8 +396,8 @@ null_print(v)
|
|||
struct vnode *a_vp;
|
||||
} */ *ap = v;
|
||||
register struct vnode *vp = ap->a_vp;
|
||||
printf ("\ttag VT_NULLFS, vp=%x, lowervp=%x\n", (unsigned int) vp,
|
||||
(unsigned int) NULLVPTOLOWERVP(vp));
|
||||
printf ("\ttag VT_NULLFS, vp=%p, lowervp=%p\n", vp,
|
||||
NULLVPTOLOWERVP(vp));
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: hd_input.c,v 1.8 1996/02/13 22:04:27 christos Exp $ */
|
||||
/* $NetBSD: hd_input.c,v 1.9 1996/04/13 01:34:16 cgd Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) University of British Columbia, 1984
|
||||
|
|
@ -105,8 +105,7 @@ hdintr()
|
|||
if (hdp->hd_ifp == ifp)
|
||||
break;
|
||||
if (hdp == 0) {
|
||||
printf("hdintr: unknown interface %x\n",
|
||||
(unsigned int) ifp);
|
||||
printf("hdintr: unknown interface %p\n", ifp);
|
||||
m_freem(m);
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: clnp_er.c,v 1.7 1996/02/13 22:08:17 christos Exp $ */
|
||||
/* $NetBSD: clnp_er.c,v 1.8 1996/04/13 01:34:20 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -115,8 +115,8 @@ clnp_er_input(m, src, reason)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_CTLINPUT]) {
|
||||
printf("clnp_er_input: m x%x, src %s, reason x%x\n",
|
||||
(unsigned int) m, clnp_iso_addrp(src), reason);
|
||||
printf("clnp_er_input: m %p, src %s, reason x%x\n",
|
||||
m, clnp_iso_addrp(src), reason);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -202,8 +202,7 @@ clnp_discard(m, reason)
|
|||
{
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_DISCARD]) {
|
||||
printf("clnp_discard: m x%x, reason x%x\n",
|
||||
(unsigned int) m, reason);
|
||||
printf("clnp_discard: m %p, reason x%x\n", m, reason);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -257,8 +256,8 @@ clnp_emit_er(m, reason)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_DISCARD]) {
|
||||
printf("clnp_emit_er: m x%x, hdr len %d\n",
|
||||
(unsigned int) m, clnp->cnf_hdr_len);
|
||||
printf("clnp_emit_er: m %p, hdr len %d\n",
|
||||
m, clnp->cnf_hdr_len);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: clnp_frag.c,v 1.7 1996/02/13 22:08:21 christos Exp $ */
|
||||
/* $NetBSD: clnp_frag.c,v 1.8 1996/04/13 01:34:23 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -151,9 +151,8 @@ clnp_fragment(ifp, m, first_hop, total_len, segoff, flags, rt)
|
|||
printf("clnp_fragment: total_len %d:\n",
|
||||
total_len);
|
||||
while (mdump != NULL) {
|
||||
printf("\tmbuf x%x, m_len %d\n",
|
||||
(unsigned int) mdump,
|
||||
mdump->m_len);
|
||||
printf("\tmbuf %p, m_len %d\n",
|
||||
mdump, mdump->m_len);
|
||||
tot_mlen += mdump->m_len;
|
||||
mdump = mdump->m_next;
|
||||
}
|
||||
|
|
@ -249,9 +248,8 @@ clnp_fragment(ifp, m, first_hop, total_len, segoff, flags, rt)
|
|||
struct mbuf *mdump = frag_hdr;
|
||||
printf("clnp_fragment: sending dg:\n");
|
||||
while (mdump != NULL) {
|
||||
printf("\tmbuf x%x, m_len %d\n",
|
||||
(unsigned int) mdump,
|
||||
mdump->m_len);
|
||||
printf("\tmbuf %p, m_len %d\n",
|
||||
mdump, mdump->m_len);
|
||||
mdump = mdump->m_next;
|
||||
}
|
||||
}
|
||||
|
|
@ -499,8 +497,8 @@ clnp_insert_frag(cfh, m, seg)
|
|||
first, last, fraglen);
|
||||
printf("clnp_insert_frag: current fragments:\n");
|
||||
for (cf = cfh->cfl_frags; cf != NULL; cf = cf->cfr_next) {
|
||||
printf("\tcf x%x: [%d-%d]\n",
|
||||
(unsigned int) cf, cf->cfr_first, cf->cfr_last);
|
||||
printf("\tcf %p: [%d-%d]\n",
|
||||
cf, cf->cfr_first, cf->cfr_last);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -647,8 +645,8 @@ clnp_insert_frag(cfh, m, seg)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_REASS]) {
|
||||
printf(
|
||||
"clnp_insert_frag: clnp x%x requires %d alignment\n",
|
||||
(unsigned int) clnp, pad);
|
||||
"clnp_insert_frag: clnp %p requires %d alignment\n",
|
||||
clnp, pad);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -661,8 +659,8 @@ clnp_insert_frag(cfh, m, seg)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_REASS]) {
|
||||
printf("clnp_insert_frag: cf now x%x, cfr_bytes %d\n",
|
||||
(unsigned int) cf, cf->cfr_bytes);
|
||||
printf("clnp_insert_frag: cf now %p, cfr_bytes %d\n",
|
||||
cf, cf->cfr_bytes);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -745,9 +743,8 @@ clnp_comp_pdu(cfh)
|
|||
mdump = cf->cfr_data;
|
||||
l = 0;
|
||||
while (mdump != NULL) {
|
||||
printf("\tmbuf x%x, m_len %d\n",
|
||||
(unsigned int) mdump,
|
||||
mdump->m_len);
|
||||
printf("\tmbuf %p, m_len %d\n",
|
||||
mdump, mdump->m_len);
|
||||
l += mdump->m_len;
|
||||
mdump = mdump->m_next;
|
||||
}
|
||||
|
|
@ -759,9 +756,8 @@ clnp_comp_pdu(cfh)
|
|||
mdump = cf_next->cfr_data;
|
||||
l = 0;
|
||||
while (mdump != NULL) {
|
||||
printf("\tmbuf x%x, m_len %d\n",
|
||||
(unsigned int) mdump,
|
||||
mdump->m_len);
|
||||
printf("\tmbuf %p, m_len %d\n",
|
||||
mdump, mdump->m_len);
|
||||
l += mdump->m_len;
|
||||
mdump = mdump->m_next;
|
||||
}
|
||||
|
|
@ -799,8 +795,7 @@ clnp_comp_pdu(cfh)
|
|||
cf->cfr_first, cf->cfr_last);
|
||||
printf("clnp_comp_pdu: data for frag:\n");
|
||||
while (mdump != NULL) {
|
||||
printf("mbuf x%x, m_len %d\n", (unsigned int) mdump,
|
||||
mdump->m_len);
|
||||
printf("mbuf %p, m_len %d\n", mdump, mdump->m_len);
|
||||
/* dump_buf(mtod(mdump, caddr_t), mdump->m_len); */
|
||||
mdump = mdump->m_next;
|
||||
}
|
||||
|
|
@ -834,9 +829,8 @@ clnp_comp_pdu(cfh)
|
|||
struct mbuf *mdump = hdr;
|
||||
printf("clnp_comp_pdu: pdu is:\n");
|
||||
while (mdump != NULL) {
|
||||
printf("mbuf x%x, m_len %d\n",
|
||||
(unsigned int) mdump,
|
||||
mdump->m_len);
|
||||
printf("mbuf %p, m_len %d\n",
|
||||
mdump, mdump->m_len);
|
||||
#if 0
|
||||
dump_buf(mtod(mdump, caddr_t), mdump->m_len);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: clnp_input.c,v 1.11 1996/02/13 22:08:26 christos Exp $ */
|
||||
/* $NetBSD: clnp_input.c,v 1.12 1996/04/13 01:34:26 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -348,8 +348,7 @@ clnp_input(m, va_alist)
|
|||
dump_buf(mtod(m, caddr_t), clnp->cnf_hdr_len);
|
||||
printf("clnp_input: mbuf chain:\n");
|
||||
for (mhead = m; mhead != NULL; mhead = mhead->m_next) {
|
||||
printf("m x%x, len %d\n", (unsigned int) mhead,
|
||||
mhead->m_len);
|
||||
printf("m %p, len %d\n", mhead, mhead->m_len);
|
||||
total_len += mhead->m_len;
|
||||
}
|
||||
printf("clnp_input: total length of mbuf chain %d:\n",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: clnp_options.c,v 1.6 1996/02/13 22:08:32 christos Exp $ */
|
||||
/* $NetBSD: clnp_options.c,v 1.7 1996/04/13 01:34:29 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -171,8 +171,8 @@ clnp_dooptions(options, oidx, ifp, isoa)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_OPTIONS]) {
|
||||
printf("clnp_dooptions: record route: option x%x for %d bytes\n",
|
||||
(unsigned int) opt, oidx->cni_recrt_len);
|
||||
printf("clnp_dooptions: record route: option %p for %d bytes\n",
|
||||
opt, oidx->cni_recrt_len);
|
||||
printf("\tfree slot offset x%x\n", off);
|
||||
printf("clnp_dooptions: recording %s\n", clnp_iso_addrp(isoa));
|
||||
printf("clnp_dooptions: option dump:\n");
|
||||
|
|
@ -193,9 +193,8 @@ clnp_dooptions(options, oidx, ifp, isoa)
|
|||
} else {
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_OPTIONS]) {
|
||||
printf("clnp_dooptions: new addr at x%x for %d\n",
|
||||
(unsigned int) rec_start,
|
||||
new_addrlen);
|
||||
printf("clnp_dooptions: new addr at %p for %d\n",
|
||||
rec_start, new_addrlen);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: clnp_output.c,v 1.8 1996/02/13 22:08:39 christos Exp $ */
|
||||
/* $NetBSD: clnp_output.c,v 1.9 1996/04/13 01:34:32 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -223,9 +223,8 @@ clnp_output(m0, va_alist)
|
|||
if (argo_debug[D_OUTPUT]) {
|
||||
printf("clnp_output: to %s", clnp_iso_addrp(dst));
|
||||
printf(" from %s of %d bytes\n", clnp_iso_addrp(src), datalen);
|
||||
printf("\toptions x%x, flags x%x, isop_clnpcache x%x\n",
|
||||
(unsigned int) isop->isop_options, flags,
|
||||
(unsigned int) isop->isop_clnpcache);
|
||||
printf("\toptions %p, flags x%x, isop_clnpcache %p\n",
|
||||
isop->isop_options, flags, isop->isop_clnpcache);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -237,19 +236,18 @@ clnp_output(m0, va_alist)
|
|||
*/
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_OUTPUT]) {
|
||||
printf("clnp_output: ck cache: clcp %x\n", (unsigned int) clcp);
|
||||
printf("clnp_output: ck cache: clcp %p\n", clcp);
|
||||
if (clcp != NULL) {
|
||||
printf("\tclc_dst %s\n", clnp_iso_addrp(&clcp->clc_dst));
|
||||
printf("\tisop_opts x%x, clc_opts x%x\n",
|
||||
(unsigned int) isop->isop_options,
|
||||
(unsigned int) clcp->clc_options);
|
||||
printf("\tisop_opts %p, clc_opts %p\n",
|
||||
isop->isop_options, clcp->clc_options);
|
||||
if (isop->isop_route.ro_rt)
|
||||
printf("\tro_rt x%x, rt_flags x%x\n",
|
||||
(unsigned int) isop->isop_route.ro_rt,
|
||||
printf("\tro_rt %p, rt_flags x%x\n",
|
||||
isop->isop_route.ro_rt,
|
||||
isop->isop_route.ro_rt->rt_flags);
|
||||
printf("\tflags x%x, clc_flags x%x\n", flags,
|
||||
clcp->clc_flags);
|
||||
printf("\tclc_hdr x%x\n", (unsigned int) clcp->clc_hdr);
|
||||
printf("\tclc_hdr %p\n", clcp->clc_hdr);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -335,8 +333,8 @@ clnp_output(m0, va_alist)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_OUTPUT]) {
|
||||
printf(
|
||||
"clnp_output: freeing old clc_hdr 0x%x\n",
|
||||
(unsigned int) clcp->clc_hdr);
|
||||
"clnp_output: freeing old clc_hdr %p\n",
|
||||
clcp->clc_hdr);
|
||||
}
|
||||
#endif
|
||||
m_free(clcp->clc_hdr);
|
||||
|
|
@ -350,8 +348,7 @@ clnp_output(m0, va_alist)
|
|||
}
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_OUTPUT]) {
|
||||
printf("clnp_output: NEW clcp x%x\n",
|
||||
(unsigned int) clcp);
|
||||
printf("clnp_output: NEW clcp %p\n", clcp);
|
||||
}
|
||||
#endif
|
||||
bzero((caddr_t) clcp, sizeof(struct clnp_cache));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: clnp_subr.c,v 1.7 1996/02/13 22:08:49 christos Exp $ */
|
||||
/* $NetBSD: clnp_subr.c,v 1.8 1996/04/13 01:34:35 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -211,9 +211,8 @@ clnp_ours(dst)
|
|||
for (ia = iso_ifaddr.tqh_first; ia != 0; ia = ia->ia_list.tqe_next) {
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ROUTE]) {
|
||||
printf("clnp_ours: ia_sis x%x, dst x%x\n",
|
||||
(unsigned int) &ia->ia_addr,
|
||||
(unsigned int) dst);
|
||||
printf("clnp_ours: ia_sis %p, dst %p\n",
|
||||
&ia->ia_addr, dst);
|
||||
}
|
||||
#endif
|
||||
/*
|
||||
|
|
@ -285,8 +284,8 @@ clnp_forward(m, len, dst, oidx, seg_off, inbound_shp)
|
|||
}
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_FORWARD]) {
|
||||
printf("clnp_forward: %d bytes, to %s, options x%x\n", len,
|
||||
clnp_iso_addrp(dst), (unsigned int) oidx);
|
||||
printf("clnp_forward: %d bytes, to %s, options %p\n", len,
|
||||
clnp_iso_addrp(dst), oidx);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -495,8 +494,8 @@ clnp_route(dst, ro, flags, first_hop, ifa)
|
|||
(Bcmp(ro->ro_dst.siso_data, dst->isoa_genaddr, dst->isoa_len)))) {
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ROUTE]) {
|
||||
printf("clnp_route: freeing old route: ro->ro_rt 0x%x\n",
|
||||
(unsigned int) ro->ro_rt);
|
||||
printf("clnp_route: freeing old route: ro->ro_rt %p\n",
|
||||
ro->ro_rt);
|
||||
printf("clnp_route: old route refcnt: 0x%x\n",
|
||||
ro->ro_rt->rt_refcnt);
|
||||
}
|
||||
|
|
@ -668,8 +667,8 @@ clnp_badmtu(ifp, rt, line, file)
|
|||
int line; /* where the dirty deed occured */
|
||||
char *file; /* where the dirty deed occured */
|
||||
{
|
||||
printf("sending on route 0x%x with no mtu, line %d of file %s\n",
|
||||
(unsigned int) rt, line, file);
|
||||
printf("sending on route %p with no mtu, line %d of file %s\n",
|
||||
rt, line, file);
|
||||
#ifdef ARGO_DEBUG
|
||||
printf("route dst is ");
|
||||
dump_isoaddr((struct sockaddr_iso *) rt_key(rt));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: esis.c,v 1.12 1996/02/13 22:09:23 christos Exp $ */
|
||||
/* $NetBSD: esis.c,v 1.13 1996/04/13 01:34:39 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -345,10 +345,9 @@ esis_rdoutput(inbound_shp, inbound_m, inbound_oidx, rd_dstnsap, rt)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ESISOUTPUT]) {
|
||||
printf(
|
||||
"esis_rdoutput: ifp x%x (%s%d), ht %d, m x%x, oidx x%x\n",
|
||||
(unsigned int) ifp, ifp->if_name, ifp->if_unit,
|
||||
esis_holding_time,
|
||||
(unsigned int) inbound_m, (unsigned int) inbound_oidx);
|
||||
"esis_rdoutput: ifp %p (%s%d), ht %d, m %p, oidx %p\n",
|
||||
ifp, ifp->if_name, ifp->if_unit, esis_holding_time,
|
||||
inbound_m, inbound_oidx);
|
||||
printf("\tdestination: %s\n", clnp_iso_addrp(rd_dstnsap));
|
||||
printf("\tredirected toward:%s\n", clnp_iso_addrp(rd_gwnsap));
|
||||
}
|
||||
|
|
@ -871,8 +870,8 @@ esis_shoutput(ifp, type, ht, sn_addr, sn_len, isoa)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ESISOUTPUT]) {
|
||||
int i;
|
||||
printf("esis_shoutput: ifp x%x (%s%d), %s, ht %d, to: [%d] ",
|
||||
(unsigned int) ifp, ifp->if_name, ifp->if_unit,
|
||||
printf("esis_shoutput: ifp %p (%s%d), %s, ht %d, to: [%d] ",
|
||||
ifp, ifp->if_name, ifp->if_unit,
|
||||
type == ESIS_ESH ? "esh" : "ish",
|
||||
ht, sn_len);
|
||||
for (i = 0; i < sn_len; i++)
|
||||
|
|
@ -969,10 +968,8 @@ esis_shoutput(ifp, type, ht, sn_addr, sn_len, isoa)
|
|||
m->m_len += 4;
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ESISOUTPUT]) {
|
||||
printf("m0 0x%x, m 0x%x, data 0x%x, len %d, cp 0x%x\n",
|
||||
(unsigned int) m0, (unsigned int) m,
|
||||
(unsigned int) m->m_data, m->m_len,
|
||||
(unsigned int) cp);
|
||||
printf("m0 %p, m %p, data %p, len %d, cp %p\n",
|
||||
m0, m, m->m_data, m->m_len, cp);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -1024,9 +1021,8 @@ isis_input(m0, va_alist)
|
|||
if (argo_debug[D_ISISINPUT]) {
|
||||
int i;
|
||||
|
||||
printf("isis_input: pkt on ifp x%x (%s%d): from:",
|
||||
(unsigned int) ifp,
|
||||
ifp->if_name, ifp->if_unit);
|
||||
printf("isis_input: pkt on ifp %p (%s%d): from:",
|
||||
ifp, ifp->if_name, ifp->if_unit);
|
||||
for (i = 0; i < 6; i++)
|
||||
printf("%x%c", shp->snh_shost[i] & 0xff,
|
||||
(i < 5) ? ':' : ' ');
|
||||
|
|
@ -1055,8 +1051,7 @@ isis_input(m0, va_alist)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISISINPUT]) {
|
||||
printf(
|
||||
"Error in sbappenaddr, mm = 0x%x\n",
|
||||
(unsigned int) mm);
|
||||
"Error in sbappenaddr, mm = %p\n", mm);
|
||||
}
|
||||
#endif
|
||||
m_freem(mm);
|
||||
|
|
@ -1107,8 +1102,8 @@ isis_output(m, va_alist)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISISOUTPUT]) {
|
||||
u_char *cp = (u_char *) LLADDR(sdl), *cplim = cp + sn_len;
|
||||
printf("isis_output: ifp 0x%x (%s%d), to: ",
|
||||
(unsigned int) ifp, ifp->if_name, ifp->if_unit);
|
||||
printf("isis_output: ifp %p (%s%d), to: ",
|
||||
ifp, ifp->if_name, ifp->if_unit);
|
||||
while (cp < cplim) {
|
||||
printf("%x", *cp++);
|
||||
printf("%c", (cp < cplim) ? ':' : ' ');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_eon.c,v 1.12 1996/02/13 22:09:50 christos Exp $ */
|
||||
/* $NetBSD: if_eon.c,v 1.13 1996/04/13 01:34:44 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -250,9 +250,9 @@ eoniphdr(hdr, loc, ro, class, zero)
|
|||
mhead.m_next = 0;
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_EON]) {
|
||||
printf("eonoutput : gen csum (0x%x, offset %d, datalen %d)\n",
|
||||
(unsigned int) &mhead,
|
||||
_offsetof(struct eon_hdr, eonh_csum), sizeof(struct eon_hdr));
|
||||
printf("eonoutput : gen csum (%p, offset %d, datalen %d)\n",
|
||||
&mhead, _offsetof(struct eon_hdr, eonh_csum),
|
||||
sizeof(struct eon_hdr));
|
||||
}
|
||||
#endif
|
||||
iso_gen_csum(&mhead,
|
||||
|
|
@ -468,9 +468,8 @@ eoninput(m, va_alist)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_EON]) {
|
||||
printf("eoninput() 0x%x m_data 0x%x m_len 0x%x dequeued\n",
|
||||
(unsigned int) m,
|
||||
(unsigned int) (m ? m->m_data : 0), m ? m->m_len : 0);
|
||||
printf("eoninput() %p m_data %p m_len 0x%x dequeued\n",
|
||||
m, (m ? m->m_data : 0), m ? m->m_len : 0);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -567,9 +566,8 @@ eoninput(m, va_alist)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_EON]) {
|
||||
printf(
|
||||
"0x%x enqueued on clnp Q: m_len 0x%x m_type 0x%x m_data 0x%x\n",
|
||||
(unsigned int) m, m->m_len, m->m_type,
|
||||
(unsigned int) m->m_data);
|
||||
"%p enqueued on clnp Q: m_len 0x%x m_type 0x%x m_data %p\n",
|
||||
m, m->m_len, m->m_type, m->m_data);
|
||||
dump_buf(mtod(m, caddr_t), m->m_len);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: iso.c,v 1.13 1996/02/13 22:09:54 christos Exp $ */
|
||||
/* $NetBSD: iso.c,v 1.14 1996/04/13 01:34:48 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -857,8 +857,8 @@ iso_nlctloutput(cmd, optname, pcb, m)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_nlctloutput: cmd %x, opt %x, pcb %x, m %x\n",
|
||||
cmd, optname, (unsigned int) pcb, (unsigned int) m);
|
||||
printf("iso_nlctloutput: cmd %x, opt %x, pcb %p, m %p\n",
|
||||
cmd, optname, pcb, m);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: iso_chksum.c,v 1.6 1996/02/13 22:10:01 christos Exp $ */
|
||||
/* $NetBSD: iso_chksum.c,v 1.7 1996/04/13 01:34:52 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -123,8 +123,8 @@ iso_check_csum(m, len)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_CHKSUM]) {
|
||||
printf("iso_check_csum: m x%x, l x%x, m->m_len x%x\n",
|
||||
(unsigned int) m, l, m->m_len);
|
||||
printf("iso_check_csum: m %p, l x%x, m->m_len x%x\n",
|
||||
m, l, m->m_len);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -142,8 +142,8 @@ iso_check_csum(m, len)
|
|||
printf("iso_check_csum: new mbuf\n");
|
||||
if (l - i < m->m_len)
|
||||
printf(
|
||||
"bad mbuf chain in check csum l 0x%x i 0x%x m_data 0x%x",
|
||||
l, i, (unsigned int) m->m_data);
|
||||
"bad mbuf chain in check csum l 0x%x i 0x%x m_data %p",
|
||||
l, i, m->m_data);
|
||||
}
|
||||
#endif
|
||||
ASSERT(m != NULL);
|
||||
|
|
@ -199,8 +199,8 @@ iso_gen_csum(m, n, l)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_CHKSUM]) {
|
||||
printf("enter gen csum m 0x%x n 0x%x l 0x%x\n",
|
||||
(unsigned int) m, n - 1, l);
|
||||
printf("enter gen csum m %p n 0x%x l 0x%x\n",
|
||||
m, n - 1, l);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -217,10 +217,8 @@ iso_gen_csum(m, n, l)
|
|||
xloc = loc + mtod(m, u_char *);
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_CHKSUM]) {
|
||||
printf(
|
||||
"1: zeroing xloc 0x%x loc 0x%x\n",
|
||||
(unsigned int) xloc,
|
||||
(unsigned int) loc);
|
||||
printf("1: zeroing xloc %p loc %p\n",
|
||||
xloc, loc);
|
||||
}
|
||||
#endif
|
||||
*xloc = (u_char) 0;
|
||||
|
|
@ -233,8 +231,8 @@ iso_gen_csum(m, n, l)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_CHKSUM]) {
|
||||
printf(
|
||||
"2: zeroing yloc 0x%x loc 0x%x\n",
|
||||
(unsigned int) yloc, loc);
|
||||
"2: zeroing yloc %p loc 0x%x\n",
|
||||
yloc, loc);
|
||||
}
|
||||
#endif
|
||||
*yloc = (u_char) 0;
|
||||
|
|
@ -244,8 +242,7 @@ iso_gen_csum(m, n, l)
|
|||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_CHKSUM]) {
|
||||
printf(
|
||||
"3: zeroing yloc 0x%x \n",
|
||||
(unsigned int) yloc);
|
||||
"3: zeroing yloc %p \n", yloc);
|
||||
}
|
||||
#endif
|
||||
*yloc = (u_char) 0;
|
||||
|
|
@ -263,8 +260,7 @@ iso_gen_csum(m, n, l)
|
|||
}
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_CHKSUM]) {
|
||||
printf("gen csum final xloc 0x%x yloc 0x%x\n",
|
||||
(unsigned int) xloc, (unsigned int) yloc);
|
||||
printf("gen csum final xloc %p yloc %p\n", xloc, yloc);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -339,12 +335,11 @@ m_compress(in, out)
|
|||
while (in) {
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_REQUEST]) {
|
||||
printf("m_compress in 0x%x *out 0x%x\n",
|
||||
(unsigned int) in, (unsigned int) *out);
|
||||
printf("m_compress in: len 0x%x, off 0x%x\n",
|
||||
in->m_len, (unsigned int) in->m_data);
|
||||
printf("m_compress *out: len 0x%x, off 0x%x\n",
|
||||
(*out)->m_len, (unsigned int) (*out)->m_data);
|
||||
printf("m_compress in %p *out %p\n", in, *out);
|
||||
printf("m_compress in: len 0x%x, off %p\n",
|
||||
in->m_len, in->m_data);
|
||||
printf("m_compress *out: len 0x%x, off %p\n",
|
||||
(*out)->m_len, (*out)->m_data);
|
||||
}
|
||||
#endif
|
||||
if (in->m_flags & M_EXT) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: iso_pcb.c,v 1.9 1996/02/13 22:10:13 christos Exp $ */
|
||||
/* $NetBSD: iso_pcb.c,v 1.10 1996/04/13 01:34:56 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -116,7 +116,7 @@ iso_pcballoc(so, v)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcballoc(so 0x%x)\n", (unsigned int) so);
|
||||
printf("iso_pcballoc(so %p)\n", so);
|
||||
}
|
||||
#endif
|
||||
MALLOC(isop, struct isopcb *, sizeof(*isop), M_PCB, M_NOWAIT);
|
||||
|
|
@ -164,8 +164,7 @@ iso_pcbbind(v, nam)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbbind(isop 0x%x, nam 0x%x)\n",
|
||||
(unsigned int) isop, (unsigned int) nam);
|
||||
printf("iso_pcbbind(isop %p, nam %p)\n", isop, nam);
|
||||
}
|
||||
#endif
|
||||
suf.s = 0;
|
||||
|
|
@ -292,9 +291,8 @@ iso_pcbconnect(v, nam)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbconnect(isop 0x%x sock 0x%x nam 0x%x",
|
||||
(unsigned int) isop, (unsigned int) isop->isop_socket,
|
||||
(unsigned int) nam);
|
||||
printf("iso_pcbconnect(isop %p sock %p nam %p",
|
||||
isop, isop->isop_socket, nam);
|
||||
printf("nam->m_len 0x%x), addr:\n", nam->m_len);
|
||||
dump_isoaddr(siso);
|
||||
}
|
||||
|
|
@ -340,16 +338,16 @@ iso_pcbconnect(v, nam)
|
|||
return error;
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbconnect localzero 2, ro->ro_rt 0x%x",
|
||||
(unsigned int) isop->isop_route.ro_rt);
|
||||
printf(" ia 0x%x\n", (unsigned int) ia);
|
||||
printf("iso_pcbconnect localzero 2, ro->ro_rt %p",
|
||||
isop->isop_route.ro_rt);
|
||||
printf(" ia %p\n", ia);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("in iso_pcbconnect before lookup isop 0x%x isop->sock 0x%x\n",
|
||||
(unsigned int) isop, (unsigned int) isop->isop_socket);
|
||||
printf("in iso_pcbconnect before lookup isop %p isop->sock %p\n",
|
||||
isop, isop->isop_socket);
|
||||
}
|
||||
#endif
|
||||
if (local_zero) {
|
||||
|
|
@ -387,8 +385,8 @@ iso_pcbconnect(v, nam)
|
|||
}
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("in iso_pcbconnect before bcopy isop 0x%x isop->sock 0x%x\n",
|
||||
(unsigned int) isop, (unsigned int) isop->isop_socket);
|
||||
printf("in iso_pcbconnect before bcopy isop %p isop->sock %p\n",
|
||||
isop, isop->isop_socket);
|
||||
}
|
||||
#endif
|
||||
/*
|
||||
|
|
@ -412,8 +410,8 @@ iso_pcbconnect(v, nam)
|
|||
bcopy((caddr_t) siso, (caddr_t) isop->isop_faddr, siso->siso_len);
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("in iso_pcbconnect after bcopy isop 0x%x isop->sock 0x%x\n",
|
||||
(unsigned int) isop, (unsigned int) isop->isop_socket);
|
||||
printf("in iso_pcbconnect after bcopy isop %p isop->sock %p\n",
|
||||
isop, isop->isop_socket);
|
||||
printf("iso_pcbconnect connected to addr:\n");
|
||||
dump_isoaddr(isop->isop_faddr);
|
||||
printf("iso_pcbconnect end: src addr:\n");
|
||||
|
|
@ -446,7 +444,7 @@ iso_pcbdisconnect(v)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbdisconnect(isop 0x%x)\n", (unsigned int) isop);
|
||||
printf("iso_pcbdisconnect(isop %p)\n", isop);
|
||||
}
|
||||
#endif
|
||||
/*
|
||||
|
|
@ -486,9 +484,8 @@ iso_pcbdetach(v)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbdetach(isop 0x%x socket 0x%x so 0x%x)\n",
|
||||
(unsigned int) isop, (unsigned int) isop->isop_socket,
|
||||
(unsigned int) so);
|
||||
printf("iso_pcbdetach(isop %p socket %p so %p)\n",
|
||||
isop, isop->isop_socket, so);
|
||||
}
|
||||
#endif
|
||||
#ifdef TPCONS
|
||||
|
|
@ -533,17 +530,16 @@ iso_pcbdetach(v)
|
|||
mtod(isop->isop_clnpcache, struct clnp_cache *);
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbdetach 3.2: clcp 0x%x freeing clc_hdr x%x\n",
|
||||
(unsigned int) clcp,
|
||||
(unsigned int) clcp->clc_hdr);
|
||||
printf("iso_pcbdetach 3.2: clcp %p freeing clc_hdr %p\n",
|
||||
clcp, clcp->clc_hdr);
|
||||
}
|
||||
#endif
|
||||
if (clcp->clc_hdr != NULL)
|
||||
m_free(clcp->clc_hdr);
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbdetach 3.3: freeing cache x%x\n",
|
||||
(unsigned int) isop->isop_clnpcache);
|
||||
printf("iso_pcbdetach 3.3: freeing cache %p\n",
|
||||
isop->isop_clnpcache);
|
||||
}
|
||||
#endif
|
||||
m_free(isop->isop_clnpcache);
|
||||
|
|
@ -590,8 +586,8 @@ iso_pcbnotify(head, siso, errno, notify)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbnotify(head 0x%x, notify 0x%x) dst:\n",
|
||||
(unsigned int) head, (unsigned int) notify);
|
||||
printf("iso_pcbnotify(head %p, notify %p) dst:\n",
|
||||
head, notify);
|
||||
}
|
||||
#endif
|
||||
for (isop = head->isop_next; isop != head; isop = isop->isop_next) {
|
||||
|
|
@ -599,11 +595,10 @@ iso_pcbnotify(head, siso, errno, notify)
|
|||
!SAME_ISOADDR(siso, isop->isop_faddr)) {
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcbnotify: CONTINUE isop 0x%x, sock 0x%x\n",
|
||||
(unsigned int) isop,
|
||||
(unsigned int) isop->isop_socket);
|
||||
printf("addrmatch cmp'd with (0x%x):\n",
|
||||
(unsigned int) isop->isop_faddr);
|
||||
printf("iso_pcbnotify: CONTINUE isop %p, sock %p\n",
|
||||
isop, isop->isop_socket);
|
||||
printf("addrmatch cmp'd with (%p):\n",
|
||||
isop->isop_faddr);
|
||||
dump_isoaddr(isop->isop_faddr);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -650,9 +645,8 @@ iso_pcblookup(head, fportlen, fport, laddr)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_ISO]) {
|
||||
printf("iso_pcblookup(head 0x%x laddr 0x%x fport 0x%x)\n",
|
||||
(unsigned int) head, (unsigned int) laddr,
|
||||
(unsigned int) fport);
|
||||
printf("iso_pcblookup(head %p laddr %p fport %p)\n",
|
||||
head, laddr, fport);
|
||||
}
|
||||
#endif
|
||||
for (isop = head->isop_next; isop != head; isop = isop->isop_next) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: iso_snpac.c,v 1.11 1996/02/13 22:10:25 christos Exp $ */
|
||||
/* $NetBSD: iso_snpac.c,v 1.12 1996/04/13 01:35:00 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
|
|
@ -174,8 +174,7 @@ llc_rtrequest(req, rt, sa)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_SNPA]) {
|
||||
printf("llc_rtrequest(%d, %x, %x)\n", req,
|
||||
(unsigned int) rt, (unsigned int) sa);
|
||||
printf("llc_rtrequest(%d, %p, %p)\n", req, rt, sa);
|
||||
}
|
||||
#endif
|
||||
if (rt->rt_flags & RTF_GATEWAY)
|
||||
|
|
@ -413,17 +412,15 @@ snpac_add(ifp, nsap, snpa, type, ht, nsellength)
|
|||
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_SNPA]) {
|
||||
printf("snpac_add(%x, %x, %x, %x, %x, %x)\n",
|
||||
(unsigned int) ifp,
|
||||
(unsigned int) nsap,
|
||||
(unsigned int) snpa, type, ht, nsellength);
|
||||
printf("snpac_add(%p, %p, %p, %x, %x, %x)\n",
|
||||
ifp, nsap, snpa, type, ht, nsellength);
|
||||
}
|
||||
#endif
|
||||
zap_isoaddr(dst, nsap);
|
||||
rt = rtalloc1(sisotosa(&dst), 0);
|
||||
#ifdef ARGO_DEBUG
|
||||
if (argo_debug[D_SNPA]) {
|
||||
printf("snpac_add: rtalloc1 returns %x\n", (unsigned int) rt);
|
||||
printf("snpac_add: rtalloc1 returns %p\n", rt);
|
||||
}
|
||||
#endif
|
||||
if (rt == 0) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue