|
|
@@ -26,7 +26,6 @@ impl RendezvousServer {
|
|
26
|
26
|
pub async fn start(addr: &str) -> ResultType {
|
|
27
|
27
|
let socket = UdpSocket::bind(addr).await?;
|
|
28
|
28
|
let mut socket = UdpFramed::new(socket, BytesCodec::new());
|
|
29
|
|
-
|
|
30
|
29
|
let mut rs = Self {
|
|
31
|
30
|
peer_map: PeerMap::new(),
|
|
32
|
31
|
};
|
|
|
@@ -46,6 +45,7 @@ impl RendezvousServer {
|
|
46
|
45
|
match msg_in.union {
|
|
47
|
46
|
Some(Message_oneof_union::register_peer(rp)) => {
|
|
48
|
47
|
if rp.hbb_addr.len() > 0 {
|
|
|
48
|
+ log::debug!("New peer registered: {:?} {:?}", &rp.hbb_addr, &addr);
|
|
49
|
49
|
self.peer_map
|
|
50
|
50
|
.insert(rp.hbb_addr, Peer { socket_addr: addr });
|
|
51
|
51
|
}
|
|
|
@@ -53,6 +53,12 @@ impl RendezvousServer {
|
|
53
|
53
|
Some(Message_oneof_union::punch_hole_request(ph)) => {
|
|
54
|
54
|
// punch hole request from A, forward to B
|
|
55
|
55
|
if let Some(peer) = self.peer_map.get(&ph.hbb_addr) {
|
|
|
56
|
+ log::debug!(
|
|
|
57
|
+ "Punch hole {:?} {:?} request from {:?}",
|
|
|
58
|
+ &ph.hbb_addr,
|
|
|
59
|
+ &peer.socket_addr,
|
|
|
60
|
+ &addr
|
|
|
61
|
+ );
|
|
56
|
62
|
let mut msg_out = Message::new();
|
|
57
|
63
|
msg_out.set_punch_hole(PunchHole {
|
|
58
|
64
|
socket_addr: AddrMangle::encode(&addr),
|
|
|
@@ -64,6 +70,7 @@ impl RendezvousServer {
|
|
64
|
70
|
Some(Message_oneof_union::punch_hole_sent(phs)) => {
|
|
65
|
71
|
// punch hole sent from B, tell A that B ready
|
|
66
|
72
|
let addr_a = AddrMangle::decode(&phs.socket_addr);
|
|
|
73
|
+ log::debug!("Punch hole response to {:?} from {:?}", &addr_a, &addr);
|
|
67
|
74
|
let mut msg_out = Message::new();
|
|
68
|
75
|
msg_out.set_punch_hole_response(PunchHoleResponse {
|
|
69
|
76
|
socket_addr: AddrMangle::encode(&addr),
|
|
|
@@ -165,7 +172,6 @@ mod tests {
|
|
165
|
172
|
let msg_in = parse_from_bytes::<Message>(&bytes).unwrap();
|
|
166
|
173
|
let remote_addr_b =
|
|
167
|
174
|
AddrMangle::decode(&msg_in.get_punch_hole_response().socket_addr[..]);
|
|
168
|
|
- println!("{:?}", msg_in);
|
|
169
|
175
|
assert_eq!(local_addr_b, remote_addr_b);
|
|
170
|
176
|
}
|
|
171
|
177
|
|