Commit 3a785dd5 authored by Nick Mathewson's avatar Nick Mathewson 🐦
Browse files

Merge branch 'maint-0.4.3'

parents e39b35f1 b444096b
o Minor bugfixes (logging):
- Fix a logic error in a log message about whether an address was
invalid. Previously, the code would never report that onion addresses
were onion addresses. Fixes bug 34131; bugfix on 0.4.3.1-alpha.
......@@ -1658,9 +1658,11 @@ parse_extended_hostname(char *address, hostname_type_t *type_out)
failed:
/* otherwise, return to previous state and return 0 */
*s = '.';
const bool is_onion = (*type_out == ONION_V2_HOSTNAME) ||
(*type_out == ONION_V3_HOSTNAME);
log_warn(LD_APP, "Invalid %shostname %s; rejecting",
(*type_out == (ONION_V2_HOSTNAME || ONION_V3_HOSTNAME) ? "onion " : ""),
safe_str_client(address));
is_onion ? "onion " : "",
safe_str_client(address));
return false;
}
......
......@@ -661,6 +661,7 @@ connection_or_finished_flushing(or_connection_t *conn)
}
break;
}
break;
case OR_CONN_STATE_OPEN:
case OR_CONN_STATE_OR_HANDSHAKING_V2:
case OR_CONN_STATE_OR_HANDSHAKING_V3:
......
......@@ -147,6 +147,7 @@ bto_cevent_apconn(const bt_orconn_t *bto)
break;
case OR_CONN_STATE_OPEN:
control_event_bootstrap(BOOTSTRAP_STATUS_AP_HANDSHAKE_DONE, 0);
break;
default:
break;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment