Nginx/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-21 16:28:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

QUIC: separate event handling functions.

Browse Source 
The functions ngx_quic_handle_read_event() and ngx_quic_handle_write_event()
are added.  Previously this code was a part of ngx_handle_read_event() and
ngx_handle_write_event().

The change simplifies ngx_handle_read_event() and ngx_handle_write_event()
by moving QUIC-related code to a QUIC source file.
This commit is contained in:
Roman Arutyunyan 2021-09-09 16:55:00 +03:00
parent 9d7f2e7917
commit 00bb4e4b8d
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/event/ngx_event.c
View File

@ -273,15 +273,7 @@ ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
c = rev->data;
if (c->quic) {
if (!rev->active && !rev->ready) {
rev->active = 1;
} else if (rev->active && (rev->ready || (flags & NGX_CLOSE_EVENT))) {
rev->active = 0;
}
return NGX_OK;
return ngx_quic_handle_read_event(rev, flags);
}
#endif
@ -358,28 +350,18 @@ ngx_handle_write_event(ngx_event_t *wev, size_t lowat)
c = wev->data;
#if (NGX_QUIC)
if (c->quic) {
return ngx_quic_handle_write_event(wev, lowat);
}
#endif
if (lowat) {
if (ngx_send_lowat(c, lowat) == NGX_ERROR) {
return NGX_ERROR;
}
}
#if (NGX_QUIC)
if (c->quic) {
if (!wev->active && !wev->ready) {
wev->active = 1;
} else if (wev->active && wev->ready) {
wev->active = 0;
}
return NGX_OK;
}
#endif
if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
/* kqueue, epoll */

2
src/event/quic/ngx_event_quic.h
View File

@ -93,6 +93,8 @@ void ngx_quic_shutdown_connection(ngx_connection_t *c, ngx_uint_t err,
const char *reason);
ngx_int_t ngx_quic_reset_stream(ngx_connection_t *c, ngx_uint_t err);
uint32_t ngx_quic_version(ngx_connection_t *c);
ngx_int_t ngx_quic_handle_read_event(ngx_event_t *rev, ngx_uint_t flags);
ngx_int_t ngx_quic_handle_write_event(ngx_event_t *wev, size_t lowat);
ngx_int_t ngx_quic_get_packet_dcid(ngx_log_t *log, u_char *data, size_t len,
ngx_str_t *dcid);
ngx_int_t ngx_quic_derive_key(ngx_log_t *log, const char *label,

28
src/event/quic/ngx_event_quic_streams.c
View File

@ -1470,3 +1470,31 @@ ngx_quic_update_flow(ngx_connection_t *c, uint64_t last)
return NGX_OK;
}
ngx_int_t
ngx_quic_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
{
if (!rev->active && !rev->ready) {
rev->active = 1;
} else if (rev->active && (rev->ready || (flags & NGX_CLOSE_EVENT))) {
rev->active = 0;
}
return NGX_OK;
}
ngx_int_t
ngx_quic_handle_write_event(ngx_event_t *wev, size_t lowat)
{
if (!wev->active && !wev->ready) {
wev->active = 1;
} else if (wev->active && wev->ready) {
wev->active = 0;
}
return NGX_OK;
}