mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Native fixed traffic log time

This commit is contained in:
M66B 2016-01-21 17:41:18 +01:00
parent 7c974c7278
commit ee78684869
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/jni/netguard/netguard.c
View File

@ -852,7 +852,7 @@ void handle_ip(const struct arguments *args, const uint8_t *buffer, const uint16
// Log traffic // Log traffic
if (args->log) { if (args->log) {
if (!args->filter || syn || log || protocol != IPPROTO_TCP) if (!args->filter || syn || log || protocol != IPPROTO_TCP)
log_packet(args, time(NULL), version, dest, protocol, dport, flags, uid, allowed); log_packet(args, version, dest, protocol, dport, flags, uid, allowed);
} }
} }
@ -1440,7 +1440,7 @@ int write_udp(const struct arguments *args, const struct udp_session *cur,
log_android(ANDROID_LOG_INFO, "tun UDP write %f", mselapsed); log_android(ANDROID_LOG_INFO, "tun UDP write %f", mselapsed);
#endif #endif
log_packet(args, time(NULL), cur->version, to, ip->protocol, ntohs(udp->dest), "", cur->uid, 1); log_packet(args, cur->version, to, ip->protocol, ntohs(udp->dest), "", cur->uid, 1);
// Write pcap record // Write pcap record
if (pcap_fn != NULL) if (pcap_fn != NULL)
@ -1720,7 +1720,6 @@ void log_android(int prio, const char *fmt, ...) {
void log_packet( void log_packet(
const struct arguments *args, const struct arguments *args,
jlong time,
jint version, jint version,
const char *dest, const char *dest,
jint protocol, jint protocol,
@ -1742,10 +1741,13 @@ void log_packet(
if (mid == 0) if (mid == 0)
log_android(ANDROID_LOG_ERROR, "Method logPacket%s not found", signature); log_android(ANDROID_LOG_ERROR, "Method logPacket%s not found", signature);
else { else {
struct timeval tv;
gettimeofday(&tv, NULL);
jlong t = tv.tv_sec * 1000LL + tv.tv_usec / 1000;
jstring jdest = (*env)->NewStringUTF(env, dest); jstring jdest = (*env)->NewStringUTF(env, dest);
jstring jflags = (*env)->NewStringUTF(env, flags); jstring jflags = (*env)->NewStringUTF(env, flags);
(*env)->CallVoidMethod(env, instance, mid, (*env)->CallVoidMethod(env, instance, mid,
time, t,
version, version,
jdest, jdest,
protocol, protocol,

1
app/src/main/jni/netguard/netguard.h
View File

@ -147,7 +147,6 @@ uint16_t calc_checksum(uint8_t *buffer, uint16_t length);
void log_android(int prio, const char *fmt, ...); void log_android(int prio, const char *fmt, ...);
void log_packet(const struct arguments *args, void log_packet(const struct arguments *args,
jlong time,
jint version, jint version,
const char *dest, const char *dest,
jint protocol, jint protocol,