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

Fix supernode handling REGISTER message from edge and let edge ask supernode to forward REGISTER message in case of non-p2p-reflection.

Browse Source 
This is reliable way to PUNCH UDP HOLE (following STUN spec)
This commit is contained in:
yunbox 2019-05-23 19:21:21 +08:00 committed by Jiang Zihao
parent 3aec02d3e6
commit f48c170c26
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
edge_utils.c
View File

@ -370,6 +370,7 @@ static void register_with_local_peers(n2n_edge_t * eee) {
* Called from the main loop when Rx a packet for our device mac.
*/
static void register_with_new_peer(n2n_edge_t * eee,
uint8_t from_supernode,
const n2n_mac_t mac,
const n2n_sock_t * peer) {
/* REVISIT: purge of pending_peers not yet done. */
@ -397,6 +398,9 @@ static void register_with_new_peer(n2n_edge_t * eee,
/* trace Sending REGISTER */
send_register(eee, &(scan->sock), mac);
if(from_supernode) {
send_register(eee, &(eee->supernode), mac);
}
register_with_local_peers(eee);
}
@ -413,7 +417,7 @@ static void check_peer_registration_needed(n2n_edge_t * eee,
if(scan == NULL) {
/* Not in known_peers - start the REGISTER process. */
register_with_new_peer(eee, mac, peer);
register_with_new_peer(eee, from_supernode, mac, peer);
} else {
/* Already in known_peers. */
time_t now = time(NULL);
@ -571,7 +575,7 @@ static void check_known_peer_sock_change(n2n_edge_t * eee,
/* The peer has changed public socket. It can no longer be assumed to be reachable. */
remove_peer_from_list(&eee->known_peers, prev, scan);
register_with_new_peer(eee, mac, peer);
register_with_new_peer(eee, from_supernode, mac, peer);
} else {
/* Don't worry about what the supernode reports, it could be seeing a different socket. */
}

2
sn.c
View File

@ -583,7 +583,7 @@ static int process_udp(n2n_sn_t * sss,
macaddr_str(mac_buf2, reg.dstMac),
((cmn.flags & N2N_FLAGS_FROM_SUPERNODE)?"from sn":"local"));
if(0 != (cmn.flags & N2N_FLAGS_FROM_SUPERNODE)) {
if(0 == (cmn.flags & N2N_FLAGS_FROM_SUPERNODE)) {
memcpy(&cmn2, &cmn, sizeof(n2n_common_t));
/* We are going to add socket even if it was not there before */