diff options
Diffstat (limited to 'sys/netatm/uni')
-rw-r--r-- | sys/netatm/uni/sscf_uni.c | 6 | ||||
-rw-r--r-- | sys/netatm/uni/sscf_uni_lower.c | 12 | ||||
-rw-r--r-- | sys/netatm/uni/sscf_uni_upper.c | 12 | ||||
-rw-r--r-- | sys/netatm/uni/sscop.c | 6 | ||||
-rw-r--r-- | sys/netatm/uni/sscop_lower.c | 20 | ||||
-rw-r--r-- | sys/netatm/uni/sscop_subr.c | 8 | ||||
-rw-r--r-- | sys/netatm/uni/sscop_timer.c | 24 | ||||
-rw-r--r-- | sys/netatm/uni/sscop_upper.c | 16 | ||||
-rw-r--r-- | sys/netatm/uni/uniarp.c | 18 | ||||
-rw-r--r-- | sys/netatm/uni/uniarp_vcm.c | 14 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_decode.c | 7 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_encode.c | 76 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_if.c | 20 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_mbuf.c | 8 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_msg.c | 26 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_proto.c | 36 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_sigmgr_state.c | 8 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_subr.c | 16 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_util.c | 10 | ||||
-rw-r--r-- | sys/netatm/uni/unisig_vc_state.c | 20 |
20 files changed, 181 insertions, 182 deletions
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c index b5fd7fb..0582580 100644 --- a/sys/netatm/uni/sscf_uni.c +++ b/sys/netatm/uni/sscf_uni.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscf_uni.c,v 1.6 1998/03/24 21:10:38 mks Exp $ + * @(#) $Id: sscf_uni.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscf_uni.c,v 1.6 1998/03/24 21:10:38 mks Exp $"; +static char *RCSid = "@(#) $Id: sscf_uni.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -188,7 +188,7 @@ sscf_uni_inst(ssp, cvp) struct univcc *uvp; int err; - ATM_DEBUG2("sscf_uni_inst: ssp=0x%x, cvp=0x%x\n", ssp, cvp); + ATM_DEBUG2("sscf_uni_inst: ssp=%p, cvp=%p\n", ssp, cvp); /* * Validate lower SAP diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c index fe2d839..9639d96 100644 --- a/sys/netatm/uni/sscf_uni_lower.c +++ b/sys/netatm/uni/sscf_uni_lower.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscf_uni_lower.c,v 1.6 1998/04/07 23:23:26 mks Exp $ + * @(#) $Id: sscf_uni_lower.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscf_uni_lower.c,v 1.6 1998/04/07 23:23:26 mks Exp $"; +static char *RCSid = "@(#) $Id: sscf_uni_lower.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -92,8 +92,8 @@ sscf_uni_lower(cmd, tok, arg1, arg2) enum sscop_vers vers; int err; - ATM_DEBUG5("sscf_uni_lower: cmd=0x%x, uvp=0x%x, ustate=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)uvp, uvp->uv_ustate, arg1, arg2); + ATM_DEBUG5("sscf_uni_lower: cmd=0x%x, uvp=%p, ustate=%d, arg1=0x%x, arg2=0x%x\n", + cmd, uvp, uvp->uv_ustate, arg1, arg2); switch (cmd) { @@ -370,8 +370,8 @@ sscf_uni_lower(cmd, tok, arg1, arg2) break; default: - log(LOG_ERR, "sscf_uni_lower: unknown cmd 0x%x, uvp=0x%x\n", - cmd, (int)uvp); + log(LOG_ERR, "sscf_uni_lower: unknown cmd 0x%x, uvp=%p\n", + cmd, uvp); } return; diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c index 2febb5c..a979260 100644 --- a/sys/netatm/uni/sscf_uni_upper.c +++ b/sys/netatm/uni/sscf_uni_upper.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscf_uni_upper.c,v 1.7 1998/06/29 22:15:31 mks Exp $ + * @(#) $Id: sscf_uni_upper.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscf_uni_upper.c,v 1.7 1998/06/29 22:15:31 mks Exp $"; +static char *RCSid = "@(#) $Id: sscf_uni_upper.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -74,8 +74,8 @@ sscf_uni_upper(cmd, tok, arg1, arg2) Atm_connvc *cvp = uvp->uv_connvc; int err; - ATM_DEBUG5("sscf_uni_upper: cmd=0x%x, uvp=0x%x, lstate=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)uvp, uvp->uv_lstate, arg1, arg2); + ATM_DEBUG5("sscf_uni_upper: cmd=0x%x, uvp=%p, lstate=%d, arg1=0x%x, arg2=0x%x\n", + cmd, uvp, uvp->uv_lstate, arg1, arg2); switch (cmd) { @@ -616,8 +616,8 @@ seqerr: * Not supported */ default: - log(LOG_ERR, "sscf_uni_upper: unknown cmd 0x%x, uvp=0x%x\n", - cmd, (int)uvp); + log(LOG_ERR, "sscf_uni_upper: unknown cmd 0x%x, uvp=%p\n", + cmd, uvp); } return; diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c index d65118b..d4a2dfb 100644 --- a/sys/netatm/uni/sscop.c +++ b/sys/netatm/uni/sscop.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop.c,v 1.6 1998/03/24 21:10:43 mks Exp $ + * @(#) $Id: sscop.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop.c,v 1.6 1998/03/24 21:10:43 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -238,7 +238,7 @@ sscop_inst(ssp, cvp) struct sscop *sop; int err; - ATM_DEBUG2("sscop_inst: ssp=0x%x, cvp=0x%x\n", ssp, cvp); + ATM_DEBUG2("sscop_inst: ssp=%p, cvp=%p\n", ssp, cvp); /* * Validate lower SAP diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c index f76f702..536ed03 100644 --- a/sys/netatm/uni/sscop_lower.c +++ b/sys/netatm/uni/sscop_lower.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop_lower.c,v 1.6 1998/04/07 23:21:28 mks Exp $ + * @(#) $Id: sscop_lower.c,v 1.1 1998/09/15 08:23:07 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_lower.c,v 1.6 1998/04/07 23:21:28 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_lower.c,v 1.1 1998/09/15 08:23:07 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -124,8 +124,8 @@ sscop_lower(cmd, tok, arg1, arg2) void (*func) __P((struct sscop *, int, int)); int val; - ATM_DEBUG5("sscop_lower: cmd=0x%x, sop=0x%x, state=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)sop, sop->so_state, arg1, arg2); + ATM_DEBUG5("sscop_lower: cmd=0x%x, sop=%p, state=%d, arg1=0x%x, arg2=0x%x\n", + cmd, sop, sop->so_state, arg1, arg2); /* * Validate stack command @@ -136,8 +136,8 @@ sscop_lower(cmd, tok, arg1, arg2) ((stab = (sop->so_vers == SSCOP_VERS_QSAAL ? sscop_qsaal_aatab[val] : sscop_q2110_aatab[val])) == NULL)) { - log(LOG_ERR, "sscop_lower: unknown cmd 0x%x, sop=0x%x\n", - cmd, (int)sop); + log(LOG_ERR, "sscop_lower: unknown cmd 0x%x, sop=%p\n", + cmd, sop); return; } @@ -145,8 +145,8 @@ sscop_lower(cmd, tok, arg1, arg2) * Validate sscop state */ if (sop->so_state > SOS_MAXSTATE) { - log(LOG_ERR, "sscop_lower: invalid state sop=0x%x, state=%d\n", - (int)sop, sop->so_state); + log(LOG_ERR, "sscop_lower: invalid state sop=%p, state=%d\n", + sop, sop->so_state); /* * Release possible buffer */ @@ -163,8 +163,8 @@ sscop_lower(cmd, tok, arg1, arg2) func = stab[sop->so_state]; if (func == NULL) { log(LOG_ERR, - "sscop_lower: invalid cmd/state: sop=0x%x, cmd=0x%x, state=%d\n", - (int)sop, cmd, sop->so_state); + "sscop_lower: invalid cmd/state: sop=%p, cmd=0x%x, state=%d\n", + sop, cmd, sop->so_state); /* * Release possible buffer */ diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c index 2d01229..88656ad 100644 --- a/sys/netatm/uni/sscop_subr.c +++ b/sys/netatm/uni/sscop_subr.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop_subr.c,v 1.7 1998/08/26 23:29:19 mks Exp $ + * @(#) $Id: sscop_subr.c,v 1.1 1998/09/15 08:23:08 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_subr.c,v 1.7 1998/08/26 23:29:19 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_subr.c,v 1.1 1998/09/15 08:23:08 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -364,8 +364,8 @@ sscop_rexmit_unlink(sop, php) sop->so_rexmit_tl = curr; } else { log(LOG_ERR, - "sscop_rexmit_unlink: Not found - sop=0x%x, php=0x%x\n", - (int)sop, (int)php); + "sscop_rexmit_unlink: Not found - sop=%p, php=%p\n", + sop, php); #ifdef DIAGNOSTIC panic("sscop_rexmit_unlink: Not found"); #endif diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c index 8c23344b..c66525b 100644 --- a/sys/netatm/uni/sscop_timer.c +++ b/sys/netatm/uni/sscop_timer.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop_timer.c,v 1.6 1998/04/07 23:21:48 mks Exp $ + * @(#) $Id: sscop_timer.c,v 1.1 1998/09/15 08:23:08 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_timer.c,v 1.6 1998/04/07 23:21:48 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_timer.c,v 1.1 1998/09/15 08:23:08 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -121,8 +121,8 @@ sscop_timeout(tip) "CC", "IDLE" }; - ATM_DEBUG3("sscop_timer: %s expired, sop=0x%x, state=%d\n", - tn[i], (int)sop, sop->so_state); + ATM_DEBUG3("sscop_timer: %s expired, sop=%p, state=%d\n", + tn[i], sop, sop->so_state); } #endif @@ -170,8 +170,8 @@ sscop_poll_expire(sop) if ((sop->so_state != SOS_READY) && ((sop->so_state != SOS_INRESYN) || (sop->so_vers != SSCOP_VERS_QSAAL))) { - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_POLL", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_POLL", sop, sop->so_state); return; } @@ -214,8 +214,8 @@ sscop_idle_expire(sop) * Timer_IDLE only valid in READY state */ if (sop->so_state != SOS_READY) { - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_IDLE", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_IDLE", sop, sop->so_state); return; } @@ -266,8 +266,8 @@ sscop_noresponse_expire(sop) if ((sop->so_state != SOS_READY) && ((sop->so_state != SOS_INRESYN) || (sop->so_vers != SSCOP_VERS_QSAAL))) { - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_NORESPONSE", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_NORESPONSE", sop, sop->so_state); return; } @@ -569,8 +569,8 @@ rexmitrs: break; default: - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_CC", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_CC", sop, sop->so_state); } } diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c index be9556d..162b48c 100644 --- a/sys/netatm/uni/sscop_upper.c +++ b/sys/netatm/uni/sscop_upper.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop_upper.c,v 1.6 1998/08/26 23:29:20 mks Exp $ + * @(#) $Id: sscop_upper.c,v 1.1 1998/09/15 08:23:08 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_upper.c,v 1.6 1998/08/26 23:29:20 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_upper.c,v 1.1 1998/09/15 08:23:08 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -199,8 +199,8 @@ sscop_upper(cmd, tok, arg1, arg2) caddr_t trlr; int type; - ATM_DEBUG5("sscop_upper: cmd=0x%x, sop=0x%x, state=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)sop, sop->so_state, arg1, arg2); + ATM_DEBUG5("sscop_upper: cmd=0x%x, sop=%p, state=%d, arg1=0x%x, arg2=0x%x\n", + cmd, sop, sop->so_state, arg1, arg2); switch (cmd) { @@ -218,8 +218,8 @@ sscop_upper(cmd, tok, arg1, arg2) */ if (sop->so_state > SOS_MAXSTATE) { log(LOG_ERR, - "sscop_upper: invalid state sop=0x%x, state=%d\n", - (int)sop, sop->so_state); + "sscop_upper: invalid state sop=%p, state=%d\n", + sop, sop->so_state); KB_FREEALL((KBuffer *)arg1); return; } @@ -241,8 +241,8 @@ sscop_upper(cmd, tok, arg1, arg2) break; default: - log(LOG_ERR, "sscop_upper: unknown cmd 0x%x, sop=0x%x\n", - cmd, (int)sop); + log(LOG_ERR, "sscop_upper: unknown cmd 0x%x, sop=%p\n", + cmd, sop); } return; diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c index f316a73..e0448a8 100644 --- a/sys/netatm/uni/uniarp.c +++ b/sys/netatm/uni/uniarp.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: uniarp.c,v 1.10 1998/07/20 18:58:45 mks Exp $ + * @(#) $Id: uniarp.c,v 1.1 1998/09/15 08:23:09 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: uniarp.c,v 1.10 1998/07/20 18:58:45 mks Exp $"; +static char *RCSid = "@(#) $Id: uniarp.c,v 1.1 1998/09/15 08:23:09 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -181,7 +181,7 @@ uniarp_ipact(uip) { struct unisig *usp; - ATM_DEBUG1("uniarp_ipact: uip=0x%x\n", (int)uip); + ATM_DEBUG1("uniarp_ipact: uip=%p\n", uip); /* * Set initial state @@ -229,7 +229,7 @@ uniarp_ipdact(uip) struct uniarp *uap, *unext; int i; - ATM_DEBUG1("uniarp_ipdact: uip=0x%x\n", (int)uip); + ATM_DEBUG1("uniarp_ipdact: uip=%p\n", uip); /* * Delete all interface entries @@ -337,7 +337,7 @@ uniarp_ifaddr(sip) struct atm_nif *nip; struct uniip *uip; - ATM_DEBUG1("uniarp_ifaddr: sip=0x%x\n", (int)sip); + ATM_DEBUG1("uniarp_ifaddr: sip=%p\n", sip); /* * We've got to handle this for every network interface @@ -406,7 +406,7 @@ uniarp_server_mode(uip) struct uniarp *uap, *unext; int i; - ATM_DEBUG1("uniarp_server_mode: uip=0x%x\n", (int)uip); + ATM_DEBUG1("uniarp_server_mode: uip=%p\n", uip); /* * Handle client/server mode changes first @@ -525,8 +525,8 @@ uniarp_client_mode(uip, aap) struct ipvcc *ivp, *inext; int i; - ATM_DEBUG2("uniarp_client_mode: uip=0x%x, atm=(%s,-)\n", - (int)uip, aap ? unisig_addr_print(aap): "-"); + ATM_DEBUG2("uniarp_client_mode: uip=%p, atm=(%s,-)\n", + uip, aap ? unisig_addr_print(aap): "-"); /* * Handle client/server mode changes first @@ -747,7 +747,7 @@ uniarp_iftimeout(tip) uip = (struct uniip *) ((caddr_t)tip - (int)(&((struct uniip *)0)->uip_arptime)); - ATM_DEBUG2("uniarp_iftimeout: uip=0x%x, state=%d\n", (int)uip, + ATM_DEBUG2("uniarp_iftimeout: uip=%p, state=%d\n", uip, uip->uip_arpstate); /* diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c index 9b1f211..338d2b5 100644 --- a/sys/netatm/uni/uniarp_vcm.c +++ b/sys/netatm/uni/uniarp_vcm.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: uniarp_vcm.c,v 1.10 1998/06/29 22:15:46 mks Exp $ + * @(#) $Id: uniarp_vcm.c,v 1.1 1998/09/15 08:23:10 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: uniarp_vcm.c,v 1.10 1998/06/29 22:15:46 mks Exp $"; +static char *RCSid = "@(#) $Id: uniarp_vcm.c,v 1.1 1998/09/15 08:23:10 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -92,7 +92,7 @@ uniarp_pvcopen(ivp) struct uniarp *uap; int s, err; - ATM_DEBUG1("uniarp_pvcopen: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_pvcopen: ivp=%p\n", ivp); ivp->iv_arpent = NULL; @@ -195,7 +195,7 @@ uniarp_svcout(ivp, dst) struct uniarp *uap; int s = splnet(); - ATM_DEBUG2("uniarp_svcout: ivp=0x%x,dst=0x%x\n", (int)ivp, dst->s_addr); + ATM_DEBUG2("uniarp_svcout: ivp=%p,dst=0x%x\n", ivp, dst->s_addr); ivp->iv_arpent = NULL; @@ -332,7 +332,7 @@ uniarp_svcin(ivp, dst, dstsub) struct uniarp *uap; int found = 0, i, s = splnet(); - ATM_DEBUG1("uniarp_svcin: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_svcin: ivp=%p\n", ivp); /* * Clear ARP entry field @@ -476,7 +476,7 @@ uniarp_svcactive(ivp) struct uniarp *uap; int err, s = splnet(); - ATM_DEBUG1("uniarp_svcactive: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_svcactive: ivp=%p\n", ivp); inp = ivp->iv_ipnif; uip = (struct uniip *)inp->inf_isintf; @@ -571,7 +571,7 @@ uniarp_vcclose(ivp) struct uniarp *uap; int s; - ATM_DEBUG1("uniarp_vcclose: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_vcclose: ivp=%p\n", ivp); /* * Close our CM connection diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c index 98f5dfd..d7d3cd4 100644 --- a/sys/netatm/uni/unisig_decode.c +++ b/sys/netatm/uni/unisig_decode.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_decode.c,v 1.13 1998/08/26 23:29:20 mks Exp $ + * @(#) $Id: unisig_decode.c,v 1.1 1998/09/15 08:23:10 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_decode.c,v 1.13 1998/08/26 23:29:20 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_decode.c,v 1.1 1998/09/15 08:23:10 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -755,8 +755,7 @@ usf_dec_msg(usf, msg) u_char c, *ie_tbl; struct ie_generic *ie; - ATM_DEBUG2("usf_dec_msg: usf=0x%x, msg=0x%x\n", (int) usf, - (int) msg); + ATM_DEBUG2("usf_dec_msg: usf=%p, msg=%p\n", usf, msg); /* * Check the total message length diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c index 0920acc..a142a33 100644 --- a/sys/netatm/uni/unisig_encode.c +++ b/sys/netatm/uni/unisig_encode.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_encode.c,v 1.11 1998/08/26 23:29:21 mks Exp $ + * @(#) $Id: unisig_encode.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_encode.c,v 1.11 1998/08/26 23:29:21 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_encode.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -142,8 +142,8 @@ usf_enc_msg(usf, msg) u_char sb[sizeof(short)]; } su; - ATM_DEBUG2("usf_enc_msg: usf=0x%x, msg=0x%x\n", - (int)usf, (int)msg); + ATM_DEBUG2("usf_enc_msg: usf=%p, msg=%p\n", + usf, msg); /* * Encode the protocol discriminator @@ -251,8 +251,8 @@ usf_enc_ie(usf, ie) u_char sb[sizeof(short)]; } su; - ATM_DEBUG2("usf_enc_ie: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie: usf=%p, ie=%p\n", + usf, ie); /* * Encode the IE identifier @@ -337,8 +337,8 @@ usf_enc_ie_aalp(usf, ie) { int i, rc = 0; - ATM_DEBUG2("usf_enc_ie_aalp: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_aalp: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -414,8 +414,8 @@ usf_enc_ie_clrt(usf, ie) { int rc; - ATM_DEBUG2("usf_enc_ie_clrt: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_clrt: usf=%p, ie=%p\n", + usf, ie); #ifdef NOTDEF /* @@ -484,8 +484,8 @@ usf_enc_ie_bbcp(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_bbcp: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_bbcp: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -555,8 +555,8 @@ usf_enc_ie_bhli(usf, ie) int i, rc; u_int type; - ATM_DEBUG2("usf_enc_ie_bhli: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_bhli: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -643,8 +643,8 @@ usf_enc_ie_blli(usf, ie) int rc; u_int ipi; - ATM_DEBUG2("usf_enc_ie_blli: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_blli: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -932,8 +932,8 @@ usf_enc_ie_clst(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_clst: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_clst: usf=%p, ie=%p\n", + usf, ie); c = ie->ie_clst_state & UNI_IE_CLST_STATE_MASK; rc = usf_byte(usf, &c); @@ -965,8 +965,8 @@ usf_enc_ie_cdad(usf, ie) u_char c; int rc; - ATM_DEBUG2("usf_enc_ie_cdad: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_cdad: usf=%p, ie=%p\n", + usf, ie); /* * Encode the numbering plan @@ -1066,8 +1066,8 @@ usf_enc_ie_cgad(usf, ie) u_char c; int rc; - ATM_DEBUG2("usf_enc_ie_cgad: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_cgad: usf=%p, ie=%p\n", + usf, ie); /* * Encode the numbering plan @@ -1183,8 +1183,8 @@ usf_enc_ie_caus(usf, ie) int i, rc; u_char c; - ATM_DEBUG2("usf_enc_ie_caus: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_caus: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -1242,8 +1242,8 @@ usf_enc_ie_cnid(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_cnid: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_cnid: usf=%p, ie=%p\n", + usf, ie); c = ((ie->ie_cnid_vp_sig & UNI_IE_CNID_VPSIG_MASK) << UNI_IE_CNID_VPSIG_SHIFT) + @@ -1284,8 +1284,8 @@ usf_enc_ie_qosp(usf, ie) { int rc; - ATM_DEBUG2("usf_enc_ie_qosp: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_qosp: usf=%p, ie=%p\n", + usf, ie); /* * Encode forward QoS class @@ -1327,8 +1327,8 @@ usf_enc_ie_brpi(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_brpi: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_brpi: usf=%p, ie=%p\n", + usf, ie); /* * Encode the repeat indicator @@ -1360,8 +1360,8 @@ usf_enc_ie_rsti(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_rsti: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_rsti: usf=%p, ie=%p\n", + usf, ie); /* * Encode the restart class @@ -1395,8 +1395,8 @@ usf_enc_ie_bsdc(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_bsdc: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_bsdc: usf=%p, ie=%p\n", + usf, ie); /* * Encode the sending complete indicator @@ -1429,8 +1429,8 @@ usf_enc_ie_trnt(usf, ie) int i, rc; u_char c; - ATM_DEBUG2("usf_enc_ie_trnt: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_trnt: usf=%p, ie=%p\n", + usf, ie); /* * Encode the sending complete indicator @@ -1508,8 +1508,8 @@ usf_enc_ie_ident(usf, ie, tbl) u_int16_t sv; u_int32_t iv; - ATM_DEBUG3("usf_enc_ie_ident: usf=0x%x, ie=0x%x, tbl=0x%x\n", - (int)usf, (int)ie, (int)tbl); + ATM_DEBUG3("usf_enc_ie_ident: usf=%p, ie=%p, tbl=%p\n", + usf, ie, tbl); /* * Scan through the IE table diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c index 784b6c5..e52f650 100644 --- a/sys/netatm/uni/unisig_if.c +++ b/sys/netatm/uni/unisig_if.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_if.c,v 1.12 1998/07/30 22:36:57 mks Exp $ + * @(#) $Id: unisig_if.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_if.c,v 1.12 1998/07/30 22:36:57 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_if.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -248,7 +248,7 @@ unisig_attach(smp, pip) int err = 0, s; struct unisig *usp = NULL; - ATM_DEBUG2("unisig_attach: smp=%x, pip=%x\n", smp, pip); + ATM_DEBUG2("unisig_attach: smp=%p, pip=%p\n", smp, pip); /* * Allocate UNISIG protocol instance control block @@ -358,7 +358,7 @@ unisig_detach(pip) struct unisig *usp; int err; - ATM_DEBUG1("unisig_detach: pip=0x%x\n", pip); + ATM_DEBUG1("unisig_detach: pip=%p\n", pip); /* * Get UNISIG protocol instance @@ -418,7 +418,7 @@ unisig_setup(cvp, errp) struct unisig *usp = (struct unisig *)pip->pif_siginst; int rc = 0; - ATM_DEBUG1("unisig_setup: cvp=0x%x\n", cvp); + ATM_DEBUG1("unisig_setup: cvp=%p\n", cvp); /* * Intialize the returned error code @@ -485,7 +485,7 @@ unisig_release(vcp, errp) struct atm_pif *pip = vcp->vc_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_release: vcp=0x%x\n", vcp); + ATM_DEBUG1("unisig_release: vcp=%p\n", vcp); /* * Initialize returned error code @@ -548,7 +548,7 @@ unisig_accept(vcp, errp) struct atm_pif *pip = uvp->uv_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_accept: vcp=0x%x\n", vcp); + ATM_DEBUG1("unisig_accept: vcp=%p\n", vcp); /* * Initialize the returned error code @@ -622,7 +622,7 @@ unisig_reject(vcp, errp) struct atm_pif *pip = uvp->uv_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_reject: uvp=0x%x\n", uvp); + ATM_DEBUG1("unisig_reject: uvp=%p\n", uvp); /* * Initialize the returned error code @@ -684,7 +684,7 @@ unisig_abort(vcp) struct vccb *vcp; { - ATM_DEBUG1("unisig_abort: vcp=0x%x\n", (int)vcp); + ATM_DEBUG1("unisig_abort: vcp=%p\n", vcp); /* * Only abort once @@ -733,7 +733,7 @@ unisig_free(vcp) struct atm_pif *pip = vcp->vc_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_free: vcp = 0x%x\n", vcp); + ATM_DEBUG1("unisig_free: vcp = %p\n", vcp); /* * Make sure VCC has been closed diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c index 84c78fe..c64ee9a 100644 --- a/sys/netatm/uni/unisig_mbuf.c +++ b/sys/netatm/uni/unisig_mbuf.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_mbuf.c,v 1.6 1998/08/26 23:29:22 mks Exp $ + * @(#) $Id: unisig_mbuf.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_mbuf.c,v 1.6 1998/08/26 23:29:22 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_mbuf.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -71,8 +71,8 @@ usf_init(usf, usp, buf, op, headroom) { KBuffer *m; - ATM_DEBUG3("usf_init: usf=0x%x, buf=0x%x, op=%d\n", - (int) usf, (int) buf, op); + ATM_DEBUG3("usf_init: usf=%p, buf=%p, op=%d\n", + usf, buf, op); /* * Check parameters diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c index 22bf469..4e61cf4 100644 --- a/sys/netatm/uni/unisig_msg.c +++ b/sys/netatm/uni/unisig_msg.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_msg.c,v 1.10 1998/08/26 23:29:22 mks Exp $ + * @(#) $Id: unisig_msg.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_msg.c,v 1.10 1998/08/26 23:29:22 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_msg.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -183,7 +183,7 @@ unisig_send_msg(usp, msg) int err = 0; struct usfmt usf; - ATM_DEBUG2("unisig_send_msg: msg=0x%x, type=%d\n", msg, + ATM_DEBUG2("unisig_send_msg: msg=%p, type=%d\n", msg, msg->msg_type); /* @@ -257,7 +257,7 @@ unisig_send_setup(usp, uvp) struct unisig_msg *setup; Atm_attributes *ap = &uvp->uv_connvc->cvc_attr; - ATM_DEBUG1("unisig_send_setup: uvp=0x%x\n", (int) uvp); + ATM_DEBUG1("unisig_send_setup: uvp=%p\n", uvp); /* * Make sure required connection attriutes are set @@ -355,8 +355,8 @@ unisig_send_release(usp, uvp, msg, cause) struct unisig_msg *rls_msg; struct ie_generic *cause_ie; - ATM_DEBUG2("unisig_send_release: usp=0x%x, uvp=0x%x\n", - (int) usp, (int) uvp); + ATM_DEBUG2("unisig_send_release: usp=%p, uvp=%p\n", + usp, uvp); /* * Get memory for a RELEASE message @@ -431,8 +431,8 @@ unisig_send_release_complete(usp, uvp, msg, cause) struct unisig_msg *rls_cmp; struct ie_generic *cause_ie; - ATM_DEBUG4("unisig_send_release_complete usp=0x%x, uvp=0x%x, msg=0x%x, cause=%d\n", - (int) usp, (int) uvp, (int) msg, cause); + ATM_DEBUG4("unisig_send_release_complete usp=%p, uvp=%p, msg=%p, cause=%d\n", + usp, uvp, msg, cause); /* * Get memory for a RELEASE COMPLETE message @@ -510,8 +510,8 @@ unisig_send_status(usp, uvp, msg, cause) struct unisig_msg *stat_msg; struct ie_generic *cause_ie, *clst_ie, *iep; - ATM_DEBUG4("unisig_send_status: usp=0x%x, uvp=0x%x, msg=0x%x, cause=%d\n", - (int) usp, (int) uvp, (int) msg, cause); + ATM_DEBUG4("unisig_send_status: usp=%p, uvp=%p, msg=%p, cause=%d\n", + usp, uvp, msg, cause); /* * Get memory for a STATUS message @@ -621,7 +621,7 @@ unisig_rcv_restart(usp, msg) struct unisig_msg *rsta_msg; int s; - ATM_DEBUG2("unisig_rcv_restart: usp=0x%x, msg=0x%x\n", + ATM_DEBUG2("unisig_rcv_restart: usp=%p, msg=%p\n", usp, msg); /* @@ -709,7 +709,7 @@ unisig_rcv_setup(usp, msg) struct unisig_vccb *uvp = NULL; struct ie_generic *iep; - ATM_DEBUG2("unisig_rcv_setup: usp=0x%x, msg=0x%x\n", usp, msg); + ATM_DEBUG2("unisig_rcv_setup: usp=%p, msg=%p\n", usp, msg); /* * If we already have a VCC with the call reference, @@ -816,7 +816,7 @@ unisig_rcv_msg(usp, m) struct unisig_vccb *uvp = 0; struct ie_generic *iep; - ATM_DEBUG2("unisig_rcv_msg: bfr=0x%x, len=%d\n", (int)m, KB_LEN(m)); + ATM_DEBUG2("unisig_rcv_msg: bfr=%p, len=%d\n", m, KB_LEN(m)); #ifdef NOTDEF unisig_print_mbuf(m); diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c index 914e76d..bbad9e6 100644 --- a/sys/netatm/uni/unisig_proto.c +++ b/sys/netatm/uni/unisig_proto.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_proto.c,v 1.9 1998/08/26 23:29:23 mks Exp $ + * @(#) $Id: unisig_proto.c,v 1.1 1998/09/15 08:23:12 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_proto.c,v 1.9 1998/08/26 23:29:23 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_proto.c,v 1.1 1998/09/15 08:23:12 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -75,8 +75,8 @@ unisig_timer(tip) usp = (struct unisig *) ((caddr_t)tip - (int)(&((struct unisig *)0)->us_time)); - ATM_DEBUG2("unisig_timer: usp=0x%x,state=%d\n", - (int)usp, usp->us_state); + ATM_DEBUG2("unisig_timer: usp=%p,state=%d\n", + usp, usp->us_state); /* * Pass the timeout to the signalling manager state machine @@ -116,8 +116,8 @@ unisig_vctimer(tip) (int)(&((struct vccb *)0)->vc_time)); usp = (struct unisig *)uvp->uv_pif->pif_siginst; - ATM_DEBUG3("unisig_vctimer: uvp=0x%x, sstate=%d, ustate=%d\n", - (int)uvp, uvp->uv_sstate, uvp->uv_ustate); + ATM_DEBUG3("unisig_vctimer: uvp=%p, sstate=%d, ustate=%d\n", + uvp, uvp->uv_sstate, uvp->uv_ustate); /* * Hand the timeout to the VC finite state machine @@ -162,8 +162,8 @@ unisig_saal_ctl(cmd, tok, a1) { struct unisig *usp = tok; - ATM_DEBUG4("unisig_upper: usp=0x%x,state=%d,cmd=%d,a1=0x%x,\n", - (u_long)usp, usp->us_state, cmd, (u_long)a1); + ATM_DEBUG4("unisig_upper: usp=%p,state=%d,cmd=%d,a1=0x%lx,\n", + usp, usp->us_state, cmd, (u_long)a1); /* * Process command @@ -196,8 +196,8 @@ unisig_saal_ctl(cmd, tok, a1) default: log(LOG_ERR, - "unisig: unknown SAAL cmd: usp=0x%x, state=%d, cmd=%d\n", - (int)usp, usp->us_state, cmd); + "unisig: unknown SAAL cmd: usp=%p, state=%d, cmd=%d\n", + usp, usp->us_state, cmd); } } @@ -223,8 +223,8 @@ unisig_saal_data(tok, m) { struct unisig *usp = tok; - ATM_DEBUG3("unisig_saal_data: usp=0x%x,state=%d,m=0x%x,\n", - (int)usp, usp->us_state, m); + ATM_DEBUG3("unisig_saal_data: usp=%p,state=%d,m=%p,\n", + usp, usp->us_state, m); /* * Pass data to signalling manager state machine @@ -280,14 +280,14 @@ unisig_connected(tok) { struct unisig *usp = tok; - ATM_DEBUG2("unisig_connected: usp=0x%x,state=%d\n", - (u_long)usp, usp->us_state); + ATM_DEBUG2("unisig_connected: usp=%p,state=%d\n", + usp, usp->us_state); /* * Connected routine shouldn't ever get called for a PVC */ - log(LOG_ERR, "unisig: connected notification, usp=0x%x\n", - (u_long)usp); + log(LOG_ERR, "unisig: connected notification, usp=%p\n", + usp); } @@ -311,8 +311,8 @@ unisig_cleared(tok, cp) { struct unisig *usp = tok; - ATM_DEBUG3("unisig_cleared: usp=0x%x, state=%d, cause=%d\n", - (u_long)usp, usp->us_state, cp->cause_value); + ATM_DEBUG3("unisig_cleared: usp=%p, state=%d, cause=%d\n", + usp, usp->us_state, cp->cause_value); /* * VCC has been closed. Notify the signalling diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c index 2fbbfca..0439d1c 100644 --- a/sys/netatm/uni/unisig_sigmgr_state.c +++ b/sys/netatm/uni/unisig_sigmgr_state.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_sigmgr_state.c,v 1.10 1998/08/26 23:29:24 mks Exp $ + * @(#) $Id: unisig_sigmgr_state.c,v 1.1 1998/09/15 08:23:12 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_sigmgr_state.c,v 1.10 1998/08/26 23:29:24 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_sigmgr_state.c,v 1.1 1998/09/15 08:23:12 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -249,8 +249,8 @@ unisig_sigmgr_state(usp, event, m) * the signalling manager's state */ action = sigmgr_state_table[event][usp->us_state]; - ATM_DEBUG4("unisig_sigmgr_state: usp=0x%x, state=%d, event=%d, action=%d\n", - (u_int) usp, usp->us_state, event, action); + ATM_DEBUG4("unisig_sigmgr_state: usp=%p, state=%d, event=%d, action=%d\n", + usp, usp->us_state, event, action); if (action >= MAX_ACTION || action < 0) { panic("unisig_sigmgr_state: invalid action\n"); } diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c index f8dc067..52326bc 100644 --- a/sys/netatm/uni/unisig_subr.c +++ b/sys/netatm/uni/unisig_subr.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_subr.c,v 1.12 1998/08/26 23:29:24 mks Exp $ + * @(#) $Id: unisig_subr.c,v 1.1 1998/09/15 08:23:12 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_subr.c,v 1.12 1998/08/26 23:29:24 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_subr.c,v 1.1 1998/09/15 08:23:12 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -129,7 +129,7 @@ unisig_open_vcc(usp, cvp) Atm_addr_pvc *pvp; int err, pvc; - ATM_DEBUG2("unisig_open_vcc: usp=0x%x, cvp=0x%x\n", usp, cvp); + ATM_DEBUG2("unisig_open_vcc: usp=%p, cvp=%p\n", usp, cvp); /* * Validate user parameters. AAL and encapsulation are @@ -305,7 +305,7 @@ unisig_close_vcc(usp, uvp) { int err = 0; - ATM_DEBUG2("unisig_close_vcc: uvp=0x%x, state=%d\n", uvp, + ATM_DEBUG2("unisig_close_vcc: uvp=%p, state=%d\n", uvp, uvp->uv_sstate); /* @@ -367,8 +367,8 @@ unisig_clear_vcc(usp, uvp, cause) { u_char outstate; - ATM_DEBUG3("unisig_clear_vcc: uvp=0x%x, state=%d, cause=%d\n", - (int)uvp, uvp->uv_sstate, cause); + ATM_DEBUG3("unisig_clear_vcc: uvp=%p, state=%d, cause=%d\n", + uvp, uvp->uv_sstate, cause); /* * Check that this is for the same interface UNISIG uses @@ -432,7 +432,7 @@ unisig_switch_reset(usp, cause) int s; struct unisig_vccb *uvp, *vnext; - ATM_DEBUG2("unisig_switch_reset: usp=0x%x, cause=%d\n", + ATM_DEBUG2("unisig_switch_reset: usp=%p, cause=%d\n", usp, cause); /* @@ -463,7 +463,7 @@ unisig_switch_reset(usp, cause) } atm_cm_cleared(uvp->uv_connvc, cause); } else { - log(LOG_ERR, "unisig: invalid VCC type: vccb=0x%x, type=%d\n", + log(LOG_ERR, "unisig: invalid VCC type: vccb=%p, type=%d\n", uvp, uvp->uv_type); } } diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c index ec4fbd0..d7a64f6 100644 --- a/sys/netatm/uni/unisig_util.c +++ b/sys/netatm/uni/unisig_util.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_util.c,v 1.9 1998/08/26 23:29:24 mks Exp $ + * @(#) $Id: unisig_util.c,v 1.1 1998/09/15 08:23:13 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_util.c,v 1.9 1998/08/26 23:29:24 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_util.c,v 1.1 1998/09/15 08:23:13 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -65,7 +65,7 @@ unisig_free_msg(msg) int i; struct ie_generic *ie, *ienxt; - ATM_DEBUG1("unisig_free_msg: msg=0x%x\n", msg); + ATM_DEBUG1("unisig_free_msg: msg=%p\n", msg); /* * First free all the IEs @@ -325,7 +325,7 @@ unisig_addr_print(p) * Print the IA5 characters of the E.164 address */ for(i=0; i<p->address_length; i++) { - sprintf(&strbuff[strlen(strbuff)], "%c\0", + sprintf(&strbuff[strlen(strbuff)], "%c", ((Atm_addr_e164 *)p->address)->aae_addr[i]); } break; @@ -380,7 +380,7 @@ unisig_print_mbuf(m) KB_DATASTART(m, cp, caddr_t); for (i = 0; i < KB_LEN(m); i++) { if (i == 0) - printf(" bfr=0x%x: ", (int)m); + printf(" bfr=%p: ", m); printf("%x ", (u_char)*cp++); } printf("<end_bfr>\n"); diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c index cfd7635..e52515d 100644 --- a/sys/netatm/uni/unisig_vc_state.c +++ b/sys/netatm/uni/unisig_vc_state.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_vc_state.c,v 1.11 1998/08/06 18:16:29 mks Exp $ + * @(#) $Id: unisig_vc_state.c,v 1.1 1998/09/15 08:23:13 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_vc_state.c,v 1.11 1998/08/06 18:16:29 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_vc_state.c,v 1.1 1998/09/15 08:23:13 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -233,8 +233,8 @@ unisig_vc_state(usp, uvp, event, msg) /* * Perform the requested action */ - ATM_DEBUG4("unisig_vc_state: uvp=0x%x, state=%d, event=%d, action=%d\n", - (int) uvp, state, event, action); + ATM_DEBUG4("unisig_vc_state: uvp=%p, state=%d, event=%d, action=%d\n", + uvp, state, event, action); rc = unisig_vc_act_vec[action](usp, uvp, msg); return(rc); @@ -850,8 +850,8 @@ unisig_vc_act08(usp, uvp, msg) Atm_addr_nsap *nap; Atm_attributes attr; - ATM_DEBUG3("unisig_vc_act08: usp=0x%x, uvp=0x%x, msg=0x%x\n", - (int) usp, (int) uvp, (int) msg); + ATM_DEBUG3("unisig_vc_act08: usp=%p, uvp=%p, msg=%p\n", + usp, uvp, msg); /* * Make sure that the called address is the right format @@ -1467,8 +1467,8 @@ unisig_vc_act17(usp, uvp, msg) { int rc; - ATM_DEBUG3("unisig_vc_perror: usp=0x%x, uvp=0x%x, msg=0x%x\n", - (int) usp, (int) uvp, (int) msg); + ATM_DEBUG3("unisig_vc_perror: usp=%p, uvp=%p, msg=%p\n", + usp, uvp, msg); /* * Clear any running timer @@ -1725,8 +1725,8 @@ unisig_vc_act22(usp, uvp, msg) struct unisig_msg *status; struct ie_generic *callst_ie, *cause_ie; - ATM_DEBUG3("unisig_vc_perror: usp=0x%x, uvp=0x%x, msg=0x%x\n", - (int) usp, (int) uvp, (int) msg); + ATM_DEBUG3("unisig_vc_perror: usp=%p, uvp=%p, msg=%p\n", + usp, uvp, msg); /* * Get memory for a STATUS message |