QUIC TXP TEST: Remove dependency on legacy DEMUX-QRX routing
Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/22674)
This commit is contained in:
parent
08c7caebbe
commit
5d49f9ef9a
@ -108,6 +108,17 @@ static void helper_cleanup(struct helper *h)
|
|||||||
BIO_free(h->bio2);
|
BIO_free(h->bio2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void demux_default_handler(QUIC_URXE *e, void *arg,
|
||||||
|
const QUIC_CONN_ID *dcid)
|
||||||
|
{
|
||||||
|
struct helper *h = arg;
|
||||||
|
|
||||||
|
if (dcid == NULL || !ossl_quic_conn_id_eq(dcid, &dcid_1))
|
||||||
|
return;
|
||||||
|
|
||||||
|
ossl_qrx_inject_urxe(h->qrx, e);
|
||||||
|
}
|
||||||
|
|
||||||
static int helper_init(struct helper *h)
|
static int helper_init(struct helper *h)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
@ -204,6 +215,8 @@ static int helper_init(struct helper *h)
|
|||||||
fake_now, NULL)))
|
fake_now, NULL)))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
ossl_quic_demux_set_default_handler(h->demux, demux_default_handler, h);
|
||||||
|
|
||||||
h->qrx_args.demux = h->demux;
|
h->qrx_args.demux = h->demux;
|
||||||
h->qrx_args.short_conn_id_len = 8;
|
h->qrx_args.short_conn_id_len = 8;
|
||||||
h->qrx_args.max_deferred = 32;
|
h->qrx_args.max_deferred = 32;
|
||||||
@ -211,9 +224,6 @@ static int helper_init(struct helper *h)
|
|||||||
if (!TEST_ptr(h->qrx = ossl_qrx_new(&h->qrx_args)))
|
if (!TEST_ptr(h->qrx = ossl_qrx_new(&h->qrx_args)))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
if (!TEST_true(ossl_qrx_add_dst_conn_id(h->qrx, &dcid_1)))
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
ossl_qrx_allow_1rtt_processing(h->qrx);
|
ossl_qrx_allow_1rtt_processing(h->qrx);
|
||||||
|
|
||||||
rc = 1;
|
rc = 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user