mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-12 09:58:36 +00:00
Code Issues Releases Activity

Revert https://svnweb.freebsd.org/changeset/base/357761

Browse Source 
This was suggested by cem@
This commit is contained in:
Michael Tuexen 2020-02-11 20:02:20 +00:00
parent d65c432aa6
commit 8803350d6d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=357775
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/netinet/sctp_pcb.c
View File

@ -4767,7 +4767,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre
}
}
/* Now clean up any other timers */
sctp_stop_association_timers(stcb, 0);
sctp_stop_association_timers(stcb, false);
/* 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);
@ -4935,7 +4935,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre
/*
* Now restop the timers to be sure this is paranoia at is finest!
*/
sctp_stop_association_timers(stcb, 1);
sctp_stop_association_timers(stcb, true);
/*
* The chunk lists and such SHOULD be empty but we check them just

4
sys/netinet/sctputil.c
View File

@ -802,7 +802,7 @@ sctp_stop_timers_for_shutdown(struct sctp_tcb *stcb)
}
void
sctp_stop_association_timers(struct sctp_tcb *stcb, int stop_assoc_kill_timer)
sctp_stop_association_timers(struct sctp_tcb *stcb, bool stop_assoc_kill_timer)
{
struct sctp_inpcb *inp;
struct sctp_nets *net;
@ -812,7 +812,7 @@ sctp_stop_association_timers(struct sctp_tcb *stcb, int stop_assoc_kill_timer)
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 != 0) {
if (stop_assoc_kill_timer) {
sctp_timer_stop(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL,
SCTP_FROM_SCTPUTIL + SCTP_LOC_20);
}

2
sys/netinet/sctputil.h
View File

@ -165,7 +165,7 @@ sctp_pull_off_control_to_new_inp(struct sctp_inpcb *old_inp,
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 *, int);
void sctp_stop_association_timers(struct sctp_tcb *, bool);
void
sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int