kdxcxs
/
n2n
mirror of https://github.com/ntop/n2n.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

readability code clean-up (#542)

pull/554/head
Francesco Carli 4 years ago
committed by GitHub
parent
595384a355
commit
e71de330e5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1201 additions and 1212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      include/edge_utils_win32.h
  2. 345
      src/edge.c
  3. 1947
      src/edge_utils.c
  4. 18
      src/edge_utils_win32.c
  5. 82
      src/example_edge_embed.c
  6. 19
      src/example_edge_embed_quick_edge_init.c

2
include/edge_utils_win32.h
View File

@ -35,7 +35,7 @@ struct tunread_arg {
int *keep_running; int *keep_running;
}; };
extern HANDLE startTunReadThread(struct tunread_arg *arg); extern HANDLE startTunReadThread (struct tunread_arg *arg);
#endif /* WIN32 */ #endif /* WIN32 */

345
src/edge.c
View File

@ -57,10 +57,10 @@ int num_cap = sizeof(cap_values)/sizeof(cap_value_t);
* *
* return 0 on success and -1 on error * return 0 on success and -1 on error
*/ */
static int scan_address(char * ip_addr, size_t addr_size, static int scan_address (char * ip_addr, size_t addr_size,
char * netmask, size_t netmask_size, char * netmask, size_t netmask_size,
char * ip_mode, size_t mode_size, char * ip_mode, size_t mode_size,
char * s) { char * s) {
int retval = -1; int retval = -1;
char * start; char * start;
@ -116,37 +116,37 @@ static void help() {
print_n2n_version(); print_n2n_version();
printf("edge <config file> (see edge.conf)\n" printf("edge <config file> (see edge.conf)\n"
"or\n" "or\n"
); );
printf("edge " printf("edge "
#if defined(N2N_CAN_NAME_IFACE) #if defined(N2N_CAN_NAME_IFACE)
"-d <tap device> " "-d <tap device> "
#endif /* #if defined(N2N_CAN_NAME_IFACE) */ #endif /* #if defined(N2N_CAN_NAME_IFACE) */
"-a [static:|dhcp:]<tap IP address>[/nn] " "-a [static:|dhcp:]<tap IP address>[/nn] "
"-c <community> " "-c <community> "
"[-k <encrypt key>]\n" "[-k <encrypt key>]\n"
" " " "
#ifndef WIN32 #ifndef WIN32
"[-u <uid> -g <gid>]" "[-u <uid> -g <gid>]"
#endif /* #ifndef WIN32 */ #endif /* #ifndef WIN32 */
#ifndef WIN32 #ifndef WIN32
"[-f]" "[-f]"
#endif /* #ifndef WIN32 */ #endif /* #ifndef WIN32 */
#ifdef __linux__ #ifdef __linux__
"[-T <tos>]" "[-T <tos>]"
#endif #endif
"[-n cidr:gateway] " "[-n cidr:gateway] "
"[-m <MAC address>] " "[-m <MAC address>] "
"-l <supernode host:port>\n" "-l <supernode host:port>\n"
" " " "
"[-p <local port>] [-M <mtu>] " "[-p <local port>] [-M <mtu>] "
#ifndef __APPLE__ #ifndef __APPLE__
"[-D] " "[-D] "
#endif #endif
"[-r] [-E] [-v] [-i <reg_interval>] [-L <reg_ttl>] [-t <mgmt port>] [-A[<cipher>]] [-H] [-z[<compression algo>]] " "[-r] [-E] [-v] [-i <reg_interval>] [-L <reg_ttl>] [-t <mgmt port>] [-A[<cipher>]] [-H] [-z[<compression algo>]] "
"[-R <rule_str>] " "[-R <rule_str>] "
"[-h]\n\n"); "[-h]\n\n");
#if defined(N2N_CAN_NAME_IFACE) #if defined(N2N_CAN_NAME_IFACE)
printf("-d <tap device> | tap device name\n"); printf("-d <tap device> | tap device name\n");
@ -178,14 +178,14 @@ static void help() {
printf("-A1 | Disable payload encryption. Do not use with key (defaulting to Twofish then).\n"); printf("-A1 | Disable payload encryption. Do not use with key (defaulting to Twofish then).\n");
printf("-A2 ... -A5 or -A | Choose a cipher for payload encryption, requires a key: -A2 = Twofish (default),\n"); printf("-A2 ... -A5 or -A | Choose a cipher for payload encryption, requires a key: -A2 = Twofish (default),\n");
printf(" | -A3 or -A (deprecated) = AES, " printf(" | -A3 or -A (deprecated) = AES, "
"-A4 = ChaCha20, " "-A4 = ChaCha20, "
"-A5 = Speck-CTR.\n"); "-A5 = Speck-CTR.\n");
printf("-H | Enable full header encryption. Requires supernode with fixed community.\n"); printf("-H | Enable full header encryption. Requires supernode with fixed community.\n");
printf("-z1 ... -z2 or -z | Enable compression for outgoing data packets: -z1 or -z = lzo1x" printf("-z1 ... -z2 or -z | Enable compression for outgoing data packets: -z1 or -z = lzo1x"
#ifdef N2N_HAVE_ZSTD #ifdef N2N_HAVE_ZSTD
", -z2 = zstd" ", -z2 = zstd"
#endif #endif
" (default=disabled).\n"); " (default=disabled).\n");
printf("-E | Accept multicast MAC addresses (default=drop).\n"); printf("-E | Accept multicast MAC addresses (default=drop).\n");
printf("-S | Do not connect P2P. Always use the supernode.\n"); printf("-S | Do not connect P2P. Always use the supernode.\n");
#ifdef __linux__ #ifdef __linux__
@ -210,25 +210,22 @@ static void help() {
/* *************************************************** */ /* *************************************************** */
static void setPayloadCompression(n2n_edge_conf_t *conf, int compression) { static void setPayloadCompression (n2n_edge_conf_t *conf, int compression) {
/* even though 'compression' and 'conf->compression' share the same encoding scheme, /* even though 'compression' and 'conf->compression' share the same encoding scheme,
* a switch-statement under conditional compilation is used to sort out the * a switch-statement under conditional compilation is used to sort out the
* unsupported optarguments */ * unsupported optarguments */
switch (compression) { switch (compression) {
case 1: case 1: {
{
conf->compression = N2N_COMPRESSION_ID_LZO; conf->compression = N2N_COMPRESSION_ID_LZO;
break; break;
} }
#ifdef N2N_HAVE_ZSTD #ifdef N2N_HAVE_ZSTD
case 2: case 2: {
{
conf->compression = N2N_COMPRESSION_ID_ZSTD; conf->compression = N2N_COMPRESSION_ID_ZSTD;
break; break;
} }
#endif #endif
default: default: {
{
conf->compression = N2N_COMPRESSION_ID_NONE; conf->compression = N2N_COMPRESSION_ID_NONE;
// internal comrpession scheme numbering differs from cli counting by one, hence plus one // internal comrpession scheme numbering differs from cli counting by one, hence plus one
// (internal: 0 == invalid, 1 == none, 2 == lzo, 3 == zstd) // (internal: 0 == invalid, 1 == none, 2 == lzo, 3 == zstd)
@ -240,38 +237,37 @@ static void setPayloadCompression(n2n_edge_conf_t *conf, int compression) {
/* *************************************************** */ /* *************************************************** */
static void setPayloadEncryption( n2n_edge_conf_t *conf, int cipher) { static void setPayloadEncryption (n2n_edge_conf_t *conf, int cipher) {
/* even though 'cipher' and 'conf->transop_id' share the same encoding scheme, /* even though 'cipher' and 'conf->transop_id' share the same encoding scheme,
* a switch-statement under conditional compilation is used to sort out the * a switch-statement under conditional compilation is used to sort out the
* unsupported ciphers */ * unsupported ciphers */
switch (cipher) { switch (cipher) {
case 1: case 1: {
{
conf->transop_id = N2N_TRANSFORM_ID_NULL; conf->transop_id = N2N_TRANSFORM_ID_NULL;
break; break;
} }
case 2:
{ case 2: {
conf->transop_id = N2N_TRANSFORM_ID_TWOFISH; conf->transop_id = N2N_TRANSFORM_ID_TWOFISH;
break; break;
} }
case 3:
{ case 3: {
conf->transop_id = N2N_TRANSFORM_ID_AES; conf->transop_id = N2N_TRANSFORM_ID_AES;
break; break;
} }
case 4:
{ case 4: {
conf->transop_id = N2N_TRANSFORM_ID_CHACHA20; conf->transop_id = N2N_TRANSFORM_ID_CHACHA20;
break; break;
} }
case 5:
{ case 5: {
conf->transop_id = N2N_TRANSFORM_ID_SPECK; conf->transop_id = N2N_TRANSFORM_ID_SPECK;
break; break;
} }
default:
{ default: {
conf->transop_id = N2N_TRANSFORM_ID_INVAL; conf->transop_id = N2N_TRANSFORM_ID_INVAL;
traceEvent(TRACE_NORMAL, "the %s cipher given by -A_ option is not supported in this version.", transop_str(cipher)); traceEvent(TRACE_NORMAL, "the %s cipher given by -A_ option is not supported in this version.", transop_str(cipher));
exit(1); exit(1);
@ -281,184 +277,165 @@ static void setPayloadEncryption( n2n_edge_conf_t *conf, int cipher) {
/* *************************************************** */ /* *************************************************** */
static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec, n2n_edge_conf_t *conf) { static int setOption (int optkey, char *optargument, n2n_tuntap_priv_config_t *ec, n2n_edge_conf_t *conf) {
/* traceEvent(TRACE_NORMAL, "Option %c = %s", optkey, optargument ? optargument : ""); */ /* traceEvent(TRACE_NORMAL, "Option %c = %s", optkey, optargument ? optargument : ""); */
switch(optkey) { switch(optkey) {
case 'a': /* IP address and mode of TUNTAP interface */ case 'a': /* IP address and mode of TUNTAP interface */ {
{
scan_address(ec->ip_addr, N2N_NETMASK_STR_SIZE, scan_address(ec->ip_addr, N2N_NETMASK_STR_SIZE,
ec->netmask, N2N_NETMASK_STR_SIZE, ec->netmask, N2N_NETMASK_STR_SIZE,
ec->ip_mode, N2N_IF_MODE_SIZE, ec->ip_mode, N2N_IF_MODE_SIZE,
optargument); optargument);
break; break;
} }
case 'c': /* community as a string */ case 'c': /* community as a string */ {
{
memset(conf->community_name, 0, N2N_COMMUNITY_SIZE); memset(conf->community_name, 0, N2N_COMMUNITY_SIZE);
strncpy((char *)conf->community_name, optargument, N2N_COMMUNITY_SIZE); strncpy((char *)conf->community_name, optargument, N2N_COMMUNITY_SIZE);
conf->community_name[N2N_COMMUNITY_SIZE-1] = '\0'; conf->community_name[N2N_COMMUNITY_SIZE - 1] = '\0';
break; break;
} }
case 'E': /* multicast ethernet addresses accepted. */ case 'E': /* multicast ethernet addresses accepted. */ {
{ conf->drop_multicast = 0;
conf->drop_multicast=0;
traceEvent(TRACE_DEBUG, "Enabling ethernet multicast traffic"); traceEvent(TRACE_DEBUG, "Enabling ethernet multicast traffic");
break; break;
} }
#ifndef WIN32 #ifndef WIN32
case 'u': /* unprivileged uid */ case 'u': /* unprivileged uid */ {
{
ec->userid = atoi(optargument); ec->userid = atoi(optargument);
break; break;
} }
case 'g': /* unprivileged uid */ case 'g': /* unprivileged uid */ {
{
ec->groupid = atoi(optargument); ec->groupid = atoi(optargument);
break; break;
} }
#endif #endif
#ifndef WIN32 #ifndef WIN32
case 'f' : /* do not fork as daemon */ case 'f' : /* do not fork as daemon */ {
{ ec->daemon = 0;
ec->daemon=0;
break; break;
} }
#endif /* #ifndef WIN32 */ #endif /* #ifndef WIN32 */
case 'm' : /* TUNTAP MAC address */ case 'm' : /* TUNTAP MAC address */ {
{ strncpy(ec->device_mac, optargument, N2N_MACNAMSIZ);
strncpy(ec->device_mac,optargument,N2N_MACNAMSIZ); ec->device_mac[N2N_MACNAMSIZ - 1] = '\0';
ec->device_mac[N2N_MACNAMSIZ-1] = '\0';
break; break;
} }
case 'M' : /* TUNTAP MTU */ case 'M' : /* TUNTAP MTU */ {
{
ec->mtu = atoi(optargument); ec->mtu = atoi(optargument);
break; break;
} }
#ifndef __APPLE__ #ifndef __APPLE__
case 'D' : /* enable PMTU discovery */ case 'D' : /* enable PMTU discovery */ {
{
conf->disable_pmtu_discovery = 0; conf->disable_pmtu_discovery = 0;
break; break;
} }
#endif #endif
case 'k': /* encrypt key */ case 'k': /* encrypt key */ {
{
if(conf->encrypt_key) free(conf->encrypt_key); if(conf->encrypt_key) free(conf->encrypt_key);
conf->encrypt_key = strdup(optargument); conf->encrypt_key = strdup(optargument);
traceEvent(TRACE_DEBUG, "encrypt_key = '%s'\n", conf->encrypt_key); traceEvent(TRACE_DEBUG, "encrypt_key = '%s'\n", conf->encrypt_key);
break; break;
} }
case 'r': /* enable packet routing across n2n endpoints */ case 'r': /* enable packet routing across n2n endpoints */ {
{
conf->allow_routing = 1; conf->allow_routing = 1;
break; break;
} }
case 'A': case 'A': {
{
int cipher; int cipher;
if (optargument) { if(optargument) {
cipher = atoi(optargument); cipher = atoi(optargument);
} else { } else {
traceEvent(TRACE_NORMAL, "the use of the solitary -A switch is deprecated and might not be supported in future versions. " traceEvent(TRACE_NORMAL, "the use of the solitary -A switch is deprecated and might not be supported in future versions. "
"please use -A3 instead to choose a the AES cipher for payload encryption."); "please use -A3 instead to choose a the AES cipher for payload encryption.");
cipher = N2N_TRANSFORM_ID_AES; // default, if '-A' only cipher = N2N_TRANSFORM_ID_AES; // default, if '-A' only
} }
setPayloadEncryption(conf, cipher); setPayloadEncryption(conf, cipher);
break; break;
} }
case 'H': /* indicate header encryption */ case 'H': /* indicate header encryption */ {
{
/* we cannot be sure if this gets parsed before the community name is set. /* we cannot be sure if this gets parsed before the community name is set.
* so, only an indicator is set, action is taken later*/ * so, only an indicator is set, action is taken later*/
conf->header_encryption = HEADER_ENCRYPTION_ENABLED; conf->header_encryption = HEADER_ENCRYPTION_ENABLED;
break; break;
} }
case 'z': case 'z': {
{
int compression; int compression;
if (optargument) { if(optargument) {
compression = atoi(optargument); compression = atoi(optargument);
} else } else
compression = 1; // default, if '-z' only, equals -z1 compression = 1; // default, if '-z' only, equals -z1
setPayloadCompression(conf, compression); setPayloadCompression(conf, compression);
break; break;
} }
case 'l': /* supernode-list */ case 'l': /* supernode-list */
if(optargument) { if(optargument) {
if(edge_conf_add_supernode(conf, optargument) != 0) { if(edge_conf_add_supernode(conf, optargument) != 0) {
traceEvent(TRACE_WARNING, "Too many supernodes!"); traceEvent(TRACE_WARNING, "Too many supernodes!");
exit(1); exit(1);
}
break;
} }
break;
}
case 'i': /* supernode registration interval */ case 'i': /* supernode registration interval */
conf->register_interval = atoi(optargument); conf->register_interval = atoi(optargument);
break; break;
case 'L': /* supernode registration interval */ case 'L': /* supernode registration interval */
conf->register_ttl = atoi(optarg); conf->register_ttl = atoi(optarg);
break; break;
#if defined(N2N_CAN_NAME_IFACE) #if defined(N2N_CAN_NAME_IFACE)
case 'd': /* TUNTAP name */ case 'd': /* TUNTAP name */ {
{
strncpy(ec->tuntap_dev_name, optargument, N2N_IFNAMSIZ); strncpy(ec->tuntap_dev_name, optargument, N2N_IFNAMSIZ);
ec->tuntap_dev_name[N2N_IFNAMSIZ-1] = '\0'; ec->tuntap_dev_name[N2N_IFNAMSIZ - 1] = '\0';
break; break;
} }
#endif #endif
case 'I': /* Device Description (hint) */ case 'I': /* Device Description (hint) */ {
{
memset(conf->dev_desc, 0, N2N_DESC_SIZE); memset(conf->dev_desc, 0, N2N_DESC_SIZE);
/* reserve possible last char as null terminator. */ /* reserve possible last char as null terminator. */
strncpy((char *)conf->dev_desc, optargument, N2N_DESC_SIZE-1); strncpy((char *)conf->dev_desc, optargument, N2N_DESC_SIZE-1);
break; break;
} }
case 'p': case 'p': {
{
conf->local_port = atoi(optargument); conf->local_port = atoi(optargument);
if(conf->local_port == 0){ if(conf->local_port == 0) {
traceEvent(TRACE_WARNING, "Bad local port format"); traceEvent(TRACE_WARNING, "Bad local port format");
break; break;
} }
break; break;
} }
case 't': case 't': {
{
conf->mgmt_port = atoi(optargument); conf->mgmt_port = atoi(optargument);
break; break;
} }
#ifdef __linux__ #ifdef __linux__
case 'T': case 'T': {
{
if((optargument[0] == '0') && (optargument[1] == 'x')) if((optargument[0] == '0') && (optargument[1] == 'x'))
conf->tos = strtol(&optargument[2], NULL, 16); conf->tos = strtol(&optargument[2], NULL, 16);
else else
@ -468,8 +445,7 @@ static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec
} }
#endif #endif
case 'n': case 'n': {
{
char cidr_net[64], gateway[64]; char cidr_net[64], gateway[64];
n2n_route_t route; n2n_route_t route;
@ -505,38 +481,35 @@ static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec
break; break;
} }
case 'S': case 'S': {
{
conf->allow_p2p = 0; conf->allow_p2p = 0;
break; break;
} }
case 'h': /* help */ case 'h': /* help */ {
{
help(); help();
break; break;
} }
case 'v': /* verbose */ case 'v': /* verbose */
setTraceLevel(getTraceLevel() + 1); setTraceLevel(getTraceLevel() + 1);
break; break;
case 'R': /* network traffic filter */ case 'R': /* network traffic filter */ {
{
filter_rule_t *new_rule = malloc(sizeof(filter_rule_t)); filter_rule_t *new_rule = malloc(sizeof(filter_rule_t));
memset(new_rule, 0, sizeof(filter_rule_t)); memset(new_rule, 0, sizeof(filter_rule_t));
if(process_traffic_filter_rule_str(optargument, new_rule) )
{ if(process_traffic_filter_rule_str(optargument, new_rule)) {
HASH_ADD(hh, conf->network_traffic_filter_rules, key, sizeof(filter_rule_key_t), new_rule); HASH_ADD(hh, conf->network_traffic_filter_rules, key, sizeof(filter_rule_key_t), new_rule);
}else{ } else {
free(new_rule); free(new_rule);
traceEvent(TRACE_WARNING, "Invalid filter rule: %s", optargument); traceEvent(TRACE_WARNING, "Invalid filter rule: %s", optargument);
return(-1); return(-1);
} }
break; break;
} }
default:
{ default: {
traceEvent(TRACE_WARNING, "Unknown option -%c: Ignored", (char)optkey); traceEvent(TRACE_WARNING, "Unknown option -%c: Ignored", (char)optkey);
return(-1); return(-1);
} }
@ -562,7 +535,7 @@ static const struct option long_options[] =
/* *************************************************** */ /* *************************************************** */
/* read command line options */ /* read command line options */
static int loadFromCLI(int argc, char *argv[], n2n_edge_conf_t *conf, n2n_tuntap_priv_config_t *ec) { static int loadFromCLI (int argc, char *argv[], n2n_edge_conf_t *conf, n2n_tuntap_priv_config_t *ec) {
u_char c; u_char c;
while ((c = getopt_long(argc, argv, while ((c = getopt_long(argc, argv,
@ -581,7 +554,7 @@ static int loadFromCLI(int argc, char *argv[], n2n_edge_conf_t *conf, n2n_tuntap
/* *************************************************** */ /* *************************************************** */
static char *trim(char *s) { static char *trim (char *s) {
char *end; char *end;
while(isspace(s[0]) || (s[0] == '"') || (s[0] == '\'')) s++; while(isspace(s[0]) || (s[0] == '"') || (s[0] == '\'')) s++;
@ -589,7 +562,7 @@ static char *trim(char *s) {
end = &s[strlen(s) - 1]; end = &s[strlen(s) - 1];
while(end > s while(end > s
&& (isspace(end[0])|| (end[0] == '"') || (end[0] == '\''))) && (isspace(end[0])|| (end[0] == '"') || (end[0] == '\'')))
end--; end--;
end[1] = 0; end[1] = 0;
@ -599,7 +572,7 @@ static char *trim(char *s) {
/* *************************************************** */ /* *************************************************** */
/* parse the configuration file */ /* parse the configuration file */
static int loadFromFile(const char *path, n2n_edge_conf_t *conf, n2n_tuntap_priv_config_t *ec) { static int loadFromFile (const char *path, n2n_edge_conf_t *conf, n2n_tuntap_priv_config_t *ec) {
char buffer[4096], *line, *key, *value; char buffer[4096], *line, *key, *value;
u_int line_len, opt_name_len; u_int line_len, opt_name_len;
FILE *fd; FILE *fd;
@ -624,22 +597,22 @@ static int loadFromFile(const char *path, n2n_edge_conf_t *conf, n2n_tuntap_priv
opt = long_options; opt = long_options;
while(opt->name != NULL) { while(opt->name != NULL) {
opt_name_len = strlen(opt->name); opt_name_len = strlen(opt->name);
if(!strncmp(key, opt->name, opt_name_len) if(!strncmp(key, opt->name, opt_name_len)
&& (line_len <= opt_name_len && (line_len <= opt_name_len
|| key[opt_name_len] == '\0' || key[opt_name_len] == '\0'
|| key[opt_name_len] == ' ' || key[opt_name_len] == ' '
|| key[opt_name_len] == '=')) { || key[opt_name_len] == '=')) {
if(line_len > opt_name_len) key[opt_name_len] = '\0'; if(line_len > opt_name_len) key[opt_name_len] = '\0';
if(line_len > opt_name_len + 1) value = trim(&key[opt_name_len + 1]); if(line_len > opt_name_len + 1) value = trim(&key[opt_name_len + 1]);
// traceEvent(TRACE_NORMAL, "long key: %s value: %s", key, value); // traceEvent(TRACE_NORMAL, "long key: %s value: %s", key, value);
setOption(opt->val, value, ec, conf); setOption(opt->val, value, ec, conf);
break; break;
} }
opt++; opt++;
} }
} else if(line[0] == '-') { /* short opt */ } else if(line[0] == '-') { /* short opt */
char *equal; char *equal;
@ -649,23 +622,23 @@ static int loadFromFile(const char *path, n2n_edge_conf_t *conf, n2n_tuntap_priv
equal = strchr(line, '='); equal = strchr(line, '=');
if(equal) { if(equal) {
equal[0] = '\0'; equal[0] = '\0';
value = &equal[1]; value = &equal[1];
if((value[0] == '\0') && (key[1] != '\0')) if((value[0] == '\0') && (key[1] != '\0'))
value = &key[1]; value = &key[1];
} else { } else {
value = NULL; value = NULL;
/* Adding an exception for -A_ -z_ which can come /* Adding an exception for -A_ -z_ which can come
without '=' and even without any further data */ without '=' and even without any further data */
if (key[0] == 'z') { if(key[0] == 'z') {
if (key[1]) value = &key[1]; if(key[1]) value = &key[1];
key = "z"; key = "z";
} else if (key[0] == 'A') { } else if(key[0] == 'A') {
if (key[1]) value = &key[1]; if(key[1]) value = &key[1];
key = "A"; key = "A";
} }
} }
// traceEvent(TRACE_NORMAL, "key: %c value: %s", key[0], value); // traceEvent(TRACE_NORMAL, "key: %c value: %s", key[0], value);
@ -683,7 +656,7 @@ static int loadFromFile(const char *path, n2n_edge_conf_t *conf, n2n_tuntap_priv
/* ************************************** */ /* ************************************** */
static void daemonize() { static void daemonize () {
#ifndef WIN32 #ifndef WIN32
int childpid; int childpid;
@ -696,7 +669,7 @@ static void daemonize() {
if((childpid = fork()) < 0) if((childpid = fork()) < 0)
traceEvent(TRACE_ERROR, "Occurred while daemonizing (errno=%d)", traceEvent(TRACE_ERROR, "Occurred while daemonizing (errno=%d)",
errno); errno);
else { else {
if(!childpid) { /* child */ if(!childpid) { /* child */
int rc; int rc;
@ -704,7 +677,7 @@ static void daemonize() {
//traceEvent(TRACE_NORMAL, "Bye bye: I'm becoming a daemon..."); //traceEvent(TRACE_NORMAL, "Bye bye: I'm becoming a daemon...");
rc = chdir("/"); rc = chdir("/");
if(rc != 0) if(rc != 0)
traceEvent(TRACE_ERROR, "Error while moving to / directory"); traceEvent(TRACE_ERROR, "Error while moving to / directory");
setsid(); /* detach from the terminal */ setsid(); /* detach from the terminal */
@ -759,7 +732,7 @@ BOOL WINAPI term_handler(DWORD sig)
/* *************************************************** */ /* *************************************************** */
/** Entry point to program from kernel. */ /** Entry point to program from kernel. */
int main(int argc, char* argv[]) { int main (int argc, char* argv[]) {
int rc; int rc;
tuntap_dev tuntap; /* a tuntap device */ tuntap_dev tuntap; /* a tuntap device */
n2n_edge_t *eee; /* single instance for this program */ n2n_edge_t *eee; /* single instance for this program */
@ -772,7 +745,7 @@ int main(int argc, char* argv[]) {
cap_t caps; cap_t caps;
#endif #endif
#ifdef WIN32 #ifdef WIN32
initWin32(); initWin32();
#endif #endif
/* Defaults */ /* Defaults */
@ -807,7 +780,7 @@ int main(int argc, char* argv[]) {
/* Load from current directory */ /* Load from current directory */
rc = loadFromFile("edge.conf", &conf, &ec); rc = loadFromFile("edge.conf", &conf, &ec);
#else #else
rc = -1; rc = -1;
#endif #endif
if(conf.transop_id == N2N_TRANSFORM_ID_NULL) { if(conf.transop_id == N2N_TRANSFORM_ID_NULL) {
@ -852,11 +825,11 @@ int main(int argc, char* argv[]) {
} }
memcpy(&(eee->tuntap_priv_conf), &ec, sizeof(ec)); memcpy(&(eee->tuntap_priv_conf), &ec, sizeof(ec));
if ((0 == strcmp("static", eee->tuntap_priv_conf.ip_mode)) || if((0 == strcmp("static", eee->tuntap_priv_conf.ip_mode)) ||
((eee->tuntap_priv_conf.ip_mode[0] == '\0') && (eee->tuntap_priv_conf.ip_addr[0] != '\0'))) { ((eee->tuntap_priv_conf.ip_mode[0] == '\0') && (eee->tuntap_priv_conf.ip_addr[0] != '\0'))) {
traceEvent(TRACE_NORMAL, "Use manually set IP address."); traceEvent(TRACE_NORMAL, "Use manually set IP address.");
eee->conf.tuntap_ip_mode = TUNTAP_IP_MODE_STATIC; eee->conf.tuntap_ip_mode = TUNTAP_IP_MODE_STATIC;
} else if (0 == strcmp("dhcp", eee->tuntap_priv_conf.ip_mode)) { } else if(0 == strcmp("dhcp", eee->tuntap_priv_conf.ip_mode)) {
traceEvent(TRACE_NORMAL, "Obtain IP from other edge DHCP services."); traceEvent(TRACE_NORMAL, "Obtain IP from other edge DHCP services.");
eee->conf.tuntap_ip_mode = TUNTAP_IP_MODE_DHCP; eee->conf.tuntap_ip_mode = TUNTAP_IP_MODE_DHCP;
} else { } else {
@ -872,22 +845,22 @@ int main(int argc, char* argv[]) {
wait_time.tv_sec = SOCKET_TIMEOUT_INTERVAL_SECS; wait_time.tv_sec = SOCKET_TIMEOUT_INTERVAL_SECS;
wait_time.tv_usec = 0; wait_time.tv_usec = 0;
if (select(eee->udp_sock + 1, &socket_mask, NULL, NULL, &wait_time) > 0) { if(select(eee->udp_sock + 1, &socket_mask, NULL, NULL, &wait_time) > 0) {
if (FD_ISSET(eee->udp_sock, &socket_mask)) { if(FD_ISSET(eee->udp_sock, &socket_mask)) {
readFromIPSocket(eee, eee->udp_sock); readFromIPSocket(eee, eee->udp_sock);
} }
} }
} while (eee->sn_wait); } while(eee->sn_wait);
eee->last_register_req = 0; eee->last_register_req = 0;
} }
if (tuntap_open(&tuntap, eee->tuntap_priv_conf.tuntap_dev_name, eee->tuntap_priv_conf.ip_mode, if(tuntap_open(&tuntap, eee->tuntap_priv_conf.tuntap_dev_name, eee->tuntap_priv_conf.ip_mode,
eee->tuntap_priv_conf.ip_addr, eee->tuntap_priv_conf.netmask, eee->tuntap_priv_conf.ip_addr, eee->tuntap_priv_conf.netmask,
eee->tuntap_priv_conf.device_mac, eee->tuntap_priv_conf.mtu) < 0) exit(1); eee->tuntap_priv_conf.device_mac, eee->tuntap_priv_conf.mtu) < 0) exit(1);
traceEvent(TRACE_NORMAL, "Local tap IP: %s, Mask: %s", traceEvent(TRACE_NORMAL, "Local tap IP: %s, Mask: %s",
eee->tuntap_priv_conf.ip_addr, eee->tuntap_priv_conf.netmask); eee->tuntap_priv_conf.ip_addr, eee->tuntap_priv_conf.netmask);
memcpy(&eee->device, &tuntap, sizeof(tuntap)); memcpy(&eee->device, &tuntap, sizeof(tuntap));
// hexdump((unsigned char*)&tuntap,sizeof(tuntap_dev)); // hexdump((unsigned char*)&tuntap,sizeof(tuntap_dev));
#ifndef WIN32 #ifndef WIN32
if(eee->tuntap_priv_conf.daemon) { if(eee->tuntap_priv_conf.daemon) {
@ -915,7 +888,7 @@ int main(int argc, char* argv[]) {
if((eee->tuntap_priv_conf.userid != 0) || (eee->tuntap_priv_conf.groupid != 0)) { if((eee->tuntap_priv_conf.userid != 0) || (eee->tuntap_priv_conf.groupid != 0)) {
traceEvent(TRACE_NORMAL, "Dropping privileges to uid=%d, gid=%d", traceEvent(TRACE_NORMAL, "Dropping privileges to uid=%d, gid=%d",
(signed int)eee->tuntap_priv_conf.userid, (signed int)eee->tuntap_priv_conf.groupid); (signed int)eee->tuntap_priv_conf.userid, (signed int)eee->tuntap_priv_conf.groupid);
/* Finished with the need for root privileges. Drop to unprivileged user. */ /* Finished with the need for root privileges. Drop to unprivileged user. */
if((setgid(eee->tuntap_priv_conf.groupid) != 0) if((setgid(eee->tuntap_priv_conf.groupid) != 0)
@ -959,7 +932,7 @@ int main(int argc, char* argv[]) {
edge_term(eee); edge_term(eee);
#ifdef WIN32 #ifdef WIN32
destroyWin32(); destroyWin32();
#endif #endif
return(rc); return(rc);

1947
src/edge_utils.c
View File

File diff suppressed because it is too large

18
src/edge_utils_win32.c
View File

@ -22,11 +22,12 @@
/* ************************************** */ /* ************************************** */
static DWORD* tunReadThread(LPVOID lpArg) { static DWORD* tunReadThread (LPVOID lpArg) {
struct tunread_arg *arg = (struct tunread_arg*)lpArg; struct tunread_arg *arg = (struct tunread_arg*)lpArg;
while(*arg->keep_running) while(*arg->keep_running)
edge_read_from_tap(arg->eee); edge_read_from_tap(arg->eee);
return((DWORD*)NULL); return((DWORD*)NULL);
} }
@ -35,15 +36,16 @@ static DWORD* tunReadThread(LPVOID lpArg) {
/** Start a second thread in Windows because TUNTAP interfaces do not expose /** Start a second thread in Windows because TUNTAP interfaces do not expose
* file descriptors. */ * file descriptors. */
HANDLE startTunReadThread(struct tunread_arg *arg) { HANDLE startTunReadThread (struct tunread_arg *arg) {
DWORD dwThreadId; DWORD dwThreadId;
return(CreateThread(NULL, /* security attributes */ return(CreateThread(NULL, /* security attributes */
0, /* use default stack size */ 0, /* use default stack size */
(LPTHREAD_START_ROUTINE)tunReadThread, /* thread function */ (LPTHREAD_START_ROUTINE)tunReadThread, /* thread function */
(void*)arg, /* argument to thread function */ (void*)arg, /* argument to thread function */
0, /* thread creation flags */ 0, /* thread creation flags */
&dwThreadId)); /* thread id out */ &dwThreadId)); /* thread id out */
} }
#endif #endif

82
src/example_edge_embed.c
View File

@ -20,56 +20,54 @@
static int keep_running; static int keep_running;
int main() int main() {
{
n2n_edge_conf_t conf;
tuntap_dev tuntap;
n2n_edge_t *eee;
int rc;
edge_init_conf_defaults(&conf); n2n_edge_conf_t conf;
conf.allow_p2p = 1; // Whether to allow peer-to-peer communication tuntap_dev tuntap;
conf.allow_routing = 1; // Whether to allow the edge to route packets to other edges n2n_edge_t *eee;
snprintf((char *)conf.community_name, sizeof(conf.community_name), "%s", "mycommunity"); // Community to connect to int rc;
conf.disable_pmtu_discovery = 1; // Whether to disable the path MTU discovery
conf.drop_multicast = 0; // Whether to disable multicast
conf.tuntap_ip_mode = TUNTAP_IP_MODE_SN_ASSIGN; // How to set the IP address
conf.encrypt_key = "mysecret"; // Secret to decrypt & encrypt with
conf.local_port = 0; // What port to use (0 = any port)
conf.mgmt_port = N2N_EDGE_MGMT_PORT; // Edge management port (5644 by default)
conf.register_interval = 1; // Interval for both UDP NAT hole punching and supernode registration
conf.register_ttl = 1; // Interval for UDP NAT hole punching through supernode
edge_conf_add_supernode(&conf, "localhost:1234"); // Supernode to connect to
conf.tos = 16; // Type of service for sent packets
conf.transop_id = N2N_TRANSFORM_ID_TWOFISH; // Use the twofish encryption
if (edge_verify_conf(&conf) != 0) edge_init_conf_defaults(&conf);
{ conf.allow_p2p = 1; // Whether to allow peer-to-peer communication
return -1; conf.allow_routing = 1; // Whether to allow the edge to route packets to other edges
} snprintf((char *)conf.community_name, sizeof(conf.community_name), "%s", "mycommunity"); // Community to connect to
conf.disable_pmtu_discovery = 1; // Whether to disable the path MTU discovery
conf.drop_multicast = 0; // Whether to disable multicast
conf.tuntap_ip_mode = TUNTAP_IP_MODE_SN_ASSIGN; // How to set the IP address
conf.encrypt_key = "mysecret"; // Secret to decrypt & encrypt with
conf.local_port = 0; // What port to use (0 = any port)
conf.mgmt_port = N2N_EDGE_MGMT_PORT; // Edge management port (5644 by default)
conf.register_interval = 1; // Interval for both UDP NAT hole punching and supernode registration
conf.register_ttl = 1; // Interval for UDP NAT hole punching through supernode
edge_conf_add_supernode(&conf, "localhost:1234"); // Supernode to connect to
conf.tos = 16; // Type of service for sent packets
conf.transop_id = N2N_TRANSFORM_ID_TWOFISH; // Use the twofish encryption
if (tuntap_open(&tuntap, if(edge_verify_conf(&conf) != 0) {
"edge0", // Name of the device to create return -1;
"static", // IP mode; static|dhcp }
"10.0.0.1", // Set ip address
"255.255.255.0", // Netmask to use if(tuntap_open(&tuntap,
"DE:AD:BE:EF:01:10", // Set mac address "edge0", // Name of the device to create
DEFAULT_MTU) < 0) // MTU to use "static", // IP mode; static|dhcp
"10.0.0.1", // Set ip address
"255.255.255.0", // Netmask to use
"DE:AD:BE:EF:01:10", // Set mac address
DEFAULT_MTU) < 0) // MTU to use
{ {
return -1; return -1;
} }
eee = edge_init(&conf, &rc); eee = edge_init(&conf, &rc);
if (eee == NULL) if(eee == NULL) {
{ exit(1);
exit(1); }
}
keep_running = 1; keep_running = 1;
rc = run_edge_loop(eee, &keep_running); rc = run_edge_loop(eee, &keep_running);
edge_term(eee); edge_term(eee);
tuntap_close(&tuntap); tuntap_close(&tuntap);
return rc; return rc;
} }

19
src/example_edge_embed_quick_edge_init.c
View File

@ -23,7 +23,8 @@
n2n on an existing application n2n on an existing application
*/ */
int main(int argc, char* argv[]) { int main (int argc, char* argv[]) {
char *device_name = (char*)"n2n0"; char *device_name = (char*)"n2n0";
char *network_name = (char*)"mynetwork"; char *network_name = (char*)"mynetwork";
char *secret_key = (char*)"mysecret"; char *secret_key = (char*)"mysecret";
@ -31,24 +32,24 @@ int main(int argc, char* argv[]) {
char *my_ipv4_addr = (char*)"1.2.3.4"; char *my_ipv4_addr = (char*)"1.2.3.4";
char *supernode = (char*)"7.8.9.10:1234"; char *supernode = (char*)"7.8.9.10:1234";
int keep_on_running = 1; int keep_on_running = 1;
/* Increase tracelevel to see what's happening */ /* Increase tracelevel to see what's happening */
setTraceLevel(10); setTraceLevel(10);
/* Random seed */ /* Random seed */
n2n_srand (n2n_seed()); n2n_srand (n2n_seed());
/* /*
NOTE NOTE
As the function below won't end, you should As the function below won't end, you should
call it inside a separate thread call it inside a separate thread
*/ */
return(quick_edge_init(device_name, return(quick_edge_init(device_name,
network_name, network_name,
secret_key, secret_key,
my_mac_address, my_mac_address,
my_ipv4_addr, my_ipv4_addr,
supernode, supernode,
&keep_on_running)); &keep_on_running));
} }

Write Preview
Loading…
Cancel
Save