1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-23 14:51:06 +00:00

Skip entries with port number zero

This commit is contained in:
M66B 2017-03-12 08:42:11 +01:00
parent a6a73e0ba9
commit e80119fb62

View file

@ -439,29 +439,30 @@ jint get_uid(const int version, const int protocol,
line, line,
"%*d: %*X:%X %32s:%X %*X %*lX:%*lX %*X:%*X %*X %d %*d %*ld", "%*d: %*X:%X %32s:%X %*X %*lX:%*lX %*X:%*X %*X %d %*d %*ld",
&_sport, hex, &_dport, &u); &_sport, hex, &_dport, &u);
if (fields == 4 && if (fields == 4 && (version == 4 ? strlen(hex) == 8 : strlen(hex) == 32)) {
_sport > 0 && _dport > 0 && u >= 0 && if (_sport > 0 && _dport > 0 && u >= 0) {
(version == 4 ? strlen(hex) == 8 : strlen(hex) == 32)) { hex2bytes(hex, version == 4 ? _daddr4 : _daddr6);
hex2bytes(hex, version == 4 ? _daddr4 : _daddr6); if (version == 4)
if (version == 4) ((uint32_t *) _daddr4)[0] = htonl(((uint32_t *) _daddr4)[0]);
((uint32_t *) _daddr4)[0] = htonl(((uint32_t *) _daddr4)[0]); else
else for (int w = 0; w < 4; w++)
for (int w = 0; w < 4; w++) ((uint32_t *) _daddr6)[w] = htonl(((uint32_t *) _daddr6)[w]);
((uint32_t *) _daddr6)[w] = htonl(((uint32_t *) _daddr6)[w]);
if (lasttry) { if (lasttry) {
char dest[INET6_ADDRSTRLEN + 1]; char dest[INET6_ADDRSTRLEN + 1];
inet_ntop(version == 4 ? AF_INET : AF_INET6, inet_ntop(version == 4 ? AF_INET : AF_INET6,
version == 4 ? _daddr4 : _daddr6, version == 4 ? _daddr4 : _daddr6,
dest, sizeof(dest)); dest, sizeof(dest));
log_android(ANDROID_LOG_WARN, "%u > %s/%u %d %s", log_android(ANDROID_LOG_WARN, "%u > %s/%u %d %s",
_sport, dest, _dport, u, line); _sport, dest, _dport, u, line);
} }
if (_sport == sport && _dport == dport && if (_sport == sport && _dport == dport &&
memcmp(version == 4 ? _daddr4 : _daddr6, daddr, version == 4 ? 4 : 16) == 0) { memcmp(version == 4 ? _daddr4 : _daddr6, daddr, version == 4 ? 4 : 16) ==
uid = u; 0) {
break; uid = u;
break;
}
} }
} }
else else