From 0d39f50051e0efdd3989f062e11f509bebbc5b97 Mon Sep 17 00:00:00 2001 From: Logan oos Even <46396513+Logan007@users.noreply.github.com> Date: Mon, 27 Sep 2021 02:41:14 +0545 Subject: [PATCH] created space for more REGISTER type cookies --- src/edge_utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/edge_utils.c b/src/edge_utils.c index b6f78a6..9dbb4e9 100644 --- a/src/edge_utils.c +++ b/src/edge_utils.c @@ -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,