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 purgeable is always false on supernode peer list (#1117)

Browse Source 
* Fix purgeable is always false on sn peer list
- And change sn_purge to bool

* Change all keep_on_running to bool

* Fix wrong `keep_running` type
This commit is contained in:
Tony 2023-06-18 15:58:49 +08:00 committed by GitHub
parent e42cbd7e0c
commit 76cbff370e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/n2n.h
View File

@ -50,7 +50,7 @@
#endif
#include <stdbool.h>
#include <time.h>
#include <ctype.h>
#include <stdlib.h>
@ -272,7 +272,7 @@ int quick_edge_init (char *device_name, char *community_name,
char *encrypt_key, char *device_mac,
char *local_ip_address,
char *supernode_ip_address_port,
int *keep_on_running);
bool *keep_on_running);
int comm_init (struct sn_community *comm, char *cmn);
int sn_init_defaults (n2n_sn_t *sss);
void sn_init (n2n_sn_t *sss);

3
include/n2n_define.h
View File

@ -99,9 +99,6 @@
#define FEDERATION_NAME "*Federation"
enum federation {IS_NO_FEDERATION = 0,IS_FEDERATION = 1};
/* (un)purgeable indicator for supernodes, communities, routes, ... */
enum sn_purge {UNPURGEABLE = 0, PURGEABLE = 1};
/* Header encryption indicators */
#define HEADER_ENCRYPTION_UNKNOWN 0
#define HEADER_ENCRYPTION_NONE 1

9
include/n2n_typedefs.h
View File

@ -19,6 +19,7 @@
#ifndef _N2N_TYPEDEFS_H_
#define _N2N_TYPEDEFS_H_
#include <stdbool.h>
#include <stdint.h> // for uint8_t and friends
#ifndef WIN32
#include <arpa/inet.h> // for in_addr_t
@ -455,7 +456,7 @@ struct peer_info {
n2n_cookie_t last_cookie;
n2n_auth_t auth;
int timeout;
uint8_t purgeable;
bool purgeable;
time_t last_seen;
time_t last_p2p;
time_t last_sent_query;
@ -703,7 +704,7 @@ struct n2n_edge {
n2n_edge_conf_t conf;
/* Status */
int *keep_running; /**< Pointer to edge loop stop/go flag */
bool *keep_running; /**< Pointer to edge loop stop/go flag */
struct peer_info *curr_sn; /**< Currently active supernode. */
uint8_t sn_wait; /**< Whether we are waiting for a supernode response. */
uint8_t sn_pong; /**< Whether we have seen a PONG since last time reset. */
@ -789,7 +790,7 @@ typedef struct sn_user {
struct sn_community {
char community[N2N_COMMUNITY_SIZE];
uint8_t is_federation; /* if not-zero, then the current community is the federation of supernodes */
uint8_t purgeable; /* indicates purgeable community (fixed-name, predetermined (-c parameter) communties usually are unpurgeable) */
bool purgeable; /* indicates purgeable community (fixed-name, predetermined (-c parameter) communties usually are unpurgeable) */
uint8_t header_encryption; /* Header encryption indicator. */
he_context_t *header_encryption_ctx_static; /* Header encryption cipher context. */
he_context_t *header_encryption_ctx_dynamic; /* Header encryption cipher context. */
@ -832,7 +833,7 @@ typedef struct n2n_tcp_connection {
typedef struct n2n_sn {
int *keep_running; /* Pointer to sn loop stop/go flag */
bool *keep_running; /* Pointer to sn loop stop/go flag */
time_t start_time; /* Used to measure uptime. */
n2n_version_t version; /* version string sent to edges along with PEER_INFO a.k.a. PONG */
sn_stats_t stats;

5
src/edge.c
View File

@ -925,7 +925,7 @@ static void daemonize () {
/* *************************************************** */
static int keep_on_running;
static bool keep_on_running = true;
#if defined(__linux__) || defined(WIN32)
#ifdef WIN32
@ -944,7 +944,7 @@ BOOL WINAPI term_handler(DWORD sig)
called = 1;
}
keep_on_running = 0;
keep_on_running = false;
#ifdef WIN32
return(TRUE);
#endif
@ -1303,7 +1303,6 @@ int main (int argc, char* argv[]) {
SetConsoleCtrlHandler(term_handler, TRUE);
#endif
keep_on_running = 1;
eee->keep_running = &keep_on_running;
traceEvent(TRACE_NORMAL, "edge started");
rc = run_edge_loop(eee);

4
src/edge_management.c
View File

@ -472,7 +472,7 @@ void readFromMgmtSocket (n2n_edge_t *eee) {
if(0 == memcmp(udp_buf, "stop", 4)) {
traceEvent(TRACE_NORMAL, "stop command received");
*eee->keep_running = 0;
*eee->keep_running = false;
return;
}
@ -586,7 +586,7 @@ void readFromMgmtSocket (n2n_edge_t *eee) {
msg_len += snprintf((char *) (udp_buf + msg_len), (N2N_PKT_BUF_SIZE - msg_len),
"%-19s %1s%1s | %-17s | %-21s | %-15s | %9s | %10s\n",
peer->version,
(peer->purgeable == UNPURGEABLE) ? "l" : "",
(peer->purgeable == false) ? "l" : "",
(peer == eee->curr_sn) ? (eee->sn_wait ? "." : "*" ) : "",
is_null_mac(peer->mac_addr) ? "" : macaddr_str(mac_buf, peer->mac_addr),
sock_to_cstr(sockbuf, &(peer->sock)),

10
src/edge_utils.c
View File

@ -2863,7 +2863,7 @@ int run_edge_loop (n2n_edge_t *eee) {
HANDLE tun_read_thread = startTunReadThread(&arg);
#endif
*eee->keep_running = 1;
*eee->keep_running = true;
update_supernode_reg(eee, time(NULL));
/* Main loop
@ -2922,7 +2922,7 @@ int run_edge_loop (n2n_edge_t *eee) {
if(0 != fetch_and_eventually_process_data(eee, eee->sock,
pktbuf, &expected, &position,
now)) {
*eee->keep_running = 0;
*eee->keep_running = false;
break;
}
if(eee->conf.connect_tcp) {
@ -2943,7 +2943,7 @@ int run_edge_loop (n2n_edge_t *eee) {
if(0 != fetch_and_eventually_process_data(eee, eee->udp_multicast_sock,
pktbuf, &expected, &position,
now)) {
*eee->keep_running = 0;
*eee->keep_running = false;
break;
}
}
@ -3223,7 +3223,7 @@ int edge_conf_add_supernode (n2n_edge_conf_t *conf, const char *ip_and_port) {
strncpy(sn->ip_addr, ip_and_port, N2N_EDGE_SN_HOST_SIZE - 1);
memcpy(&(sn->sock), sock, sizeof(n2n_sock_t));
memcpy(sn->mac_addr, null_mac, sizeof(n2n_mac_t));
sn->purgeable = UNPURGEABLE;
sn->purgeable = false;
}
}
@ -3241,7 +3241,7 @@ int quick_edge_init (char *device_name, char *community_name,
char *encrypt_key, char *device_mac,
char *local_ip_address,
char *supernode_ip_address_port,
int *keep_on_running) {
bool *keep_on_running) {
tuntap_dev tuntap;
n2n_edge_t *eee;

3
src/example_edge_embed.c
View File

@ -18,7 +18,7 @@
#include "n2n.h"
static int keep_running;
static bool keep_running = true;
int main() {
@ -67,7 +67,6 @@ int main() {
exit(1);
}
keep_running = 1;
eee->keep_running = &keep_running;
rc = run_edge_loop(eee);

2
src/example_edge_embed_quick_edge_init.c
View File

@ -31,7 +31,7 @@ int main (int argc, char* argv[]) {
char *my_mac_address = (char*)"DE:AD:BE:EF:01:10";
char *my_ipv4_addr = (char*)"1.2.3.4";
char *supernode = (char*)"7.8.9.10:1234";
int keep_on_running = 1;
bool keep_on_running = true;
/* Increase tracelevel to see what's happening */
setTraceLevel(10);

3
src/example_sn_embed.c
View File

@ -18,7 +18,7 @@
#include "n2n.h"
static int keep_running;
static bool keep_running = true;
int main () {
@ -41,7 +41,6 @@ int main () {
sn_init(&sss_node);
keep_running = 1;
sss_node.keep_running = &keep_running;
rc = run_sn_loop(&sss_node);

2
src/management.c
View File

@ -65,7 +65,7 @@ void mgmt_error (mgmt_req_t *req, strbuf_t *buf, char *msg) {
void mgmt_stop (mgmt_req_t *req, strbuf_t *buf) {
if(req->type==N2N_MGMT_WRITE) {
*req->keep_running = 0;
*req->keep_running = false;
}
send_json_1uint(req, buf, "row", "keep_running", *req->keep_running);

2
src/management.h
View File

@ -33,7 +33,7 @@ typedef struct mgmt_req {
n2n_sn_t *sss;
n2n_edge_t *eee;
int mgmt_sock; // socket replies come from
int *keep_running;
bool *keep_running;
uint64_t mgmt_password_hash;
enum n2n_mgmt_type type;
char *argv0;

4
src/n2n.c
View File

@ -635,7 +635,7 @@ size_t purge_peer_list (struct peer_info **peer_list,
size_t retval = 0;
HASH_ITER(hh, *peer_list, scan, tmp) {
if((scan->purgeable == PURGEABLE) && (scan->last_seen < purge_before)) {
if(scan->purgeable && scan->last_seen < purge_before) {
if((scan->socket_fd >=0) && (scan->socket_fd != socket_not_to_close)) {
if(tcp_connections) {
HASH_FIND_INT(*tcp_connections, &scan->socket_fd, conn);
@ -665,7 +665,7 @@ size_t clear_peer_list (struct peer_info ** peer_list) {
size_t retval = 0;
HASH_ITER(hh, *peer_list, scan, tmp) {
if (scan->purgeable == UNPURGEABLE && scan->ip_addr) {
if (scan->purgeable == false && scan->ip_addr) {
free(scan->ip_addr);
}
HASH_DEL(*peer_list, scan);

4
src/sn_management.c
View File

@ -356,7 +356,7 @@ int process_mgmt (n2n_sn_t *sss,
ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
"%s '%s'\n",
(community->is_federation) ? "FEDERATION" : ((community->purgeable == UNPURGEABLE) ? "FIXED NAME COMMUNITY" : "COMMUNITY"),
(community->is_federation) ? "FEDERATION" : ((community->purgeable == false) ? "FIXED NAME COMMUNITY" : "COMMUNITY"),
(community->is_federation) ? "-/-" : community->community);
sendto_mgmt(sss, sender_sock, sock_size, (const uint8_t *) resbuf, ressize);
ressize = 0;
@ -367,7 +367,7 @@ int process_mgmt (n2n_sn_t *sss,
ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
"%4u | %-19s | %-17s | %-21s %-3s | %-15s | %9s\n",
++num,
(peer->dev_addr.net_addr == 0) ? ((peer->purgeable == UNPURGEABLE) ? "-l" : "") : ip_subnet_to_str(ip_bit_str, &peer->dev_addr),
(peer->dev_addr.net_addr == 0) ? ((peer->purgeable == false) ? "-l" : "") : ip_subnet_to_str(ip_bit_str, &peer->dev_addr),
(is_null_mac(peer->mac_addr)) ? "" : macaddr_str(mac_buf, peer->mac_addr),
sock_to_cstr(sockbuf, &(peer->sock)),
((peer->socket_fd >= 0) && (peer->socket_fd != sss->sock)) ? "TCP" : "",

13
src/sn_utils.c
View File

@ -379,7 +379,7 @@ int load_allowed_sn_community (n2n_sn_t *sss) {
if(comm != NULL) {
comm_init(comm, cmn_str);
/* loaded from file, this community is unpurgeable */
comm->purgeable = UNPURGEABLE;
comm->purgeable = false;
/* we do not know if header encryption is used in this community,
* first packet will show. just in case, setup the key. */
comm->header_encryption = HEADER_ENCRYPTION_UNKNOWN;
@ -767,7 +767,7 @@ int sn_init_defaults (n2n_sn_t *sss) {
sss->federation->community[N2N_COMMUNITY_SIZE - 1] = '\0';
/* enable the flag for federation */
sss->federation->is_federation = IS_FEDERATION;
sss->federation->purgeable = UNPURGEABLE;
sss->federation->purgeable = false;
/* header encryption enabled by default */
sss->federation->header_encryption = HEADER_ENCRYPTION_ENABLED;
/*setup the encryption key */
@ -1075,6 +1075,7 @@ static int update_edge (n2n_sn_t *sss,
if(handle_remote_auth(sss, &(reg->auth), answer_auth, comm) == 0) {
if(skip_add == SN_ADD) {
scan = (struct peer_info *) calloc(1, sizeof(struct peer_info)); /* deallocated in purge_expired_nodes */
scan->purgeable = true;
memcpy(&(scan->mac_addr), reg->edgeMac, sizeof(n2n_mac_t));
scan->dev_addr.net_addr = reg->dev_addr.net_addr;
scan->dev_addr.net_bitlen = reg->dev_addr.net_bitlen;
@ -1446,7 +1447,7 @@ static int purge_expired_communities (n2n_sn_t *sss,
}
}
if((comm->edges == NULL) && (comm->purgeable == PURGEABLE)) {
if((comm->edges == NULL) && (comm->purgeable == true)) {
traceEvent(TRACE_INFO, "purging idle community %s", comm->community);
if(NULL != comm->header_encryption_ctx_static) {
/* this should not happen as 'purgeable' and thus only communities w/o encrypted header here */
@ -1904,7 +1905,7 @@ static int process_udp (n2n_sn_t * sss,
comm->header_encryption_ctx_static = NULL;
comm->header_encryption_ctx_dynamic = NULL;
/* ... and also are purgeable during periodic purge */
comm->purgeable = PURGEABLE;
comm->purgeable = true;
comm->number_enc_packets = 0;
HASH_ADD_STR(sss->communities, community, comm);
@ -2617,7 +2618,7 @@ int run_sn_loop (n2n_sn_t *sss) {
#ifdef WIN32
traceEvent(TRACE_ERROR, "WSAGetLastError(): %u", WSAGetLastError());
#endif
*sss->keep_running = 0;
*sss->keep_running = false;
break;
}
@ -2735,7 +2736,7 @@ int run_sn_loop (n2n_sn_t *sss) {
// REVISIT: should we error out if ss_size returns bigger than before? can this ever happen?
if(bread <= 0) {
traceEvent(TRACE_ERROR, "recvfrom() failed %d errno %d (%s)", bread, errno, strerror(errno));
*sss->keep_running = 0;
*sss->keep_running = false;
break;
}

9
src/supernode.c
View File

@ -249,7 +249,7 @@ static int setOption (int optkey, char *_optarg, n2n_sn_t *sss) {
strncpy(anchor_sn->ip_addr, _optarg, N2N_EDGE_SN_HOST_SIZE - 1);
memcpy(&(anchor_sn->sock), socket, sizeof(n2n_sock_t));
memcpy(anchor_sn->mac_addr, null_mac, sizeof(n2n_mac_t));
anchor_sn->purgeable = UNPURGEABLE;
anchor_sn->purgeable = false;
anchor_sn->last_valid_time_stamp = initial_time_stamp();
}
}
@ -312,7 +312,7 @@ static int setOption (int optkey, char *_optarg, n2n_sn_t *sss) {
case 'F': { /* federation name */
snprintf(sss->federation->community, N2N_COMMUNITY_SIZE - 1 ,"*%s", _optarg);
sss->federation->community[N2N_COMMUNITY_SIZE - 1] = '\0';
sss->federation->purgeable = UNPURGEABLE;
sss->federation->purgeable = false;
break;
}
#ifdef SN_MANUAL_MAC
@ -541,7 +541,7 @@ static void dump_registrations (int signo) {
/* *************************************************** */
static int keep_running;
static bool keep_running = true;
#if defined(__linux__) || defined(WIN32)
#ifdef WIN32
@ -560,7 +560,7 @@ BOOL WINAPI term_handler (DWORD sig)
called = 1;
}
keep_running = 0;
keep_running = false;
#ifdef WIN32
return(TRUE);
#endif
@ -714,7 +714,6 @@ int main (int argc, char * const argv[]) {
SetConsoleCtrlHandler(term_handler, TRUE);
#endif
keep_running = 1;
sss_node.keep_running = &keep_running;
return run_sn_loop(&sss_node);
}

4
tools/n2n-portfwd.c
View File

@ -37,7 +37,7 @@ typedef struct n2n_portfwd_conf {
} n2n_portfwd_conf_t;
static int keep_running = 1; /* for main loop, handled by signals */
static bool keep_running = true; /* for main loop, handled by signals */
// -------------------------------------------------------------------------------------------------------
@ -73,7 +73,7 @@ static void term_handler (int sig) {
called = 1;
}
keep_running = 0;
keep_running = false;
#ifdef WIN32
return TRUE;
#endif

12
tools/n2n-route.c
View File

@ -69,7 +69,7 @@ typedef struct n2n_route_conf {
} n2n_route_conf_t;
static int keep_running = 1; /* for main loop, handled by signals */
static bool keep_running = true; /* for main loop, handled by signals */
// -------------------------------------------------------------------------------------------------------
@ -137,7 +137,7 @@ BOOL WINAPI term_handler (DWORD sig) {
called = 1;
}
keep_running = 0;
keep_running = false;
#if defined(WIN32)
return TRUE;
#endif
@ -827,7 +827,7 @@ int main (int argc, char* argv[]) {
if(!inet_address_valid(route->gateway)) {
route->gateway = rrr.gateway_vpn;
}
route->purgeable = UNPURGEABLE;
route->purgeable = false;
handle_route(route, ROUTE_ADD);
}
@ -876,7 +876,7 @@ reset_main_loop:
rrr.gateway_org = addr_tmp;
// delete all purgeable routes as they are still relying on old original default gateway
HASH_ITER(hh, rrr.routes, route, tmp_route) {
if((route->purgeable == PURGEABLE)) {
if((route->purgeable == true)) {
handle_route(route, ROUTE_DEL);
HASH_DEL(rrr.routes, route);
free(route);
@ -937,7 +937,7 @@ reset_main_loop:
if(now > last_purge + PURGE_INTERVAL) {
last_purge = now;
HASH_ITER(hh, rrr.routes, route, tmp_route) {
if((route->purgeable == PURGEABLE) && (now > route->last_seen + REMOVE_ROUTE_AGE)) {
if((route->purgeable == true) && (now > route->last_seen + REMOVE_ROUTE_AGE)) {
handle_route(route, ROUTE_DEL);
HASH_DEL(rrr.routes, route);
free(route);
@ -1007,7 +1007,7 @@ reset_main_loop:
HASH_DEL(rrr.routes, route);
if(route) {
fill_route(route, addr, inet_address(HOST_MASK), rrr.gateway_org);
route->purgeable = PURGEABLE;
route->purgeable = true;
if(!(route->last_seen)) {
handle_route(route, ROUTE_ADD);
}