|
|
@@ -176,18 +176,16 @@ impl RendezvousServer {
|
|
176
|
176
|
if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) {
|
|
177
|
177
|
match msg_in.union {
|
|
178
|
178
|
Some(rendezvous_message::Union::punch_hole_request(ph)) => {
|
|
|
179
|
+ // there maybe several attempt, so sender can be none
|
|
179
|
180
|
if let Some(sender) = sender.take() {
|
|
180
|
181
|
tcp_punch.lock().unwrap().insert(addr, sender);
|
|
181
|
|
- } else {
|
|
182
|
|
- break;
|
|
183
|
182
|
}
|
|
184
|
183
|
allow_err!(rs.handle_tcp_punch_hole_request(addr, ph).await);
|
|
185
|
184
|
}
|
|
186
|
185
|
Some(rendezvous_message::Union::request_relay(mut rf)) => {
|
|
|
186
|
+ // there maybe several attempt, so sender can be none
|
|
187
|
187
|
if let Some(sender) = sender.take() {
|
|
188
|
188
|
tcp_punch.lock().unwrap().insert(addr, sender);
|
|
189
|
|
- } else {
|
|
190
|
|
- break;
|
|
191
|
189
|
}
|
|
192
|
190
|
if let Some(peer) = rs.pm.map.read().unwrap().get(&rf.id).map(|x| x.clone()) {
|
|
193
|
191
|
let mut msg_out = RendezvousMessage::new();
|