Cleaup, no functional change.
This commit is contained in:
parent
62cf53fdac
commit
cd6340caf7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=326829
@ -3207,9 +3207,9 @@ sctp_handle_ecn_cwr(struct sctp_cwr_chunk *cp, struct sctp_tcb *stcb, struct sct
|
||||
stcb->asoc.ecn_echo_cnt_onq--;
|
||||
TAILQ_REMOVE(&stcb->asoc.control_send_queue, chk,
|
||||
sctp_next);
|
||||
stcb->asoc.ctrl_queue_cnt--;
|
||||
sctp_m_freem(chk->data);
|
||||
chk->data = NULL;
|
||||
stcb->asoc.ctrl_queue_cnt--;
|
||||
sctp_free_a_chunk(stcb, chk, SCTP_SO_NOT_LOCKED);
|
||||
if (override == 0) {
|
||||
break;
|
||||
@ -3641,26 +3641,23 @@ static void
|
||||
sctp_clean_up_stream_reset(struct sctp_tcb *stcb)
|
||||
{
|
||||
struct sctp_association *asoc;
|
||||
struct sctp_tmit_chunk *chk = stcb->asoc.str_reset;
|
||||
struct sctp_tmit_chunk *chk;
|
||||
|
||||
if (stcb->asoc.str_reset == NULL) {
|
||||
asoc = &stcb->asoc;
|
||||
chk = asoc->str_reset;
|
||||
if (chk == NULL) {
|
||||
return;
|
||||
}
|
||||
asoc = &stcb->asoc;
|
||||
|
||||
asoc->str_reset = NULL;
|
||||
sctp_timer_stop(SCTP_TIMER_TYPE_STRRESET, stcb->sctp_ep, stcb,
|
||||
chk->whoTo, SCTP_FROM_SCTP_INPUT + SCTP_LOC_28);
|
||||
TAILQ_REMOVE(&asoc->control_send_queue,
|
||||
chk,
|
||||
sctp_next);
|
||||
TAILQ_REMOVE(&asoc->control_send_queue, chk, sctp_next);
|
||||
asoc->ctrl_queue_cnt--;
|
||||
if (chk->data) {
|
||||
sctp_m_freem(chk->data);
|
||||
chk->data = NULL;
|
||||
}
|
||||
asoc->ctrl_queue_cnt--;
|
||||
sctp_free_a_chunk(stcb, chk, SCTP_SO_NOT_LOCKED);
|
||||
/* sa_ignore NO_NULL_CHK */
|
||||
stcb->asoc.str_reset = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
@ -6898,11 +6898,11 @@ sctp_toss_old_cookies(struct sctp_tcb *stcb, struct sctp_association *asoc)
|
||||
TAILQ_FOREACH_SAFE(chk, &asoc->control_send_queue, sctp_next, nchk) {
|
||||
if (chk->rec.chunk_id.id == SCTP_COOKIE_ECHO) {
|
||||
TAILQ_REMOVE(&asoc->control_send_queue, chk, sctp_next);
|
||||
asoc->ctrl_queue_cnt--;
|
||||
if (chk->data) {
|
||||
sctp_m_freem(chk->data);
|
||||
chk->data = NULL;
|
||||
}
|
||||
asoc->ctrl_queue_cnt--;
|
||||
sctp_free_a_chunk(stcb, chk, SCTP_SO_NOT_LOCKED);
|
||||
}
|
||||
}
|
||||
@ -6927,11 +6927,11 @@ sctp_toss_old_asconf(struct sctp_tcb *stcb)
|
||||
}
|
||||
}
|
||||
TAILQ_REMOVE(&asoc->asconf_send_queue, chk, sctp_next);
|
||||
asoc->ctrl_queue_cnt--;
|
||||
if (chk->data) {
|
||||
sctp_m_freem(chk->data);
|
||||
chk->data = NULL;
|
||||
}
|
||||
asoc->ctrl_queue_cnt--;
|
||||
sctp_free_a_chunk(stcb, chk, SCTP_SO_NOT_LOCKED);
|
||||
}
|
||||
}
|
||||
@ -7055,13 +7055,14 @@ sctp_clean_up_ctl(struct sctp_tcb *stcb, struct sctp_association *asoc, int so_l
|
||||
/* Stray chunks must be cleaned up */
|
||||
clean_up_anyway:
|
||||
TAILQ_REMOVE(&asoc->control_send_queue, chk, sctp_next);
|
||||
asoc->ctrl_queue_cnt--;
|
||||
if (chk->data) {
|
||||
sctp_m_freem(chk->data);
|
||||
chk->data = NULL;
|
||||
}
|
||||
asoc->ctrl_queue_cnt--;
|
||||
if (chk->rec.chunk_id.id == SCTP_FORWARD_CUM_TSN)
|
||||
if (chk->rec.chunk_id.id == SCTP_FORWARD_CUM_TSN) {
|
||||
asoc->fwd_tsn_cnt--;
|
||||
}
|
||||
sctp_free_a_chunk(stcb, chk, so_locked);
|
||||
} else if (chk->rec.chunk_id.id == SCTP_STREAM_RESET) {
|
||||
/* special handling, we must look into the param */
|
||||
|
Loading…
Reference in New Issue
Block a user