QUIC_TXPIM_PKT *pkt,
void *arg);
void *regen_frame_arg;
+ void (*sstream_updated)(uint64_t stream_id,
+ void *arg);
+ void *sstream_updated_arg;
};
int ossl_quic_fifd_init(QUIC_FIFD *fifd,
uint64_t stream_id,
QUIC_TXPIM_PKT *pkt,
void *arg),
- void *regen_frame_arg);
+ void *regen_frame_arg,
+ void (*sstream_updated)(uint64_t stream_id,
+ void *arg),
+ void *sstream_updated_arg);
void ossl_quic_fifd_cleanup(QUIC_FIFD *fifd); /* (no-op) */
uint64_t stream_id,
QUIC_TXPIM_PKT *pkt,
void *arg),
- void *regen_frame_arg)
+ void *regen_frame_arg,
+ void (*sstream_updated)(uint64_t stream_id,
+ void *arg),
+ void *sstream_updated_arg)
{
if (cfq == NULL || ackm == NULL || txpim == NULL
|| get_sstream_by_id == NULL || regen_frame == NULL)
fifd->get_sstream_by_id_arg = get_sstream_by_id_arg;
fifd->regen_frame = regen_frame;
fifd->regen_frame_arg = regen_frame_arg;
+ fifd->sstream_updated = sstream_updated;
+ fifd->sstream_updated_arg = sstream_updated_arg;
return 1;
}
size_t i, num_chunks = ossl_quic_txpim_pkt_get_num_chunks(pkt);
QUIC_SSTREAM *sstream;
QUIC_CFQ_ITEM *cfq_item, *cfq_item_next;
+ int sstream_updated;
/* STREAM and CRYPTO stream chunks, FIN and stream FC frames */
for (i = 0; i < num_chunks; ++i) {
if (sstream == NULL)
continue;
- if (chunks[i].end >= chunks[i].start)
+ sstream_updated = 0;
+
+ if (chunks[i].end >= chunks[i].start) {
ossl_quic_sstream_mark_lost(sstream,
chunks[i].start, chunks[i].end);
+ sstream_updated = 1;
+ }
- if (chunks[i].has_fin && chunks[i].stream_id != UINT64_MAX)
+ if (chunks[i].has_fin && chunks[i].stream_id != UINT64_MAX) {
ossl_quic_sstream_mark_lost_fin(sstream);
+ sstream_updated = 1;
+ }
if (chunks[i].has_stop_sending && chunks[i].stream_id != UINT64_MAX)
fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
chunks[i].stream_id,
pkt,
fifd->regen_frame_arg);
+
+ if (sstream_updated && chunks[i].stream_id != UINT64_MAX)
+ fifd->sstream_updated(chunks[i].stream_id,
+ fifd->sstream_updated_arg);
}
/* GCR */
void *arg);
static void on_regen_notify(uint64_t frame_type, uint64_t stream_id,
QUIC_TXPIM_PKT *pkt, void *arg);
+static void on_sstream_updated(uint64_t stream_id, void *arg);
static int sstream_is_pending(QUIC_SSTREAM *sstream);
static int txp_el_pending(OSSL_QUIC_TX_PACKETISER *txp, uint32_t enc_level,
uint32_t archetype,
if (!ossl_quic_fifd_init(&txp->fifd,
txp->args.cfq, txp->args.ackm, txp->args.txpim,
get_sstream_by_id, txp,
- on_regen_notify, txp)) {
+ on_regen_notify, txp,
+ on_sstream_updated, txp)) {
OPENSSL_free(txp);
return NULL;
}
}
}
+static void on_sstream_updated(uint64_t stream_id, void *arg)
+{
+ OSSL_QUIC_TX_PACKETISER *txp = arg;
+ QUIC_STREAM *s;
+
+ s = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
+ if (s == NULL)
+ return;
+
+ ossl_quic_stream_map_update_state(txp->args.qsm, s);
+}
+
static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp,
struct tx_helper *h,
QUIC_TXPIM_PKT *tpkt,
regen_frame_p(frame_type, stream_id, pkt, arg);
}
+static void sstream_updated(uint64_t stream_id, void *arg)
+{}
+
typedef struct info_st {
QUIC_FIFD fifd;
OSSL_ACKM *ackm;
|| !TEST_true(ossl_quic_fifd_init(&info.fifd, info.cfq, info.ackm,
info.txpim,
get_sstream_by_id, NULL,
- regen_frame, NULL)))
+ regen_frame, NULL,
+ sstream_updated, NULL)))
goto err;
for (i = 0; i < OSSL_NELEM(info.sstream); ++i)