|
@@ -332,6 +332,8 @@ impl RendezvousServer {
|
|
332
|
let mut res = register_pk_response::Result::OK;
|
332
|
let mut res = register_pk_response::Result::OK;
|
|
333
|
if !id_change_support {
|
333
|
if !id_change_support {
|
|
334
|
res = register_pk_response::Result::NOT_SUPPORT;
|
334
|
res = register_pk_response::Result::NOT_SUPPORT;
|
|
|
|
335
|
+ } else if !hbb_common::is_valid_custom_id(&rk.id) {
|
|
|
|
336
|
+ res = register_pk_response::Result::INVALID_ID_FORMAT;
|
|
335
|
} else if let Some(peer) = rs.pm.get(&rk.id).await {
|
337
|
} else if let Some(peer) = rs.pm.get(&rk.id).await {
|
|
336
|
if peer.uuid != rk.uuid {
|
338
|
if peer.uuid != rk.uuid {
|
|
337
|
res = register_pk_response::Result::ID_EXISTS;
|
339
|
res = register_pk_response::Result::ID_EXISTS;
|
|
@@ -398,9 +400,7 @@ impl RendezvousServer {
|
|
398
|
}
|
400
|
}
|
|
399
|
let id = rk.id;
|
401
|
let id = rk.id;
|
|
400
|
let mut res = register_pk_response::Result::OK;
|
402
|
let mut res = register_pk_response::Result::OK;
|
|
401
|
- if !hbb_common::is_valid_custom_id(&id) {
|
|
|
|
402
|
- res = register_pk_response::Result::INVALID_ID_FORMAT;
|
|
|
|
403
|
- } else if let Some(peer) = self.pm.get(&id).await {
|
|
|
|
|
|
403
|
+ if let Some(peer) = self.pm.get(&id).await {
|
|
404
|
if peer.uuid != rk.uuid {
|
404
|
if peer.uuid != rk.uuid {
|
|
405
|
log::warn!(
|
405
|
log::warn!(
|
|
406
|
"Peer {} uuid mismatch: {:?} vs {:?}",
|
406
|
"Peer {} uuid mismatch: {:?} vs {:?}",
|