open-trade лет назад: 5
Родитель
Сommit
2c35413d03
2 измененных файлов с 13 добавлено и 6 удалено
  1. 5 4
      src/main.rs
  2. 8 2
      src/rendezvous_server.rs

+ 5 - 4
src/main.rs

@@ -2,11 +2,12 @@
2
 // https://blog.csdn.net/bytxl/article/details/44344855
2
 // https://blog.csdn.net/bytxl/article/details/44344855
3
 
3
 
4
 use hbbs::*;
4
 use hbbs::*;
5
-use std::error::Error;
6
 
5
 
7
 #[tokio::main]
6
 #[tokio::main]
8
-async fn main() -> Result<(), Box<dyn Error>> {
7
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
9
     env_logger::init();
8
     env_logger::init();
10
-    RendezvousServer::start("0.0.0.0:21116").await?;
9
+    let addr = "0.0.0.0:21116";
10
+    log::info!("Start Server {}", addr);
11
+    RendezvousServer::start(&addr).await?;
11
     Ok(())
12
     Ok(())
12
-}
13
+}

+ 8 - 2
src/rendezvous_server.rs

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