root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove extra FD_SET 

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25532)
This commit is contained in:
Andrew Dinh 2024-10-17 12:48:17 -07:00 committed by Neil Horman
parent 0237f21e03
commit 417a8e8812
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/guide/quic-server-non-block.c
View File

@ -228,10 +228,6 @@ static void wait_for_activity(SSL *ssl)
if (SSL_net_read_desired(ssl)) if (SSL_net_read_desired(ssl))
FD_SET(sock, &read_fd); FD_SET(sock, &read_fd);
/* Add the socket file descriptor to the fd_set */
FD_SET(sock, &read_fd);
FD_SET(sock, &write_fd);
/* /*
* Find out when OpenSSL would next like to be called, regardless of * Find out when OpenSSL would next like to be called, regardless of
* whether the state of the underlying socket has changed or not. * whether the state of the underlying socket has changed or not.

12
doc/man7/ossl-guide-quic-server-non-block.pod
View File

@ -32,7 +32,7 @@ text that will be echoed back by the server.
Both the listening socket and connected socket are "nonblocking". However, Both the listening socket and connected socket are "nonblocking". However,
we use select() to make the listening socket block when it cannot read/write. we use select() to make the listening socket block when it cannot read/write.
Rather than stopping and waiting, your application may need to go and do other Rather than stopping and waiting, your application may need to go and do other
tasks whilst the B<SSL> object is unable to read/write. For example: updating a tasks whilst the B<SSL> object is unable to read/write. For example: updating a
GUI or performing operations on some other connection or stream. GUI or performing operations on some other connection or stream.
The complete source code for this example nonblocking QUIC server is available The complete source code for this example nonblocking QUIC server is available
@ -44,12 +44,12 @@ We assume that you already have OpenSSL installed on your system; that you
already have some fundamental understanding of OpenSSL concepts and QUIC (see already have some fundamental understanding of OpenSSL concepts and QUIC (see
L<ossl-guide-libraries-introduction(7)> and L<ossl-guide-quic-introduction(7)>); L<ossl-guide-libraries-introduction(7)> and L<ossl-guide-quic-introduction(7)>);
and that you know how to write and build C code and link it against the and that you know how to write and build C code and link it against the
libcrypto and libssl libraries that are provided by OpenSSL. It also assumes libcrypto and libssl libraries that are provided by OpenSSL. It also assumes
that you have a basic understanding of UDP/IP and sockets. that you have a basic understanding of UDP/IP and sockets.
=head2 Creating the SSL_CTX and SSL objects =head2 Creating the SSL_CTX and SSL objects
The first step is to create an B<SSL_CTX> object for our server. We use the The first step is to create an B<SSL_CTX> object for our server. We use the
L<SSL_CTX_new(3)> function for this purpose. We pass as an argument the return L<SSL_CTX_new(3)> function for this purpose. We pass as an argument the return
value of the function L<OSSL_QUIC_server_method(3)>. You should use this method value of the function L<OSSL_QUIC_server_method(3)>. You should use this method
whenever you are writing a QUIC server. whenever you are writing a QUIC server.
@ -255,10 +255,6 @@ a more real-world application would likely use this time to perform other tasks.
if (SSL_net_read_desired(ssl)) if (SSL_net_read_desired(ssl))
FD_SET(sock, &read_fd); FD_SET(sock, &read_fd);
/* Add the socket file descriptor to the fd_set */
FD_SET(sock, &read_fd);
FD_SET(sock, &write_fd);
/* /*
* Find out when OpenSSL would next like to be called, regardless of * Find out when OpenSSL would next like to be called, regardless of
* whether the state of the underlying socket has changed or not. * whether the state of the underlying socket has changed or not.
@ -313,7 +309,7 @@ With the handshake complete, the server reads all the client input.
} }
} }
Finally, we echo the received data back to the client. We can use Finally, we echo the received data back to the client. We can use
L<SSL_write_ex2(3)> to pass in a special flag SSL_WRITE_FLAG_CONCLUDE that will L<SSL_write_ex2(3)> to pass in a special flag SSL_WRITE_FLAG_CONCLUDE that will
send a FIN packet once the write has successfully finished writing all the data send a FIN packet once the write has successfully finished writing all the data
to the peer. to the peer.