diff options
| author | Werner Koch <[email protected]> | 2017-06-08 07:30:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-06-08 07:37:36 +0000 |
| commit | 9b43220b8ad1a5c1cd51de3bbfff7ccbcc3fa877 (patch) | |
| tree | 6ef342f715e143c390eff68629d909e94f6cbd6f /dirmngr/server.c | |
| parent | dirmngr: Allow a timeout for HTTP and other TCP connects. (diff) | |
| download | gnupg-9b43220b8ad1a5c1cd51de3bbfff7ccbcc3fa877.tar.gz gnupg-9b43220b8ad1a5c1cd51de3bbfff7ccbcc3fa877.zip | |
dirmngr: Implement HTTP connect timeouts of 15 or 2 seconds.
* dirmngr/dirmngr.c (oConnectTimeout, oConnectQuickTimeout): New
enums.
(opts): New options --connect-timeout and --connect-quick-timeout.
(DEFAULT_CONNECT_TIMEOUT): New.
(DEFAULT_CONNECT_QUICK_TIMEOUT): New.
(parse_rereadable_options): Handle new options.
(post_option_parsing): New. Use instead of direct calls to
set_debug() and set_tor_mode ().
(main): Setup default timeouts.
(dirmngr_init_default_ctrl): Set standard connect timeout.
* dirmngr/dirmngr.h (opt): New fields connect_timeout and
connect_quick_timeout.
(server_control_s): New field timeout.
* dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass timeout to
http_raw_connect.
* dirmngr/ks-engine-hkp.c (send_request): Call
http_session_set_timeout.
* dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
* dirmngr/server.c (cmd_wkd_get, cmd_ks_search, cmd_ks_get)
(cmd_ks_fetch): Implement --quick option.
--
The standard connect timeouts are way to long so we add a timeout to
the connect calls. Also implement the --quick option which is already
used by gpg for non-important requests (e.g. looking up a key for
verification).
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/server.c')
| -rw-r--r-- | dirmngr/server.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dirmngr/server.c b/dirmngr/server.c index 237cb5278..151f1a063 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -842,6 +842,8 @@ cmd_wkd_get (assuan_context_t ctx, char *line) opt_submission_addr = has_option (line, "--submission-address"); opt_policy_flags = has_option (line, "--policy-flags"); + if (has_option (line, "--quick")) + ctrl->timeout = opt.connect_quick_timeout; line = skip_options (line); mbox = mailbox_from_userid (line); @@ -2123,7 +2125,8 @@ cmd_ks_search (assuan_context_t ctx, char *line) char *p; estream_t outfp; - /* No options for now. */ + if (has_option (line, "--quick")) + ctrl->timeout = opt.connect_quick_timeout; line = skip_options (line); /* Break the line down into an strlist. Each pattern is @@ -2187,7 +2190,8 @@ cmd_ks_get (assuan_context_t ctx, char *line) char *p; estream_t outfp; - /* No options for now. */ + if (has_option (line, "--quick")) + ctrl->timeout = opt.connect_quick_timeout; line = skip_options (line); /* Break the line into a strlist. Each pattern is by @@ -2251,7 +2255,8 @@ cmd_ks_fetch (assuan_context_t ctx, char *line) gpg_error_t err; estream_t outfp; - /* No options for now. */ + if (has_option (line, "--quick")) + ctrl->timeout = opt.connect_quick_timeout; line = skip_options (line); err = ensure_keyserver (ctrl); /* FIXME: Why do we needs this here? */ |