comparison src/event/ngx_event_quic.c @ 8379:aecd8ec29c8e quic

Removed redundant SSL_do_handshake call before any handshake data.
author Sergey Kandaurov <pluknet@nginx.com>
date Sat, 09 May 2020 17:39:47 +0300
parents 81a4f98a2556
children efe1f104caf7
comparison
equal deleted inserted replaced
8378:81a4f98a2556 8379:aecd8ec29c8e
697 697
698 698
699 static ngx_int_t 699 static ngx_int_t
700 ngx_quic_init_connection(ngx_connection_t *c) 700 ngx_quic_init_connection(ngx_connection_t *c)
701 { 701 {
702 int n, sslerr;
703 u_char *p; 702 u_char *p;
704 ssize_t len; 703 ssize_t len;
705 ngx_ssl_conn_t *ssl_conn; 704 ngx_ssl_conn_t *ssl_conn;
706 ngx_quic_connection_t *qc; 705 ngx_quic_connection_t *qc;
707 706
748 return NGX_ERROR; 747 return NGX_ERROR;
749 } 748 }
750 749
751 qc->max_streams = qc->tp.initial_max_streams_bidi; 750 qc->max_streams = qc->tp.initial_max_streams_bidi;
752 qc->state = NGX_QUIC_ST_HANDSHAKE; 751 qc->state = NGX_QUIC_ST_HANDSHAKE;
753
754 n = SSL_do_handshake(ssl_conn);
755
756 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
757 "quic SSL_do_handshake: %d", n);
758
759 if (n == -1) {
760 sslerr = SSL_get_error(ssl_conn, n);
761
762 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
763 "quic SSL_get_error: %d", sslerr);
764
765 if (sslerr != SSL_ERROR_WANT_READ) {
766 ngx_ssl_error(NGX_LOG_ERR, c->log, 0, "SSL_do_handshake() failed");
767 return NGX_ERROR;
768 }
769 }
770
771 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
772 "quic SSL_quic_read_level: %d, SSL_quic_write_level: %d",
773 (int) SSL_quic_read_level(ssl_conn),
774 (int) SSL_quic_write_level(ssl_conn));
775 752
776 return NGX_OK; 753 return NGX_OK;
777 } 754 }
778 755
779 756