d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More 64 bit pointer fun.

Browse Source 
%p changed in multiple prints
the mtod() was also fixed.
This commit is contained in:
rrs 2006-11-03 23:04:34 +00:00
parent 61e78b6cd4
commit 9fe01d5c9e
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netinet/sctp_input.c
View File

@ -250,7 +250,7 @@ sctp_process_init(struct sctp_init_chunk *cp, struct sctp_tcb *stcb,
sctp_free_remote_addr(sp->net);
sp->net = NULL;
/* Free the chunk */
printf("sp:%x tcb:%x weird free case\n",
printf("sp:%p tcb:%p weird free case\n",
(u_int)sp, (u_int)stcb);
sctp_free_a_strmoq(stcb, sp);

2
sys/netinet/sctp_pcb.c
View File

@ -2206,7 +2206,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
sp = TAILQ_LAST(&((asoc->asoc.locked_on_sending)->outqueue),
sctp_streamhead);
if (sp == NULL) {
printf("Error, sp is NULL, locked on sending is %x strm:%d\n",
printf("Error, sp is NULL, locked on sending is %ps strm:%d\n",
(u_int)asoc->asoc.locked_on_sending,
asoc->asoc.locked_on_sending->stream_no);
} else {

4
sys/netinet/sctp_timer.c
View File

@ -862,7 +862,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
int win_probe, num_mk;
#ifdef SCTP_FR_LOGGING
sctp_log_fr(sctps_datadropchklmt.sctps_senddata, 0, 0, SCTP_FR_T3_TIMEOUT);
sctp_log_fr(0, 0, 0, SCTP_FR_T3_TIMEOUT);
#ifdef SCTP_CWND_LOGGING
{
struct sctp_nets *lnet;
@ -1662,7 +1662,7 @@ sctp_iterator_timer(struct sctp_iterator *it)
}
if ((it->inp->inp_starting_point_for_iterator != NULL) &&
(it->inp->inp_starting_point_for_iterator != it)) {
printf("Iterator collision, waiting for one at 0x%x\n",
printf("Iterator collision, waiting for one at %p\n",
(uint32_t) it->inp);
SCTP_INP_WUNLOCK(it->inp);
goto start_timer_return;

2
sys/netinet/sctp_usrreq.c
View File

@ -3131,7 +3131,7 @@ sctp_optsset(struct socket *so,
error = EINVAL;
break;
}
on_off = (mtod(m, int));
on_off = *(mtod(m, int *));
if (on_off) {
sctp_feature_on(inp, SCTP_PCB_FLAGS_FRAG_INTERLEAVE);
} else {

4
sys/netinet/sctputil.c
View File

@ -3271,12 +3271,12 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb,
break;
case SCTP_NOTIFY_AUTH_NEW_KEY:
sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY, error,
(uint32_t) data);
(uint16_t) (uintptr_t) data);
break;
#if 0
case SCTP_NOTIFY_AUTH_KEY_CONFLICT:
sctp_notify_authentication(stcb, SCTP_AUTH_KEY_CONFLICT,
error, (uint32_t) data);
error, (uint16_t) (uintptr_t) data);
break;
#endif /* not yet? remove? */