|
@ -57,7 +57,7 @@ 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) { |
|
@ -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,12 +277,11 @@ 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, |
|
@ -294,83 +289,72 @@ static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec |
|
|
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. " |
|
@ -383,19 +367,17 @@ static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec |
|
|
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
|
|
@ -422,27 +404,24 @@ static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec |
|
|
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; |
|
|
} |
|
|
} |
|
@ -450,15 +429,13 @@ static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec |
|
|
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,14 +481,12 @@ 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; |
|
|
} |
|
|
} |
|
@ -521,22 +495,21 @@ static int setOption(int optkey, char *optargument, n2n_tuntap_priv_config_t *ec |
|
|
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++; |
|
@ -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; |
|
@ -660,11 +633,11 @@ static int loadFromFile(const char *path, n2n_edge_conf_t *conf, n2n_tuntap_priv |
|
|
/* 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"; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -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; |
|
|
|
|
|
|
|
@ -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 */ |
|
@ -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,16 +845,16 @@ 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", |
|
|