Remove explicit setting of read_ahead for DTLS. It never makes sense not to
use read_ahead with DTLS because it doesn't work. Therefore read_ahead needs to be the default. Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
		@@ -1299,12 +1299,6 @@ int MAIN(int argc, char **argv)
 | 
			
		||||
#endif
 | 
			
		||||
    if (exc)
 | 
			
		||||
        ssl_ctx_set_excert(ctx, exc);
 | 
			
		||||
    /*
 | 
			
		||||
     * DTLS: partial reads end up discarding unread UDP bytes :-( Setting
 | 
			
		||||
     * read ahead solves this problem.
 | 
			
		||||
     */
 | 
			
		||||
    if (socket_type == SOCK_DGRAM)
 | 
			
		||||
        SSL_CTX_set_read_ahead(ctx, 1);
 | 
			
		||||
 | 
			
		||||
#if !defined(OPENSSL_NO_TLSEXT)
 | 
			
		||||
# if !defined(OPENSSL_NO_NEXTPROTONEG)
 | 
			
		||||
 
 | 
			
		||||
@@ -1722,12 +1722,6 @@ int MAIN(int argc, char *argv[])
 | 
			
		||||
        SSL_CTX_set_options(ctx, SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
 | 
			
		||||
    if (exc)
 | 
			
		||||
        ssl_ctx_set_excert(ctx, exc);
 | 
			
		||||
    /*
 | 
			
		||||
     * DTLS: partial reads end up discarding unread UDP bytes :-( Setting
 | 
			
		||||
     * read ahead solves this problem.
 | 
			
		||||
     */
 | 
			
		||||
    if (socket_type == SOCK_DGRAM)
 | 
			
		||||
        SSL_CTX_set_read_ahead(ctx, 1);
 | 
			
		||||
 | 
			
		||||
    if (state)
 | 
			
		||||
        SSL_CTX_set_info_callback(ctx, apps_ssl_info_callback);
 | 
			
		||||
@@ -1806,12 +1800,6 @@ int MAIN(int argc, char *argv[])
 | 
			
		||||
            SSL_CTX_set_options(ctx2, SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
 | 
			
		||||
        if (exc)
 | 
			
		||||
            ssl_ctx_set_excert(ctx2, exc);
 | 
			
		||||
        /*
 | 
			
		||||
         * DTLS: partial reads end up discarding unread UDP bytes :-(
 | 
			
		||||
         * Setting read ahead solves this problem.
 | 
			
		||||
         */
 | 
			
		||||
        if (socket_type == SOCK_DGRAM)
 | 
			
		||||
            SSL_CTX_set_read_ahead(ctx2, 1);
 | 
			
		||||
 | 
			
		||||
        if (state)
 | 
			
		||||
            SSL_CTX_set_info_callback(ctx2, apps_ssl_info_callback);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user