Skip to content

Commit

Permalink
Minor updates
Browse files Browse the repository at this point in the history
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24037)
  • Loading branch information
hlandau committed Apr 19, 2024
1 parent cc16b4c commit dd753de
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 2 additions & 0 deletions demos/quic/server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
# ../../test/certs/servercert.pem \
# ../../test/certs/serverkey.pem
#
# TODO(QUIC SERVER): Add build.info.
#
CFLAGS += -I../../../include -g -Wall -Wsign-compare
LDFLAGS += -L../../..
LDLIBS = -lcrypto -lssl
Expand Down
6 changes: 2 additions & 4 deletions ssl/quic/quic_impl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3515,10 +3515,8 @@ static int qctx_should_autotick(QCTX *ctx)
int event_handling_mode;
QUIC_OBJ *obj = ctx->obj;

for (; (event_handling_mode = obj->event_handling_mode)
== SSL_VALUE_EVENT_HANDLING_MODE_INHERIT
&& obj->parent_obj != NULL;
obj = obj->parent_obj);
for (; (event_handling_mode = obj->event_handling_mode) == SSL_VALUE_EVENT_HANDLING_MODE_INHERIT
&& obj->parent_obj != NULL; obj = obj->parent_obj);

return event_handling_mode != SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT;
}
Expand Down
5 changes: 2 additions & 3 deletions ssl/quic/quic_obj.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@ int ossl_quic_obj_desires_blocking(const QUIC_OBJ *obj)
unsigned int req_blocking_mode;

assert(obj != NULL);
for (; (req_blocking_mode = obj->req_blocking_mode)
== QUIC_BLOCKING_MODE_INHERIT && obj->parent_obj != NULL;
obj = obj->parent_obj);
for (; (req_blocking_mode = obj->req_blocking_mode) == QUIC_BLOCKING_MODE_INHERIT
&& obj->parent_obj != NULL; obj = obj->parent_obj);

return req_blocking_mode != QUIC_BLOCKING_MODE_NONBLOCKING;
}
Expand Down

0 comments on commit dd753de

Please sign in to comment.