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

Merge pull request #315 from switch-iot/hin2n_arp

Browse Source 
delete android define and log code
This commit is contained in:
Luca Deri 2020-07-20 17:15:04 +02:00 committed by GitHub
commit 0ab9f3229e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/n2n.h
View File

@ -115,11 +115,6 @@ typedef struct ether_hdr ether_hdr_t;
#endif
#ifdef __ANDROID_NDK__
#undef N2N_HAVE_DAEMON
#undef N2N_HAVE_SETUID
#undef N2N_CAN_NAME_IFACE
#include <tun2tap/tun2tap.h>
#include <edge_jni/edge_jni.h>
#define ARP_PERIOD_INTERVAL (10) /* sec */
#endif /* #ifdef __ANDROID_NDK__ */
@ -378,9 +373,6 @@ typedef struct n2n_sn
#include "header_encryption.h"
#include "twofish.h"
#ifdef __ANDROID_NDK__
#include <android/log.h>
#endif /* #ifdef __ANDROID_NDK__ */
#ifndef TRACE_ERROR
#define TRACE_ERROR 0, __FILE__, __LINE__
#define TRACE_WARNING 1, __FILE__, __LINE__
@ -407,6 +399,7 @@ void setTraceLevel(int level);
void setUseSyslog(int use_syslog);
void setTraceFile(FILE *f);
int getTraceLevel();
void closeTraceFile();
void traceEvent(int eventTraceLevel, char* file, int line, char * format, ...);
/* Tuntap API */

2
src/edge_utils.c
View File

@ -1982,6 +1982,8 @@ void edge_term(n2n_edge_t * eee) {
edge_cleanup_routes(eee);
closeTraceFile();
free(eee);
}

30
src/n2n.c
View File

@ -82,6 +82,12 @@ void setTraceFile(FILE *f) {
traceFile = f;
}
void closeTraceFile() {
if (traceFile != NULL && traceFile != stdout) {
fclose(traceFile);
}
}
#define N2N_TRACE_DATESIZE 32
void traceEvent(int eventTraceLevel, char* file, int line, char * format, ...) {
va_list va_ap;
@ -129,32 +135,8 @@ void traceEvent(int eventTraceLevel, char* file, int line, char * format, ...) {
} else {
for(i=strlen(file)-1; i>0; i--) if(file[i] == '/') { i++; break; };
snprintf(out_buf, sizeof(out_buf), "%s [%s:%d] %s%s", theDate, &file[i], line, extra_msg, buf);
#ifdef __ANDROID_NDK__
switch (eventTraceLevel) {
case 0: // ERROR
eventTraceLevel = ANDROID_LOG_ERROR;
break;
case 1: // WARNING
eventTraceLevel = ANDROID_LOG_WARN;
break;
case 2: // NORMAL
eventTraceLevel = ANDROID_LOG_INFO;
break;
case 3: // INFO
eventTraceLevel = ANDROID_LOG_DEBUG;
break;
case 4: // DEBUG
eventTraceLevel = ANDROID_LOG_VERBOSE;
break;
default: // NORMAL
eventTraceLevel = ANDROID_LOG_INFO;
break;
}
__android_log_write(eventTraceLevel, "n2n", out_buf);
#else
fprintf(traceFile, "%s\n", out_buf);
fflush(traceFile);
#endif /* #ifdef __ANDROID_NDK__ */
}
#else
/* this is the WIN32 code */