Author: tuexen
Date: Tue Feb 11 14:00:27 2020
New Revision: 357761
URL: https://svnweb.freebsd.org/changeset/base/357761
Log:
Use an int instead of a bool variable, since bool is not supported
on all platforms the stack is running on in userland.
Modified:
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctputil.c
head/sys/netinet/sctputil.h
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Tue Feb 11 12:14:22 2020 (r357760)
+++ head/sys/netinet/sctp_pcb.c Tue Feb 11 14:00:27 2020 (r357761)
@@ -4766,7 +4766,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc
}
}
/* Now clean up any other timers */
- sctp_stop_association_timers(stcb, false);
+ sctp_stop_association_timers(stcb, 0);
/* Now the read queue needs to be cleaned up (only once) */
if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0) {
SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_ABOUT_TO_BE_FREED);
@@ -4934,7 +4934,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc
/*
* Now restop the timers to be sure this is paranoia at is finest!
*/
- sctp_stop_association_timers(stcb, true);
+ sctp_stop_association_timers(stcb, 1);
/*
* The chunk lists and such SHOULD be empty but we check them just
Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c Tue Feb 11 12:14:22 2020 (r357760)
+++ head/sys/netinet/sctputil.c Tue Feb 11 14:00:27 2020 (r357761)
@@ -802,7 +802,7 @@ sctp_stop_timers_for_shutdown(struct sctp_tcb *stcb)
}
void
-sctp_stop_association_timers(struct sctp_tcb *stcb, bool stop_assoc_kill_timer)
+sctp_stop_association_timers(struct sctp_tcb *stcb, int stop_assoc_kill_timer)
{
struct sctp_inpcb *inp;
struct sctp_nets *net;
@@ -812,7 +812,7 @@ sctp_stop_association_timers(struct sctp_tcb *stcb, bo
SCTP_FROM_SCTPUTIL + SCTP_LOC_18);
sctp_timer_stop(SCTP_TIMER_TYPE_STRRESET, inp, stcb, NULL,
SCTP_FROM_SCTPUTIL + SCTP_LOC_19);
- if (stop_assoc_kill_timer) {
+ if (stop_assoc_kill_timer != 0) {
sctp_timer_stop(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL,
SCTP_FROM_SCTPUTIL + SCTP_LOC_20);
}
Modified: head/sys/netinet/sctputil.h
==============================================================================
--- head/sys/netinet/sctputil.h Tue Feb 11 12:14:22 2020 (r357760)
+++ head/sys/netinet/sctputil.h Tue Feb 11 14:00:27 2020 (r357761)
@@ -165,7 +165,7 @@ sctp_pull_off_control_to_new_inp(struct sctp_inpcb *ol
void sctp_stop_timers_for_shutdown(struct sctp_tcb *);
/* Stop all timers for association and remote addresses. */
-void sctp_stop_association_timers(struct sctp_tcb *, bool);
+void sctp_stop_association_timers(struct sctp_tcb *, int);
void
sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
