enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-20 00:51:10 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #329 from skyformat99/dev

Browse Source 
Adds a trace message to mark connection type between edges.
This commit is contained in:
Luca Deri 2020-07-28 19:28:03 +02:00 committed by GitHub
commit d672c5fdca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/edge_utils.c
View File

@ -1702,13 +1702,14 @@ static void readFromIPSocket(n2n_edge_t * eee, int in_sock) {
* handle_PACKET to double check this. * handle_PACKET to double check this.
*/ */
traceEvent(TRACE_DEBUG, "Got P2P packet"); traceEvent(TRACE_DEBUG, "Got P2P packet");
find_and_remove_peer(&eee->pending_peers, pkt.srcMac); traceEvent(TRACE_DEBUG, "[P2P] Rx data from %s [%u B]", sock_to_cstr(sockbuf1, &sender), recvlen);
find_and_remove_peer(&eee->pending_peers, pkt.srcMac);
} }
else {
traceEvent(TRACE_INFO, "Rx PACKET from %s (sender=%s) [%u B]", /* [PsP] : edge Peer->Supernode->edge Peer */
sock_to_cstr(sockbuf1, &sender), traceEvent(TRACE_DEBUG, "[PsP] Rx data from %s (Via=%s) [%u B]",
sock_to_cstr(sockbuf2, orig_sender), sock_to_cstr(sockbuf2, orig_sender), sock_to_cstr(sockbuf1, &sender), recvlen);
recvlen); }
handle_PACKET(eee, &cmn, &pkt, orig_sender, udp_buf+idx, recvlen-idx); handle_PACKET(eee, &cmn, &pkt, orig_sender, udp_buf+idx, recvlen-idx);
break; break;
@ -1750,17 +1751,17 @@ static void readFromIPSocket(n2n_edge_t * eee, int in_sock) {
* to double check this. * to double check this.
*/ */
traceEvent(TRACE_DEBUG, "Got P2P register"); traceEvent(TRACE_DEBUG, "Got P2P register");
find_and_remove_peer(&eee->pending_peers, reg.srcMac); traceEvent(TRACE_NORMAL, "[P2P] Rx REGISTER from %s", sock_to_cstr(sockbuf1, &sender));
find_and_remove_peer(&eee->pending_peers, reg.srcMac);
/* NOTE: only ACK to peers */ /* NOTE: only ACK to peers */
send_register_ack(eee, orig_sender, &reg); send_register_ack(eee, orig_sender, &reg);
} }
else {
traceEvent(TRACE_INFO, "Rx REGISTER src=%s dst=%s from peer %s (%s)", traceEvent(TRACE_NORMAL, "[PsP] Rx REGISTER src=%s dst=%s from sn=%s (edge:%s)",
macaddr_str(mac_buf1, reg.srcMac), macaddr_str(mac_buf1, reg.srcMac), macaddr_str(mac_buf2, reg.dstMac),
macaddr_str(mac_buf2, reg.dstMac), sock_to_cstr(sockbuf1, &sender), sock_to_cstr(sockbuf2, orig_sender));
sock_to_cstr(sockbuf1, &sender), }
sock_to_cstr(sockbuf2, orig_sender));
check_peer_registration_needed(eee, from_supernode, reg.srcMac, orig_sender); check_peer_registration_needed(eee, from_supernode, reg.srcMac, orig_sender);
break; break;