Mercurial > hg > nginx

comparison src/http/ngx_http_request.c @ 8181:3cb4f16426a5 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduced quic_version macro, uint16/uint32 routines ported.
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 28 Feb 2020 13:09:52 +0300
parents 01dc595de244
children b28ea685a56e
comparison
equal deleted inserted replaced
8180:01dc595de244 8181:3cb4f16426a5
689 ngx_http_close_connection(c); 689 ngx_http_close_connection(c);
690 return; 690 return;
691 } 691 }
692 692
693 ngx_int_t flags = *b->pos++; 693 ngx_int_t flags = *b->pos++;
694 uint32_t version = ngx_http_v2_parse_uint32(b->pos); 694 uint32_t version = ngx_quic_parse_uint32(b->pos);
695 b->pos += 4; 695 b->pos += sizeof(uint32_t);
696 696
697 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, rev->log, 0, 697 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, rev->log, 0,
698 "quic flags:%xi version:%xD", flags, version); 698 "quic flags:%xi version:%xD", flags, version);
699 699
700 if (version != 0xff000018) { 700 if (version != quic_version) {
701 ngx_log_error(NGX_LOG_INFO, rev->log, 0, "unsupported quic version"); 701 ngx_log_error(NGX_LOG_INFO, rev->log, 0, "unsupported quic version");
702 ngx_http_close_connection(c); 702 ngx_http_close_connection(c);
703 return; 703 return;
704 } 704 }
705 705
1115 ngx_http_close_connection(c); 1115 ngx_http_close_connection(c);
1116 return; 1116 return;
1117 } 1117 }
1118 1118
1119 ngx_int_t flags = *p++; 1119 ngx_int_t flags = *p++;
1120 uint32_t version = ngx_http_v2_parse_uint32(p); 1120 uint32_t version = ngx_quic_parse_uint32(p);
1121 p += 4; 1121 p += sizeof(uint32_t);
1122 1122
1123 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, rev->log, 0, 1123 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, rev->log, 0,
1124 "quic flags:%xi version:%xD", flags, version); 1124 "quic flags:%xi version:%xD", flags, version);
1125 1125
1126 if (version != 0xff000018) { 1126 if (version != quic_version) {
1127 ngx_log_error(NGX_LOG_INFO, rev->log, 0, "unsupported quic version"); 1127 ngx_log_error(NGX_LOG_INFO, rev->log, 0, "unsupported quic version");
1128 ngx_http_close_connection(c); 1128 ngx_http_close_connection(c);
1129 return; 1129 return;
1130 } 1130 }
1131 1131