From a401f768ca8e218eef7a5c87a8f99cb1d6b4aaeb Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 14 Mar 2014 16:12:54 +0100 Subject: gpg: Print the actual used keyserver address. * dirmngr/ks-engine-hkp.c (ks_hkp_search, ks_hkp_get): Print SOURCE status lines. * g10/call-dirmngr.c (ks_status_parm_s): New. (ks_search_parm_s): Add field stparm. (ks_status_cb): New. (ks_search_data_cb): Send source to the data callback. (gpg_dirmngr_ks_search): Change callback prototope to include the SPECIAL arg. Adjust all users. Use ks_status_cb. (gpg_dirmngr_ks_get): Add arg r_source and use ks_status_cb. * g10/keyserver.c (search_line_handler): Adjust callback and print "data source" disgnostic. (keyserver_get): Print data source diagnostic. -- It has often been requested that the actually used IP of a keyservers is shown in with gpg --recv-key and --search-key. This is helpful if the keyserver is actually a pool of keyservers. This patch does this. --- g10/call-dirmngr.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'g10/call-dirmngr.h') diff --git a/g10/call-dirmngr.h b/g10/call-dirmngr.h index 933303dbf..481b948d9 100644 --- a/g10/call-dirmngr.h +++ b/g10/call-dirmngr.h @@ -22,9 +22,10 @@ void gpg_dirmngr_deinit_session_data (ctrl_t ctrl); gpg_error_t gpg_dirmngr_ks_search (ctrl_t ctrl, const char *searchstr, - gpg_error_t (*cb)(void*, char *), + gpg_error_t (*cb)(void*, int, char *), void *cb_value); -gpg_error_t gpg_dirmngr_ks_get (ctrl_t ctrl, char *pattern[], estream_t *r_fp); +gpg_error_t gpg_dirmngr_ks_get (ctrl_t ctrl, char *pattern[], + estream_t *r_fp, char **r_source); gpg_error_t gpg_dirmngr_ks_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp); gpg_error_t gpg_dirmngr_ks_put (ctrl_t ctrl, void *data, size_t datalen, -- cgit v1.2.3