diff options
Diffstat (limited to 'src/feature/control/control.c')
| -rw-r--r-- | src/feature/control/control.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/feature/control/control.c b/src/feature/control/control.c index e2611ee504..9e7d21308e 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -2014,6 +2014,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, if (!strcmp(question, "net/listeners/or")) type = CONN_TYPE_OR_LISTENER; + else if (!strcmp(question, "net/listeners/extor")) + type = CONN_TYPE_EXT_OR_LISTENER; else if (!strcmp(question, "net/listeners/dir")) type = CONN_TYPE_DIR_LISTENER; else if (!strcmp(question, "net/listeners/socks")) @@ -2022,6 +2024,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, type = CONN_TYPE_AP_TRANS_LISTENER; else if (!strcmp(question, "net/listeners/natd")) type = CONN_TYPE_AP_NATD_LISTENER; + else if (!strcmp(question, "net/listeners/httptunnel")) + type = CONN_TYPE_AP_HTTP_CONNECT_LISTENER; else if (!strcmp(question, "net/listeners/dns")) type = CONN_TYPE_AP_DNS_LISTENER; else if (!strcmp(question, "net/listeners/control")) @@ -2055,7 +2059,7 @@ getinfo_helper_listeners(control_connection_t *control_conn, } /** Implementation helper for GETINFO: answers requests for information about - * the current time in both local and UTF forms. */ + * the current time in both local and UTC forms. */ STATIC int getinfo_helper_current_time(control_connection_t *control_conn, const char *question, @@ -4994,7 +4998,7 @@ add_onion_helper_keyarg(const char *arg, int discard_pk, if (!strcasecmp(key_type_rsa1024, key_type)) { /* "RSA:<Base64 Blob>" - Loading a pre-existing RSA1024 key. */ - pk = crypto_pk_base64_decode(key_blob, strlen(key_blob)); + pk = crypto_pk_base64_decode_private(key_blob, strlen(key_blob)); if (!pk) { err_msg = tor_strdup("512 Failed to decode RSA key\r\n"); goto err; @@ -5029,7 +5033,7 @@ add_onion_helper_keyarg(const char *arg, int discard_pk, goto err; } if (!discard_pk) { - if (crypto_pk_base64_encode(pk, &key_new_blob)) { + if (crypto_pk_base64_encode_private(pk, &key_new_blob)) { crypto_pk_free(pk); tor_asprintf(&err_msg, "551 Failed to encode %s key\r\n", key_type_rsa1024); @@ -7702,11 +7706,11 @@ control_event_hsv3_descriptor_failed(const char *onion_address, tor_free(desc_id_field); } -/** Send HS_DESC_CONTENT event after completion of a successful fetch from hs - * directory. If <b>hsdir_id_digest</b> is NULL, it is replaced by "UNKNOWN". - * If <b>content</b> is NULL, it is replaced by an empty string. The - * <b>onion_address</b> or <b>desc_id</b> set to NULL will no trigger the - * control event. */ +/** Send HS_DESC_CONTENT event after completion of a successful fetch + * from hs directory. If <b>hsdir_id_digest</b> is NULL, it is replaced + * by "UNKNOWN". If <b>content</b> is NULL, it is replaced by an empty + * string. The <b>onion_address</b> or <b>desc_id</b> set to NULL will + * not trigger the control event. */ void control_event_hs_descriptor_content(const char *onion_address, const char *desc_id, |