* queue nor has an associated XSO. This condition occurs when and only
* when deleted is true.
*
- * - Once there is the case (i.e., no user-facing API object exposing the
+ * - Once this is the case (i.e., no user-facing API object exposing the
* stream), we can delete the stream once we determine that all of our
* protocol obligations requiring us to keep the QUIC_STREAM around have
* been met.
__owur int SSL_is_connection(SSL *s);
#define SSL_STREAM_TYPE_NONE 0
-#define SSL_STREAM_TYPE_READ 1
-#define SSL_STREAM_TYPE_WRITE 2
+#define SSL_STREAM_TYPE_READ (1U << 0)
+#define SSL_STREAM_TYPE_WRITE (1U << 1)
#define SSL_STREAM_TYPE_BIDI (SSL_STREAM_TYPE_READ | SSL_STREAM_TYPE_WRITE)
__owur int SSL_get_stream_type(SSL *s);
QUIC_STREAM *ossl_quic_channel_new_stream_local(QUIC_CHANNEL *ch, int is_uni)
{
QUIC_STREAM *qs;
- int type = 0;
+ int type;
uint64_t stream_id, *p_next_ordinal;
- type |= ch->is_server ? QUIC_STREAM_INITIATOR_SERVER
- : QUIC_STREAM_INITIATOR_CLIENT;
+ type = ch->is_server ? QUIC_STREAM_INITIATOR_SERVER
+ : QUIC_STREAM_INITIATOR_CLIENT;
if (is_uni) {
p_next_ordinal = &ch->next_local_stream_ordinal_uni;
if (!expect_quic(s, &ctx))
return;
+ quic_lock(ctx.qc);
+
if (ctx.is_stream) {
/*
* When a QSSO is freed, the XSO is freed immediately, because the XSO
* as deleted for later collection.
*/
- quic_lock(ctx.qc);
-
assert(ctx.qc->num_xso > 0);
--ctx.qc->num_xso;
return;
}
- quic_lock(ctx.qc);
-
/*
* Free the default XSO, if any. The QUIC_STREAM is not deleted at this
* stage, but is freed during the channel free when the whole QSM is freed.
static size_t ossl_quic_pending_int(const SSL *s)
{
QCTX ctx;
- size_t avail = 0;
+ size_t avail;
int fin = 0;
if (!expect_quic_with_stream_lock(s, /*remote_init=*/-1, &ctx))
* the records for some reason.
*/
const SSL_CONNECTION *sc;
-#ifndef OPENSSL_NO_QUIC
- const QUIC_CONNECTION *qc = QUIC_CONNECTION_FROM_CONST_SSL(s);
- if (qc != NULL)
+#ifndef OPENSSL_NO_QUIC
+ if (IS_QUIC(s))
return ossl_quic_has_pending(s);
#endif
-
sc = SSL_CONNECTION_FROM_CONST_SSL(s);
/* Check buffered app data if any first */
* (see ssl3_shutdown).
*/
SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
-#ifndef OPENSSL_NO_QUIC
- QUIC_CONNECTION *qc = QUIC_CONNECTION_FROM_SSL(s);
- if (qc != NULL)
+#ifndef OPENSSL_NO_QUIC
+ if (IS_QUIC(s))
return ossl_quic_conn_shutdown(s, 0, NULL, 0);
#endif