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
fa7a916e
Commit
fa7a916e
authored
Oct 10, 2021
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Store initial_rtt in ev_tstamp for consistency
parent
69c41871
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
14 deletions
+7
-14
src/shrpx.cc
src/shrpx.cc
+3
-5
src/shrpx_config.cc
src/shrpx_config.cc
+1
-7
src/shrpx_config.h
src/shrpx_config.h
+1
-1
src/shrpx_http3_upstream.cc
src/shrpx_http3_upstream.cc
+2
-1
No files found.
src/shrpx.cc
View file @
fa7a916e
...
...
@@ -1959,7 +1959,8 @@ void fill_default_config(Config *config) {
abort
();
}
upstreamconf
.
initial_rtt
=
NGTCP2_DEFAULT_INITIAL_RTT
;
upstreamconf
.
initial_rtt
=
static_cast
<
ev_tstamp
>
(
NGTCP2_DEFAULT_INITIAL_RTT
)
/
NGTCP2_SECONDS
;
}
auto
&
http3conf
=
config
->
http3
;
...
...
@@ -3404,10 +3405,7 @@ HTTP/3 and QUIC:
--frontend-quic-initial-rtt=<DURATION>
Specify the initial RTT of the frontend QUIC connection.
Default: )"
<<
util
::
duration_str
(
static_cast
<
double
>
(
config
->
quic
.
upstream
.
initial_rtt
)
/
NGTCP2_SECONDS
)
<<
R"(
<<
util
::
duration_str
(
config
->
quic
.
upstream
.
initial_rtt
)
<<
R"(
--no-quic-bpf
Disable eBPF.
--frontend-http3-window-size=<SIZE>
...
...
src/shrpx_config.cc
View file @
fa7a916e
...
...
@@ -4159,13 +4159,7 @@ int parse_config(Config *config, int optid, const StringRef &opt,
optarg
);
case
SHRPX_OPTID_FRONTEND_QUIC_INITIAL_RTT
:
{
#ifdef ENABLE_HTTP3
ev_tstamp
d
;
if
(
parse_duration
(
&
d
,
opt
,
optarg
)
!=
0
)
{
return
-
1
;
}
config
->
quic
.
upstream
.
initial_rtt
=
static_cast
<
ngtcp2_duration
>
(
d
*
NGTCP2_SECONDS
);
return
parse_duration
(
&
config
->
quic
.
upstream
.
initial_rtt
,
opt
,
optarg
);
#endif // ENABLE_HTTP3
return
0
;
...
...
src/shrpx_config.h
View file @
fa7a916e
...
...
@@ -782,7 +782,7 @@ struct QUICConfig {
bool
require_token
;
std
::
array
<
uint8_t
,
SHRPX_QUIC_SERVER_IDLEN
>
server_id
;
StringRef
secret_file
;
ngtcp2_duration
initial_rtt
;
ev_tstamp
initial_rtt
;
}
upstream
;
struct
{
StringRef
prog_file
;
...
...
src/shrpx_http3_upstream.cc
View file @
fa7a916e
...
...
@@ -592,7 +592,8 @@ int Http3Upstream::init(const UpstreamAddr *faddr, const Address &remote_addr,
}
settings
.
initial_ts
=
quic_timestamp
();
settings
.
initial_rtt
=
quicconf
.
upstream
.
initial_rtt
;
settings
.
initial_rtt
=
static_cast
<
ngtcp2_tstamp
>
(
quicconf
.
upstream
.
initial_rtt
*
NGTCP2_SECONDS
);
settings
.
cc_algo
=
quicconf
.
upstream
.
congestion_controller
;
settings
.
max_window
=
http3conf
.
upstream
.
max_connection_window_size
;
settings
.
max_stream_window
=
http3conf
.
upstream
.
max_window_size
;
...
...
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