|
|
@@ -27,6 +27,7 @@ use std::{
|
|
27
|
27
|
struct Peer {
|
|
28
|
28
|
socket_addr: SocketAddr,
|
|
29
|
29
|
last_reg_time: Instant,
|
|
|
30
|
+ uuid: Vec<u8>,
|
|
30
|
31
|
pk: Vec<u8>,
|
|
31
|
32
|
}
|
|
32
|
33
|
|
|
|
@@ -37,6 +38,7 @@ impl Default for Peer {
|
|
37
|
38
|
last_reg_time: Instant::now()
|
|
38
|
39
|
.checked_sub(std::time::Duration::from_secs(3600))
|
|
39
|
40
|
.unwrap(),
|
|
|
41
|
+ uuid: Vec::new(),
|
|
40
|
42
|
pk: Vec::new(),
|
|
41
|
43
|
}
|
|
42
|
44
|
}
|
|
|
@@ -47,6 +49,8 @@ struct PeerSerde {
|
|
47
|
49
|
#[serde(default)]
|
|
48
|
50
|
ip: String,
|
|
49
|
51
|
#[serde(default)]
|
|
|
52
|
+ uuid: Vec<u8>,
|
|
|
53
|
+ #[serde(default)]
|
|
50
|
54
|
pk: Vec<u8>,
|
|
51
|
55
|
}
|
|
52
|
56
|
|
|
|
@@ -65,18 +69,19 @@ impl PeerMap {
|
|
65
|
69
|
}
|
|
66
|
70
|
|
|
67
|
71
|
#[inline]
|
|
68
|
|
- fn update_pk(&mut self, id: String, socket_addr: SocketAddr, pk: Vec<u8>) {
|
|
|
72
|
+ fn update_pk(&mut self, id: String, socket_addr: SocketAddr, uuid: Vec<u8>, pk: Vec<u8>) {
|
|
69
|
73
|
let mut lock = self.map.write().unwrap();
|
|
70
|
74
|
lock.insert(
|
|
71
|
75
|
id.clone(),
|
|
72
|
76
|
Peer {
|
|
73
|
77
|
socket_addr,
|
|
74
|
78
|
last_reg_time: Instant::now(),
|
|
|
79
|
+ uuid: uuid.clone(),
|
|
75
|
80
|
pk: pk.clone(),
|
|
76
|
81
|
},
|
|
77
|
82
|
);
|
|
78
|
83
|
let ip = socket_addr.ip().to_string();
|
|
79
|
|
- self.db.insert(id, PeerSerde { ip, pk });
|
|
|
84
|
+ self.db.insert(id, PeerSerde { ip, uuid, pk });
|
|
80
|
85
|
}
|
|
81
|
86
|
|
|
82
|
87
|
#[inline]
|
|
|
@@ -91,6 +96,7 @@ impl PeerMap {
|
|
91
|
96
|
self.map.write().unwrap().insert(
|
|
92
|
97
|
id,
|
|
93
|
98
|
Peer {
|
|
|
99
|
+ uuid: v.uuid,
|
|
94
|
100
|
pk: v.pk,
|
|
95
|
101
|
..Default::default()
|
|
96
|
102
|
},
|
|
|
@@ -189,16 +195,14 @@ impl RendezvousServer {
|
|
189
|
195
|
let id = rk.id;
|
|
190
|
196
|
let mut res = register_pk_response::Result::OK;
|
|
191
|
197
|
if let Some(peer) = self.pm.get(&id).await {
|
|
192
|
|
- if peer.pk.is_empty() {
|
|
193
|
|
- self.pm.update_pk(id, addr, rk.pk);
|
|
194
|
|
- } else {
|
|
195
|
|
- if peer.pk != rk.pk {
|
|
196
|
|
- log::warn!("Peer {} pk mismatch: {:?} vs {:?}", id, rk.pk, peer.pk);
|
|
197
|
|
- res = register_pk_response::Result::PK_MISMATCH;
|
|
198
|
|
- }
|
|
|
198
|
+ if peer.uuid != rk.uuid {
|
|
|
199
|
+ log::warn!("Peer {} pk mismatch: {:?} vs {:?}", id, rk.uuid, peer.uuid);
|
|
|
200
|
+ res = register_pk_response::Result::UUID_MISMATCH;
|
|
|
201
|
+ } else if peer.pk != rk.pk {
|
|
|
202
|
+ self.pm.update_pk(id, addr, rk.uuid, rk.pk);
|
|
199
|
203
|
}
|
|
200
|
204
|
} else {
|
|
201
|
|
- self.pm.update_pk(id, addr, rk.pk);
|
|
|
205
|
+ self.pm.update_pk(id, addr, rk.uuid, rk.pk);
|
|
202
|
206
|
}
|
|
203
|
207
|
let mut msg_out = RendezvousMessage::new();
|
|
204
|
208
|
msg_out.set_register_pk_response(RegisterPkResponse {
|
|
|
@@ -260,11 +264,11 @@ impl RendezvousServer {
|
|
260
|
264
|
let tx = self.tx.clone();
|
|
261
|
265
|
tokio::spawn(async move {
|
|
262
|
266
|
let v = pm.db.get(id.clone()).await;
|
|
263
|
|
- let pk = {
|
|
|
267
|
+ let (uuid, pk) = {
|
|
264
|
268
|
if let Some(v) = super::SledAsync::deserialize::<PeerSerde>(&v) {
|
|
265
|
|
- v.pk
|
|
|
269
|
+ (v.uuid, v.pk)
|
|
266
|
270
|
} else {
|
|
267
|
|
- Vec::new()
|
|
|
271
|
+ (Vec::new(), Vec::new())
|
|
268
|
272
|
}
|
|
269
|
273
|
};
|
|
270
|
274
|
let mut msg_out = RendezvousMessage::new();
|
|
|
@@ -278,6 +282,7 @@ impl RendezvousServer {
|
|
278
|
282
|
Peer {
|
|
279
|
283
|
socket_addr,
|
|
280
|
284
|
last_reg_time,
|
|
|
285
|
+ uuid,
|
|
281
|
286
|
pk,
|
|
282
|
287
|
},
|
|
283
|
288
|
);
|
open-trade