Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
quic: call quic_send_packets only once per ctx
[vpp.git]
/
src
/
plugins
/
quic
/
quic.h
diff --git
a/src/plugins/quic/quic.h
b/src/plugins/quic/quic.h
index
c426e39
..
5921f3a
100644
(file)
--- a/
src/plugins/quic/quic.h
+++ b/
src/plugins/quic/quic.h
@@
-40,6
+40,11
@@
#define QUIC_INT_MAX 0x3FFFFFFFFFFFFFFF
#define QUIC_DEFAULT_FIFO_SIZE (64 << 10)
#define QUIC_SEND_PACKET_VEC_SIZE 16
#define QUIC_INT_MAX 0x3FFFFFFFFFFFFFFF
#define QUIC_DEFAULT_FIFO_SIZE (64 << 10)
#define QUIC_SEND_PACKET_VEC_SIZE 16
+#define QUIC_IV_LEN 17
+
+#define QUIC_SEND_MAX_BATCH_PACKETS 16
+#define QUIC_RCV_MAX_BATCH_PACKETS 16
+#define QUIC_DEFAULT_CONN_TIMEOUT (30 * 1000) /* 30 seconds */
/* Taken from quicly.c */
#define QUICLY_QUIC_BIT 0x40
/* Taken from quicly.c */
#define QUICLY_QUIC_BIT 0x40
@@
-65,11
+70,23
@@
#define QUIC_DBG(_lvl, _fmt, _args...)
#endif
#define QUIC_DBG(_lvl, _fmt, _args...)
#endif
+#if CLIB_ASSERT_ENABLE
+#define QUIC_ASSERT(truth) ASSERT (truth)
+#else
+#define QUIC_ASSERT(truth) \
+ do { \
+ if (PREDICT_FALSE (! (truth))) \
+ QUIC_ERR ("ASSERT(%s) failed", # truth); \
+ } while (0)
+#endif
+
#define QUIC_ERR(_fmt, _args...) \
do { \
clib_warning ("QUIC-ERR: " _fmt, ##_args); \
} while (0)
#define QUIC_ERR(_fmt, _args...) \
do { \
clib_warning ("QUIC-ERR: " _fmt, ##_args); \
} while (0)
+
+
extern vlib_node_registration_t quic_input_node;
typedef enum
extern vlib_node_registration_t quic_input_node;
typedef enum
@@
-91,6
+108,15
@@
typedef enum quic_ctx_conn_state_
QUIC_CONN_STATE_ACTIVE_CLOSING,
} quic_ctx_conn_state_t;
QUIC_CONN_STATE_ACTIVE_CLOSING,
} quic_ctx_conn_state_t;
+typedef enum quic_packet_type_
+{
+ QUIC_PACKET_TYPE_NONE,
+ QUIC_PACKET_TYPE_RECEIVE,
+ QUIC_PACKET_TYPE_MIGRATE,
+ QUIC_PACKET_TYPE_ACCEPT,
+ QUIC_PACKET_TYPE_RESET,
+ QUIC_PACKET_TYPE_DROP,
+} quic_packet_type_t;
typedef enum quic_ctx_flags_
{
typedef enum quic_ctx_flags_
{
@@
-127,7
+153,8
@@
typedef struct quic_ctx_
u32 parent_app_wrk_id;
u32 parent_app_id;
u32 ckpair_index;
u32 parent_app_wrk_id;
u32 parent_app_id;
u32 ckpair_index;
- quicly_context_t *quicly_ctx;
+ u32 crypto_engine;
+ u32 crypto_context_index;
u8 flags;
} quic_ctx_t;
u8 flags;
} quic_ctx_t;
@@
-153,15
+180,25
@@
typedef struct quic_stream_data_
{
u32 ctx_id;
u32 thread_index;
{
u32 ctx_id;
u32 thread_index;
- u32 app_rx_data_len; /* bytes received, to be read by external app */
+ u32 app_rx_data_len; /**< bytes received, to be read by external app */
+ u32 app_tx_data_len; /**< bytes sent */
} quic_stream_data_t;
} quic_stream_data_t;
+typedef struct quic_crypto_context_data_
+{
+ quicly_context_t quicly_ctx;
+ char cid_key[QUIC_IV_LEN];
+ ptls_context_t ptls_ctx;
+} quic_crypto_context_data_t;
+
typedef struct quic_worker_ctx_
{
CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
int64_t time_now; /**< worker time */
tw_timer_wheel_1t_3w_1024sl_ov_t timer_wheel; /**< worker timer wheel */
typedef struct quic_worker_ctx_
{
CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
int64_t time_now; /**< worker time */
tw_timer_wheel_1t_3w_1024sl_ov_t timer_wheel; /**< worker timer wheel */
- u32 *opening_ctx_pool;
+ quicly_cid_plaintext_t next_cid;
+ crypto_context_t *crypto_ctx_pool; /**< per thread pool of crypto contexes */
+ clib_bihash_24_8_t crypto_context_hash; /**< per thread [params:crypto_ctx_index] hash */
} quic_worker_ctx_t;
typedef struct quic_rx_packet_ctx_
} quic_worker_ctx_t;
typedef struct quic_rx_packet_ctx_
@@
-170,36
+207,34
@@
typedef struct quic_rx_packet_ctx_
u8 data[QUIC_MAX_PACKET_SIZE];
u32 ctx_index;
u32 thread_index;
u8 data[QUIC_MAX_PACKET_SIZE];
u32 ctx_index;
u32 thread_index;
+ union
+ {
+ struct sockaddr sa;
+ struct sockaddr_in6 sa6;
+ };
+ socklen_t salen;
+ u8 ptype;
+ session_dgram_hdr_t ph;
} quic_rx_packet_ctx_t;
} quic_rx_packet_ctx_t;
-typedef struct quicly_ctx_data_
-{
- quicly_context_t quicly_ctx;
- char cid_key[17];
- ptls_context_t ptls_ctx;
-} quicly_ctx_data_t;
-
typedef struct quic_main_
{
u32 app_index;
quic_ctx_t **ctx_pool;
quic_worker_ctx_t *wrk_ctx;
typedef struct quic_main_
{
u32 app_index;
quic_ctx_t **ctx_pool;
quic_worker_ctx_t *wrk_ctx;
- clib_bihash_16_8_t connection_hash; /* quic connection id -> conn handle */
+ clib_bihash_16_8_t connection_hash; /*
*<
quic connection id -> conn handle */
f64 tstamp_ticks_per_clock;
f64 tstamp_ticks_per_clock;
- ptls_cipher_suite_t ***quic_ciphers; /* available ciphers by crypto engine */
- u
8 default_cipher;
- quic_session_cache_t session_cache;
+ ptls_cipher_suite_t ***quic_ciphers; /*
*<
available ciphers by crypto engine */
+ u
word *available_crypto_engines; /**< Bitmap for registered engines */
+ u8 default_crypto_engine; /**< Used if you do connect with CRYPTO_ENGINE_NONE (0) */
- /*
- * Config
- */
- quicly_context_t quicly_ctx;
ptls_handshake_properties_t hs_properties;
ptls_handshake_properties_t hs_properties;
- quic
ly_cid_plaintext_t next_cid
;
+ quic
_session_cache_t session_cache
;
u32 udp_fifo_size;
u32 udp_fifo_prealloc;
u32 udp_fifo_size;
u32 udp_fifo_prealloc;
+ u32 connection_timeout;
} quic_main_t;
#endif /* __included_quic_h__ */
} quic_main_t;
#endif /* __included_quic_h__ */