github/n2n
4
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-04-21 16:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into iwyu

Browse Source
This commit is contained in:
Hamish Coleman
2023-06-18 12:31:58 +01:00
parent 585b3cec59 e397a5af75
commit a7fc1c2bbc
17 changed files with 73 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/n2n.h
+2 -1
View File
@@ -50,6 +50,7 @@
#endif /* WIN32 */
#include <stdbool.h>
#include <stdio.h> // for size_t, FILE
#include "n2n_define.h"
#include "n2n_typedefs.h"
@@ -207,7 +208,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);
include/n2n_define.h
-3
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
include/n2n_typedefs.h
+6 -5
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. */
@@ -733,7 +734,7 @@ struct n2n_edge {
/* Peers */
struct peer_info * known_peers; /**< Edges we are connected to. */
struct peer_info * pending_peers; /**< Edges we have tried to register with. */
#ifdef HAVE_BRIDGING_SUPPORT
#ifdef HAVE_BRIDGING_SUPPORT
struct host_info * known_hosts; /**< hosts we know. */
#endif
/* Timers */
@@ -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;