summaryrefslogtreecommitdiff
path: root/sys/netiso
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netiso')
-rw-r--r--sys/netiso/clnp_er.c15
-rw-r--r--sys/netiso/clnp_frag.c44
-rw-r--r--sys/netiso/clnp_input.c7
-rw-r--r--sys/netiso/clnp_options.c13
-rw-r--r--sys/netiso/clnp_output.c29
-rw-r--r--sys/netiso/clnp_subr.c21
-rw-r--r--sys/netiso/esis.c33
-rw-r--r--sys/netiso/if_eon.c20
-rw-r--r--sys/netiso/iso.c8
-rw-r--r--sys/netiso/iso_chksum.c43
-rw-r--r--sys/netiso/iso_pcb.c66
-rw-r--r--sys/netiso/iso_snpac.c15
-rw-r--r--sys/netiso/tp_driver.c14
-rw-r--r--sys/netiso/tp_emit.c28
-rw-r--r--sys/netiso/tp_inet.c10
-rw-r--r--sys/netiso/tp_input.c52
-rw-r--r--sys/netiso/tp_iso.c14
-rw-r--r--sys/netiso/tp_output.c20
-rw-r--r--sys/netiso/tp_pcb.c32
-rw-r--r--sys/netiso/tp_subr.c26
-rw-r--r--sys/netiso/tp_subr2.c22
-rw-r--r--sys/netiso/tp_timer.c12
-rw-r--r--sys/netiso/tp_usrreq.c28
23 files changed, 268 insertions, 304 deletions
diff --git a/sys/netiso/clnp_er.c b/sys/netiso/clnp_er.c
index f2eb126286c..d565359623a 100644
--- a/sys/netiso/clnp_er.c
+++ b/sys/netiso/clnp_er.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: clnp_er.c,v 1.2 1996/03/04 10:34:48 mickey Exp $ */
-/* $NetBSD: clnp_er.c,v 1.7 1996/02/13 22:08:17 christos Exp $ */
+/* $OpenBSD: clnp_er.c,v 1.3 1996/04/21 22:29:08 deraadt Exp $ */
+/* $NetBSD: clnp_er.c,v 1.8 1996/04/13 01:34:20 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -116,8 +116,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
@@ -203,8 +203,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
@@ -258,8 +257,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
diff --git a/sys/netiso/clnp_frag.c b/sys/netiso/clnp_frag.c
index a3227ab7589..dff3c3f14db 100644
--- a/sys/netiso/clnp_frag.c
+++ b/sys/netiso/clnp_frag.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: clnp_frag.c,v 1.2 1996/03/04 10:34:50 mickey Exp $ */
-/* $NetBSD: clnp_frag.c,v 1.7 1996/02/13 22:08:21 christos Exp $ */
+/* $OpenBSD: clnp_frag.c,v 1.3 1996/04/21 22:29:11 deraadt Exp $ */
+/* $NetBSD: clnp_frag.c,v 1.8 1996/04/13 01:34:23 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -152,9 +152,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;
}
@@ -250,9 +249,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;
}
}
@@ -500,8 +498,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
@@ -648,8 +646,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
@@ -662,8 +660,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
}
@@ -746,9 +744,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;
}
@@ -760,9 +757,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;
}
@@ -800,8 +796,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;
}
@@ -835,9 +830,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
diff --git a/sys/netiso/clnp_input.c b/sys/netiso/clnp_input.c
index ebe4c49afc5..a184970f06b 100644
--- a/sys/netiso/clnp_input.c
+++ b/sys/netiso/clnp_input.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: clnp_input.c,v 1.2 1996/03/04 10:34:53 mickey Exp $ */
-/* $NetBSD: clnp_input.c,v 1.11 1996/02/13 22:08:26 christos Exp $ */
+/* $OpenBSD: clnp_input.c,v 1.3 1996/04/21 22:29:13 deraadt Exp $ */
+/* $NetBSD: clnp_input.c,v 1.12 1996/04/13 01:34:26 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -349,8 +349,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",
diff --git a/sys/netiso/clnp_options.c b/sys/netiso/clnp_options.c
index 1ae69c809df..a891186ac33 100644
--- a/sys/netiso/clnp_options.c
+++ b/sys/netiso/clnp_options.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: clnp_options.c,v 1.2 1996/03/04 10:34:55 mickey Exp $ */
-/* $NetBSD: clnp_options.c,v 1.6 1996/02/13 22:08:32 christos Exp $ */
+/* $OpenBSD: clnp_options.c,v 1.3 1996/04/21 22:29:15 deraadt Exp $ */
+/* $NetBSD: clnp_options.c,v 1.7 1996/04/13 01:34:29 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -172,8 +172,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");
@@ -194,9 +194,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
diff --git a/sys/netiso/clnp_output.c b/sys/netiso/clnp_output.c
index 6db45c626b6..a07d80a03c7 100644
--- a/sys/netiso/clnp_output.c
+++ b/sys/netiso/clnp_output.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: clnp_output.c,v 1.2 1996/03/04 10:34:57 mickey Exp $ */
-/* $NetBSD: clnp_output.c,v 1.8 1996/02/13 22:08:39 christos Exp $ */
+/* $OpenBSD: clnp_output.c,v 1.3 1996/04/21 22:29:16 deraadt Exp $ */
+/* $NetBSD: clnp_output.c,v 1.9 1996/04/13 01:34:32 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -224,9 +224,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
@@ -238,19 +237,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
@@ -336,8 +334,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);
@@ -351,8 +349,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));
diff --git a/sys/netiso/clnp_subr.c b/sys/netiso/clnp_subr.c
index 4b634c9f279..a0f01c064ac 100644
--- a/sys/netiso/clnp_subr.c
+++ b/sys/netiso/clnp_subr.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: clnp_subr.c,v 1.2 1996/03/04 10:35:02 mickey Exp $ */
-/* $NetBSD: clnp_subr.c,v 1.7 1996/02/13 22:08:49 christos Exp $ */
+/* $OpenBSD: clnp_subr.c,v 1.3 1996/04/21 22:29:18 deraadt Exp $ */
+/* $NetBSD: clnp_subr.c,v 1.8 1996/04/13 01:34:35 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -212,9 +212,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
/*
@@ -286,8 +285,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
@@ -496,8 +495,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);
}
@@ -669,8 +668,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));
diff --git a/sys/netiso/esis.c b/sys/netiso/esis.c
index 1db53269def..634030e10f8 100644
--- a/sys/netiso/esis.c
+++ b/sys/netiso/esis.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: esis.c,v 1.2 1996/03/04 10:35:15 mickey Exp $ */
-/* $NetBSD: esis.c,v 1.12 1996/02/13 22:09:23 christos Exp $ */
+/* $OpenBSD: esis.c,v 1.3 1996/04/21 22:29:21 deraadt Exp $ */
+/* $NetBSD: esis.c,v 1.13 1996/04/13 01:34:39 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -346,10 +346,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));
}
@@ -872,8 +871,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++)
@@ -970,10 +969,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
}
@@ -1025,9 +1022,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) ? ':' : ' ');
@@ -1056,8 +1052,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);
@@ -1108,8 +1103,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) ? ':' : ' ');
diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c
index 5916cf62e99..26faad42800 100644
--- a/sys/netiso/if_eon.c
+++ b/sys/netiso/if_eon.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: if_eon.c,v 1.2 1996/03/04 10:35:24 mickey Exp $ */
-/* $NetBSD: if_eon.c,v 1.12 1996/02/13 22:09:50 christos Exp $ */
+/* $OpenBSD: if_eon.c,v 1.3 1996/04/21 22:29:23 deraadt Exp $ */
+/* $NetBSD: if_eon.c,v 1.13 1996/04/13 01:34:44 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -251,9 +251,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,
@@ -469,9 +469,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
@@ -568,9 +567,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
diff --git a/sys/netiso/iso.c b/sys/netiso/iso.c
index dce15a0fb2b..b9385efee65 100644
--- a/sys/netiso/iso.c
+++ b/sys/netiso/iso.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: iso.c,v 1.2 1996/03/04 10:35:26 mickey Exp $ */
-/* $NetBSD: iso.c,v 1.13 1996/02/13 22:09:54 christos Exp $ */
+/* $OpenBSD: iso.c,v 1.3 1996/04/21 22:29:25 deraadt Exp $ */
+/* $NetBSD: iso.c,v 1.14 1996/04/13 01:34:48 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -858,8 +858,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
diff --git a/sys/netiso/iso_chksum.c b/sys/netiso/iso_chksum.c
index 7e64c84ddd8..bad42da9193 100644
--- a/sys/netiso/iso_chksum.c
+++ b/sys/netiso/iso_chksum.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: iso_chksum.c,v 1.2 1996/03/04 10:35:30 mickey Exp $ */
-/* $NetBSD: iso_chksum.c,v 1.6 1996/02/13 22:10:01 christos Exp $ */
+/* $OpenBSD: iso_chksum.c,v 1.3 1996/04/21 22:29:27 deraadt Exp $ */
+/* $NetBSD: iso_chksum.c,v 1.7 1996/04/13 01:34:52 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -124,8 +124,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
@@ -143,8 +143,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);
@@ -200,8 +200,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
@@ -218,10 +218,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;
@@ -234,8 +232,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;
@@ -245,8 +243,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;
@@ -264,8 +261,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
@@ -340,12 +336,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) {
diff --git a/sys/netiso/iso_pcb.c b/sys/netiso/iso_pcb.c
index 2bc72461025..4d4486d3a49 100644
--- a/sys/netiso/iso_pcb.c
+++ b/sys/netiso/iso_pcb.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: iso_pcb.c,v 1.2 1996/03/04 10:35:34 mickey Exp $ */
-/* $NetBSD: iso_pcb.c,v 1.9 1996/02/13 22:10:13 christos Exp $ */
+/* $OpenBSD: iso_pcb.c,v 1.3 1996/04/21 22:29:29 deraadt Exp $ */
+/* $NetBSD: iso_pcb.c,v 1.10 1996/04/13 01:34:56 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -117,7 +117,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);
@@ -165,8 +165,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;
@@ -293,9 +292,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);
}
@@ -341,16 +339,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) {
@@ -388,8 +386,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
/*
@@ -413,8 +411,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");
@@ -447,7 +445,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
/*
@@ -487,9 +485,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
@@ -534,17 +531,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);
@@ -591,8 +587,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) {
@@ -600,11 +596,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
@@ -651,9 +646,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) {
diff --git a/sys/netiso/iso_snpac.c b/sys/netiso/iso_snpac.c
index 55138723796..991ccc25c66 100644
--- a/sys/netiso/iso_snpac.c
+++ b/sys/netiso/iso_snpac.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: iso_snpac.c,v 1.2 1996/03/04 10:35:39 mickey Exp $ */
-/* $NetBSD: iso_snpac.c,v 1.11 1996/02/13 22:10:25 christos Exp $ */
+/* $OpenBSD: iso_snpac.c,v 1.3 1996/04/21 22:29:32 deraadt Exp $ */
+/* $NetBSD: iso_snpac.c,v 1.12 1996/04/13 01:35:00 cgd Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -175,8 +175,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)
@@ -414,17 +413,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) {
diff --git a/sys/netiso/tp_driver.c b/sys/netiso/tp_driver.c
index 1e19566d4c0..df8832b212b 100644
--- a/sys/netiso/tp_driver.c
+++ b/sys/netiso/tp_driver.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_driver.c,v 1.2 1996/03/04 10:35:53 mickey Exp $ */
-/* $NetBSD: tp_driver.c,v 1.7 1996/02/13 22:10:49 christos Exp $ */
+/* $OpenBSD: tp_driver.c,v 1.3 1996/04/21 22:29:40 deraadt Exp $ */
+/* $NetBSD: tp_driver.c,v 1.8 1996/03/16 23:13:45 christos Exp $ */
#include "tp_states.h"
@@ -94,7 +94,7 @@ _Xebec_action(a, e, p)
#endif
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("CR datalen 0x%x data 0x%x",
+ printf("CR datalen 0x%x data %p",
e->ev_union.EV_CR_TPDU.e_datalen,
e->ev_union.EV_CR_TPDU.e_data);
}
@@ -164,7 +164,7 @@ _Xebec_action(a, e, p)
if (data) {
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("T_CONN_req.trans m_copy cc 0x%x\n",
+ printf("T_CONN_req.trans m_copy cc %p\n",
p->tp_ucddata);
dump_mbuf(data, "sosnd @ T_CONN_req");
}
@@ -311,7 +311,7 @@ _Xebec_action(a, e, p)
if (p->tp_ucddata) {
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("TM_retrans.trans m_copy cc 0x%x\n",
+ printf("TM_retrans.trans m_copy cc %p\n",
data);
dump_mbuf(p->tp_ucddata, "sosnd @ TM_retrans");
}
@@ -554,7 +554,7 @@ _Xebec_action(a, e, p)
if (data) {
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("T_DISC_req.trans tp_ucddata 0x%x\n",
+ printf("T_DISC_req.trans tp_ucddata %p\n",
p->tp_ucddata);
dump_mbuf(data, "ucddata @ T_DISC_req");
}
@@ -691,7 +691,7 @@ _Xebec_action(a, e, p)
#endif
#ifdef ARGO_DEBUG
if (argo_debug[D_XPD]) {
- printf("T_XPD_req: sb_cc 0x%x\n", p->tp_Xsnd.sb_cc);
+ printf("T_XPD_req: sb_cc 0x%lx\n", p->tp_Xsnd.sb_cc);
dump_mbuf(m, "XPD req emitting M");
}
#endif
diff --git a/sys/netiso/tp_emit.c b/sys/netiso/tp_emit.c
index 12b8f8cc3f1..dd06e957469 100644
--- a/sys/netiso/tp_emit.c
+++ b/sys/netiso/tp_emit.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_emit.c,v 1.2 1996/03/04 10:35:56 mickey Exp $ */
-/* $NetBSD: tp_emit.c,v 1.7 1996/02/13 22:10:54 christos Exp $ */
+/* $OpenBSD: tp_emit.c,v 1.3 1996/04/21 22:29:43 deraadt Exp $ */
+/* $NetBSD: tp_emit.c,v 1.8 1996/03/16 23:13:48 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -185,7 +185,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
printf(
- "tp_emit dutype 0x%x, tpcb 0x%x, eot 0x%x, seq 0x%x, data 0x%x",
+ "tp_emit dutype 0x%x, tpcb %p, eot 0x%x, seq 0x%x, data %p",
dutype, tpcb, eot, seq, data);
}
#endif
@@ -456,7 +456,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
} else if (tpcb->tp_class == TP_CLASS_0) {
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
- printf("DT tpdu: class 0 m 0x%x hdr 0x%x\n", m, hdr);
+ printf("DT tpdu: class 0 m %p hdr %p\n", m, hdr);
dump_buf(hdr, hdr->tpdu_li + 1);
}
#endif
@@ -464,7 +464,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
((struct tp0du *) hdr)->tp0du_mbz = 0;
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
- printf("DT 2 tpdu: class 0 m 0x%x hdr 0x%x\n", m, hdr);
+ printf("DT 2 tpdu: class 0 m %p hdr %p\n", m, hdr);
dump_buf(hdr, hdr->tpdu_li + 1);
}
#endif
@@ -668,7 +668,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKSEND]) {
- printf("Calling ADDOPTION 0x%x, 0x%x, 0x%x,0x%x\n",
+ printf("Calling ADDOPTION 0x%x, %p, 0x%x,0x%x\n",
TPP_flow_cntl_conf,
hdr, sizeof(bogus), bogus[0]);
}
@@ -676,7 +676,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
ADDOPTION(TPP_flow_cntl_conf, hdr, sizeof(bogus), bogus[0]);
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKSEND]) {
- printf("after ADDOPTION hdr 0x%x hdr->tpdu_li 0x%x\n",
+ printf("after ADDOPTION hdr %p hdr->tpdu_li 0x%x\n",
hdr, hdr->tpdu_li);
printf(
"after ADDOPTION csum_offset 0x%x, hdr->tpdu_li 0x%x\n",
@@ -755,7 +755,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
}
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
- printf("tp_emit before tpxxx_output tpcb 0x%x, dutype 0x%x, datalen 0x%x\n",
+ printf("tp_emit before tpxxx_output tpcb %p, dutype 0x%x, datalen 0x%x\n",
tpcb, dutype, datalen);
dump_buf(mtod(m, caddr_t), datalen);
}
@@ -779,7 +779,7 @@ tp_emit(dutype, tpcb, seq, eot, data)
#endif
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
- printf("OUTPUT: tpcb 0x%x, isop 0x%x, so 0x%x\n",
+ printf("OUTPUT: tpcb %p, isop %p, so %p\n",
tpcb, tpcb->tp_npcb, tpcb->tp_sock);
}
#endif
@@ -872,7 +872,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
#ifdef ARGO_DEBUG
if (argo_debug[D_ERROR_EMIT]) {
printf(
- "tp_error_emit error 0x%x sref 0x%x tpcb 0x%x erlen 0x%x chan 0x%x\n",
+ "tp_error_emit error 0x%x sref %lx tpcb %p erlen 0x%x chan %p\n",
error, sref, tpcb, erlen, cons_channel);
}
#endif
@@ -1000,7 +1000,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
} else {
#ifdef ARGO_DEBUG
if (argo_debug[D_ERROR_EMIT]) {
- printf("error_emit DR error tpduli 0x%x\n", error, hdr->tpdu_li);
+ printf("error_emit DR error %d tpduli %x\n", error, hdr->tpdu_li);
dump_buf((char *) hdr, hdr->tpdu_li);
}
#endif
@@ -1034,7 +1034,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
}
#ifdef ARGO_DEBUG
if (argo_debug[D_ERROR_EMIT]) {
- printf("OUTPUT: tpcb 0x%x, isop 0x%x, so 0x%x\n",
+ printf("OUTPUT: tpcb %p, isop %p, so %p\n",
tpcb, tpcb->tp_npcb, tpcb->tp_sock);
}
#endif
@@ -1062,7 +1062,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
}
#endif
#else
- printf("TP panic! cons channel 0x%x but not cons configured\n",
+ printf("TP panic! cons channel %p but not cons configured\n",
cons_channel);
#endif
return 0;
@@ -1094,7 +1094,7 @@ tp_error_emit(error, sref, faddr, laddr, erdata, erlen, tpcb, cons_channel,
} else {
#ifdef ARGO_DEBUG
if (argo_debug[D_ERROR_EMIT]) {
- printf("tp_error_emit DROPPING \n", m);
+ printf("tp_error_emit DROPPING %p\n", m);
}
#endif
IncStat(ts_send_drop);
diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c
index 60f53d36954..d5104ffa6d4 100644
--- a/sys/netiso/tp_inet.c
+++ b/sys/netiso/tp_inet.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_inet.c,v 1.2 1996/03/04 10:36:00 mickey Exp $ */
-/* $NetBSD: tp_inet.c,v 1.10 1996/02/13 22:11:02 christos Exp $ */
+/* $OpenBSD: tp_inet.c,v 1.3 1996/04/21 22:29:45 deraadt Exp $ */
+/* $NetBSD: tp_inet.c,v 1.11 1996/03/16 23:13:49 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -345,7 +345,7 @@ tpip_mtu(v)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tpip_mtu(tpcb)\n", tpcb);
+ printf("tpip_mtu(tpcb %p)\n", tpcb);
printf("tpip_mtu routing to addr 0x%x\n", inp->inp_faddr.s_addr);
}
#endif
@@ -444,7 +444,7 @@ tpip_output_dg(m0, va_alist)
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
- printf("tpip_output_dg datalen 0x%x m0 0x%x\n", datalen, m0);
+ printf("tpip_output_dg datalen 0x%x m0 %p\n", datalen, m0);
}
#endif
@@ -747,7 +747,7 @@ void
dump_inaddr(addr)
register struct sockaddr_in *addr;
{
- printf("INET: port 0x%x; addr 0x%x\n", addr->sin_port, addr->sin_addr);
+ printf("INET: port 0x%x; addr 0x%x\n", addr->sin_port, addr->sin_addr.s_addr);
}
#endif /* ARGO_DEBUG */
#endif /* INET */
diff --git a/sys/netiso/tp_input.c b/sys/netiso/tp_input.c
index b1645c57b03..b7d6b2394dc 100644
--- a/sys/netiso/tp_input.c
+++ b/sys/netiso/tp_input.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_input.c,v 1.2 1996/03/04 10:36:02 mickey Exp $ */
-/* $NetBSD: tp_input.c,v 1.8 1996/02/13 22:11:08 christos Exp $ */
+/* $OpenBSD: tp_input.c,v 1.3 1996/04/21 22:29:47 deraadt Exp $ */
+/* $NetBSD: tp_input.c,v 1.9 1996/03/16 23:13:51 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -130,7 +130,7 @@ tp_inputprep(m)
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("tp_inputprep: m 0x%x\n", m);
+ printf("tp_inputprep: m %p\n", m);
}
#endif
@@ -181,7 +181,7 @@ tp_inputprep(m)
#ifdef ARGO_DEBUG
if (argo_debug[D_INPUT]) {
printf(
- " at end: m 0x%x hdr->tpdu_li 0x%x m_len 0x%x\n", m,
+ " at end: m %p hdr->tpdu_li 0x%x m_len 0x%x\n", m,
hdrlen, m->m_len);
}
#endif
@@ -296,7 +296,7 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
#ifdef ARGO_DEBUG
if (argo_debug[D_NEWSOCK]) {
- printf("tp_newsocket(channel 0x%x) after sonewconn so 0x%x \n",
+ printf("tp_newsocket(channel %p) after sonewconn so %p \n",
cons_channel, so);
dump_addr(fname);
{
@@ -304,10 +304,10 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
head = so->so_head;
t = so;
- printf("so 0x%x so_head 0x%x so_q0 0x%x, q0len %d\n",
+ printf("so %p so_head %p so_q0 %p, q0len %d\n",
t, t->so_head, t->so_q0, t->so_q0len);
while ((t = t->so_q0) && t != so && t != head)
- printf("so 0x%x so_head 0x%x so_q0 0x%x, q0len %d\n",
+ printf("so %p so_head %p so_q0 %p, q0len %d\n",
t, t->so_head, t->so_q0, t->so_q0len);
}
}
@@ -379,7 +379,7 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
}
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tp_route_to FAILED! detaching tpcb 0x%x, so 0x%x\n",
+ printf("tp_route_to FAILED! detaching tpcb %p, so %p\n",
tpcb, so);
}
#endif
@@ -389,7 +389,7 @@ tp_newsocket(so, fname, cons_channel, class_to_use, netservice)
ok:
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("tp_newsocket returning so 0x%x, sototpcb(so) 0x%x\n",
+ printf("tp_newsocket returning so %p, sototpcb(so) %p\n",
so, sototpcb(so));
}
#endif
@@ -478,7 +478,7 @@ again:
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("tp_input(0x%x, ... 0x%x)\n", m, cons_channel);
+ printf("tp_input(%p, ... %p)\n", m, cons_channel);
}
#endif
@@ -535,8 +535,8 @@ again:
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("input: dutype 0x%x cons_channel 0x%x dref 0x%x\n", dutype,
- cons_channel, dref);
+ printf("input: dutype 0x%x cons_channel %p dref 0x%x\n",
+ dutype, cons_channel, dref);
printf("input: dref 0x%x sref 0x%x\n", dref, sref);
}
#endif
@@ -550,7 +550,7 @@ again:
#ifdef ARGO_DEBUG
if ((dutype < TP_MIN_TPDUTYPE) || (dutype > TP_MAX_TPDUTYPE)) {
- printf("BAD dutype! 0x%x, channel 0x%x dref 0x%x\n",
+ printf("BAD dutype! 0x%x, channel %p dref 0x%x\n",
dutype, cons_channel, dref);
dump_buf(m, sizeof(struct mbuf));
@@ -813,7 +813,7 @@ again:
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("HAVE A TPCB 1: 0x%x\n", tpcb);
+ printf("HAVE A TPCB 1: %p\n", tpcb);
}
#endif
#ifdef ARGO_DEBUG
@@ -870,7 +870,7 @@ again:
)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("CR: after CRCCCHECKS: tpcb 0x%x, flags 0x%x\n",
+ printf("CR: after CRCCCHECKS: tpcb %p, flags 0x%x\n",
tpcb, tpcb->tp_flags);
}
#endif
@@ -887,7 +887,7 @@ again:
*/
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("abt to call tp_newsocket(0x%x, 0x%x, 0x%x, 0x%x)\n",
+ printf("abt to call tp_newsocket(%p, %p, %p, %p)\n",
so, laddr, faddr, cons_channel);
}
#endif
@@ -1044,7 +1044,7 @@ again:
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("HAVE A TPCB 2: 0x%x\n", tpcb);
+ printf("HAVE A TPCB 2: %p\n", tpcb);
}
#endif
@@ -1054,8 +1054,8 @@ again:
ts_inv_dref, respond,
(1 + 2 + (caddr_t) & hdr->_tpduf - (caddr_t) hdr))
#ifdef ARGO_DEBUG
- if (argo_debug[D_TPINPUT]) {
- printf("state of dref %d ok, tpcb 0x%x\n", dref, tpcb);
+ if (argo_debug[D_TPINPUT]) {
+ printf("state of dref %d ok, tpcb %p\n", dref, tpcb);
}
#endif
/*
@@ -1580,7 +1580,7 @@ again:
default:
printf(
- "ERROR in tp_input! hdr->tpdu_type 0x%x takes_data 0x%x m 0x%x\n",
+ "ERROR in tp_input! hdr->tpdu_type 0x%x takes_data 0x%x m %p\n",
hdr->tpdu_type, takes_data, m);
break;
}
@@ -1594,9 +1594,9 @@ again:
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("tp_input: before driver, state 0x%x event 0x%x m 0x%x",
+ printf("tp_input: before driver, state 0x%x event 0x%x m %p",
tpcb->tp_state, e.ev_number, m);
- printf(" e.e_data 0x%x\n", e.TPDU_ATTR(DT).e_data);
+ printf(" e.e_data %p\n", e.TPDU_ATTR(DT).e_data);
printf("takes_data 0x%x m_len 0x%x, tpdu_len 0x%x\n",
takes_data, (m == MNULL) ? 0 : m->m_len, tpdu_len);
}
@@ -1622,7 +1622,7 @@ again:
* dutypes */
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("after driver, restoring m to 0x%x, takes_data 0x%x\n",
+ printf("after driver, restoring m to %p, takes_data 0x%x\n",
m, takes_data);
}
#endif
@@ -1647,7 +1647,7 @@ again:
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
hdr = mtod(m, struct tpdu *);
- printf("tp_input @ separate: hdr 0x%x size %d m 0x%x\n",
+ printf("tp_input @ separate: hdr %p size %d m %p\n",
hdr, (int) hdr->tpdu_li + 1, m);
dump_mbuf(m, "tp_input after driver, at separate");
}
@@ -1660,13 +1660,13 @@ again:
if (m != MNULL) {
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("tp_input : m_freem(0x%x)\n", m);
+ printf("tp_input : m_freem(%p)\n", m);
}
#endif
m_freem(m);
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("tp_input : after m_freem 0x%x\n", m);
+ printf("tp_input : after m_freem %p\n", m);
}
#endif
}
diff --git a/sys/netiso/tp_iso.c b/sys/netiso/tp_iso.c
index d9d0a452a06..bbd0a4b145e 100644
--- a/sys/netiso/tp_iso.c
+++ b/sys/netiso/tp_iso.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_iso.c,v 1.2 1996/03/04 10:36:07 mickey Exp $ */
-/* $NetBSD: tp_iso.c,v 1.7 1996/02/13 22:11:15 christos Exp $ */
+/* $OpenBSD: tp_iso.c,v 1.3 1996/04/21 22:29:50 deraadt Exp $ */
+/* $NetBSD: tp_iso.c,v 1.8 1996/03/16 23:13:54 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -360,7 +360,7 @@ tpclnp_mtu(v)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tpclnp_mtu(tpcb)\n", tpcb);
+ printf("tpclnp_mtu(tpcb %p)\n", tpcb);
}
#endif
tpcb->tp_routep = &(isop->isop_route.ro_rt);
@@ -466,7 +466,7 @@ tpclnp_output_dg(m0, va_alist)
#ifdef ARGO_DEBUG
if (argo_debug[D_TPISO]) {
- printf("tpclnp_output_dg datalen 0x%x m0 0x%x\n", datalen, m0);
+ printf("tpclnp_output_dg datalen 0x%x m0 %p\n", datalen, m0);
}
#endif
@@ -539,7 +539,7 @@ tpclnp_input(m, va_alist)
#ifdef ARGO_DEBUG
if (argo_debug[D_TPINPUT]) {
- printf("tpclnp_input: m 0x%x clnp_len 0x%x\n", m, clnp_len);
+ printf("tpclnp_input: m %p clnp_len 0x%x\n", m, clnp_len);
dump_mbuf(m, "at tpclnp_input");
}
#endif
@@ -581,7 +581,7 @@ tpclnp_input(m, va_alist)
#ifdef ARGO_DEBUG
if (argo_debug[D_TPISO]) {
- printf("calling %sinput : src 0x%x, dst 0x%x, src addr:\n",
+ printf("calling %sinput : src %p, dst %p, src addr:\n",
(input == tp_input ? "tp_" : "clts_"), src, dst);
dump_isoaddr(src);
printf(" dst addr:\n");
@@ -754,7 +754,7 @@ tpiso_abort(isop)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tpiso_abort 0x%x\n", isop);
+ printf("tpiso_abort %p\n", isop);
}
#endif
e.ev_number = ER_TPDU;
diff --git a/sys/netiso/tp_output.c b/sys/netiso/tp_output.c
index 817405c596c..7df67cdb1ff 100644
--- a/sys/netiso/tp_output.c
+++ b/sys/netiso/tp_output.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_output.c,v 1.2 1996/03/04 10:36:13 mickey Exp $ */
-/* $NetBSD: tp_output.c,v 1.11 1996/02/13 22:11:25 christos Exp $ */
+/* $OpenBSD: tp_output.c,v 1.3 1996/04/21 22:29:52 deraadt Exp $ */
+/* $NetBSD: tp_output.c,v 1.12 1996/03/16 23:13:56 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -406,7 +406,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
#ifdef ARGO_DEBUG
if (argo_debug[D_REQUEST]) {
printf(
- "tp_ctloutput so 0x%x cmd 0x%x optname 0x%x, mp 0x%x *mp 0x%x tpcb 0x%x\n",
+ "tp_ctloutput so %p cmd 0x%x optname 0x%x, mp %p *mp %p tpcb %p\n",
so, cmd, optname, mp, mp ? *mp : 0, tpcb);
}
#endif
@@ -548,7 +548,8 @@ tp_ctloutput(cmd, so, level, optname, mp)
(*mp)->m_len = tpcb->tp_lsuffixlen;
} else { /* cmd == PRCO_SETOPT */
if ((val_len > MAX_TSAP_SEL_LEN) || (val_len <= 0)) {
- printf("val_len 0x%x (*mp)->m_len 0x%x\n", val_len, (*mp));
+ printf("val_len 0x%x (*mp)->m_len %p\n",
+ val_len, (*mp));
error = EINVAL;
} else {
bcopy(value, (caddr_t) tpcb->tp_lsuffix, val_len);
@@ -564,7 +565,8 @@ tp_ctloutput(cmd, so, level, optname, mp)
(*mp)->m_len = tpcb->tp_fsuffixlen;
} else { /* cmd == PRCO_SETOPT */
if ((val_len > MAX_TSAP_SEL_LEN) || (val_len <= 0)) {
- printf("val_len 0x%x (*mp)->m_len 0x%x\n", val_len, (*mp));
+ printf("val_len 0x%x (*mp)->m_len %p\n",
+ val_len, (*mp));
error = EINVAL;
} else {
bcopy(value, (caddr_t) tpcb->tp_fsuffix, val_len);
@@ -576,7 +578,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
case TPOPT_FLAGS:
#ifdef ARGO_DEBUG
if (argo_debug[D_REQUEST]) {
- printf("%s TPOPT_FLAGS value 0x%x *value 0x%x, flags 0x%x \n",
+ printf("%s TPOPT_FLAGS value %p *value 0x%x, flags 0x%x \n",
cmd == PRCO_GETOPT ? "GET" : "SET",
value,
*value,
@@ -602,13 +604,13 @@ tp_ctloutput(cmd, so, level, optname, mp)
*/
#ifdef ARGO_DEBUG
if (argo_debug[D_SETPARAMS]) {
- printf("TPOPT_PARAMS value 0x%x, cmd %s \n", value,
+ printf("TPOPT_PARAMS value %p, cmd %s \n", value,
cmd == PRCO_GETOPT ? "GET" : "SET");
}
#endif
#ifdef ARGO_DEBUG
if (argo_debug[D_REQUEST]) {
- printf("TPOPT_PARAMS value 0x%x, cmd %s \n", value,
+ printf("TPOPT_PARAMS value %p, cmd %s \n", value,
cmd == PRCO_GETOPT ? "GET" : "SET");
}
#endif
@@ -675,7 +677,7 @@ tp_ctloutput(cmd, so, level, optname, mp)
#ifdef ARGO_DEBUG
if (argo_debug[D_REQUEST]) {
printf("%s\n", optname == TPOPT_DISC_DATA ? "DISC data" : "CONN data");
- printf("m_len 0x%x, vallen 0x%x so_snd.cc 0x%x\n",
+ printf("m_len 0x%x, vallen 0x%x so_snd.cc 0x%lx\n",
(*mp)->m_len, val_len, so->so_snd.sb_cc);
dump_mbuf(so->so_snd.sb_mb, "tp_ctloutput: sosnd ");
}
diff --git a/sys/netiso/tp_pcb.c b/sys/netiso/tp_pcb.c
index fb02766666a..3e80bdee24d 100644
--- a/sys/netiso/tp_pcb.c
+++ b/sys/netiso/tp_pcb.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_pcb.c,v 1.2 1996/03/04 10:36:18 mickey Exp $ */
-/* $NetBSD: tp_pcb.c,v 1.12 1996/02/13 22:11:39 christos Exp $ */
+/* $OpenBSD: tp_pcb.c,v 1.3 1996/04/21 22:29:55 deraadt Exp $ */
+/* $NetBSD: tp_pcb.c,v 1.13 1996/03/16 23:13:58 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -465,7 +465,7 @@ tp_freeref(n)
tpcb = r->tpr_pcb;
#ifdef ARGO_DEBUG
if (argo_debug[D_TIMER]) {
- printf("tp_freeref called for ref %d pcb %x maxrefopen %d\n",
+ printf("tp_freeref called for ref %d pcb %p maxrefopen %d\n",
n, tpcb, tp_refinfo.tpr_maxopen);
}
#endif
@@ -479,7 +479,7 @@ tp_freeref(n)
return;
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tp_freeref: CLEARING tpr_pcb 0x%x\n", tpcb);
+ printf("tp_freeref: CLEARING tpr_pcb %p\n", tpcb);
}
#endif
r->tpr_pcb = (struct tp_pcb *) 0;
@@ -622,7 +622,7 @@ tp_attach(so, protocol)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tp_attach:dom 0x%x so 0x%x ", dom, so);
+ printf("tp_attach:dom 0x%x so %p ", dom, so);
}
#endif
#ifdef TPPT
@@ -702,7 +702,7 @@ tp_attach(so, protocol)
bad4:
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("BAD4 in tp_attach, so 0x%x\n", so);
+ printf("BAD4 in tp_attach, so %p\n", so);
}
#endif
tp_freeref(tpcb->tp_lref);
@@ -710,7 +710,7 @@ bad4:
bad3:
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("BAD3 in tp_attach, so 0x%x\n", so);
+ printf("BAD3 in tp_attach, so %p\n", so);
}
#endif
@@ -719,7 +719,7 @@ bad3:
bad2:
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("BAD2 in tp_attach, so 0x%x\n", so);
+ printf("BAD2 in tp_attach, so %p\n", so);
}
#endif
so->so_pcb = 0;
@@ -727,7 +727,7 @@ bad2:
/* bad: */
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("BAD in tp_attach, so 0x%x\n", so);
+ printf("BAD in tp_attach, so %p\n", so);
}
#endif
return error;
@@ -764,7 +764,7 @@ tp_detach(tpcb)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tp_detach(tpcb 0x%x, so 0x%x)\n",
+ printf("tp_detach(tpcb %p, so %p)\n",
tpcb, so);
}
#endif
@@ -777,9 +777,9 @@ tp_detach(tpcb)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("so_snd at 0x%x so_rcv at 0x%x\n", &so->so_snd, &so->so_rcv);
+ printf("so_snd at %p so_rcv at %p\n", &so->so_snd, &so->so_rcv);
dump_mbuf(so->so_snd.sb_mb, "so_snd at detach ");
- printf("about to call LL detach, nlproto 0x%x, nl_detach 0x%x\n",
+ printf("about to call LL detach, nlproto %p, nl_detach %p\n",
tpcb->tp_nlproto, tpcb->tp_nlproto->nlp_pcbdetach);
}
#endif
@@ -793,7 +793,7 @@ tp_detach(tpcb)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("reassembly info cnt %d rsyq 0x%x\n",
+ printf("reassembly info cnt %d rsyq %p\n",
tpcb->tp_rsycnt, tpcb->tp_rsyq);
}
#endif
@@ -808,9 +808,9 @@ tp_detach(tpcb)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("calling (...nlproto->...)(0x%x, so 0x%x)\n",
+ printf("calling (...nlproto->...)(%p, so %p)\n",
tpcb->tp_npcb, so);
- printf("so 0x%x so_head 0x%x, qlen %d q0len %d qlimit %d\n",
+ printf("so %p so_head %p, qlen %d q0len %d qlimit %d\n",
so, so->so_head,
so->so_q0len, so->so_qlen, so->so_qlimit);
}
@@ -872,7 +872,7 @@ tp_detach(tpcb)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("end of detach, NOT single, tpcb 0x%x\n", tpcb);
+ printf("end of detach, NOT single, tpcb %p\n", tpcb);
}
#endif
/* free((caddr_t)tpcb, M_PCB); WHere to put this ? */
diff --git a/sys/netiso/tp_subr.c b/sys/netiso/tp_subr.c
index 6334e4faf80..602b452fc84 100644
--- a/sys/netiso/tp_subr.c
+++ b/sys/netiso/tp_subr.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_subr.c,v 1.2 1996/03/04 10:36:29 mickey Exp $ */
-/* $NetBSD: tp_subr.c,v 1.7 1996/02/13 22:11:59 christos Exp $ */
+/* $OpenBSD: tp_subr.c,v 1.3 1996/04/21 22:29:57 deraadt Exp $ */
+/* $NetBSD: tp_subr.c,v 1.8 1996/03/16 23:14:00 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -222,7 +222,7 @@ tp_rtt_rtv(tpcb)
tpcb->tp_peer_acktime, 128 /* XXX */ );
#ifdef ARGO_DEBUG
if (argo_debug[D_RTT]) {
- printf("%s tpcb 0x%x, elapsed %d, delta %d, rtt %d, rtv %d, old %d\n",
+ printf("%s tpcb %p, elapsed %d, delta %d, rtt %d, rtv %d, old %d\n",
"tp_rtt_rtv:", tpcb, elapsed, delta, tpcb->tp_rtt, tpcb->tp_rtv, old);
}
#endif
@@ -262,7 +262,7 @@ tp_goodack(tpcb, cdt, seq, subseq)
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKRECV]) {
- printf("goodack tpcb 0x%x seq 0x%x cdt %d una 0x%x new 0x%x nxt 0x%x\n",
+ printf("goodack tpcb %p seq 0x%x cdt %d una 0x%x new 0x%x nxt 0x%x\n",
tpcb, seq, cdt, tpcb->tp_snduna, tpcb->tp_sndnew, tpcb->tp_sndnxt);
}
#endif
@@ -286,7 +286,7 @@ tp_goodack(tpcb, cdt, seq, subseq)
discard_the_ack:
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKRECV]) {
- printf("goodack discard : tpcb 0x%x subseq %d r_subseq %d\n",
+ printf("goodack discard : tpcb %p subseq %d r_subseq %d\n",
tpcb, subseq, tpcb->tp_r_subseq);
}
#endif
@@ -311,7 +311,7 @@ tp_goodack(tpcb, cdt, seq, subseq)
tpcb->tp_cong_win / tpcb->tp_l_tpdusize) / 2;
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKRECV]) {
- printf("%s tpcb 0x%x seq 0x%x rttseq 0x%x onxt 0x%x\n",
+ printf("%s tpcb %p seq 0x%x rttseq 0x%x onxt 0x%x\n",
"goodack dupacks:", tpcb, seq, tpcb->tp_rttseq, onxt);
}
#endif
@@ -422,7 +422,7 @@ tp_goodack(tpcb, cdt, seq, subseq)
done:
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKRECV]) {
- printf("goodack returns 0x%x, cdt 0x%x ocdt 0x%x cwin 0x%x\n",
+ printf("goodack returns 0x%x, cdt 0x%x ocdt 0x%x cwin 0x%lx\n",
bang, cdt, old_fcredit, tpcb->tp_cong_win);
}
#endif
@@ -456,7 +456,7 @@ tp_sbdrop(tpcb, seq)
sbdroprecord(sb);
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKRECV]) {
- printf("tp_sbdroping %d pkts %d bytes on %x at 0x%x\n",
+ printf("tp_sbdroping %d pkts %ld bytes on %p at 0x%x\n",
oldi, oldcc - sb->sb_cc, tpcb, seq);
}
#endif
@@ -517,7 +517,7 @@ tp_send(tpcb)
#ifdef ARGO_DEBUG
if (argo_debug[D_DATA]) {
- printf("tp_send enter tpcb 0x%x nxt 0x%x win %d high 0x%x\n",
+ printf("tp_send enter tpcb %p nxt 0x%x win %d high 0x%x\n",
tpcb, tpcb->tp_sndnxt, cong_win, highseq);
}
#endif
@@ -577,7 +577,7 @@ tp_send(tpcb)
#ifdef ARGO_DEBUG
if (argo_debug[D_DATA]) {
- printf("tp_sending tpcb 0x%x nxt 0x%x\n",
+ printf("tp_sending tpcb %p nxt 0x%x\n",
tpcb, tpcb->tp_sndnxt);
}
#endif
@@ -971,7 +971,7 @@ tp_rsyflush(tpcb)
m_freem(*mp);
}
if (tpcb->tp_rsycnt) {
- printf("tp_rsyflush %x\n", tpcb);
+ printf("tp_rsyflush %p\n", tpcb);
tpcb->tp_rsycnt = 0;
}
}
@@ -1022,13 +1022,13 @@ tpsbcheck(tpcb, i)
mbcnt += m->m_ext.ext_size;
}
if (len != pktlen) {
- printf("test %d; len %d != pktlen %d on mbuf 0x%x\n",
+ printf("test %d; len %d != pktlen %d on mbuf %p\n",
i, len, pktlen, n);
panic("tpsbcheck short");
}
}
if (len != sb->sb_cc || mbcnt != sb->sb_mbcnt) {
- printf("test %d: cc %d != %d || mbcnt %d != %d\n", i, len, sb->sb_cc,
+ printf("test %d: cc %d != %ld || mbcnt %d != %ld\n", i, len, sb->sb_cc,
mbcnt, sb->sb_mbcnt);
panic("tpsbcheck");
}
diff --git a/sys/netiso/tp_subr2.c b/sys/netiso/tp_subr2.c
index 5358684ac9e..87045d21b44 100644
--- a/sys/netiso/tp_subr2.c
+++ b/sys/netiso/tp_subr2.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_subr2.c,v 1.2 1996/03/04 10:36:32 mickey Exp $ */
-/* $NetBSD: tp_subr2.c,v 1.9 1996/02/13 22:12:04 christos Exp $ */
+/* $OpenBSD: tp_subr2.c,v 1.3 1996/04/21 22:29:59 deraadt Exp $ */
+/* $NetBSD: tp_subr2.c,v 1.11 1996/03/26 22:27:01 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -124,9 +124,6 @@ SOFTWARE.
#if 0
static void copyQOSparms __P((struct tp_conn_param *, struct tp_conn_param *));
#endif
-#if 0
-static void pk_flowcontrol __P((struct pklcd *, int, int));
-#endif
/*
* NAME: tp_local_credit()
@@ -155,7 +152,7 @@ tp_local_credit(tpcb)
LOCAL_CREDIT(tpcb);
#ifdef ARGO_DEBUG
if (argo_debug[D_CREDIT]) {
- printf("ref 0x%x lcdt 0x%x l_tpdusize 0x%x decbit 0x%x\n",
+ printf("ref 0x%x lcdt 0x%x l_tpdusize 0x%x decbit 0x%x cong_win 0x%lx\n",
tpcb->tp_lref,
tpcb->tp_lcredit,
tpcb->tp_l_tpdusize,
@@ -195,7 +192,7 @@ tp_protocol_error(e, tpcb)
struct tp_event *e;
struct tp_pcb *tpcb;
{
- printf("TP PROTOCOL ERROR! tpcb 0x%x event 0x%x, state 0x%x\n",
+ printf("TP PROTOCOL ERROR! tpcb %p event 0x%x, state 0x%x\n",
tpcb, e->ev_number, tpcb->tp_state);
#ifdef TPPT
if (tp_traceflags[D_DRIVER]) {
@@ -390,9 +387,9 @@ tp_quench(ipcb, cmd)
struct tp_pcb *tpcb = (struct tp_pcb *) ipcb;
#ifdef ARGO_DEBUG
if (argo_debug[D_QUENCH]) {
- printf("tp_quench tpcb 0x%x ref 0x%x sufx 0x%x\n",
+ printf("tp_quench tpcb %p ref 0x%x sufx 0x%x\n",
tpcb, tpcb->tp_lref, *(u_short *) (tpcb->tp_lsuffix));
- printf("cong_win 0x%x decbit 0x%x \n",
+ printf("cong_win 0x%lx decbit 0x%x \n",
tpcb->tp_cong_win, tpcb->tp_decbit);
}
#endif
@@ -673,7 +670,7 @@ tp_route_to(m, tpcb, channel)
#endif
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("tp_route_to( m x%x, channel 0x%x, tpcb 0x%x netserv 0x%x)\n",
+ printf("tp_route_to( m %p, channel %p, tpcb %p netserv 0x%x)\n",
m, channel, tpcb, tpcb->tp_netservice);
printf("m->mlen x%x, m->m_data:\n", m->m_len);
dump_buf(mtod(m, caddr_t), m->m_len);
@@ -763,8 +760,7 @@ done:
return error;
}
-#if 0
-static
+#ifndef CCITT
void
pk_flowcontrol(lcp, foo, bar)
struct pklcd *lcp;
@@ -908,7 +904,7 @@ Dump_buf(buf, len)
{
int i, j;
#define Buf ((u_char *)buf)
- printf("Dump buf 0x%x len 0x%x\n", buf, len);
+ printf("Dump buf %p len 0x%x\n", buf, len);
for (i = 0; i < len; i += MAX_COLUMNS) {
printf("+%d:\t", i);
for (j = 0; j < MAX_COLUMNS; j++) {
diff --git a/sys/netiso/tp_timer.c b/sys/netiso/tp_timer.c
index 0daaf01f649..c298159dbe1 100644
--- a/sys/netiso/tp_timer.c
+++ b/sys/netiso/tp_timer.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_timer.c,v 1.2 1996/03/04 10:36:34 mickey Exp $ */
-/* $NetBSD: tp_timer.c,v 1.7 1996/02/13 22:12:10 christos Exp $ */
+/* $OpenBSD: tp_timer.c,v 1.3 1996/04/21 22:30:02 deraadt Exp $ */
+/* $NetBSD: tp_timer.c,v 1.8 1996/03/16 23:14:04 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -130,7 +130,7 @@ tp_etimeout(tpcb, fun, ticks)
register u_int *callp;
#ifdef ARGO_DEBUG
if (argo_debug[D_TIMER]) {
- printf("etimeout pcb 0x%x state 0x%x\n", tpcb, tpcb->tp_state);
+ printf("etimeout pcb %p state 0x%x\n", tpcb, tpcb->tp_state);
}
#endif
#ifdef TPPT
@@ -209,7 +209,7 @@ tp_slowtimo()
E.ev_number = t;
#ifdef ARGO_DEBUG
if (argo_debug[D_TIMER]) {
- printf("tp_slowtimo: pcb 0x%x t %d\n",
+ printf("tp_slowtimo: pcb %p t %d\n",
tpcb, t);
}
#endif
@@ -254,7 +254,7 @@ tp_data_retrans(tpcb)
*/
#ifdef ARGO_DEBUG
if (argo_debug[D_ACKRECV]) {
- printf("tp_data_retrans: 0 window tpcb 0x%x una 0x%x\n",
+ printf("tp_data_retrans: 0 window tpcb %p una 0x%x\n",
tpcb, tpcb->tp_snduna);
}
#endif
@@ -374,7 +374,7 @@ tp_cuntimeout(tpcb, which)
{
#ifdef ARGO_DEBUG
if (argo_debug[D_TIMER]) {
- printf("tp_cuntimeout(0x%x, %d) active %d\n",
+ printf("tp_cuntimeout(%p, %d) active %d\n",
tpcb, which, tpcb->tp_timer[which]);
}
#endif
diff --git a/sys/netiso/tp_usrreq.c b/sys/netiso/tp_usrreq.c
index 2a2aff6939f..7c6f03cec22 100644
--- a/sys/netiso/tp_usrreq.c
+++ b/sys/netiso/tp_usrreq.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: tp_usrreq.c,v 1.2 1996/03/04 10:36:45 mickey Exp $ */
-/* $NetBSD: tp_usrreq.c,v 1.8 1996/02/13 22:12:27 christos Exp $ */
+/* $OpenBSD: tp_usrreq.c,v 1.3 1996/04/21 22:30:04 deraadt Exp $ */
+/* $NetBSD: tp_usrreq.c,v 1.9 1996/03/16 23:14:06 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -121,7 +121,7 @@ dump_mbuf(n, str)
nextrecord = n->m_act;
printf("RECORD:\n");
while (n) {
- printf("%x : Len %x Data %x A %x Nx %x Tp %x\n",
+ printf("%p : Len %x Data %p A %p Nx %p Tp %x\n",
n, n->m_len, n->m_data, n->m_act, n->m_next, n->m_type);
#ifdef notdef
{
@@ -404,7 +404,7 @@ tp_usrreq(so, req, m, nam, controlp)
#ifdef ARGO_DEBUG
if (argo_debug[D_REQUEST]) {
- printf("usrreq(0x%x,%d,0x%x,0x%x,0x%x)\n", so, req, m, nam, outflags);
+ printf("usrreq(%p,%d,%p,%p,%p)\n", so, req, m, nam, outflags);
if (so->so_error)
printf("WARNING!!! so->so_error is 0x%x\n", so->so_error);
}
@@ -508,7 +508,7 @@ tp_usrreq(so, req, m, nam, controlp)
#endif
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("PRU_CONNECT: so *SHORT_LSUFXP(tpcb) 0x%x lsuflen 0x%x, class 0x%x",
+ printf("PRU_CONNECT: so %p *SHORT_LSUFXP(tpcb) 0x%x lsuflen 0x%x, class 0x%x",
tpcb->tp_sock, *SHORT_LSUFXP(tpcb), tpcb->tp_lsuffixlen,
tpcb->tp_class);
}
@@ -525,7 +525,7 @@ tp_usrreq(so, req, m, nam, controlp)
}
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
- printf("isop 0x%x isop->isop_socket offset 12 :\n", tpcb->tp_npcb);
+ printf("isop %p isop->isop_socket offset 12 :\n", tpcb->tp_npcb);
dump_buf(tpcb->tp_npcb, 16);
}
#endif
@@ -534,9 +534,9 @@ tp_usrreq(so, req, m, nam, controlp)
#ifdef ARGO_DEBUG
if (argo_debug[D_CONN]) {
printf(
- "PRU_CONNECT after tpcb 0x%x so 0x%x npcb 0x%x flags 0x%x\n",
+ "PRU_CONNECT after tpcb %p so %p npcb %p flags 0x%x\n",
tpcb, so, tpcb->tp_npcb, tpcb->tp_flags);
- printf("isop 0x%x isop->isop_socket offset 12 :\n", tpcb->tp_npcb);
+ printf("isop %p isop->isop_socket offset 12 :\n", tpcb->tp_npcb);
dump_buf(tpcb->tp_npcb, 16);
}
#endif
@@ -607,7 +607,7 @@ tp_usrreq(so, req, m, nam, controlp)
#endif
#ifdef ARGO_DEBUG
if (argo_debug[D_REQUEST]) {
- printf("RCVD: cc %d space %d hiwat %d\n",
+ printf("RCVD: cc %ld space %ld hiwat %ld\n",
so->so_rcv.sb_cc, sbspace(&so->so_rcv),
so->so_rcv.sb_hiwat);
}
@@ -687,7 +687,7 @@ tp_usrreq(so, req, m, nam, controlp)
#ifdef ARGO_DEBUG
if (argo_debug[D_SYSCALL]) {
printf(
- "PRU_SEND: eot %d before sbappend 0x%x len 0x%x to sb @ 0x%x\n",
+ "PRU_SEND: eot %ld before sbappend %p len 0x%x to sb @ %p\n",
eotsdu, m, totlen, sb);
dump_mbuf(sb->sb_mb, "so_snd.sb_mb");
dump_mbuf(m, "m : to be added");
@@ -696,7 +696,7 @@ tp_usrreq(so, req, m, nam, controlp)
tp_packetize(tpcb, m, eotsdu);
#ifdef ARGO_DEBUG
if (argo_debug[D_SYSCALL]) {
- printf("PRU_SEND: eot %d after sbappend 0x%x\n", eotsdu, m);
+ printf("PRU_SEND: eot %ld after sbappend %p\n", eotsdu, m);
dump_mbuf(sb->sb_mb, "so_snd.sb_mb");
}
#endif
@@ -705,7 +705,7 @@ tp_usrreq(so, req, m, nam, controlp)
#ifdef ARGO_DEBUG
if (argo_debug[D_SYSCALL]) {
printf("PRU_SEND: after driver error 0x%x \n", error);
- printf("so_snd 0x%x cc 0t%d mbcnt 0t%d\n",
+ printf("so_snd %p cc 0t%ld mbcnt 0t%ld\n",
sb, sb->sb_cc, sb->sb_mbcnt);
dump_mbuf(sb->sb_mb, "so_snd.sb_mb after driver");
}
@@ -742,7 +742,7 @@ tp_usrreq(so, req, m, nam, controlp)
#ifdef ARGO_DEBUG
if (argo_debug[D_REQUEST]) {
- printf("%s, so 0x%x, tpcb 0x%x, error %d, state %d\n",
+ printf("%s, so %p, tpcb %p, error %d, state %d\n",
"returning from tp_usrreq", so, tpcb, error,
tpcb ? tpcb->tp_state : 0);
}
@@ -784,7 +784,7 @@ tp_confirm(tpcb)
struct tp_event E;
if (tpcb->tp_state == TP_CONFIRMING)
return DoEvent(T_ACPT_req);
- printf("Tp confirm called when not confirming; tpcb 0x%x, state 0x%x\n",
+ printf("Tp confirm called when not confirming; tpcb %p, state 0x%x\n",
tpcb, tpcb->tp_state);
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:37:37 +0000