Browse Source

more log for debugging pk mismatch

open-trade 5 years ago
parent
commit
8295278479
3 changed files with 229 additions and 351 deletions
  1. 224 347
      Cargo.lock
  2. 1 1
      libs/hbb_common
  3. 4 3
      src/rendezvous_server.rs

File diff suppressed because it is too large
+ 224 - 347
Cargo.lock


+ 1 - 1
libs/hbb_common

@@ -1 +1 @@
1
-Subproject commit 45ef8cd75fcc7c94634cafcefddccd31353fdfac
1
+Subproject commit 3ac832109bb75284a1d195a47300498e3bddc277

+ 4 - 3
src/rendezvous_server.rs

@@ -7,7 +7,7 @@ use hbb_common::{
7
         stream::{SplitSink, StreamExt},
7
         stream::{SplitSink, StreamExt},
8
     },
8
     },
9
     log,
9
     log,
10
-    protobuf::{parse_from_bytes, Message as _},
10
+    protobuf::Message as _,
11
     rendezvous_proto::*,
11
     rendezvous_proto::*,
12
     tcp::new_listener,
12
     tcp::new_listener,
13
     tokio::{self, net::TcpStream, sync::mpsc},
13
     tokio::{self, net::TcpStream, sync::mpsc},
@@ -144,7 +144,7 @@ impl RendezvousServer {
144
                     let mut rs = rs.clone();
144
                     let mut rs = rs.clone();
145
                     tokio::spawn(async move {
145
                     tokio::spawn(async move {
146
                         while let Some(Ok(bytes)) = b.next().await {
146
                         while let Some(Ok(bytes)) = b.next().await {
147
-                            if let Ok(msg_in) = parse_from_bytes::<RendezvousMessage>(&bytes) {
147
+                            if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) {
148
                                 match msg_in.union {
148
                                 match msg_in.union {
149
                                     Some(rendezvous_message::Union::punch_hole_request(ph)) => {
149
                                     Some(rendezvous_message::Union::punch_hole_request(ph)) => {
150
                                         allow_err!(rs.handle_tcp_punch_hole_request(addr, ph.id).await);
150
                                         allow_err!(rs.handle_tcp_punch_hole_request(addr, ph.id).await);
@@ -176,7 +176,7 @@ impl RendezvousServer {
176
         addr: SocketAddr,
176
         addr: SocketAddr,
177
         socket: &mut FramedSocket,
177
         socket: &mut FramedSocket,
178
     ) -> ResultType<()> {
178
     ) -> ResultType<()> {
179
-        if let Ok(msg_in) = parse_from_bytes::<RendezvousMessage>(&bytes) {
179
+        if let Ok(msg_in) = RendezvousMessage::parse_from_bytes(&bytes) {
180
             match msg_in.union {
180
             match msg_in.union {
181
                 Some(rendezvous_message::Union::register_peer(rp)) => {
181
                 Some(rendezvous_message::Union::register_peer(rp)) => {
182
                     // B registered
182
                     // B registered
@@ -193,6 +193,7 @@ impl RendezvousServer {
193
                             self.pm.update_pk(id, addr, rk.pk);
193
                             self.pm.update_pk(id, addr, rk.pk);
194
                         } else {
194
                         } else {
195
                             if peer.pk != rk.pk {
195
                             if peer.pk != rk.pk {
196
+                                log::warn!("Peer {} pk mismatch: {:?} vs {:?}", id, rk.pk, peer.pk);
196
                                 res = register_pk_response::Result::PK_MISMATCH;
197
                                 res = register_pk_response::Result::PK_MISMATCH;
197
                             }
198
                             }
198
                         }
199
                         }