github/n2n
4
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2026-10-19 16:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #379 from Logan007/reSck

Browse Source 
re-open sockets if supernode not responding
This commit is contained in:
Luca Deri
2020-08-23 14:16:20 +02:00
committed by GitHub
parent a538cd3ded 9554f336d2
commit f7f9c98752
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/edge_utils.c
+31
View File
@@ -252,6 +252,14 @@ n2n_edge_t* edge_init(const n2n_edge_conf_t *conf, int *rv) {
if(eee->transop.no_encryption)
traceEvent(TRACE_WARNING, "Encryption is disabled in edge");
// first time calling edge_init_sockets needs -1 in the sockets for it does throw an error
// on trying to close them (open_sockets does so for also being able to RE-open the sockets
// if called in-between, see "Supernode not responding" in update_supernode_reg(...)
eee->udp_sock = -1;
eee->udp_mgmt_sock = -1;
#ifndef SKIP_MULTICAST_PEERS_DISCOVERY
eee->udp_multicast_sock = -1;
#endif
if(edge_init_sockets(eee, eee->conf.local_port, eee->conf.mgmt_port, eee->conf.tos) < 0) {
traceEvent(TRACE_ERROR, "socket setup failed");
goto edge_init_error;
@@ -943,6 +951,18 @@ void update_supernode_reg(n2n_edge_t * eee, time_t nowTime) {
traceEvent(TRACE_WARNING, "Supernode not responding, now trying %s", supernode_ip(eee));
eee->sup_attempts = N2N_EDGE_SUP_ATTEMPTS;
// in some multi-NATed scenarios communication gets stuck on losing connection to supernode
// closing and re-opening the socket(s) allows for re-establishing communication
// this can only be done, if working on som eunprivileged port and/or having sufficent
// privileges. as we are not able to check for sufficent privileges here, we only do it
// if port is sufficently high or unset. uncovered: privileged port and sufficent privileges
if( (eee->conf.local_port == 0) || (eee->conf.local_port > 1024) ) {
if(edge_init_sockets(eee, eee->conf.local_port, eee->conf.mgmt_port, eee->conf.tos) < 0) {
traceEvent(TRACE_ERROR, "socket re-initiliaization failed");
}
}
}
else
--(eee->sup_attempts);
@@ -2193,6 +2213,17 @@ void edge_term(n2n_edge_t * eee) {
static int edge_init_sockets(n2n_edge_t *eee, int udp_local_port, int mgmt_port, uint8_t tos) {
int sockopt;
if(eee->udp_sock >= 0)
closesocket(eee->udp_sock);
if(eee->udp_mgmt_sock >= 0)
closesocket(eee->udp_mgmt_sock);
#ifndef SKIP_MULTICAST_PEERS_DISCOVERY
if(eee->udp_multicast_sock >= 0)
closesocket(eee->udp_multicast_sock);
#endif
if(udp_local_port > 0)
traceEvent(TRACE_NORMAL, "Binding to local port %d", udp_local_port);