mirror of https://github.com/openssl/openssl
QUIC CHANNEL: Consolidate forward object declarations in a single header
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
26624caf17
commit
e801455446
|
@ -12,9 +12,9 @@
|
||||||
|
|
||||||
# include <openssl/ssl.h>
|
# include <openssl/ssl.h>
|
||||||
# include "internal/quic_types.h"
|
# include "internal/quic_types.h"
|
||||||
# include "internal/quic_stream_map.h"
|
# include "internal/quic_record_tx.h"
|
||||||
# include "internal/quic_reactor.h"
|
# include "internal/quic_wire.h"
|
||||||
# include "internal/quic_statm.h"
|
# include "internal/quic_predef.h"
|
||||||
# include "internal/time.h"
|
# include "internal/time.h"
|
||||||
# include "internal/thread.h"
|
# include "internal/thread.h"
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||||
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
|
* in the file LICENSE in the source distribution or at
|
||||||
|
* https://www.openssl.org/source/license.html
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef OSSL_QUIC_PREDEF_H
|
||||||
|
# define OSSL_QUIC_PREDEF_H
|
||||||
|
|
||||||
|
# ifndef OPENSSL_NO_QUIC
|
||||||
|
|
||||||
|
typedef struct quic_port_st QUIC_PORT;
|
||||||
|
typedef struct quic_channel_st QUIC_CHANNEL;
|
||||||
|
typedef struct quic_tls_st QUIC_TLS;
|
||||||
|
typedef struct quic_txpim_st QUIC_TXPIM;
|
||||||
|
typedef struct quic_cfq_st QUIC_CFQ;
|
||||||
|
typedef struct ossl_quic_tx_packetiser_st OSSL_QUIC_TX_PACKETISER;
|
||||||
|
typedef struct ossl_ackm_st OSSL_ACKM;
|
||||||
|
typedef struct quic_srt_elem_st QUIC_SRT_ELEM;
|
||||||
|
typedef struct ossl_cc_data_st OSSL_CC_DATA;
|
||||||
|
typedef struct ossl_cc_method_st OSSL_CC_METHOD;
|
||||||
|
typedef struct quic_stream_map_st QUIC_STREAM_MAP;
|
||||||
|
typedef struct quic_stream_st QUIC_STREAM;
|
||||||
|
typedef struct quic_sstream_st QUIC_SSTREAM;
|
||||||
|
typedef struct quic_rstream_st QUIC_RSTREAM;
|
||||||
|
typedef struct quic_reactor_st QUIC_REACTOR;
|
||||||
|
typedef struct ossl_statm_st OSSL_STATM;
|
||||||
|
typedef struct quic_demux_st QUIC_DEMUX;
|
||||||
|
typedef struct ossl_qrx_pkt_st OSSL_QRX_PKT;
|
||||||
|
typedef struct ossl_qtx_pkt_st OSSL_QTX_PKT;
|
||||||
|
typedef struct quic_tick_result_st QUIC_TICK_RESULT;
|
||||||
|
typedef struct quic_srtm_st QUIC_SRTM;
|
||||||
|
typedef struct quic_lcidm_st QUIC_LCIDM;
|
||||||
|
typedef struct quic_urxe_st QUIC_URXE;
|
||||||
|
|
||||||
|
# endif
|
||||||
|
|
||||||
|
#endif
|
|
@ -7,9 +7,9 @@
|
||||||
|
|
||||||
# include <openssl/lhash.h>
|
# include <openssl/lhash.h>
|
||||||
# include "internal/list.h"
|
# include "internal/list.h"
|
||||||
|
# include "internal/quic_predef.h"
|
||||||
|
# include "internal/quic_fc.h"
|
||||||
typedef struct quic_srt_elem_st QUIC_SRT_ELEM;
|
# include "internal/quic_stream_map.h"
|
||||||
|
|
||||||
struct quic_srt_elem_st {
|
struct quic_srt_elem_st {
|
||||||
OSSL_LIST_MEMBER(stateless_reset_tokens, QUIC_SRT_ELEM);
|
OSSL_LIST_MEMBER(stateless_reset_tokens, QUIC_SRT_ELEM);
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include "internal/quic_tserver.h"
|
#include "internal/quic_tserver.h"
|
||||||
#include "internal/quic_ssl.h"
|
#include "internal/quic_ssl.h"
|
||||||
#include "internal/quic_error.h"
|
#include "internal/quic_error.h"
|
||||||
|
#include "internal/quic_stream_map.h"
|
||||||
#include "testutil.h"
|
#include "testutil.h"
|
||||||
#include "helpers/quictestlib.h"
|
#include "helpers/quictestlib.h"
|
||||||
#if defined(OPENSSL_THREADS)
|
#if defined(OPENSSL_THREADS)
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "internal/e_os.h"
|
#include "internal/e_os.h"
|
||||||
#include "internal/sockets.h"
|
#include "internal/sockets.h"
|
||||||
#include "internal/quic_tserver.h"
|
#include "internal/quic_tserver.h"
|
||||||
|
#include "internal/quic_stream_map.h"
|
||||||
#include "internal/time.h"
|
#include "internal/time.h"
|
||||||
|
|
||||||
static BIO *bio_err = NULL;
|
static BIO *bio_err = NULL;
|
||||||
|
|
Loading…
Reference in New Issue