enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-20 00:51:10 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Compilation fixes

Browse Source
This commit is contained in:
Luca 2018-09-01 18:13:42 +02:00
parent 268308607d
commit 50755005e0
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -16,8 +16,8 @@ N2N_DEFINES=
N2N_OBJS_OPT= N2N_OBJS_OPT=
LIBS_EDGE_OPT= LIBS_EDGE_OPT=
N2N_OPTION_AES?="yes" #N2N_OPTION_AES?="yes"
#N2N_OPTION_AES=no N2N_OPTION_AES=no
ifeq ($(N2N_OPTION_AES), "yes") ifeq ($(N2N_OPTION_AES), "yes")
N2N_DEFINES+=-DN2N_HAVE_AES N2N_DEFINES+=-DN2N_HAVE_AES
@ -148,4 +148,4 @@ push: pre_push
.PHONY: pre_platforms platforms build pre_push push .PHONY: pre_platforms platforms build pre_push push
.SILENT: pre_platforms pre_push .SILENT: pre_platforms pre_push
# End Docker builder section # End Docker builder section

9
edge.c
View File

@ -174,9 +174,8 @@ static void help() {
/* *************************************************** */ /* *************************************************** */
static int setOption(int optkey, char *optarg, edge_conf_t *ec, n2n_edge_t *eee) { static int setOption(int optkey, char *optargument, edge_conf_t *ec, n2n_edge_t *eee) {
//traceEvent(TRACE_NORMAL, "Option %c = %s", optkey, optargument ? optargument : "");
//traceEvent(TRACE_NORMAL, "Option %c = %s", optkey, optarg ? optarg : "");
switch(optkey) { switch(optkey) {
case'K': case'K':
@ -185,7 +184,7 @@ static int setOption(int optkey, char *optarg, edge_conf_t *ec, n2n_edge_t *eee)
fprintf(stderr, "Error: -K and -k options are mutually exclusive.\n"); fprintf(stderr, "Error: -K and -k options are mutually exclusive.\n");
exit(1); exit(1);
} else { } else {
strncpy(eee->keyschedule, optarg, N2N_PATHNAME_MAXLEN-1); strncpy(eee->keyschedule, optargument, N2N_PATHNAME_MAXLEN-1);
/* strncpy does not add NULL if the source has no NULL. */ /* strncpy does not add NULL if the source has no NULL. */
eee->keyschedule[N2N_PATHNAME_MAXLEN-1] = 0; eee->keyschedule[N2N_PATHNAME_MAXLEN-1] = 0;
@ -199,7 +198,7 @@ static int setOption(int optkey, char *optarg, edge_conf_t *ec, n2n_edge_t *eee)
{ {
scan_address(ec->ip_addr, N2N_NETMASK_STR_SIZE, scan_address(ec->ip_addr, N2N_NETMASK_STR_SIZE,
ec->ip_mode, N2N_IF_MODE_SIZE, ec->ip_mode, N2N_IF_MODE_SIZE,
optarg); optargument);
break; break;
} }

4
edge_utils.c
View File

@ -894,7 +894,7 @@ static void readFromMgmtSocket(n2n_edge_t * eee, int * keep_running) {
"Statistics for edge\n"); "Statistics for edge\n");
msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len), msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len),
"uptime %llu\n", "uptime %lu\n",
time(NULL) - eee->start_time); time(NULL) - eee->start_time);
msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len), msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len),
@ -921,7 +921,7 @@ static void readFromMgmtSocket(n2n_edge_t * eee, int * keep_running) {
(unsigned int)peer_list_size(eee->known_peers)); (unsigned int)peer_list_size(eee->known_peers));
msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len), msg_len += snprintf((char *)(udp_buf+msg_len), (N2N_PKT_BUF_SIZE-msg_len),
"last super:%llu(%lld sec ago) p2p:%llu(%lld sec ago)\n", "last super:%lu (%ld sec ago) p2p:%lu (%ld sec ago)\n",
eee->last_sup, (now-eee->last_sup), eee->last_p2p, (now-eee->last_p2p)); eee->last_sup, (now-eee->last_sup), eee->last_p2p, (now-eee->last_p2p));
traceEvent(TRACE_DEBUG, "mgmt status sending: %s", udp_buf); traceEvent(TRACE_DEBUG, "mgmt status sending: %s", udp_buf);

2
transform_aes.c
View File

@ -20,8 +20,6 @@
#include "n2n_transforms.h" #include "n2n_transforms.h"
#if defined(N2N_HAVE_AES) #if defined(N2N_HAVE_AES)
#include "openssl/aes.h" #include "openssl/aes.h"
#ifndef _MSC_VER #ifndef _MSC_VER
/* Not included in Visual Studio 2008 */ /* Not included in Visual Studio 2008 */