The branch stable/13 has been updated by tuexen:
URL:
https://cgit.FreeBSD.org/src/commit/?id=db083b5e571a1c20044f543b10f31e32eee9a2bf
commit db083b5e571a1c20044f543b10f31e32eee9a2bf
Author: Michael Tuexen <tue...@freebsd.org>
AuthorDate: 2023-08-14 10:27:39 +0000
Commit: Michael Tuexen <tue...@freebsd.org>
CommitDate: 2024-01-11 12:41:56 +0000
sctp: cleanup
Do not put a variable in the stcb for passing it to a function.
Just use a parameter of the function. No functional change intended.
(cherry picked from commit 749a7fb588c4a872a4f1ce3ee92be86bab1b1f17)
---
sys/netinet/sctp_indata.c | 9 ++-------
sys/netinet/sctp_pcb.c | 11 +++--------
sys/netinet/sctputil.c | 27 ++++++++++-----------------
3 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index e389cf7826b7..25819af0bdb2 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -5489,9 +5489,8 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb,
struct sctp_association *asoc;
uint32_t new_cum_tsn, gap;
unsigned int i, fwd_sz, m_size;
- uint32_t str_seq;
struct sctp_stream_in *strm;
- struct sctp_queued_to_read *control, *ncontrol, *sv;
+ struct sctp_queued_to_read *control, *ncontrol;
asoc = &stcb->asoc;
if ((fwd_sz = ntohs(fwd->ch.chunk_length)) < sizeof(struct
sctp_forward_tsn_chunk)) {
@@ -5672,9 +5671,7 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb,
TAILQ_FOREACH(control, &stcb->sctp_ep->read_queue,
next) {
if ((control->sinfo_stream == sid) &&
(SCTP_MID_EQ(asoc->idata_supported,
control->mid, mid))) {
- str_seq = (sid << 16) | (0x0000ffff &
mid);
control->pdapi_aborted = 1;
- sv = stcb->asoc.control_pdapi;
control->end_added = 1;
if (control->on_strm_q ==
SCTP_ON_ORDERED) {
TAILQ_REMOVE(&strm->inqueue,
control, next_instrm);
@@ -5697,13 +5694,11 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb,
#endif
}
control->on_strm_q = 0;
- stcb->asoc.control_pdapi = control;
sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION,
stcb,
SCTP_PARTIAL_DELIVERY_ABORTED,
- (void *)&str_seq,
+ (void *)control,
SCTP_SO_NOT_LOCKED);
- stcb->asoc.control_pdapi = sv;
break;
} else if ((control->sinfo_stream == sid) &&
SCTP_MID_GT(asoc->idata_supported,
control->mid, mid)) {
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 15f406eae32d..282ffebad541 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -4774,20 +4774,15 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb
*stcb, int from_inpcbfre
* added right after this
* msg.
*/
- uint32_t strseq;
-
- stcb->asoc.control_pdapi = sq;
- strseq = (sq->sinfo_stream <<
16) | (sq->mid & 0x0000ffff);
sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION,
stcb,
SCTP_PARTIAL_DELIVERY_ABORTED,
- (void *)&strseq,
+ (void *)sq,
SCTP_SO_LOCKED);
- stcb->asoc.control_pdapi = NULL;
}
+ /* Add an end to wake them */
+ sq->end_added = 1;
}
- /* Add an end to wake them */
- sq->end_added = 1;
}
}
SCTP_INP_READ_UNLOCK(inp);
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index e21fbe041291..828455207fe2 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -3638,7 +3638,8 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb)
static void
sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error,
- uint32_t val, int so_locked)
+ struct sctp_queued_to_read *aborted_control,
+ int so_locked)
{
struct mbuf *m_notify;
struct sctp_pdapi_event *pdapi;
@@ -3651,6 +3652,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb
*stcb, uint32_t error,
return;
}
+ KASSERT(aborted_control != NULL, ("aborted_control is NULL"));
SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep);
m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0,
M_NOWAIT, 1, MT_DATA);
@@ -3664,8 +3666,8 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb
*stcb, uint32_t error,
pdapi->pdapi_flags = 0;
pdapi->pdapi_length = sizeof(struct sctp_pdapi_event);
pdapi->pdapi_indication = error;
- pdapi->pdapi_stream = (val >> 16);
- pdapi->pdapi_seq = (val & 0x0000ffff);
+ pdapi->pdapi_stream = aborted_control->sinfo_stream;
+ pdapi->pdapi_seq = (uint16_t)aborted_control->mid;
pdapi->pdapi_assoc_id = sctp_get_associd(stcb);
SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_pdapi_event);
@@ -3691,12 +3693,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb
*stcb, uint32_t error,
sctp_sblog(sb, control->do_not_ref_stcb ? NULL : stcb,
SCTP_LOG_SBRESULT, 0);
}
control->end_added = 1;
- if (stcb->asoc.control_pdapi)
- TAILQ_INSERT_AFTER(&stcb->sctp_ep->read_queue,
stcb->asoc.control_pdapi, control, next);
- else {
- /* we really should not see this case */
- TAILQ_INSERT_TAIL(&stcb->sctp_ep->read_queue, control, next);
- }
+ TAILQ_INSERT_AFTER(&stcb->sctp_ep->read_queue, aborted_control,
control, next);
if (stcb->sctp_ep && stcb->sctp_socket) {
/* This should always be the case */
sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket);
@@ -4132,14 +4129,10 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb
*stcb,
(struct sctp_tmit_chunk *)data, so_locked);
break;
case SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION:
- {
- uint32_t val;
-
- val = *((uint32_t *)data);
-
- sctp_notify_partial_delivery_indication(stcb, error,
val, so_locked);
- break;
- }
+ sctp_notify_partial_delivery_indication(stcb, error,
+ (struct sctp_queued_to_read *)data,
+ so_locked);
+ break;
case SCTP_NOTIFY_ASSOC_LOC_ABORTED:
if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) ||
(SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) {
