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

created space for more REGISTER type cookies

Browse Source
This commit is contained in:
Logan oos Even 2021-09-27 02:41:14 +05:45 committed by GitHub
parent 5a93fdf166
commit 0d39f50051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/edge_utils.c
View File

@ -758,7 +758,7 @@ static void check_peer_registration_needed (n2n_edge_t *eee,
if(((now - scan->last_seen) > 0 /* >= 1 sec */)
||(cookie == N2N_LOCAL_REG_COOKIE)) {
||(cookie & N2N_LOCAL_REG_COOKIE)) {
/* Don't register too often */
check_known_peer_sock_change(eee, from_supernode, via_multicast, mac, dev_addr, dev_desc, peer, now);
}
@ -804,14 +804,14 @@ static void peer_set_p2p_confirmed (n2n_edge_t * eee,
} else {
// ignore regular ACKs's socket update for a while if we have recently received a local (!) ACK
if(((now - scan->last_local_reg) > REGISTRATION_TIMEOUT)
||(cookie == N2N_LOCAL_REG_COOKIE)) {
||(cookie & N2N_LOCAL_REG_COOKIE)) {
scan->sock = *peer;
}
}
HASH_ADD_PEER(eee->known_peers, scan);
scan->last_p2p = now;
if(cookie == N2N_LOCAL_REG_COOKIE)
if(cookie & N2N_LOCAL_REG_COOKIE)
scan->last_local_reg = now;
traceEvent(TRACE_DEBUG, "p2p connection established: %s [%s]",
@ -2561,7 +2561,7 @@ void process_udp (n2n_edge_t *eee, const struct sockaddr_in *sender_sock, const
traceEvent(TRACE_INFO, "[p2p] Rx REGISTER from %s [%s]%s",
macaddr_str(mac_buf1, reg.srcMac),
sock_to_cstr(sockbuf1, &sender),
(reg.cookie == N2N_LOCAL_REG_COOKIE) ? " (local)" : "");
(reg.cookie & N2N_LOCAL_REG_COOKIE) ? " (local)" : "");
find_and_remove_peer(&eee->pending_peers, reg.srcMac);
/* NOTE: only ACK to peers */
@ -2598,7 +2598,7 @@ void process_udp (n2n_edge_t *eee, const struct sockaddr_in *sender_sock, const
sock_to_cstr(sockbuf2, orig_sender),
macaddr_str(mac_buf2, ra.dstMac),
sock_to_cstr(sockbuf1, &sender),
(ra.cookie == N2N_LOCAL_REG_COOKIE) ? " (local)" : "");
(ra.cookie & N2N_LOCAL_REG_COOKIE) ? " (local)" : "");
peer_set_p2p_confirmed(eee, ra.srcMac,