Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
d91ae698
Commit
d91ae698
authored
Jan 11, 2022
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile with the latest ngtcp2
parent
02e6cad1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
src/h2load_quic.cc
src/h2load_quic.cc
+2
-2
src/shrpx_http3_upstream.cc
src/shrpx_http3_upstream.cc
+3
-3
src/shrpx_quic_connection_handler.cc
src/shrpx_quic_connection_handler.cc
+2
-1
No files found.
src/h2load_quic.cc
View file @
d91ae698
...
@@ -535,12 +535,12 @@ void Client::quic_close_connection() {
...
@@ -535,12 +535,12 @@ void Client::quic_close_connection() {
case
quic
:
:
ErrorType
::
Transport
:
case
quic
:
:
ErrorType
::
Transport
:
nwrite
=
ngtcp2_conn_write_connection_close
(
nwrite
=
ngtcp2_conn_write_connection_close
(
quic
.
conn
,
&
ps
.
path
,
nullptr
,
buf
.
data
(),
buf
.
size
(),
quic
.
conn
,
&
ps
.
path
,
nullptr
,
buf
.
data
(),
buf
.
size
(),
quic
.
last_error
.
code
,
timestamp
(
worker
->
loop
));
quic
.
last_error
.
code
,
nullptr
,
0
,
timestamp
(
worker
->
loop
));
break
;
break
;
case
quic
:
:
ErrorType
::
Application
:
case
quic
:
:
ErrorType
::
Application
:
nwrite
=
ngtcp2_conn_write_application_close
(
nwrite
=
ngtcp2_conn_write_application_close
(
quic
.
conn
,
&
ps
.
path
,
nullptr
,
buf
.
data
(),
buf
.
size
(),
quic
.
conn
,
&
ps
.
path
,
nullptr
,
buf
.
data
(),
buf
.
size
(),
quic
.
last_error
.
code
,
timestamp
(
worker
->
loop
));
quic
.
last_error
.
code
,
nullptr
,
0
,
timestamp
(
worker
->
loop
));
break
;
break
;
default:
default:
assert
(
0
);
assert
(
0
);
...
...
src/shrpx_http3_upstream.cc
View file @
d91ae698
...
@@ -1406,7 +1406,7 @@ void Http3Upstream::on_handler_delete() {
...
@@ -1406,7 +1406,7 @@ void Http3Upstream::on_handler_delete() {
auto
nwrite
=
ngtcp2_conn_write_connection_close
(
auto
nwrite
=
ngtcp2_conn_write_connection_close
(
conn_
,
&
ps
.
path
,
&
pi
,
conn_close_
.
data
(),
conn_close_
.
size
(),
conn_
,
&
ps
.
path
,
&
pi
,
conn_close_
.
data
(),
conn_close_
.
size
(),
NGTCP2_NO_ERROR
,
quic_timestamp
());
NGTCP2_NO_ERROR
,
nullptr
,
0
,
quic_timestamp
());
if
(
nwrite
<
0
)
{
if
(
nwrite
<
0
)
{
if
(
nwrite
!=
NGTCP2_ERR_INVALID_STATE
)
{
if
(
nwrite
!=
NGTCP2_ERR_INVALID_STATE
)
{
ULOG
(
ERROR
,
this
)
<<
"ngtcp2_conn_write_connection_close: "
ULOG
(
ERROR
,
this
)
<<
"ngtcp2_conn_write_connection_close: "
...
@@ -1764,7 +1764,7 @@ int Http3Upstream::handle_error() {
...
@@ -1764,7 +1764,7 @@ int Http3Upstream::handle_error() {
if
(
last_error_
.
type
==
quic
::
ErrorType
::
Transport
)
{
if
(
last_error_
.
type
==
quic
::
ErrorType
::
Transport
)
{
nwrite
=
ngtcp2_conn_write_connection_close
(
nwrite
=
ngtcp2_conn_write_connection_close
(
conn_
,
&
ps
.
path
,
&
pi
,
conn_close_
.
data
(),
conn_close_
.
size
(),
conn_
,
&
ps
.
path
,
&
pi
,
conn_close_
.
data
(),
conn_close_
.
size
(),
last_error_
.
code
,
ts
);
last_error_
.
code
,
nullptr
,
0
,
ts
);
if
(
nwrite
<
0
)
{
if
(
nwrite
<
0
)
{
ULOG
(
ERROR
,
this
)
<<
"ngtcp2_conn_write_connection_close: "
ULOG
(
ERROR
,
this
)
<<
"ngtcp2_conn_write_connection_close: "
<<
ngtcp2_strerror
(
nwrite
);
<<
ngtcp2_strerror
(
nwrite
);
...
@@ -1773,7 +1773,7 @@ int Http3Upstream::handle_error() {
...
@@ -1773,7 +1773,7 @@ int Http3Upstream::handle_error() {
}
else
{
}
else
{
nwrite
=
ngtcp2_conn_write_application_close
(
nwrite
=
ngtcp2_conn_write_application_close
(
conn_
,
&
ps
.
path
,
&
pi
,
conn_close_
.
data
(),
conn_close_
.
size
(),
conn_
,
&
ps
.
path
,
&
pi
,
conn_close_
.
data
(),
conn_close_
.
size
(),
last_error_
.
code
,
ts
);
last_error_
.
code
,
nullptr
,
0
,
ts
);
if
(
nwrite
<
0
)
{
if
(
nwrite
<
0
)
{
ULOG
(
ERROR
,
this
)
<<
"ngtcp2_conn_write_application_close: "
ULOG
(
ERROR
,
this
)
<<
"ngtcp2_conn_write_application_close: "
<<
ngtcp2_strerror
(
nwrite
);
<<
ngtcp2_strerror
(
nwrite
);
...
...
src/shrpx_quic_connection_handler.cc
View file @
d91ae698
...
@@ -615,7 +615,8 @@ int QUICConnectionHandler::send_connection_close(
...
@@ -615,7 +615,8 @@ int QUICConnectionHandler::send_connection_close(
std
::
array
<
uint8_t
,
NGTCP2_MAX_UDP_PAYLOAD_SIZE
>
buf
;
std
::
array
<
uint8_t
,
NGTCP2_MAX_UDP_PAYLOAD_SIZE
>
buf
;
auto
nwrite
=
ngtcp2_crypto_write_connection_close
(
auto
nwrite
=
ngtcp2_crypto_write_connection_close
(
buf
.
data
(),
buf
.
size
(),
version
,
&
ini_scid
,
&
ini_dcid
,
error_code
);
buf
.
data
(),
buf
.
size
(),
version
,
&
ini_scid
,
&
ini_dcid
,
error_code
,
nullptr
,
0
);
if
(
nwrite
<
0
)
{
if
(
nwrite
<
0
)
{
LOG
(
ERROR
)
<<
"ngtcp2_crypto_write_connection_close failed"
;
LOG
(
ERROR
)
<<
"ngtcp2_crypto_write_connection_close failed"
;
return
-
1
;
return
-
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment