Check remote protocol version only for the first connection (when it
is actually sent by the remote node). Otherwise it generated confusing "Negotiated protocol version 1" debug messages when processing the second connection. MFC after: 2 weeks
This commit is contained in:
parent
7a816c7150
commit
885a4376b6
@ -806,12 +806,6 @@ listen_accept(struct hastd_listen *lst)
|
||||
*/
|
||||
version = 1;
|
||||
}
|
||||
if (version > HAST_PROTO_VERSION) {
|
||||
pjdlog_info("Remote protocol version %hhu is not supported, falling back to version %hhu.",
|
||||
version, (unsigned char)HAST_PROTO_VERSION);
|
||||
version = HAST_PROTO_VERSION;
|
||||
}
|
||||
pjdlog_debug(1, "Negotiated protocol version %hhu.", version);
|
||||
token = nv_get_uint8_array(nvin, &size, "token");
|
||||
/*
|
||||
* NULL token means that this is first connection.
|
||||
@ -925,6 +919,12 @@ listen_accept(struct hastd_listen *lst)
|
||||
*/
|
||||
|
||||
if (token == NULL) {
|
||||
if (version > HAST_PROTO_VERSION) {
|
||||
pjdlog_info("Remote protocol version %hhu is not supported, falling back to version %hhu.",
|
||||
version, (unsigned char)HAST_PROTO_VERSION);
|
||||
version = HAST_PROTO_VERSION;
|
||||
}
|
||||
pjdlog_debug(1, "Negotiated protocol version %hhu.", version);
|
||||
res->hr_version = version;
|
||||
arc4random_buf(res->hr_token, sizeof(res->hr_token));
|
||||
nvout = nv_alloc();
|
||||
|
Loading…
Reference in New Issue
Block a user